[DHG_packages] 02/02: argon2: Backport upstream patch to build with newer libargon2

[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 3b15339334495b0cb56ab1356dbed553f5d9e065
Author: Ilias Tsitsimpis <iliastsi at debian.org>
Date:   Thu Nov 16 16:58:38 2017 +0200

    argon2: Backport upstream patch to build with newer libargon2
    
    Closes: #868907
---
 p/haskell-argon2/debian/changelog               |  5 +++--
 p/haskell-argon2/debian/patches/newer-libargon2 | 19 +++++++++++++++++++
 p/haskell-argon2/debian/patches/series          |  1 +
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/p/haskell-argon2/debian/changelog b/p/haskell-argon2/debian/changelog
index e3c73e0..2272816 100644
--- a/p/haskell-argon2/debian/changelog
+++ b/p/haskell-argon2/debian/changelog
@@ -1,4 +1,4 @@
-haskell-argon2 (1.2.0+dfsg1-1) UNRELEASED; urgency=medium
+haskell-argon2 (1.2.0+dfsg1-1) unstable; urgency=medium
 
   * Change Priority to optional. Since Debian Policy version 4.0.1,
     priority extra has been deprecated.
@@ -6,8 +6,9 @@ haskell-argon2 (1.2.0+dfsg1-1) UNRELEASED; urgency=medium
   * Modify d/watch and Source field in d/copyright to use HTTPS
   * Declare compliance with Debian policy 4.1.1
   * Remove embedded copy of Argon2 library
+  * Backport upstream patch to build with newer libargon2 (Closes: #868907)
 
- -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 01 Nov 2017 12:13:37 +0200
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Thu, 16 Nov 2017 16:58:55 +0200
 
 haskell-argon2 (1.2.0-3) unstable; urgency=medium
 
diff --git a/p/haskell-argon2/debian/patches/newer-libargon2 b/p/haskell-argon2/debian/patches/newer-libargon2
new file mode 100644
index 0000000..8cd8f07
--- /dev/null
+++ b/p/haskell-argon2/debian/patches/newer-libargon2
@@ -0,0 +1,19 @@
+Description: Handle removal of ARGON2_FLAG_CLEAR_MEMORY
+Author: Herbert Valerio Riedel <hvr at gnu.org>
+Origin: upstream, https://github.com/hvr/argon2/commit/1a002ebf0ecdb9a4d2b3a
+Bug: https://github.com/hvr/argon2/issues/14
+Bug-Debian: https://bugs.debian.org/868907
+---
+
+Index: b/src/Crypto/Argon2/FFI.hsc
+===================================================================
+--- a/src/Crypto/Argon2/FFI.hsc
++++ b/src/Crypto/Argon2/FFI.hsc
+@@ -90,5 +90,6 @@ pattern ARGON2_MAX_SECRET = (#const ARGO
+ 
+ pattern ARGON2_FLAG_CLEAR_PASSWORD = (#const ARGON2_FLAG_CLEAR_PASSWORD)
+ pattern ARGON2_FLAG_CLEAR_SECRET = (#const ARGON2_FLAG_CLEAR_SECRET)
+-pattern ARGON2_FLAG_CLEAR_MEMORY = (#const ARGON2_FLAG_CLEAR_MEMORY)
++-- This got removed, see 78d2a579fec204d7f50ecbe79e71ca33b6a60c1c
++-- pattern ARGON2_FLAG_CLEAR_MEMORY = (#const ARGON2_FLAG_CLEAR_MEMORY)
+ pattern ARGON2_DEFAULT_FLAGS = (#const ARGON2_DEFAULT_FLAGS)
diff --git a/p/haskell-argon2/debian/patches/series b/p/haskell-argon2/debian/patches/series
index 508739c..0cfeea6 100644
--- a/p/haskell-argon2/debian/patches/series
+++ b/p/haskell-argon2/debian/patches/series
@@ -1 +1,2 @@
 remove-embedded-argon2
+newer-libargon2

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