Hi!
Update to 1.19.
Patches needed to be regenerated, otherwise a clean update.
The update itself is mostly code cleanup, style and Makefile fixes.
Tested on amd64.
Daniel
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/libscrypt/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -p -u -r1.1.1.1 Makefile
--- Makefile 15 Mar 2014 13:37:18 -0000 1.1.1.1
+++ Makefile 8 May 2014 17:52:49 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY = Yes
COMMENT = shared library that implements scrypt() functionality
-GH_VER = 1.17
+GH_VER = 1.19
PROJECT = libscrypt
DISTNAME = ${PROJECT}-${GH_VER}
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/libscrypt/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -p -u -r1.1.1.1 distinfo
--- distinfo 15 Mar 2014 13:37:18 -0000 1.1.1.1
+++ distinfo 8 May 2014 17:52:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (libscrypt-1.17.tar.gz) = V/7+Rjk34x6qkfeJLIHTxvSfGWBak+LnYhRbc70h3lc=
-SIZE (libscrypt-1.17.tar.gz) = 17276
+SHA256 (libscrypt-1.19.tar.gz) = jzmGd7K0PiFCO4ABVrM3nzyw0xTnDuwusug6ASvOhU8=
+SIZE (libscrypt-1.19.tar.gz) = 18208
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/security/libscrypt/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -p -u -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 15 Mar 2014 13:37:18 -0000 1.1.1.1
+++ patches/patch-Makefile 8 May 2014 17:52:49 -0000
@@ -3,8 +3,9 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2014/
- use OpenBSD shared library naming
- sys.mk defines CFLAGS and LDFLAGS so don't use conditional value assignments
for those.
---- Makefile.orig Thu Feb 27 02:05:51 2014
-+++ Makefile Mon Mar 10 12:38:53 2014
+- 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
@@ -5,20 +5,19 @@ MAKE_DIR ?= install -d
INSTALL_DATA ?= install
@@ -17,22 +18,22 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2014/
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
+ 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
-libscrypt.so.0: $(OBJS)
-- $(CC) $(LDFLAGS) -shared -o libscrypt.so.0 -lc -lm $(OBJS)
+- $(CC) $(LDFLAGS) -shared -o libscrypt.so.0 $(OBJS) -lm -lc
+libscrypt.so.${LIBscrypt_VERSION}: $(OBJS)
-+ $(CC) $(LDFLAGS) -shared -o libscrypt.so.${LIBscrypt_VERSION} -lc -lm
$(OBJS)
++ $(CC) $(LDFLAGS) -shared -o libscrypt.so.${LIBscrypt_VERSION} $(OBJS)
-lm -lc
ar rcs libscrypt.a $(OBJS)
--reference: libscrypt.so.0 main.o b64.o
+-reference: libscrypt.so.0 main.o b64.o crypto_scrypt-hexconvert.o
- ln -s -f libscrypt.so.0 libscrypt.so
-+reference: libscrypt.so.${LIBscrypt_VERSION} main.o b64.o
- $(CC) -Wall -o reference main.o b64.o $(CFLAGS_EXTRA) -L. -lscrypt
++reference: libscrypt.so.${LIBscrypt_VERSION} main.o b64.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
+ splint crypto-scrypt-saltgen.c +posixlib -compdef
valgrind ./reference
-install: libscrypt.so.0
@@ -44,6 +45,11 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2014/
+ $(MAKE_DIR) $(LIBDIR) $(INCLUDEDIR)
+ $(INSTALL_DATA) -pm 0755 libscrypt.so.${LIBscrypt_VERSION} $(LIBDIR)
+ $(INSTALL_DATA) -pm 0644 libscrypt.h $(INCLUDEDIR)
+
+ install-osx: libscrypt.so.0
+ $(MAKE_DIR) $(DESTDIR) $(DESTDIR)$(PREFIX) $(DESTDIR)$(LIBDIR)
$(DESTDIR)$(INCLUDEDIR)
+@@ -46,4 +44,4 @@ install-osx: libscrypt.so.0
+ $(INSTALL_DATA) -pm 0644 libscrypt.h $(DESTDIR)$(INCLUDEDIR)
install-static: libscrypt.a
- $(INSTALL_DATA) -pm 0644 libscrypt.a $(DESTDIR)$(LIBDIR)
Index: patches/patch-main_c
===================================================================
RCS file: /cvs/ports/security/libscrypt/patches/patch-main_c,v
retrieving revision 1.1.1.1
diff -u -p -p -u -r1.1.1.1 patch-main_c
--- patches/patch-main_c 15 Mar 2014 13:37:18 -0000 1.1.1.1
+++ patches/patch-main_c 8 May 2014 17:52:49 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-main_c,v 1.1.1.1 2014/03
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 Thu Jan 23 02:32:17 2014
-+++ main.c Thu Jan 23 14:32:56 2014
-@@ -147,7 +147,7 @@ int main()
+--- 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()
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
