Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This is trying to get #701593 into testing. Not all arches have built everything yet, but I guess I can get the unblock on the way. The main fixes that we want to get into testing are these: unblock haskell-tls-extra/0.4.6.1-2 unblock haskell-certificate/1.2.3-2 To migrate, this will also pull some binNMUed reverse dependencies, including (but probably more): libghc-http-conduit-dev libghc-tls-dev libghc-warp-tls-dev Unfortunately, there was a version hiccup that required changes to debian/control for some of the rebuilds. I’m not yet sure which of these will have to go in to allow the above transition, but I’m sure that waiting britney’s output will be easier than manually finding the minimal set. At least http-conduit will need this, so please also unblock haskell-http-conduit/1.4.1.6-3 The attached debdiff is represenative for all these version-hiccup-fixing uploads. The packages that had the hiccup (haskell-persistent, haskell-blaze-builder-conduit) do not need to migrate. Greetings, Joachim - -- System Information: Debian Release: 7.0 APT prefers unstable APT policy: (500, 'unstable'), (101, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.5-trunk-amd64 (SMP w/4 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlE9/ZgACgkQ9ijrk0dDIGwGwQCdFQkh3TOPpIuxq+ru5FV/I6jl zsYAmwSu1JYfL4+ZDxBPvTQ2WBDzCrR1 =noRR -----END PGP SIGNATURE-----
diff -Nru haskell-http-conduit-1.4.1.6/debian/changelog haskell-http-conduit-1.4.1.6/debian/changelog --- haskell-http-conduit-1.4.1.6/debian/changelog 2012-05-19 17:40:51.000000000 +0200 +++ haskell-http-conduit-1.4.1.6/debian/changelog 2013-03-11 16:48:11.000000000 +0100 @@ -1,3 +1,16 @@ +haskell-http-conduit (1.4.1.6-3) unstable; urgency=low + + * Allow both strange and normal version in libghc-blaze-builder-conduit-dev + dependency + + -- Joachim Breitner <nome...@debian.org> Mon, 11 Mar 2013 16:48:11 +0100 + +haskell-http-conduit (1.4.1.6-2) unstable; urgency=low + + * Allow strange version in libghc-blaze-builder-conduit-dev dependency + + -- Joachim Breitner <nome...@debian.org> Sun, 10 Mar 2013 22:00:03 +0100 + haskell-http-conduit (1.4.1.6-1) unstable; urgency=low * New upstream version. diff -Nru haskell-http-conduit-1.4.1.6/debian/control haskell-http-conduit-1.4.1.6/debian/control --- haskell-http-conduit-1.4.1.6/debian/control 2012-05-19 17:40:57.000000000 +0200 +++ haskell-http-conduit-1.4.1.6/debian/control 2013-03-11 16:47:48.000000000 +0100 @@ -24,7 +24,8 @@ , libghc-blaze-builder-dev (<< 0.4) , libghc-blaze-builder-prof , libghc-blaze-builder-conduit-dev (>> 0.4) - , libghc-blaze-builder-conduit-dev (<< 0.5) + , libghc-blaze-builder-conduit-dev (<< 0.5) | libghc-blaze-builder-conduit-dev (>> 0.5.0.1.is.really.0.4), + , libghc-blaze-builder-conduit-dev (<< 0.5.0.1.is.really.0.5) , libghc-blaze-builder-conduit-prof , libghc-case-insensitive-dev (>> 0.2) , libghc-case-insensitive-prof
diff -Nru haskell-tls-extra-0.4.6.1/debian/changelog haskell-tls-extra-0.4.6.1/debian/changelog --- haskell-tls-extra-0.4.6.1/debian/changelog 2013-01-20 23:26:26.000000000 +0100 +++ haskell-tls-extra-0.4.6.1/debian/changelog 2013-03-10 22:04:56.000000000 +0100 @@ -1,3 +1,14 @@ +haskell-tls-extra (0.4.6.1-2) unstable; urgency=low + + * Fix regression introduced with the last commit, by adding compatibility + with a corresponding change in haskell-certificate (Bug #700284), patch + provided by Joey Hess. Closes: #701593. + Also Closes: #702151, as the removal should no longer be necessary. + * Stop pretending this has a different version, as we need to rebuild stuff + anyways. + + -- Joachim Breitner <nome...@debian.org> Sun, 10 Mar 2013 22:04:56 +0100 + haskell-tls-extra (0.4.6.1-1) unstable; urgency=low * New upstream release, aimed for wheezy. diff -Nru haskell-tls-extra-0.4.6.1/debian/control haskell-tls-extra-0.4.6.1/debian/control --- haskell-tls-extra-0.4.6.1/debian/control 2012-05-15 03:04:36.000000000 +0200 +++ haskell-tls-extra-0.4.6.1/debian/control 2013-03-10 21:09:26.000000000 +0100 @@ -8,7 +8,7 @@ , haskell-devscripts (>= 0.8) , ghc , ghc-prof - , libghc-certificate-dev (>> 1.2.0) + , libghc-certificate-dev (>= 1.2.3-2) , libghc-certificate-dev (<< 1.3.0) , libghc-certificate-prof , libghc-crypto-api-dev (>> 0.5) diff -Nru haskell-tls-extra-0.4.6.1/debian/patches/haskell-tls-extra.patch haskell-tls-extra-0.4.6.1/debian/patches/haskell-tls-extra.patch --- haskell-tls-extra-0.4.6.1/debian/patches/haskell-tls-extra.patch 1970-01-01 01:00:00.000000000 +0100 +++ haskell-tls-extra-0.4.6.1/debian/patches/haskell-tls-extra.patch 2013-03-10 21:09:08.000000000 +0100 @@ -0,0 +1,15 @@ +Author: Joey Hess <jo...@debian.org> +Bug-Debian: http://bugs.debian.org/701593 + +diff -ur orig/haskell-tls-extra-0.4.6.1/Network/TLS/Extra/Certificate.hs haskell-tls-extra-0.4.6.1/Network/TLS/Extra/Certificate.hs +--- orig/haskell-tls-extra-0.4.6.1/Network/TLS/Extra/Certificate.hs 2013-01-20 10:49:28.000000000 -0400 ++++ haskell-tls-extra-0.4.6.1/Network/TLS/Extra/Certificate.hs 2013-03-10 14:23:34.000000000 -0400 +@@ -92,7 +92,7 @@ + Just (ExtKeyUsage l) -> elem KeyUsage_keyCertSign l + Nothing -> False + case extensionGet es of +- Just (ExtBasicConstraints True) ++ Just (ExtBasicConstraints True _) + | kuCanCertSign -> Nothing + | otherwise -> Just certificateNotAllowedToSign + _ -> Just certificateNotAllowedToSign diff -Nru haskell-tls-extra-0.4.6.1/debian/patches/pretend-lower-version haskell-tls-extra-0.4.6.1/debian/patches/pretend-lower-version --- haskell-tls-extra-0.4.6.1/debian/patches/pretend-lower-version 2013-01-20 23:25:56.000000000 +0100 +++ haskell-tls-extra-0.4.6.1/debian/patches/pretend-lower-version 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -This upstream release contains a bugfix that does not modify the ABI of -the resulting library. To avoid having to recompile its reverse -dependencies, we patch the .cabal file to pretend to be still version -0.4.6. - -Index: haskell-tls-extra-0.4.6.1/tls-extra.cabal -=================================================================== ---- haskell-tls-extra-0.4.6.1.orig/tls-extra.cabal 2013-01-20 23:13:58.937092809 +0100 -+++ haskell-tls-extra-0.4.6.1/tls-extra.cabal 2013-01-20 23:13:58.933092809 +0100 -@@ -1,5 +1,5 @@ - Name: tls-extra --Version: 0.4.6.1 -+Version: 0.4.6 - Description: - a set of extra definitions, default values and helpers for tls. - License: BSD3 diff -Nru haskell-tls-extra-0.4.6.1/debian/patches/series haskell-tls-extra-0.4.6.1/debian/patches/series --- haskell-tls-extra-0.4.6.1/debian/patches/series 2013-01-20 23:13:34.000000000 +0100 +++ haskell-tls-extra-0.4.6.1/debian/patches/series 2013-03-10 21:10:26.000000000 +0100 @@ -1 +1 @@ -pretend-lower-version +haskell-tls-extra.patch
diff -Nru haskell-certificate-1.2.3/debian/changelog haskell-certificate-1.2.3/debian/changelog --- haskell-certificate-1.2.3/debian/changelog 2012-05-19 17:25:30.000000000 +0200 +++ haskell-certificate-1.2.3/debian/changelog 2013-03-10 21:42:03.000000000 +0100 @@ -1,3 +1,10 @@ +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 <nome...@debian.org> Sun, 10 Mar 2013 21:42:03 +0100 + haskell-certificate (1.2.3-1) unstable; urgency=low * New upstream version. diff -Nru haskell-certificate-1.2.3/debian/patches/haskell-certificate.patch haskell-certificate-1.2.3/debian/patches/haskell-certificate.patch --- haskell-certificate-1.2.3/debian/patches/haskell-certificate.patch 1970-01-01 01:00:00.000000000 +0100 +++ haskell-certificate-1.2.3/debian/patches/haskell-certificate.patch 2013-03-10 21:42:00.000000000 +0100 @@ -0,0 +1,34 @@ +From: Vincent Hanquez <vinc...@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 -Nru haskell-certificate-1.2.3/debian/patches/series haskell-certificate-1.2.3/debian/patches/series --- haskell-certificate-1.2.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ haskell-certificate-1.2.3/debian/patches/series 2013-03-10 20:51:49.000000000 +0100 @@ -0,0 +1 @@ +haskell-certificate.patch
