diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-09 12:38:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-07 14:20:35 -0400 |
| commit | 28db16d18d2d636021cf7f8486a1ed89ebd9f232 (patch) | |
| tree | 8cc57cc000433b192b74d0a840a3df4ad3e9c68b /standalone | |
| parent | 39c4fb057ab81c3bde7ef932f9eef8abb86aa92e (diff) | |
added back lost certificate path fix for Android
Diffstat (limited to 'standalone')
| -rw-r--r-- | standalone/android/haskell-patches/certificate_1.3.7-0001-support-Android-cert-store.patch | 37 | ||||
| -rwxr-xr-x | standalone/android/install-haskell-packages | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/standalone/android/haskell-patches/certificate_1.3.7-0001-support-Android-cert-store.patch b/standalone/android/haskell-patches/certificate_1.3.7-0001-support-Android-cert-store.patch new file mode 100644 index 000000000..5f772bfdf --- /dev/null +++ b/standalone/android/haskell-patches/certificate_1.3.7-0001-support-Android-cert-store.patch @@ -0,0 +1,37 @@ +From 3779c75175e895f94b21341ebd6361e9d6af54fd Mon Sep 17 00:00:00 2001 +From: Joey Hess <joey@kitenet.net> +Date: Thu, 9 May 2013 12:36:23 -0400 +Subject: [PATCH] support Android cert store + +Android puts it in a different place and has only hashed files. +See https://github.com/vincenthz/hs-certificate/issues/19 +--- + System/Certificate/X509/Unix.hs | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/System/Certificate/X509/Unix.hs b/System/Certificate/X509/Unix.hs +index 8463465..74e9503 100644 +--- a/System/Certificate/X509/Unix.hs ++++ b/System/Certificate/X509/Unix.hs +@@ -35,7 +35,8 @@ import qualified Control.Exception as E + import Data.Char + + defaultSystemPath :: FilePath +-defaultSystemPath = "/etc/ssl/certs/" ++defaultSystemPath = "/system/etc/security/cacerts/" ++--defaultSystemPath = "/etc/ssl/certs/" + + envPathOverride :: String + envPathOverride = "SYSTEM_CERTIFICATE_PATH" +@@ -47,7 +48,7 @@ listDirectoryCerts path = (map (path </>) . filter isCert <$> getDirectoryConten + && isDigit (s !! 9) + && (s !! 8) == '.' + && all isHexDigit (take 8 s) +- isCert x = (not $ isPrefixOf "." x) && (not $ isHashedFile x) ++ isCert x = (not $ isPrefixOf "." x) + + getSystemCertificateStore :: IO CertificateStore + getSystemCertificateStore = makeCertificateStore . concat <$> (getSystemPath >>= listDirectoryCerts >>= mapM readCertificates) +-- +1.8.2.rc3 + diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index 3e4c061a8..d5a4cbf82 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -91,6 +91,7 @@ install_pkgs () { patched yesod-persistent patched yesod-form patched crypto-numbers + patched certificate patched yesod-auth patched yesod patched shakespeare-text |