Commit 46e0e312 authored by Clint Adams's avatar Clint Adams
Browse files

argon2 1.3.0.1

parent 14c8c90d

p/haskell-argon2/debian/changelog

+6 −0
Original line number Diff line number Diff line 
haskell-argon2 (1.3.0.1-1) unstable; urgency=medium



  * New upstream version.



 -- Clint Adams <clint@debian.org>  Mon, 16 Apr 2018 23:07:10 -0400



haskell-argon2 (1.3.0.0-1) unstable; urgency=medium



  [ Ilias Tsitsimpis ]

p/haskell-argon2/debian/copyright

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Source: https://hackage.haskell.org/package/argon2 
Files-Excluded: phc-winner-argon2



Files: *

Copyright: (C) 2016 Ollie Charles

Copyright: 2016 Ollie Charles

License: BSD-3-clause



Files: debian/*

p/haskell-argon2/debian/patches/newer-libargon2

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
Description: Handle removal of ARGON2_FLAG_CLEAR_MEMORY

Author: Herbert Valerio Riedel <hvr@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)

p/haskell-argon2/debian/patches/remove-embedded-argon2

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
Description: Remove embedded copy ofr Argon2 library

Author: Ilias Tsitsimpis <iliastsi@debian.org>

Forwarded: no, Debian specific

---



Index: b/argon2.cabal

===================================================================

--- a/argon2.cabal

+++ b/argon2.cabal

@@ -12,10 +12,6 @@ maintainer:          ollie@ocharles.org.

 build-type:          Simple

 extra-source-files:  Changelog.md

 cabal-version:       >=1.10

-extra-source-files: phc-winner-argon2/src/blake2/blake2.h

-                    phc-winner-argon2/src/blake2/blake2-impl.h

-                    phc-winner-argon2/src/blake2/blamka-round-ref.h

-                    phc-winner-argon2/include/argon2.h

 

 flag use-system-library

   description: Link against system libargon2 library rather than embedded copy

@@ -27,21 +23,7 @@ library

   build-depends:       base >=4.8 && <4.10, bytestring, text, transformers

   hs-source-dirs:      src

   default-language:    Haskell2010

-  if flag(use-system-library)

-    extra-libraries: argon2

-  else

-    c-sources: phc-winner-argon2/src/argon2.c

-               phc-winner-argon2/src/core.c

-               phc-winner-argon2/src/blake2/blake2b.c

-               phc-winner-argon2/src/thread.c

-               phc-winner-argon2/src/ref.c

-               phc-winner-argon2/src/encoding.c

-               phc-winner-argon2/src/encoding.h

-               phc-winner-argon2/src/core.h

-               phc-winner-argon2/src/thread.h

-               phc-winner-argon2/src/ref.h

-    include-dirs: phc-winner-argon2/src

-                  phc-winner-argon2/include

+  extra-libraries: argon2

 

 test-suite tests

   type: exitcode-stdio-1.0

p/haskell-argon2/debian/patches/series

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
remove-embedded-argon2

newer-libargon2