Update argon2 to 20161029.

# 20161029

* Argon2id added
* Better documentation
* Dual licensing CC0 / Apache 2.0
* Minor bug fixes (no security issue)

# 20160406

* Version 1.3 of Argon2
* Version number in encoded hash
* Refactored low-level API
* Visibility control for library symbols
* Microsoft Visual Studio solution
* New bindings
* Minor bug and warning fixes (no security issue)

# 20151206

* Python bindings
* Password read from stdin, instead of being an argument
* Compatibility FreeBSD, NetBSD, OpenBSD
* Constant-time verification
* Minor bug and warning fixes (no security issue)

5 files changed, 31 insertions, 54 deletions

diff --git a/security/argon2/Makefile b/security/argon2/Makefile
index 06174aab824..7f55bafc745 100644
--- a/security/argon2/Makefile
+++ b/security/argon2/Makefile
@@ -1,24 +1,30 @@
-# $NetBSD: Makefile,v 1.1 2015/11/05 08:50:33 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2017/02/21 22:00:51 kleink Exp $
 
-DISTNAME=	phc-winner-argon2-20151102
-PKGNAME=	${DISTNAME:S/phc-winner-//}
+DISTNAME=	${GITHUB_PROJECT}
+PKGNAME=	${DISTNAME:S/phc-winner-//}-${GITHUB_TAG}
 CATEGORIES=	security
-MASTER_SITES=	https://password-hashing.net/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=P-H-C/}
+GITHUB_PROJECT=	phc-winner-argon2
+GITHUB_TAG=	20161029
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/p-h-c/phc-winner-argon2
+HOMEPAGE=	https://password-hashing.net/
 COMMENT=	Password hash Argon2
-LICENSE=	cc0-1.0-universal
+LICENSE=	cc0-1.0-universal OR apache-2.0
 
-WRKSRC=	${WRKDIR}/${DISTNAME:C/-2[0-9]*//}
 USE_TOOLS+=	gmake
 TEST_TARGET=	test
 INSTALLATION_DIRS=	bin lib share/doc/argon2
 
+OPSYSVARS+=		SO_SUFFIX
+SO_SUFFIX.Darwin=	dylib
+SO_SUFFIX.*=		so
+PLIST_SUBST+=		SO_SUFFIX=${SO_SUFFIX:Q}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/argon2 ${DESTDIR}${PREFIX}/bin
-	${INSTALL_LIB} ${WRKSRC}/libargon2.* ${DESTDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libargon2.a ${DESTDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libargon2.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/argon2-specs.pdf ${DESTDIR}${PREFIX}/share/doc/argon2
 	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/argon2
 
diff --git a/security/argon2/PLIST b/security/argon2/PLIST
index 66d19eb8402..15affb79869 100644
--- a/security/argon2/PLIST
+++ b/security/argon2/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2015/11/05 08:50:33 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/02/21 22:00:51 kleink Exp $
 bin/argon2
 lib/libargon2.a
-lib/libargon2.so
+lib/libargon2.${SO_SUFFIX}
 share/doc/argon2/README.md
 share/doc/argon2/argon2-specs.pdf
diff --git a/security/argon2/distinfo b/security/argon2/distinfo
index 4799ecaa674..990f737e7d3 100644
--- a/security/argon2/distinfo
+++ b/security/argon2/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.1 2015/11/05 08:50:33 wiz Exp $
+$NetBSD: distinfo,v 1.2 2017/02/21 22:00:51 kleink Exp $
 
-SHA1 (phc-winner-argon2-20151102.tgz) = 424d779af4bfe666a2de0b4c71d3a53f9b44c96b
-RMD160 (phc-winner-argon2-20151102.tgz) = 76c37fc4d4903793b885a50556153a197431ff67
-SHA512 (phc-winner-argon2-20151102.tgz) = ff99736fbe9c7c7606eed5213191327a8d5855c781c4b2fd55483beb28baa8fb07c53baf258e2636ed62304e54220b49906d3723c7c42bc862ab840b84b74060
-Size (phc-winner-argon2-20151102.tgz) = 768167 bytes
-SHA1 (patch-Makefile) = 6eafa96f951f8e8120a3b26652ed4c42b53a8783
-SHA1 (patch-kats_check-sums.sh) = d91c232633e6fc8d3ab6d8cc8701997aee9c66bc
+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
diff --git a/security/argon2/patches/patch-Makefile b/security/argon2/patches/patch-Makefile
index 880ed24cb7b..ff481fa2d90 100644
--- a/security/argon2/patches/patch-Makefile
+++ b/security/argon2/patches/patch-Makefile
@@ -1,27 +1,14 @@
-$NetBSD: patch-Makefile,v 1.1 2015/11/05 08:50:33 wiz Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/02/21 22:00:51 kleink Exp $
 
 Disable -march=native since it causes problems on NetBSD.
-Add NetBSD support.
 
---- Makefile.orig	2015-11-02 15:20:31.000000000 +0000
+--- Makefile.orig	2016-10-29 09:24:03.000000000 +0000
 +++ Makefile
-@@ -24,7 +24,6 @@ CFLAGS = -std=c89 -pthread -O3 -Wall -g
- 
- #OPT=TRUE
- ifeq ($(OPT), TRUE)
--	CFLAGS += -march=native
- 	SRC += src/opt.c
- else
+@@ -40,7 +40,6 @@ $(info Building without optimizations)
  	SRC += src/ref.c
-@@ -39,6 +38,11 @@ ifeq ($(KERNEL_NAME), Linux)
- 	LIB_CFLAGS := -shared -fPIC
- 	LIB_PATH := -Wl,-rpath=$(BUILD_PATH)
+ else
+ $(info Building with optimizations for $(OPTTARGET))
+-	CFLAGS += -march=$(OPTTARGET)
+ 	SRC += src/opt.c
  endif
-+ifeq ($(KERNEL_NAME), NetBSD)
-+	LIB_EXT := so
-+	LIB_CFLAGS := -shared -fPIC
-+	LIB_PATH := -Wl,-rpath=$(BUILD_PATH)
-+endif
- ifeq ($(KERNEL_NAME), Darwin)
- 	LIB_EXT := dylib
- 	LIB_CFLAGS := -dynamiclib -install_name @rpath/lib$(LIB_NAME).$(LIB_EXT)
+ 
diff --git a/security/argon2/patches/patch-kats_check-sums.sh b/security/argon2/patches/patch-kats_check-sums.sh
deleted file mode 100644
index 09ea8551043..00000000000
--- a/security/argon2/patches/patch-kats_check-sums.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-kats_check-sums.sh,v 1.1 2015/11/05 08:50:33 wiz Exp $
-
-Fix unportable test(1) operator.
-
---- kats/check-sums.sh.orig	2015-10-27 19:37:07.000000000 +0000
-+++ kats/check-sums.sh
-@@ -4,7 +4,7 @@ for file in `ls | grep '^[a-z2]*$' | xar
- do
-     new=`shasum -a 256 $file`
-     old=`cat $file.shasum`
--    if [ "$new" == "$old" ]
-+    if [ "$new" = "$old" ]
-     then
-         echo $file "\t" OK
-     else