Hello community, here is the log from the commit of package ghc-x509 for openSUSE:Factory checked in at 2015-09-17 09:19:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old) and /work/SRC/openSUSE:Factory/.ghc-x509.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-x509" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes 2015-08-25 08:48:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-x509.new/ghc-x509.changes 2015-09-17 09:19:40.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Sep 13 13:05:47 UTC 2015 - [email protected] + +- update to 1.6.1 + +------------------------------------------------------------------- Old: ---- x509-1.6.0.tar.gz New: ---- x509-1.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-x509.spec ++++++ --- /var/tmp/diff_new_pack.zBjLiA/_old 2015-09-17 09:19:41.000000000 +0200 +++ /var/tmp/diff_new_pack.zBjLiA/_new 2015-09-17 09:19:41.000000000 +0200 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-x509 -Version: 1.6.0 +Version: 1.6.1 Release: 0 Summary: X509 reader and writer License: BSD-3-Clause ++++++ x509-1.6.0.tar.gz -> x509-1.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-1.6.0/Data/X509/CRL.hs new/x509-1.6.1/Data/X509/CRL.hs --- old/x509-1.6.0/Data/X509/CRL.hs 2015-06-19 22:14:24.000000000 +0200 +++ new/x509-1.6.1/Data/X509/CRL.hs 2015-09-07 16:58:09.000000000 +0200 @@ -18,7 +18,7 @@ import Control.Applicative -import Data.Hourglass (DateTime) +import Data.Hourglass (DateTime, TimezoneOffset(..)) import Data.ASN1.Types import Data.X509.DistinguishedName @@ -54,7 +54,7 @@ Right (RevokedCertificate serial t (Extensions Nothing), xs) fromASN1 l = Left ("fromASN1: X509.RevokedCertificate: unknown format:" ++ show l) toASN1 (RevokedCertificate serial time _) = \xs -> - Start Sequence : IntVal serial : ASN1Time TimeGeneralized time Nothing : End Sequence : xs + Start Sequence : IntVal serial : ASN1Time TimeGeneralized time (Just (TimezoneOffset 0)) : End Sequence : xs parseCRL :: ParseASN1 CRL parseCRL = do @@ -83,8 +83,8 @@ [IntVal $ crlVersion crl] ++ toASN1 (crlSignatureAlg crl) [] ++ toASN1 (crlIssuer crl) [] ++ - [ASN1Time TimeGeneralized (crlThisUpdate crl) Nothing] ++ - (maybe [] (\t -> [ASN1Time TimeGeneralized t Nothing]) (crlNextUpdate crl)) ++ + [ASN1Time TimeGeneralized (crlThisUpdate crl) (Just (TimezoneOffset 0))] ++ + (maybe [] (\t -> [ASN1Time TimeGeneralized t (Just (TimezoneOffset 0))]) (crlNextUpdate crl)) ++ [Start Sequence] ++ revoked ++ [End Sequence] ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-1.6.0/Data/X509/Cert.hs new/x509-1.6.1/Data/X509/Cert.hs --- old/x509-1.6.0/Data/X509/Cert.hs 2015-06-19 22:14:24.000000000 +0200 +++ new/x509-1.6.1/Data/X509/Cert.hs 2015-09-07 16:58:09.000000000 +0200 @@ -12,13 +12,13 @@ module Data.X509.Cert (Certificate(..)) where import Data.ASN1.Types -import Data.Hourglass (DateTime, TimezoneOffset(TimezoneOffset)) import Control.Applicative ((<$>), (<*>)) import Data.X509.Internal import Data.X509.PublicKey import Data.X509.AlgorithmIdentifier import Data.X509.DistinguishedName import Data.X509.ExtensionRaw +import Data.Hourglass data CertKeyUsage = CertKeyUsageDigitalSignature @@ -104,8 +104,12 @@ eAlgId = toASN1 (certSignatureAlg cert) [] eIssuer = toASN1 (certIssuerDN cert) [] (t1, t2) = certValidity cert - eValidity = asn1Container Sequence [ASN1Time TimeGeneralized t1 (Just (TimezoneOffset 0)) - ,ASN1Time TimeGeneralized t2 (Just (TimezoneOffset 0))] + eValidity = asn1Container Sequence [ASN1Time (timeType t1) t1 (Just (TimezoneOffset 0)) + ,ASN1Time (timeType t2) t2 (Just (TimezoneOffset 0))] eSubject = toASN1 (certSubjectDN cert) [] epkinfo = toASN1 (certPubKey cert) [] eexts = toASN1 (certExtensions cert) [] + timeType t = + if t >= timeConvert (Date 2050 January 1) + then TimeGeneralized + else TimeUTC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-1.6.0/Data/X509/DistinguishedName.hs new/x509-1.6.1/Data/X509/DistinguishedName.hs --- old/x509-1.6.0/Data/X509/DistinguishedName.hs 2015-06-19 22:14:24.000000000 +0200 +++ new/x509-1.6.1/Data/X509/DistinguishedName.hs 2015-09-07 16:58:09.000000000 +0200 @@ -30,6 +30,7 @@ | DnCountry -- ^ Country | DnOrganization -- ^ O | DnOrganizationUnit -- ^ OU + | DnEmailAddress -- ^ Email Address (legacy) deriving (Show,Eq) instance OIDable DnElement where @@ -37,6 +38,7 @@ getObjectID DnCountry = [2,5,4,6] getObjectID DnOrganization = [2,5,4,10] getObjectID DnOrganizationUnit = [2,5,4,11] + getObjectID DnEmailAddress = [1,2,840,113549,1,9,1] -- | Try to get a specific element in a 'DistinguishedName' structure getDnElement :: DnElement -> DistinguishedName -> Maybe ASN1CharacterString diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-1.6.0/x509.cabal new/x509-1.6.1/x509.cabal --- old/x509-1.6.0/x509.cabal 2015-06-19 22:14:24.000000000 +0200 +++ new/x509-1.6.1/x509.cabal 2015-09-07 16:58:09.000000000 +0200 @@ -1,5 +1,5 @@ Name: x509 -Version: 1.6.0 +Version: 1.6.1 Description: X509 reader and writer License: BSD3 License-file: LICENSE @@ -19,9 +19,6 @@ , memory , mtl , containers - , directory - , filepath - , process , hourglass , pem >= 0.1 && < 0.3 , asn1-types >= 0.3.0 && < 0.4
