[Pkg-haskell-commits] darcs: haskell-certificate: Apply upstream patch towards fixing bug #701593, prepared and tested by Joey Hess, Closes: #700284

[Joachim Breitner]

Sun Mar 10 19:58:01 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Apply upstream patch towards fixing bug #701593, prepared and tested by Joey Hess, Closes: #700284
  Ignore-this: 7f1ca6e9ca17d176a721a6b773f048de

    M! ./changelog -28 +4
    A! ./patches/
    A! ./patches/haskell-certificate.patch
    A! ./patches/series

Sun Mar 10 19:58:01 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Apply upstream patch towards fixing bug #701593, prepared and tested by Joey Hess, Closes: #700284
  Ignore-this: 7f1ca6e9ca17d176a721a6b773f048de
diff -rN -u old-haskell-certificate//changelog new-haskell-certificate//changelog
--- old-haskell-certificate//changelog	2013-03-10 21:14:13.922301351 +0000
+++ new-haskell-certificate//changelog	2013-03-10 21:14:13.938023357 +0000
@@ -1,27 +1,3 @@
-haskell-certificate (1.3.5-1) experimental; urgency=low
-
-  * New upstream release
-
- -- Joachim Breitner <nomeata at 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 at 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 at debian.org>  Sat, 20 Oct 2012 11:17:03 -0400
-
 haskell-certificate (1.2.3-1) unstable; urgency=low
 
   * New upstream version.
diff -rN -u old-haskell-certificate//patches/haskell-certificate.patch new-haskell-certificate//patches/haskell-certificate.patch
--- old-haskell-certificate//patches/haskell-certificate.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-certificate//patches/haskell-certificate.patch	2013-03-10 21:14:13.938023357 +0000
@@ -0,0 +1,34 @@
+From: Vincent Hanquez <vincent at 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 -rN -u old-haskell-certificate//patches/series new-haskell-certificate//patches/series
--- old-haskell-certificate//patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-certificate//patches/series	2013-03-10 21:14:13.938023357 +0000
@@ -0,0 +1 @@
+haskell-certificate.patch