update remaining android patches

4 files changed, 71 insertions, 25 deletions

diff --git a/standalone/android/haskell-patches/dns_use-android-net.dns1-command-instead-of-resolv.conf.patch b/standalone/android/haskell-patches/dns_use-android-net.dns1-command-instead-of-resolv.conf.patch
index 030f59ed1..f510b0d8d 100644
--- a/standalone/android/haskell-patches/dns_use-android-net.dns1-command-instead-of-resolv.conf.patch
+++ b/standalone/android/haskell-patches/dns_use-android-net.dns1-command-instead-of-resolv.conf.patch
@@ -1,6 +1,6 @@
-From bf2126a729e87c5eae7893a48f850993498a666a Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Tue, 3 Dec 2013 13:11:15 -0400
+From 3f72e299c50476c270c5187092d6e8b13ddfbf1e Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Mon, 26 May 2014 01:53:13 +0000
 Subject: [PATCH] use android net.dns1 command instead of resolv.conf file
 
 Android has no /etc/resolv.conf. Some might have /system/etc/resolv.conf,
@@ -9,23 +9,32 @@ but even that does not seem likely.
 This is likely a little slow, but is at least fine for git-annex's uses,
 since it only uses this library for occasional SRV lookups.
 ---
- Network/DNS/Resolver.hs | 11 +++++++----
- dns.cabal               |  1 +
- 2 files changed, 8 insertions(+), 4 deletions(-)
+ Network/DNS/Resolver.hs |   13 ++++++++-----
+ dns.cabal               |    1 +
+ 2 files changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/Network/DNS/Resolver.hs b/Network/DNS/Resolver.hs
-index 9e6c951..c210763 100644
+index 5721e03..c4400d1 100644
 --- a/Network/DNS/Resolver.hs
 +++ b/Network/DNS/Resolver.hs
-@@ -27,6 +27,7 @@ import Network.Socket.ByteString.Lazy
+@@ -19,7 +19,7 @@ module Network.DNS.Resolver (
+   ) where
+ 
+ import Control.Applicative ((<$>), (<*>), pure)
+-import Control.Exception (bracket)
++import Control.Exception (bracket, catch, IOException)
+ import qualified Data.ByteString.Char8 as BS
+ import Data.Char (isSpace)
+ import Data.List (isPrefixOf)
+@@ -32,6 +32,7 @@ import Network.Socket (AddrInfoFlag(..), AddrInfo(..), defaultHints, getAddrInfo
  import Prelude hiding (lookup)
- import System.Random
- import System.Timeout
+ import System.Random (getStdRandom, randomR)
+ import System.Timeout (timeout)
 +import System.Process
  
  #if mingw32_HOST_OS == 1
  import Network.Socket (send)
-@@ -111,10 +112,12 @@ makeResolvSeed conf = ResolvSeed <$> addr
+@@ -130,10 +131,12 @@ makeResolvSeed conf = ResolvSeed <$> addr
    where
      addr = case resolvInfo conf of
          RCHostName numhost -> makeAddrInfo numhost
@@ -43,17 +52,17 @@ index 9e6c951..c210763 100644
  makeAddrInfo :: HostName -> IO AddrInfo
  makeAddrInfo addr = do
 diff --git a/dns.cabal b/dns.cabal
-index 0a7e6f8..06f5a90 100644
+index ceaf5f4..cd15e61 100644
 --- a/dns.cabal
 +++ b/dns.cabal
 @@ -37,6 +37,7 @@ Library
                        , network >= 2.3
-                       , network-conduit
                        , random
+                       , resourcet
 +                      , process
    else
      Build-Depends:      base >= 4 && < 5
                        , attoparsec
 -- 
-1.8.4.4
+1.7.10.4
 
diff --git a/standalone/android/haskell-patches/system-filepath_cross-build.patch b/standalone/android/haskell-patches/system-filepath_cross-build.patch
index 430e8f99f..c9f9304a4 100644
--- a/standalone/android/haskell-patches/system-filepath_cross-build.patch
+++ b/standalone/android/haskell-patches/system-filepath_cross-build.patch
@@ -1,14 +1,14 @@
-From 9345a1ad95cc263f99ef124c7a386fb5aaa5405b Mon Sep 17 00:00:00 2001
-From: androidbuilder <androidbuilder@example.com>
-Date: Fri, 7 Feb 2014 22:18:12 +0000
-Subject: [PATCH] fix
+From 0e728d5b049224394908d793c73902a8c981e636 Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Mon, 26 May 2014 01:04:40 +0000
+Subject: [PATCH] fix cross build
 
 ---
  system-filepath.cabal |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/system-filepath.cabal b/system-filepath.cabal
-index d5fbbdd..efdf9ca 100644
+index d6aa726..f4e5e0f 100644
 --- a/system-filepath.cabal
 +++ b/system-filepath.cabal
 @@ -6,7 +6,7 @@ license-file: license.txt
@@ -17,7 +17,7 @@ index d5fbbdd..efdf9ca 100644
  copyright: John Millikin 2010-2012
 -build-type: Custom
 +build-type: Simple
- cabal-version: >= 1.6
+ cabal-version: >= 1.8
  category: System
  stability: experimental
 -- 
diff --git a/standalone/android/haskell-patches/wai-app-static_avoid-building-warp-executable.patch b/standalone/android/haskell-patches/wai-app-static_avoid-building-warp-executable.patch
new file mode 100644
index 000000000..7143c30ba
--- /dev/null
+++ b/standalone/android/haskell-patches/wai-app-static_avoid-building-warp-executable.patch
@@ -0,0 +1,37 @@
+From 545e4197258d8243ede63314faaa14fa260d450e Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Mon, 26 May 2014 01:33:32 +0000
+Subject: [PATCH] avoid building warp executable
+
+fails to link for some reason
+
+/home/builder/.ghc/android-14/arm-linux-androideabi-4.8/bin/../lib/gcc/arm-linux-androideabi/4.8/../../../../arm-linux-androideabi/bin/ld: fatal error: /home/builder/.ghc/android-14/arm-linux-androideabi-4.8/.cabal/lib/arm-linux-android-ghc-7.8.2/system-filepath-0.4.11/libHSsystem-filepath-0.4.11.a(Path.o): unsupported ELF machine number 0
+---
+ wai-app-static.cabal |   11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/wai-app-static.cabal b/wai-app-static.cabal
+index e5d11a6..d4fd0d1 100644
+--- a/wai-app-static.cabal
++++ b/wai-app-static.cabal
+@@ -67,17 +67,6 @@ library
+     if flag(print)
+       cpp-options:  -DPRINT
+ 
+-Executable warp
+-  Main-is:        warp-static.hs
+-  hs-source-dirs: app
+-  Build-depends: base            >= 4                  && < 5
+-               , wai-app-static  >= 2.0                && < 2.1
+-               , directory       >= 1.0
+-               , containers      >= 0.2
+-               , bytestring      >= 0.9.1.4
+-               , text            >= 0.7
+-               , mime-types      >= 0.1                && < 0.2
+-
+ test-suite runtests
+     hs-source-dirs: test
+     main-is: ../tests.hs
+-- 
+1.7.10.4
+
diff --git a/standalone/no-th/haskell-patches/DAV_build-without-TH.patch b/standalone/no-th/haskell-patches/DAV_build-without-TH.patch
index d57d79a11..45e9a3cec 100644
--- a/standalone/no-th/haskell-patches/DAV_build-without-TH.patch
+++ b/standalone/no-th/haskell-patches/DAV_build-without-TH.patch
@@ -1,6 +1,6 @@
-From a908cec3ae1644d72d04ccc7657433d8335665bc Mon Sep 17 00:00:00 2001
+From 8e115228601a97b19d3f713ccf2d13f58838d927 Mon Sep 17 00:00:00 2001
 From: dummy <dummy@example.com>
-Date: Sat, 8 Feb 2014 17:11:05 +0000
+Date: Mon, 26 May 2014 01:48:22 +0000
 Subject: [PATCH] expand TH
 
 ---
@@ -10,12 +10,12 @@ Subject: [PATCH] expand TH
  3 files changed, 307 insertions(+), 45 deletions(-)
 
 diff --git a/DAV.cabal b/DAV.cabal
-index 3a755bb..748b0e1 100644
+index bf54f44..04f375a 100644
 --- a/DAV.cabal
 +++ b/DAV.cabal
 @@ -42,29 +42,7 @@ library
                       , transformers-base
-                      , xml-conduit >= 1.0          && <= 1.2
+                      , xml-conduit >= 1.0          && < 1.3
                       , xml-hamlet >= 0.4           && <= 0.5
 -executable hdav
 -  main-is:           hdav.hs
@@ -38,7 +38,7 @@ index 3a755bb..748b0e1 100644
 -                     , optparse-applicative >= 0.5.0
 -                     , transformers >= 0.3
 -                     , transformers-base
--                     , xml-conduit >= 1.0          && <= 1.2
+-                     , xml-conduit >= 1.0          && < 1.3
 -                     , xml-hamlet >= 0.4           && <= 0.5
 +                     , text