mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

freshen patch

Browse source
This commit is contained in:
Joey Hess 2017-11-21 13:11:16 -04:00
parent cd97752626
commit b411d6c412
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
standalone/linux/haskell-patches/network_disable_accept4.patch
View file

@ -1,26 +1,25 @@
From f89652f762cf40e4c737fc1b9d6f395eb8df1959 Mon Sep 17 00:00:00 2001 From a6fb84e676bc13a248baf9f617fc3e84ef902111 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net> From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 10 Mar 2014 13:28:25 -0400 Date: Tue, 21 Nov 2017 13:10:35 -0400
Subject: [PATCH] disable use of accept4, for compatability with older systems 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 +- Network/Socket.hsc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Network/Socket.hsc b/Network/Socket.hsc diff --git a/Network/Socket.hsc b/Network/Socket.hsc
index 6d304bb..d7fe733 100644 index 6a1ce6a..ef4004e 100644
--- a/Network/Socket.hsc --- a/Network/Socket.hsc
+++ b/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 return new_sock
#else #else
with (fromIntegral sz) $ \ ptr_len -> do with (fromIntegral sz) $ \ ptr_len -> do
-# ifdef HAVE_ACCEPT4 -# ifdef HAVE_ACCEPT4
+# if 0 +# if 0
new_sock <- throwSocketErrorIfMinus1RetryMayBlock "accept" new_sock <- throwSocketErrorIfMinus1RetryMayBlock "Network.Socket.accept"
(threadWaitRead (fromIntegral s)) (threadWaitRead (fromIntegral s))
(c_accept4 s sockaddr ptr_len (#const SOCK_NONBLOCK)) (c_accept4 s sockaddr ptr_len (#const SOCK_NONBLOCK))
-- --
1.9.0 2.15.0