diff options
author | Joachim Breitner <mail@joachim-breitner.de> | 2013-03-11 01:09:50 +0400 |
---|---|---|
committer | Joachim Breitner <mail@joachim-breitner.de> | 2013-03-11 01:09:50 +0400 |
commit | 10664d5b6c2f2d829ad09f54dd992f391fb1338e (patch) | |
tree | 9de56de69d3bf21b7ff1402d35795b36d2f285dc /p/haskell-certificate | |
parent | c957a05814cc0144447feada181db1755cfe9e96 (diff) | |
download | DHG_packages-10664d5b6c2f2d829ad09f54dd992f391fb1338e.tar.gz |
haskell-certificate: Merge from unstable
Diffstat (limited to 'p/haskell-certificate')
-rw-r--r-- | p/haskell-certificate/debian/changelog | 31 | ||||
-rw-r--r-- | p/haskell-certificate/debian/patches/haskell-certificate.patch | 34 | ||||
-rw-r--r-- | p/haskell-certificate/debian/patches/series | 1 |
3 files changed, 31 insertions, 35 deletions
diff --git a/p/haskell-certificate/debian/changelog b/p/haskell-certificate/debian/changelog index c248ccbb6..826b38100 100644 --- a/p/haskell-certificate/debian/changelog +++ b/p/haskell-certificate/debian/changelog @@ -1,3 +1,34 @@ +haskell-certificate (1.3.5-1) experimental; urgency=low + + * New upstream release + + -- Joachim Breitner <nomeata@debian.org> Fri, 08 Feb 2013 20:44:27 +0100 + +haskell-certificate (1.3.3-1) experimental; urgency=low + + * New upstream version. + + -- Clint Adams <clint@debian.org> Sat, 17 Nov 2012 12:02:16 -0500 + +haskell-certificate (1.2.8-1) experimental; urgency=low + + [ Joachim Breitner ] + * Depend on haskell-devscripts 0.8.13 to ensure this package is built + against experimental + * Bump standards version, no change + + [ Clint Adams ] + * New upstream version. + + -- Clint Adams <clint@debian.org> Sat, 20 Oct 2012 11:17:03 -0400 + +haskell-certificate (1.2.3-2) unstable; urgency=low + + * Apply upstream patch towards fixing bug #701593, prepared and tested by + Joey Hess, Closes: #700284 + + -- Joachim Breitner <nomeata@debian.org> Sun, 10 Mar 2013 21:42:03 +0100 + haskell-certificate (1.2.3-1) unstable; urgency=low * New upstream version. diff --git a/p/haskell-certificate/debian/patches/haskell-certificate.patch b/p/haskell-certificate/debian/patches/haskell-certificate.patch deleted file mode 100644 index c513525d3..000000000 --- a/p/haskell-certificate/debian/patches/haskell-certificate.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Vincent Hanquez <vincent@snarc.org> -Date: Sat, 19 Jan 2013 11:09:46 +0000 -Subject: [PATCH] properly implement basic constraints -Origin: upstream, https://github.com/vincenthz/hs-certificate/commit/a156d857189fc880f7d0a2de3310e750994c766b -Bug-Debian: http://bugs.debian.org/700284 - - -diff -ur orig/haskell-certificate-1.2.3/Data/Certificate/X509/Ext.hs haskell-certificate-1.2.3/Data/Certificate/X509/Ext.hs ---- orig/haskell-certificate-1.2.3/Data/Certificate/X509/Ext.hs 2012-05-16 04:30:24.000000000 -0400 -+++ haskell-certificate-1.2.3/Data/Certificate/X509/Ext.hs 2013-03-10 13:58:39.000000000 -0400 -@@ -64,14 +64,19 @@ - | otherwise -> extensionGet xs - Left _ -> extensionGet xs - --data ExtBasicConstraints = ExtBasicConstraints Bool -+data ExtBasicConstraints = ExtBasicConstraints Bool (Maybe Integer) - deriving (Show,Eq) - - instance Extension ExtBasicConstraints where - extOID = const [2,5,29,19] -- extEncode (ExtBasicConstraints b) = [Start Sequence,Boolean b,End Sequence] -- extDecode [Start Sequence,Boolean b,End Sequence] = Right (ExtBasicConstraints b) -- extDecode [Start Sequence,End Sequence] = Right (ExtBasicConstraints False) -+ extEncode (ExtBasicConstraints b Nothing) = [Start Sequence,Boolean b,End Sequence] -+ extEncode (ExtBasicConstraints b (Just i)) = [Start Sequence,Boolean b,IntVal i,End Sequence] -+ -+ extDecode [Start Sequence,Boolean b,IntVal v,End Sequence] -+ | v >= 0 = Right (ExtBasicConstraints b (Just v)) -+ | otherwise = Left "invalid pathlen" -+ extDecode [Start Sequence,Boolean b,End Sequence] = Right (ExtBasicConstraints b Nothing) -+ extDecode [Start Sequence,End Sequence] = Right (ExtBasicConstraints False Nothing) - extDecode _ = Left "unknown sequence" - - data ExtKeyUsage = ExtKeyUsage [ExtKeyUsageFlag] diff --git a/p/haskell-certificate/debian/patches/series b/p/haskell-certificate/debian/patches/series deleted file mode 100644 index 9324ac79e..000000000 --- a/p/haskell-certificate/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -haskell-certificate.patch |