CVS commit: pkgsrc/security/argon2

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Dec 30 11:34:12 UTC 2017

Modified Files:
        pkgsrc/security/argon2: Makefile distinfo
        pkgsrc/security/argon2/patches: patch-Makefile

Log Message:
argon2: updated to 20171227

20171227:
Added ABI version number
AVX2/AVX-512F optimizations of BLAMKA
Set Argon2 version number from the command line
New bindings
Minor bug and warning fixes (no security issue)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/argon2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/argon2/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/argon2/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/argon2/Makefile
diff -u pkgsrc/security/argon2/Makefile:1.3 pkgsrc/security/argon2/Makefile:1.4
--- pkgsrc/security/argon2/Makefile:1.3 Thu Feb 23 16:55:07 2017
+++ pkgsrc/security/argon2/Makefile     Sat Dec 30 11:34:12 2017
@@ -1,21 +1,22 @@
-# $NetBSD: Makefile,v 1.3 2017/02/23 16:55:07 kleink Exp $
+# $NetBSD: Makefile,v 1.4 2017/12/30 11:34:12 adam Exp $
 
 DISTNAME=      ${GITHUB_PROJECT}
 PKGNAME=       ${DISTNAME:S/phc-winner-//}-${GITHUB_TAG}
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=P-H-C/}
-GITHUB_PROJECT=        phc-winner-argon2
-GITHUB_TAG=    20161029
-PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://password-hashing.net/
 COMMENT=       Password hash Argon2
 LICENSE=       cc0-1.0-universal OR apache-2.0
 
+GITHUB_PROJECT=        phc-winner-argon2
+GITHUB_TAG=    20171227
+
 USE_TOOLS+=    gmake
 TEST_TARGET=   test
-INSTALLATION_DIRS=     bin lib share/doc/argon2
+
+INSTALLATION_DIRS=     bin include lib ${PKGMANDIR}/man1 share/doc/argon2
 
 OPSYSVARS+=            SO_SUFFIX
 SO_SUFFIX.Darwin=      dylib
@@ -24,11 +25,9 @@ PLIST_SUBST+=                SO_SUFFIX=${SO_SUFFIX:Q}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/argon2 ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include
        ${INSTALL_DATA} ${WRKSRC}/include/argon2.h ${DESTDIR}${PREFIX}/include
        ${INSTALL_LIB} ${WRKSRC}/libargon2.a ${DESTDIR}${PREFIX}/lib
        ${INSTALL_LIB} ${WRKSRC}/libargon2.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib
-       ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
        ${INSTALL_MAN} ${WRKSRC}/man/argon2.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
        ${INSTALL_DATA} ${WRKSRC}/argon2-specs.pdf ${DESTDIR}${PREFIX}/share/doc/argon2
        ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/argon2

Index: pkgsrc/security/argon2/distinfo
diff -u pkgsrc/security/argon2/distinfo:1.2 pkgsrc/security/argon2/distinfo:1.3
--- pkgsrc/security/argon2/distinfo:1.2 Tue Feb 21 22:00:51 2017
+++ pkgsrc/security/argon2/distinfo     Sat Dec 30 11:34:12 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2017/02/21 22:00:51 kleink Exp $
+$NetBSD: distinfo,v 1.3 2017/12/30 11:34:12 adam Exp $
 
-SHA1 (phc-winner-argon2-20161029.tar.gz) = 61d00ed23170aabf4140cc22d02a1d1983788b47
-RMD160 (phc-winner-argon2-20161029.tar.gz) = 78bd46ac2a131df42b6cb69bb40580d84c69e558
-SHA512 (phc-winner-argon2-20161029.tar.gz) = e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892
-Size (phc-winner-argon2-20161029.tar.gz) = 1506864 bytes
-SHA1 (patch-Makefile) = 0476b9c8f46171c3bba587034cb69846a3690a5d
+SHA1 (phc-winner-argon2-20171227.tar.gz) = c398df55c8fffe70c9a952dd3f696115437234d8
+RMD160 (phc-winner-argon2-20171227.tar.gz) = e4cf2482f11724f580da0051a8c982f9237d3451
+SHA512 (phc-winner-argon2-20171227.tar.gz) = 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
+Size (phc-winner-argon2-20171227.tar.gz) = 1503745 bytes
+SHA1 (patch-Makefile) = 63ab5d95fa44966d9713bbc81cdabf8e3fa0b855

Index: pkgsrc/security/argon2/patches/patch-Makefile
diff -u pkgsrc/security/argon2/patches/patch-Makefile:1.2 pkgsrc/security/argon2/patches/patch-Makefile:1.3
--- pkgsrc/security/argon2/patches/patch-Makefile:1.2   Tue Feb 21 22:00:51 2017
+++ pkgsrc/security/argon2/patches/patch-Makefile       Sat Dec 30 11:34:12 2017
@@ -1,10 +1,21 @@
-$NetBSD: patch-Makefile,v 1.2 2017/02/21 22:00:51 kleink Exp $
+$NetBSD: patch-Makefile,v 1.3 2017/12/30 11:34:12 adam Exp $
 
+Remove -O3 -g compiler flags.
 Disable -march=native since it causes problems on NetBSD.
+Use the same shared library name across platforms.
 
---- Makefile.orig      2016-10-29 09:24:03.000000000 +0000
+--- Makefile.orig      2017-12-27 19:56:31.000000000 +0000
 +++ Makefile
-@@ -40,7 +40,6 @@ $(info Building without optimizations)
+@@ -30,7 +30,7 @@ SRC_BENCH = src/bench.c
+ SRC_GENKAT = src/genkat.c
+ OBJ = $(SRC:.c=.o)
+ 
+-CFLAGS += -std=c89 -O3 -Wall -g -Iinclude -Isrc
++CFLAGS += -std=c89 -Wall -Iinclude -Isrc
+ 
+ ifeq ($(NO_THREADS), 1)
+ CFLAGS += -DARGON2_NO_THREADS
+@@ -50,7 +50,6 @@ $(info Building without optimizations)
        SRC += src/ref.c
  else
  $(info Building with optimizations for $(OPTTARGET))
@@ -12,3 +23,21 @@ Disable -march=native since it causes pr
        SRC += src/opt.c
  endif
  
+@@ -59,7 +58,7 @@ KERNEL_NAME := $(shell uname -s)
+ 
+ LIB_NAME=argon2
+ ifeq ($(KERNEL_NAME), Linux)
+-      LIB_EXT := so.$(ABI_VERSION)
++      LIB_EXT := so
+       LIB_CFLAGS := -shared -fPIC -fvisibility=hidden -DA2_VISCTL=1
+       SO_LDFLAGS := -Wl,-soname,lib$(LIB_NAME).$(LIB_EXT)
+       LINKED_LIB_EXT := so
+@@ -69,7 +68,7 @@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_
+       LIB_CFLAGS := -shared -fPIC
+ endif
+ ifeq ($(KERNEL_NAME), Darwin)
+-      LIB_EXT := $(ABI_VERSION).dylib
++      LIB_EXT := dylib
+       LIB_CFLAGS := -dynamiclib -install_name @rpath/lib$(LIB_NAME).$(LIB_EXT)
+       LINKED_LIB_EXT := dylib
+ endif