Hello community, here is the log from the commit of package ghc-x509-system for openSUSE:Factory checked in at 2015-09-17 09:19:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-x509-system (Old) and /work/SRC/openSUSE:Factory/.ghc-x509-system.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-x509-system" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-x509-system/ghc-x509-system.changes 2015-08-25 08:48:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-x509-system.new/ghc-x509-system.changes 2015-09-17 09:19:49.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Sep 13 13:14:35 UTC 2015 - [email protected] + +- update to 1.6.1 + +------------------------------------------------------------------- Old: ---- x509-system-1.6.0.tar.gz New: ---- x509-system-1.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-x509-system.spec ++++++ --- /var/tmp/diff_new_pack.PXYlkW/_old 2015-09-17 09:19:50.000000000 +0200 +++ /var/tmp/diff_new_pack.PXYlkW/_new 2015-09-17 09:19:50.000000000 +0200 @@ -15,15 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %global pkg_name x509-system Name: ghc-x509-system -Version: 1.6.0 +Version: 1.6.1 Release: 0 Summary: Handle per-operating-system X.509 accessors and storage +License: BSD-3-Clause Group: System/Libraries -License: BSD-3-Clause Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -61,30 +62,23 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %post devel %ghc_pkg_recache - %postun devel %ghc_pkg_recache - %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE - %files devel -f %{name}-devel.files %defattr(-,root,root,-) - %changelog ++++++ x509-system-1.6.0.tar.gz -> x509-system-1.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-system-1.6.0/System/X509/MacOS.hs new/x509-system-1.6.1/System/X509/MacOS.hs --- old/x509-system-1.6.0/System/X509/MacOS.hs 2015-06-19 22:17:39.000000000 +0200 +++ new/x509-system-1.6.1/System/X509/MacOS.hs 2015-09-07 14:46:45.000000000 +0200 @@ -11,16 +11,19 @@ import Data.X509 import Data.X509.CertificateStore -rootCAKeyChain :: String +rootCAKeyChain :: FilePath rootCAKeyChain = "/System/Library/Keychains/SystemRootCertificates.keychain" -listInKeyChain :: String -> IO [SignedCertificate] -listInKeyChain keyChain = do - (_, Just hout, _, ph) <- createProcess (proc "security" ["find-certificate", "-pa", keyChain]) { std_out = CreatePipe } +systemKeyChain :: FilePath +systemKeyChain = "/Library/Keychains/System.keychain" + +listInKeyChains :: [FilePath] -> IO [SignedCertificate] +listInKeyChains keyChains = do + (_, Just hout, _, ph) <- createProcess (proc "security" ("find-certificate" : "-pa" : keyChains)) { std_out = CreatePipe } pems <- either error id . pemParseLBS <$> LBS.hGetContents hout let targets = rights $ map (decodeSignedCertificate . pemContent) $ filter ((=="CERTIFICATE") . pemName) pems _ <- targets `seq` waitForProcess ph return targets getSystemCertificateStore :: IO CertificateStore -getSystemCertificateStore = makeCertificateStore <$> listInKeyChain rootCAKeyChain +getSystemCertificateStore = makeCertificateStore <$> listInKeyChains [rootCAKeyChain, systemKeyChain] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-system-1.6.0/System/X509/Win32.hs new/x509-system-1.6.1/System/X509/Win32.hs --- old/x509-system-1.6.0/System/X509/Win32.hs 2015-06-19 22:17:39.000000000 +0200 +++ new/x509-system-1.6.1/System/X509/Win32.hs 2015-09-07 14:46:45.000000000 +0200 @@ -11,11 +11,13 @@ import Control.Monad (when) import Control.Applicative +import Control.Exception (catch) import qualified Data.ByteString.Internal as B import Data.X509 import Data.X509.CertificateStore +import Data.ASN1.Error import System.Win32.Types @@ -64,4 +66,4 @@ case ecert of Left _ -> loop st r Right cert -> (cert :) <$> (loop st r) - + `catch` \(_ :: ASN1Error) -> loop st r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-system-1.6.0/x509-system.cabal new/x509-system-1.6.1/x509-system.cabal --- old/x509-system-1.6.0/x509-system.cabal 2015-06-19 22:17:39.000000000 +0200 +++ new/x509-system-1.6.1/x509-system.cabal 2015-09-07 14:46:45.000000000 +0200 @@ -1,5 +1,5 @@ Name: x509-system -Version: 1.6.0 +Version: 1.6.1 Description: System X.509 handling License: BSD3 License-file: LICENSE @@ -30,7 +30,7 @@ ghc-options: -Wall if os(windows) cpp-options: -DWINDOWS - Build-Depends: Win32 + Build-Depends: Win32, asn1-encoding extra-libraries: Crypt32 Exposed-modules: System.X509.Win32 if os(OSX)
