update haskell patches for new versions in hackage

6 files changed, 24 insertions, 168 deletions

diff --git a/standalone/android/haskell-patches/HTTP_4000.2.8-0001-build-with-base-4.8.patch b/standalone/android/haskell-patches/HTTP_4000.2.8-0001-build-with-base-4.8.patch
deleted file mode 100644
index dfcdc387f..000000000
--- a/standalone/android/haskell-patches/HTTP_4000.2.8-0001-build-with-base-4.8.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5c57c4ae7dac0c1aa940005f5ea55fdcd4fcd1f5 Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sat, 21 Sep 2013 22:46:42 +0000
-Subject: [PATCH] fix build with new base
-
----
- HTTP.cabal |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/HTTP.cabal b/HTTP.cabal
-index 76cb5d6..bb38f24 100644
---- a/HTTP.cabal
-+++ b/HTTP.cabal
-@@ -85,7 +85,7 @@ Library
-                  Network.HTTP.Utils
-                  Paths_HTTP
-   GHC-options: -fwarn-missing-signatures -Wall
--  Build-depends: base >= 2 && < 4.7, network < 2.5, parsec
-+  Build-depends: base >= 2 && < 4.9, network < 2.5, parsec
-   Extensions: FlexibleInstances
-   if flag(old-base)
-     Build-depends: base < 3
--- 
-1.7.10.4
-
diff --git a/standalone/android/haskell-patches/MonadCatchIO-transformers_hack-to-get-to-build-with-new-ghc.patch b/standalone/android/haskell-patches/MonadCatchIO-transformers_hack-to-get-to-build-with-new-ghc.patch
deleted file mode 100644
index 9881d35d6..000000000
--- a/standalone/android/haskell-patches/MonadCatchIO-transformers_hack-to-get-to-build-with-new-ghc.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 083c9d135ec68316db173235994c63603ad76444 Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sat, 21 Sep 2013 23:01:35 +0000
-Subject: [PATCH] hack to get to build with new ghc
-
-Copied the old implemenations of block and unblock from old Control.Exception
-since these deprecated functions have now been removed.
----
- MonadCatchIO-transformers.cabal |    2 +-
- src/Control/Monad/CatchIO.hs    |   13 +++++++++++--
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/MonadCatchIO-transformers.cabal b/MonadCatchIO-transformers.cabal
-index fe6674d..b9f559f 100644
---- a/MonadCatchIO-transformers.cabal
-+++ b/MonadCatchIO-transformers.cabal
-@@ -26,4 +26,4 @@ Library
-   Exposed-Modules:
-     Control.Monad.CatchIO
-   Hs-Source-Dirs:  src
--  Ghc-options:     -Wall
-+  Ghc-options:     -Wall -fglasgow-exts
-diff --git a/src/Control/Monad/CatchIO.hs b/src/Control/Monad/CatchIO.hs
-index 62afb83..853996b 100644
---- a/src/Control/Monad/CatchIO.hs
-+++ b/src/Control/Monad/CatchIO.hs
-@@ -19,6 +19,9 @@ where
- import           Prelude hiding ( catch )
- import           Control.Applicative                          ((<$>))
- import qualified Control.Exception.Extensible      as E
-+import qualified Control.Exception.Base      as E
-+import GHC.Base (maskAsyncExceptions#)
-+import GHC.IO (unsafeUnmask, IO(..))
- 
- import           Control.Monad.IO.Class                       (MonadIO,liftIO)
- 
-@@ -51,8 +54,14 @@ class MonadIO m => MonadCatchIO m where
- 
- instance MonadCatchIO IO where
-   catch   = E.catch
--  block   = E.block
--  unblock = E.unblock
-+  block   = oldblock
-+  unblock = oldunblock
-+
-+oldblock :: IO a -> IO a
-+oldblock (IO io) = IO $ maskAsyncExceptions# io
-+
-+oldunblock :: IO a -> IO a
-+oldunblock = unsafeUnmask
- 
- -- | Warning: this instance is somewhat contentious.
- -- 
--- 
-1.7.10.4
-
diff --git a/standalone/android/haskell-patches/network_2.4.1.0_0001-android-port-fixes.patch b/standalone/android/haskell-patches/network_2.4.1.0_0001-android-port-fixes.patch
index d7d0608d2..66c0de544 100644
--- a/standalone/android/haskell-patches/network_2.4.1.0_0001-android-port-fixes.patch
+++ b/standalone/android/haskell-patches/network_2.4.1.0_0001-android-port-fixes.patch
@@ -1,6 +1,6 @@
-From 9750532bd6200353fe09dda65ee6fb59702c4ac1 Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Thu, 28 Feb 2013 23:32:15 -0400
+From 3b478080f72240e0eb4b03b7eae52a0f5385bfef Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Thu, 26 Dec 2013 12:35:39 -0400
 Subject: [PATCH] android port fixes
 
 Build note: Ensure a hsc2hs in PATH is modified to pass -x to the real
@@ -14,14 +14,13 @@ one, to enable cross-compiling.
  config.guess                  |  562 ++++++++++++++++++++++-------------------
  config.sub                    |  384 ++++++++++++++++++++--------
  configure                     |    1 +
- include/HsNetworkConfig.h     |    8 +-
- 9 files changed, 612 insertions(+), 387 deletions(-)
+ 8 files changed, 608 insertions(+), 383 deletions(-)
 
 diff --git a/Network/Socket.hsc b/Network/Socket.hsc
-index 259e843..e6c0feb 100644
+index 6d304bb..9b34776 100644
 --- a/Network/Socket.hsc
 +++ b/Network/Socket.hsc
-@@ -38,7 +38,7 @@ module Network.Socket
+@@ -35,7 +35,7 @@ module Network.Socket
      , SockAddr(..)
      , SocketStatus(..)
      , HostAddress
@@ -30,7 +29,7 @@ index 259e843..e6c0feb 100644
      , HostAddress6
      , FlowInfo
      , ScopeID
-@@ -55,7 +55,7 @@ module Network.Socket
+@@ -52,7 +52,7 @@ module Network.Socket
      , HostName
      , ServiceName
  
@@ -48,7 +47,7 @@ index 259e843..e6c0feb 100644
      , iN6ADDR_ANY
  #endif
      , sOMAXCONN
-@@ -330,16 +330,6 @@ socket family stype protocol = do
+@@ -326,16 +326,6 @@ socket family stype protocol = do
      setNonBlockIfNeeded fd
      socket_status <- newMVar NotConnected
      let sock = MkSocket fd family stype protocol socket_status
@@ -65,7 +64,7 @@ index 259e843..e6c0feb 100644
      return sock
  
  -- | Build a pair of connected socket objects using the given address
-@@ -1043,9 +1033,9 @@ aNY_PORT = 0
+@@ -1059,9 +1049,9 @@ aNY_PORT = 0
  iNADDR_ANY :: HostAddress
  iNADDR_ANY = htonl (#const INADDR_ANY)
  
@@ -77,7 +76,7 @@ index 259e843..e6c0feb 100644
  -- | The IPv6 wild card address.
  
  iN6ADDR_ANY :: HostAddress6
-@@ -1219,7 +1209,7 @@ unpackBits ((k,v):xs) r
+@@ -1239,7 +1229,7 @@ unpackBits ((k,v):xs) r
  -----------------------------------------------------------------------------
  -- Address and service lookups
  
@@ -87,10 +86,10 @@ index 259e843..e6c0feb 100644
  -- | Flags that control the querying behaviour of 'getAddrInfo'.
  data AddrInfoFlag
 diff --git a/Network/Socket/ByteString.hsc b/Network/Socket/ByteString.hsc
-index bec2eb9..cb8ed8c 100644
+index e21ad1b..c2dd70a 100644
 --- a/Network/Socket/ByteString.hsc
 +++ b/Network/Socket/ByteString.hsc
-@@ -201,7 +201,7 @@ sendMany sock@(MkSocket fd _ _ _ _) cs = do
+@@ -197,7 +197,7 @@ sendMany sock@(MkSocket fd _ _ _ _) cs = do
        liftM fromIntegral . withIOVec cs $ \(iovsPtr, iovsLen) ->
            throwSocketErrorWaitWrite sock "writev" $
                c_writev (fromIntegral fd) iovsPtr
@@ -100,7 +99,7 @@ index bec2eb9..cb8ed8c 100644
  sendMany sock = sendAll sock . B.concat
  #endif
 diff --git a/Network/Socket/Internal.hsc b/Network/Socket/Internal.hsc
-index 96fe9c6..df5ce64 100644
+index 83333f7..0dd6a7d 100644
 --- a/Network/Socket/Internal.hsc
 +++ b/Network/Socket/Internal.hsc
 @@ -24,7 +24,7 @@ module Network.Socket.Internal
@@ -113,10 +112,10 @@ index 96fe9c6..df5ce64 100644
      , FlowInfo
      , ScopeID
 diff --git a/Network/Socket/Types.hsc b/Network/Socket/Types.hsc
-index 7ad24f1..dad1d1d 100644
+index 48a43bb..1c5994f 100644
 --- a/Network/Socket/Types.hsc
 +++ b/Network/Socket/Types.hsc
-@@ -705,8 +705,8 @@ intToPortNumber v = PortNum (htons (fromIntegral v))
+@@ -711,8 +711,8 @@ intToPortNumber v = PortNum (htons (fromIntegral v))
  portNumberToInt :: PortNumber -> Int
  portNumberToInt (PortNum po) = fromIntegral (ntohs po)
  
@@ -1911,50 +1910,15 @@ index ad9f395..802a224 100644
  				;;
  			-beos*)
 diff --git a/configure b/configure
-index a9e9814..7fd6318 100755
+index 1e352d9..e375246 100755
 --- a/configure
 +++ b/configure
 @@ -1,4 +1,5 @@
  #! /bin/sh
 +set -- --host=arm-linux-androideabi
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69 for Haskell network package 2.3.0.14.
+ # Generated by GNU Autoconf 2.68 for Haskell network package 2.3.0.14.
  #
-diff --git a/include/HsNetworkConfig.h b/include/HsNetworkConfig.h
-index c6e704d..4edc892 100644
---- a/include/HsNetworkConfig.h
-+++ b/include/HsNetworkConfig.h
-@@ -8,7 +8,7 @@
- #define HAVE_ARPA_INET_H 1
- 
- /* Define to 1 if you have a BSDish sendfile(2) implementation. */
--#define HAVE_BSD_SENDFILE 1
-+/* #undef HAVE_BSD_SENDFILE */
- 
- /* Define to 1 if you have the declaration of `AI_ADDRCONFIG', and to 0 if you
-    don't. */
-@@ -55,7 +55,7 @@
- #define HAVE_LIMITS_H 1
- 
- /* Define to 1 if you have a Linux sendfile(2) implementation. */
--/* #undef HAVE_LINUX_SENDFILE */
-+#define HAVE_LINUX_SENDFILE 1
- 
- /* Define to 1 if you have the <memory.h> header file. */
- #define HAVE_MEMORY_H 1
-@@ -91,10 +91,10 @@
- #define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
- 
- /* Define to 1 if `sa_len' is a member of `struct sockaddr'. */
--#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
-+/* #undef HAVE_STRUCT_SOCKADDR_SA_LEN */
- 
- /* Define to 1 if you have both SO_PEERCRED and struct ucred. */
--/* #undef HAVE_STRUCT_UCRED */
-+#define HAVE_STRUCT_UCRED 1
- 
- /* Define to 1 if you have the `symlink' function. */
- #define HAVE_SYMLINK 1
 -- 
 1.7.10.4
 
diff --git a/standalone/android/haskell-patches/process_fix-build-with-new-ghc.patch b/standalone/android/haskell-patches/process_fix-build-with-new-ghc.patch
deleted file mode 100644
index a790a316d..000000000
--- a/standalone/android/haskell-patches/process_fix-build-with-new-ghc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0b0d4250cfce44b1a03b50458b4122370ab349ce Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sat, 21 Sep 2013 21:50:51 +0000
-Subject: [PATCH] fix build with new ghc
-
----
- System/Process/Internals.hs |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
-index a73c6fc..6676a72 100644
---- a/System/Process/Internals.hs
-+++ b/System/Process/Internals.hs
-@@ -61,6 +61,7 @@ import Control.Concurrent
- import Control.Exception
- import Foreign.C
- import Foreign
-+import System.IO.Unsafe
- 
- # ifdef __GLASGOW_HASKELL__
- 
--- 
-1.7.10.4
-
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages
index 333a88260..9b8baf2f6 100755
--- a/standalone/android/install-haskell-packages
+++ b/standalone/android/install-haskell-packages
@@ -66,14 +66,11 @@ install_pkgs () {
 	patched unix-time
 	patched lifted-base
 	patched zlib
-	patched process
 	patched MissingH
 	patched bloomfilter
 	patched SafeSemaphore
 	patched distributive
 	patched comonad
-	patched HTTP
-	patched MonadCatchIO-transformers
 	patched iproute
 	patched primitive
 	patched socks
diff --git a/standalone/no-th/haskell-patches/persistent-template_stub-out.patch b/standalone/no-th/haskell-patches/persistent-template_stub-out.patch
index 6b7b62bd4..29002eb32 100644
--- a/standalone/no-th/haskell-patches/persistent-template_stub-out.patch
+++ b/standalone/no-th/haskell-patches/persistent-template_stub-out.patch
@@ -1,6 +1,6 @@
-From 0b9df0de3aa45918a2a9226a2da6be4680276419 Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sun, 22 Sep 2013 03:31:55 +0000
+From 4b958f97bffdeedc0c946d5fdc9749d2cc566fcc Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Thu, 26 Dec 2013 15:54:37 -0400
 Subject: [PATCH] stub out
 
 ---
@@ -8,15 +8,15 @@ Subject: [PATCH] stub out
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/persistent-template.cabal b/persistent-template.cabal
-index 8216ce7..f23234b 100644
+index c4aee68..7905278 100644
 --- a/persistent-template.cabal
 +++ b/persistent-template.cabal
-@@ -23,7 +23,7 @@ library
-                    , containers
+@@ -24,7 +24,7 @@ library
                     , aeson
                     , monad-logger
+                    , unordered-containers
 -    exposed-modules: Database.Persist.TH
-+    exposed-modules: 
++    exposed-modules:
      ghc-options:     -Wall
      if impl(ghc >= 7.4)
         cpp-options: -DGHC_7_4