summaryrefslogtreecommitdiff
path: root/standalone
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-03-10 13:31:23 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-03-10 13:31:23 -0400
commit51db34af47a2c0f2cd80aa8154bf23b9b04e6830 (patch)
tree5824b196b1704aed065076e8ea8fc034e914e62f /standalone
parent139005edeaf22fb0cbd0cf85df87abf43ae50da5 (diff)
really add patch..
Diffstat (limited to 'standalone')
-rw-r--r--standalone/linux/haskell-patches/network_disable_accept4.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/standalone/linux/haskell-patches/network_disable_accept4.patch b/standalone/linux/haskell-patches/network_disable_accept4.patch
new file mode 100644
index 000000000..a1c07206a
--- /dev/null
+++ b/standalone/linux/haskell-patches/network_disable_accept4.patch
@@ -0,0 +1,26 @@
+From f89652f762cf40e4c737fc1b9d6f395eb8df1959 Mon Sep 17 00:00:00 2001
+From: Joey Hess <joey@kitenet.net>
+Date: Mon, 10 Mar 2014 13:28:25 -0400
+Subject: [PATCH] disable use of accept4, for compatability with older systems
+
+See http://git-annex.branchable.com/bugs/Assistant_lost_dbus_connection_spamming_log/
+---
+ Network/Socket.hsc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Network/Socket.hsc b/Network/Socket.hsc
+index 6d304bb..d7fe733 100644
+--- a/Network/Socket.hsc
++++ b/Network/Socket.hsc
+@@ -510,7 +510,7 @@ accept sock@(MkSocket s family stype protocol status) = do
+ return new_sock
+ #else
+ with (fromIntegral sz) $ \ ptr_len -> do
+-# ifdef HAVE_ACCEPT4
++# if 0
+ new_sock <- throwSocketErrorIfMinus1RetryMayBlock "accept"
+ (threadWaitRead (fromIntegral s))
+ (c_accept4 s sockaddr ptr_len (#const SOCK_NONBLOCK))
+--
+1.9.0
+