diff options
| -rw-r--r-- | system/scrypt/README | 13 | ||||
| -rw-r--r-- | system/scrypt/passphrase-environ.patch.gz | bin | 2654 -> 0 bytes | |||
| -rw-r--r-- | system/scrypt/scrypt.SlackBuild | 5 | ||||
| -rw-r--r-- | system/scrypt/scrypt.info | 6 |
4 files changed, 4 insertions, 20 deletions
diff --git a/system/scrypt/README b/system/scrypt/README index 1e17314d7e..2dda616f34 100644 --- a/system/scrypt/README +++ b/system/scrypt/README @@ -14,16 +14,3 @@ a ten-character password using openssl. In addition to the scrypt command-line utility, a development library libscrypt-kdf can be built and installed by setting the LIB environment variable: LIB=yes ./scrypt.SlackBuild - -Before version 1.3.0 scrypt was able to read both passphrase and input -file from standard input. This stopped to work in 1.3.0. In future -versions it is planned to add an option to read passphrase using a -variety of methods. This SlackBuild can patch scrypt 1.3.0 to add the -option "--passphrase-env", which allows to read the passphrase from an -environment variable. To this end, set the PASS environment variable: -PASS=yes ./scrypt.SlackBuild - -The patch is taken fron the branch -https://github.com/Tarsnap/scrypt/tree/passphrase-environ - -Warning: using this patch is not officially supported by upstream. diff --git a/system/scrypt/passphrase-environ.patch.gz b/system/scrypt/passphrase-environ.patch.gz Binary files differdeleted file mode 100644 index 10f623ef05..0000000000 --- a/system/scrypt/passphrase-environ.patch.gz +++ /dev/null diff --git a/system/scrypt/scrypt.SlackBuild b/system/scrypt/scrypt.SlackBuild index bc6f1979fb..3f1f51f3c2 100644 --- a/system/scrypt/scrypt.SlackBuild +++ b/system/scrypt/scrypt.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=scrypt -VERSION=${VERSION:-1.3.0} +VERSION=${VERSION:-1.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,9 +72,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -[ "${PASS:-no}" != "no" ] && \ - zcat $CWD/passphrase-environ.patch.gz | patch -p1 --verbose - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/scrypt/scrypt.info b/system/scrypt/scrypt.info index 20bb94ecf4..5f88fd121f 100644 --- a/system/scrypt/scrypt.info +++ b/system/scrypt/scrypt.info @@ -1,8 +1,8 @@ PRGNAM="scrypt" -VERSION="1.3.0" +VERSION="1.3.1" HOMEPAGE="http://www.tarsnap.com/scrypt.html" -DOWNLOAD="http://www.tarsnap.com/scrypt/scrypt-1.3.0.tgz" -MD5SUM="62a528a6b73bccb0f8b7665cbcfec0b8" +DOWNLOAD="http://www.tarsnap.com/scrypt/scrypt-1.3.1.tgz" +MD5SUM="1f5aded31478319357c2c611eb5c4f71" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |