Hi!
Update to libscrypt (internal checks were successful on amd64):
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/libscrypt/Makefile,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 Makefile
--- Makefile 16 Mar 2016 16:46:33 -0000 1.5
+++ Makefile 18 Apr 2018 15:07:51 -0000
@@ -2,7 +2,7 @@
COMMENT = shared library that implements scrypt() functionality
-V = 1.19
+V = 1.21
GH_ACCOUNT = technion
GH_PROJECT = libscrypt
GH_TAGNAME = v$V
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/libscrypt/distinfo,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 distinfo
--- distinfo 8 May 2014 20:49:41 -0000 1.2
+++ distinfo 18 Apr 2018 15:07:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (libscrypt-1.19.tar.gz) = jzmGd7K0PiFCO4ABVrM3nzyw0xTnDuwusug6ASvOhU8=
-SIZE (libscrypt-1.19.tar.gz) = 18208
+SHA256 (libscrypt-1.21.tar.gz) = aON355dFwQ1Im3Wblw5S2BnbuA3YymH4yXUYXfP0V9M=
+SIZE (libscrypt-1.21.tar.gz) = 19425
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/security/libscrypt/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 patch-Makefile
--- patches/patch-Makefile 8 May 2014 20:49:41 -0000 1.2
+++ patches/patch-Makefile 18 Apr 2018 15:07:51 -0000
@@ -4,8 +4,9 @@ $OpenBSD: patch-Makefile,v 1.2 2014/05/0
- sys.mk defines CFLAGS and LDFLAGS so don't use conditional value assignments
for those.
- we don't patch the install-osx target, because we don't use it
---- Makefile.orig Tue May 6 11:42:07 2014
-+++ Makefile Thu May 8 21:41:43 2014
+Index: Makefile
+--- Makefile.orig
++++ Makefile
@@ -5,20 +5,19 @@ MAKE_DIR ?= install -d
INSTALL_DATA ?= install
@@ -18,7 +19,7 @@ $OpenBSD: patch-Makefile,v 1.2 2014/05/0
all: reference
- OBJS= crypto_scrypt-nosse.o sha256.o crypto_scrypt-hexconvert.o crypto-mcf.o
b64.o crypto-scrypt-saltgen.o crypto_scrypt-check.o crypto_scrypt-hash.o
slowequals.o
+ OBJS= crypto_scrypt-nosse.o sha256.o crypto-mcf.o b64.o
crypto-scrypt-saltgen.o crypto_scrypt-check.o crypto_scrypt-hash.o slowequals.o
-libscrypt.so.0: $(OBJS)
- $(CC) $(LDFLAGS) -shared -o libscrypt.so.0 $(OBJS) -lm -lc
@@ -26,15 +27,15 @@ $OpenBSD: patch-Makefile,v 1.2 2014/05/0
+ $(CC) $(LDFLAGS) -shared -o libscrypt.so.${LIBscrypt_VERSION} $(OBJS)
-lm -lc
ar rcs libscrypt.a $(OBJS)
--reference: libscrypt.so.0 main.o b64.o crypto_scrypt-hexconvert.o
+-reference: libscrypt.so.0 main.o crypto_scrypt-hexconvert.o
- ln -s -f libscrypt.so.0 libscrypt.so
-+reference: libscrypt.so.${LIBscrypt_VERSION} main.o b64.o
crypto_scrypt-hexconvert.o
++reference: libscrypt.so.${LIBscrypt_VERSION} main.o crypto_scrypt-hexconvert.o
$(CC) -Wall -o reference main.o b64.o crypto_scrypt-hexconvert.o
$(CFLAGS_EXTRA) -L. -lscrypt
clean:
-@@ -33,11 +32,10 @@ devtest:
- splint crypto-scrypt-saltgen.c +posixlib -compdef
- valgrind ./reference
+@@ -40,11 +39,10 @@ asan: main.c
+ ./asantest
+ rm -f asantest
-install: libscrypt.so.0
- $(MAKE_DIR) $(DESTDIR) $(DESTDIR)$(PREFIX) $(DESTDIR)$(LIBDIR)
$(DESTDIR)$(INCLUDEDIR)
@@ -48,7 +49,7 @@ $OpenBSD: patch-Makefile,v 1.2 2014/05/0
install-osx: libscrypt.so.0
$(MAKE_DIR) $(DESTDIR) $(DESTDIR)$(PREFIX) $(DESTDIR)$(LIBDIR)
$(DESTDIR)$(INCLUDEDIR)
-@@ -46,4 +44,4 @@ install-osx: libscrypt.so.0
+@@ -54,4 +52,4 @@ install-osx: libscrypt.so.0
$(INSTALL_DATA) -pm 0644 libscrypt.h $(DESTDIR)$(INCLUDEDIR)
install-static: libscrypt.a
Index: patches/patch-main_c
===================================================================
RCS file: /cvs/ports/security/libscrypt/patches/patch-main_c,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 patch-main_c
--- patches/patch-main_c 8 May 2014 20:49:41 -0000 1.2
+++ patches/patch-main_c 18 Apr 2018 15:07:51 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-main_c,v 1.2 2014/05/08
Trivial change of strcpy() to strlcpy().
Size of stack variable mcf and mcf2 is well known.
`make check` runs fine with it.
---- main.c.orig Tue May 6 11:42:07 2014
-+++ main.c Thu May 8 21:29:01 2014
-@@ -148,7 +148,7 @@ int main()
+Index: main.c
+--- main.c.orig
++++ main.c
+@@ -161,7 +161,7 @@ int main()
printf("TEST EIGHT: SUCCESSFUL, calculated mcf\n%s\n", mcf);
/* Since later calls to scrypt_check() butcher mcf, make a second */
--
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
