[DHG_packages] 01/01: tls: Backport upstream patch from v1.4.0

[Ilias Tsitsimpis]

This is an automated email from the git hooks/post-receive script.

iliastsi-guest pushed a commit to branch master
in repository DHG_packages.

commit dfc0237559bca5c4ed17af6ff2eb068c633ad78e
Author: Ilias Tsitsimpis <iliastsi at debian.org>
Date:   Fri Oct 20 21:25:13 2017 +0300

    tls: Backport upstream patch from v1.4.0
    
    Backport upstream patch from v1.4.0 to work with newer haskell-x509.
    Closes: #877299
---
 p/haskell-tls/debian/changelog        |  7 +++++++
 p/haskell-tls/debian/patches/series   |  1 +
 p/haskell-tls/debian/patches/x509-1.7 | 36 +++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/p/haskell-tls/debian/changelog b/p/haskell-tls/debian/changelog
index abb5c62..4bcade5 100644
--- a/p/haskell-tls/debian/changelog
+++ b/p/haskell-tls/debian/changelog
@@ -1,3 +1,10 @@
+haskell-tls (1.3.11-2) unstable; urgency=medium
+
+  * Backport upstream patch from v1.4.0 to work with newer
+    haskell-x509 (Closes: #877299)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Fri, 20 Oct 2017 21:24:15 +0300
+
 haskell-tls (1.3.11-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/p/haskell-tls/debian/patches/series b/p/haskell-tls/debian/patches/series
new file mode 100644
index 0000000..fa03b17
--- /dev/null
+++ b/p/haskell-tls/debian/patches/series
@@ -0,0 +1 @@
+x509-1.7
diff --git a/p/haskell-tls/debian/patches/x509-1.7 b/p/haskell-tls/debian/patches/x509-1.7
new file mode 100644
index 0000000..db0ab90
--- /dev/null
+++ b/p/haskell-tls/debian/patches/x509-1.7
@@ -0,0 +1,36 @@
+From: Kazu Yamamoto <kazu at iij.ad.jp>
+Subject: [PATCH] using extensionEncode.
+Origin: upstream, https://github.com/vincenthz/hs-tls/commit/3d4490a801be5
+Bug-Debian: https://bugs.debian.org/877299
+
+Index: b/Tests/Certificate.hs
+===================================================================
+--- a/Tests/Certificate.hs
++++ b/Tests/Certificate.hs
+@@ -14,8 +14,6 @@ import qualified Data.ByteString as B
+ 
+ import PubKey
+ 
+-testExtensionEncode critical ext = ExtensionRaw (extOID ext) critical (extEncode ext)
+-
+ arbitraryDN = return $ DistinguishedName []
+ 
+ instance Arbitrary Date where
+@@ -56,7 +54,7 @@ arbitraryCertificate pubKey = do
+             , certValidity     = validity
+             , certPubKey       = pubKey
+             , certExtensions   = Extensions $ Just
+-                [ testExtensionEncode True $ ExtKeyUsage [KeyUsage_digitalSignature,KeyUsage_keyEncipherment,KeyUsage_keyCertSign]
++                [ extensionEncode True $ ExtKeyUsage [KeyUsage_digitalSignature,KeyUsage_keyEncipherment,KeyUsage_keyCertSign]
+                 ]
+             }
+ 
+@@ -70,7 +68,7 @@ simpleCertificate pubKey =
+         , certValidity     = (time1, time2)
+         , certPubKey       = pubKey
+         , certExtensions   = Extensions $ Just
+-                [ testExtensionEncode True $ ExtKeyUsage [KeyUsage_digitalSignature,KeyUsage_keyEncipherment]
++                [ extensionEncode True $ ExtKeyUsage [KeyUsage_digitalSignature,KeyUsage_keyEncipherment]
+                 ]
+         }
+   where time1 = DateTime (Date 1999 January 1) (TimeOfDay 0 0 0 0)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git