Diff below brings security/scrypt to 1.3.0. Significant changes since 1.2.1 [0]: - In addition to the scrypt command-line utility, a library "libscrypt-kdf" can now be built and installed by passing the --enable-libscrypt-kdf option to configure. - On x86 CPUs which support them, RDRAND and SHA extensions are used to provide supplemental entropy and speed up hash computations respectively. - When estimating the amount of available RAM, scrypt ignores RLIMIT_DATA on systems which have mmap. - A new command "scrypt info encfile" prints information about an encrypted file without decrypting it.
Changes to the port: - Build and package libscrypt-kdf. - Change HOMEPAGE/MASTER_SITES to https. - Enable tests. - Set DEBUG_PACKAGES. Testing: 'make test' runs successfully Comments/OK? [0] http://mail.tarsnap.com/scrypt/msg00261.html diff --git Makefile Makefile index 3c3a2989df8..57667e2dd9a 100644 --- Makefile +++ Makefile @@ -2,11 +2,13 @@ COMMENT = command-line encryption using scrypt key derivation function -DISTNAME = scrypt-1.2.1 +DISTNAME = scrypt-1.3.0 + +SHARED_LIBS += scrypt-kdf 0.0 # 1.0 CATEGORIES = security -HOMEPAGE = http://www.tarsnap.com/scrypt/ +HOMEPAGE = https://www.tarsnap.com/scrypt/ # BSD PERMIT_PACKAGE = Yes @@ -17,7 +19,10 @@ MASTER_SITES = ${HOMEPAGE} EXTRACT_SUFX = .tgz CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = --enable-libscrypt-kdf + +DEBUG_PACKAGES = ${BUILD_PACKAGES} -NO_TEST = Yes +TEST_TARGET = test .include <bsd.port.mk> diff --git distinfo distinfo index 8a34c030d44..a08d6ba134c 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (scrypt-1.2.1.tgz) = RiH159ovgC4ghQQ2IZNwCS6fzak71Zj21CNszjP0xXc= -SIZE (scrypt-1.2.1.tgz) = 127619 +SHA256 (scrypt-1.3.0.tgz) = JjA07dTR4RfUBR2akmDHTe2w769EkcUVK3OJeLPzJ0g= +SIZE (scrypt-1.3.0.tgz) = 380332 diff --git patches/patch-tests_test_scrypt_sh patches/patch-tests_test_scrypt_sh new file mode 100644 index 00000000000..5ee6fb254f2 --- /dev/null +++ patches/patch-tests_test_scrypt_sh @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: tests/test_scrypt.sh +--- tests/test_scrypt.sh.orig ++++ tests/test_scrypt.sh +@@ -14,7 +14,7 @@ out_valgrind="${bindir}/tests-valgrind" + password="hunter2" + + # Find system scrypt, and ensure it supports -P. +-system_scrypt=$( find_system scrypt enc -P ) ++system_scrypt=$( find_system ${scriptdir}/../scrypt enc -P ) + + + ### Run tests using project-specific constants diff --git pkg/PLIST pkg/PLIST index 733536472a5..d6f4b7b7bec 100644 --- pkg/PLIST +++ pkg/PLIST @@ -1,3 +1,7 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2009/05/25 22:48:48 sthen Exp $ @bin bin/scrypt +include/scrypt-kdf.h +@static-lib lib/libscrypt-kdf.a +lib/libscrypt-kdf.la +@lib lib/libscrypt-kdf.so.${LIBscrypt-kdf_VERSION} @man man/man1/scrypt.1
