update some patches for new versions

2 files changed, 48 insertions, 17 deletions

diff --git a/standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch b/standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch
index 9be862b5a..116fa320e 100644
--- a/standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch
+++ b/standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch
@@ -1,26 +1,26 @@
-From 5b14dd83f9ff1d187871fc7c6e956cad95bc4e9b Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Fri, 19 Apr 2013 15:36:25 -0400
+From 63a7a97511266c1a9d2414d3314ee17fc88bb8f2 Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Fri, 18 Oct 2013 15:58:35 +0000
 Subject: [PATCH] configure misdetects accept4
 
 ---
- Network/Socket.hsc | 4 ++--
+ Network/Socket.hsc |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Network/Socket.hsc b/Network/Socket.hsc
-index e6c0feb..49d090b 100644
+index 9af31f8..6c21209 100644
 --- a/Network/Socket.hsc
 +++ b/Network/Socket.hsc
-@@ -505,7 +505,7 @@ accept sock@(MkSocket s family stype protocol status) = do
+@@ -503,7 +503,7 @@ accept sock@(MkSocket s family stype protocol status) = do
+                 return new_sock
  #else
       with (fromIntegral sz) $ \ ptr_len -> do
-      new_sock <-
 -# ifdef HAVE_ACCEPT4
-+# if 0
-                  throwSocketErrorIfMinus1RetryMayBlock "accept"
++#if 0
+      new_sock <- throwSocketErrorIfMinus1RetryMayBlock "accept"
                          (threadWaitRead (fromIntegral s))
                          (c_accept4 s sockaddr ptr_len (#const SOCK_NONBLOCK))
-@@ -1589,7 +1589,7 @@ foreign import CALLCONV SAFE_ON_WIN "connect"
+@@ -1615,7 +1615,7 @@ foreign import CALLCONV SAFE_ON_WIN "connect"
    c_connect :: CInt -> Ptr SockAddr -> CInt{-CSockLen???-} -> IO CInt
  foreign import CALLCONV unsafe "accept"
    c_accept :: CInt -> Ptr SockAddr -> Ptr CInt{-CSockLen???-} -> IO CInt
@@ -30,5 +30,5 @@ index e6c0feb..49d090b 100644
    c_accept4 :: CInt -> Ptr SockAddr -> Ptr CInt{-CSockLen???-} -> CInt -> IO CInt
  #endif
 -- 
-1.8.2.rc3
+1.7.10.4
 
diff --git a/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch b/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch
index 80b509f5f..be7956bea 100644
--- a/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch
+++ b/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch
@@ -1,12 +1,43 @@
-From eff7034f0c9f80fd30c9d8952b3fd0a343adccc8 Mon Sep 17 00:00:00 2001
-From: foo <bar>
-Date: Mon, 23 Sep 2013 00:12:35 +0000
-Subject: [PATCH] hack for Bionic
+From e6d5c141186dbdbe97c698294485ffc4dcd3a843 Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Fri, 18 Oct 2013 16:45:50 +0000
+Subject: [PATCH] hack for bionic + cross build
 
 ---
- cbits/conv.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Data/UnixTime/Types.hsc |   12 ------------
+ cbits/conv.c            |    2 +-
+ 2 files changed, 1 insertion(+), 13 deletions(-)
 
+diff --git a/Data/UnixTime/Types.hsc b/Data/UnixTime/Types.hsc
+index d30f39b..ec7ca4c 100644
+--- a/Data/UnixTime/Types.hsc
++++ b/Data/UnixTime/Types.hsc
+@@ -9,8 +9,6 @@ import Foreign.Storable
+ 
+ #include <sys/time.h>
+ 
+-#let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
+-
+ -- |
+ -- Data structure for Unix time.
+ data UnixTime = UnixTime {
+@@ -20,16 +18,6 @@ data UnixTime = UnixTime {
+   , utMicroSeconds :: {-# UNPACK #-} !Int32
+   } deriving (Eq,Ord,Show)
+ 
+-instance Storable UnixTime where
+-    sizeOf _    = (#size struct timeval)
+-    alignment _ = (#alignment struct timeval)
+-    peek ptr    = UnixTime
+-            <$> (#peek struct timeval, tv_sec)  ptr
+-            <*> (#peek struct timeval, tv_usec) ptr
+-    poke ptr ut = do
+-            (#poke struct timeval, tv_sec)  ptr (utSeconds ut)
+-            (#poke struct timeval, tv_usec) ptr (utMicroSeconds ut)
+-
+ -- |
+ -- Format of the strptime()/strftime() style.
+ type Format = ByteString
 diff --git a/cbits/conv.c b/cbits/conv.c
 index 7ff7b87..2e4c870 100644
 --- a/cbits/conv.c