diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-11-21 13:11:16 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-11-21 13:11:16 -0400 |
| commit | f301172da9cf7eed54ee399f2e179880f562d446 (patch) | |
| tree | 515f43391865afca7dffae998465611641f5b498 /standalone | |
| parent | f1c55faf54589e3b8708520f7bc9e2dab34d536c (diff) | |
freshen patch
Diffstat (limited to 'standalone')
| -rw-r--r-- | standalone/linux/haskell-patches/network_disable_accept4.patch | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/standalone/linux/haskell-patches/network_disable_accept4.patch b/standalone/linux/haskell-patches/network_disable_accept4.patch index a1c07206a..cc4ed62b9 100644 --- a/standalone/linux/haskell-patches/network_disable_accept4.patch +++ b/standalone/linux/haskell-patches/network_disable_accept4.patch @@ -1,26 +1,25 @@ -From f89652f762cf40e4c737fc1b9d6f395eb8df1959 Mon Sep 17 00:00:00 2001 -From: Joey Hess <joey@kitenet.net> -Date: Mon, 10 Mar 2014 13:28:25 -0400 +From a6fb84e676bc13a248baf9f617fc3e84ef902111 Mon Sep 17 00:00:00 2001 +From: Joey Hess <joeyh@joeyh.name> +Date: Tue, 21 Nov 2017 13:10:35 -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 +index 6a1ce6a..ef4004e 100644 --- a/Network/Socket.hsc +++ b/Network/Socket.hsc -@@ -510,7 +510,7 @@ accept sock@(MkSocket s family stype protocol status) = do +@@ -535,7 +535,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" + new_sock <- throwSocketErrorIfMinus1RetryMayBlock "Network.Socket.accept" (threadWaitRead (fromIntegral s)) (c_accept4 s sockaddr ptr_len (#const SOCK_NONBLOCK)) -- -1.9.0 +2.15.0 |