On 2020/09/16 21:13, Rafael Sadowski wrote: > Simple update, argon2 to 20190702. Changelog looks very clear: > > - https://github.com/P-H-C/phc-winner-argon2/releases/tag/20190702 > - https://github.com/P-H-C/phc-winner-argon2/compare/20190702...master > > lang/php and security/keepassxc are happy with is update. > > OK?
OK. "make test" spews a bunch of make errors, could you take a look please? > Index: Makefile > =================================================================== > RCS file: /cvs/ports/security/argon2/Makefile,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 Makefile > --- Makefile 12 Jul 2019 20:49:00 -0000 1.2 > +++ Makefile 16 Sep 2020 07:33:01 -0000 > @@ -4,7 +4,7 @@ COMMENT = C implementation of Argon2 - p > > GH_ACCOUNT = P-H-C > GH_PROJECT = phc-winner-argon2 > -GH_TAGNAME = 20171227 > +GH_TAGNAME = 20190702 > DISTNAME = argon2-${GH_TAGNAME} > > SHARED_LIBS += argon2 0.0 # 0.0 > Index: distinfo > =================================================================== > RCS file: /cvs/ports/security/argon2/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -u -p -r1.1.1.1 distinfo > --- distinfo 5 Mar 2018 09:23:43 -0000 1.1.1.1 > +++ distinfo 16 Sep 2020 07:33:01 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (argon2-20171227.tar.gz) = > 6uoBcsH07kVQ0bbJzgGquNGrZrQgd3aqZ5ketYcv3Ng= > -SIZE (argon2-20171227.tar.gz) = 1503745 > +SHA256 (argon2-20190702.tar.gz) = > 2vlyqJV3+HcmAr8us4tqPdPZIr9XJNRef5WJtegwRCw= > +SIZE (argon2-20190702.tar.gz) = 1505307 > Index: patches/patch-Makefile > =================================================================== > RCS file: /cvs/ports/security/argon2/patches/patch-Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -u -p -r1.1.1.1 patch-Makefile > --- patches/patch-Makefile 5 Mar 2018 09:23:43 -0000 1.1.1.1 > +++ patches/patch-Makefile 16 Sep 2020 07:33:01 -0000 > @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2018/ > Index: Makefile > --- Makefile.orig > +++ Makefile > -@@ -30,7 +30,7 @@ SRC_BENCH = src/bench.c > +@@ -37,7 +37,7 @@ SRC_BENCH = src/bench.c > SRC_GENKAT = src/genkat.c > OBJ = $(SRC:.c=.o) > > @@ -12,12 +12,12 @@ Index: Makefile > > ifeq ($(NO_THREADS), 1) > CFLAGS += -DARGON2_NO_THREADS > -@@ -65,7 +65,7 @@ ifeq ($(KERNEL_NAME), Linux) > - LINKED_LIB_EXT := so > +@@ -77,7 +77,7 @@ ifeq ($(KERNEL_NAME), Linux) > + PC_EXTRA_LIBS ?= -lrt -ldl > endif > - ifeq ($(KERNEL_NAME), $(filter $(KERNEL_NAME),FreeBSD NetBSD OpenBSD)) > + ifeq ($(KERNEL_NAME), $(filter $(KERNEL_NAME),DragonFly FreeBSD NetBSD > OpenBSD)) > - LIB_EXT := so > + LIB_EXT := so.$(ABI_VERSION) > LIB_CFLAGS := -shared -fPIC > + PC_EXTRA_LIBS ?= > endif > - ifeq ($(KERNEL_NAME), Darwin) > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/security/argon2/pkg/PLIST,v > retrieving revision 1.1.1.1 > diff -u -p -u -p -r1.1.1.1 PLIST > --- pkg/PLIST 5 Mar 2018 09:23:43 -0000 1.1.1.1 > +++ pkg/PLIST 16 Sep 2020 07:33:01 -0000 > @@ -1,7 +1,7 @@ > @comment $OpenBSD: PLIST,v 1.1.1.1 2018/03/05 09:23:43 rsadowski Exp $ > @bin bin/argon2 > include/argon2.h > -lib/libargon2.a > +@static-lib lib/libargon2.a > @lib lib/libargon2.so.${LIBargon2_VERSION} > lib/pkgconfig/libargon2.pc > share/doc/argon2/ >