system/scrypt: New maintainer.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 31 insertions, 48 deletions

diff --git a/system/scrypt/README b/system/scrypt/README
index 2dda616f34..57d1c78567 100644
--- a/system/scrypt/README
+++ b/system/scrypt/README
@@ -1,3 +1,5 @@
+scrypt (scrypt encryption utility and library)
+
 The scrypt key derivation function was originally developed for use in
 the Tarsnap online backup system and is designed to be far more secure
 against hardware brute-force attacks than alternative functions such as
@@ -12,5 +14,4 @@ this means that a five-character password using scrypt is stronger than
 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
+libscrypt-kdf is included in the package.
diff --git a/system/scrypt/scrypt.SlackBuild b/system/scrypt/scrypt.SlackBuild
index 230beb4356..69564341c3 100644
--- a/system/scrypt/scrypt.SlackBuild
+++ b/system/scrypt/scrypt.SlackBuild
@@ -2,31 +2,22 @@
 
 # Slackware build script for scrypt
 
-# Copyright (c) 2011-2013 LEVAI Daniel
-# Copyright 2020-2023 Alexander Verbovetsky, Moscow, Russia
-# All rights reserved.
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Original author and maintainer 2011-2013: LEVAI Daniel.
+# Maintained 2020-2023 by Alexander Verbovetsky, Moscow, Russia.
+# Now maintained by B. Watson <urchlay@slackware.uk>.
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20241007 bkw: v1.3.2, BUILD=2:
+# - take over maintenance.
+# - include COPYRIGHT in doc dir.
+# - always build/install the library.
+# - tweak README and slack-desc.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=scrypt
 VERSION=${VERSION:-1.3.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -63,9 +54,6 @@ fi
 
 set -e
 
-libscrypt_kdf=""
-[ "${LIB:-no}" != "no" ] && libscrypt_kdf="--enable-libscrypt-kdf"
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -73,11 +61,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 CFLAGS="$SLKCFLAGS" \
     ./configure \
@@ -86,20 +71,17 @@ CFLAGS="$SLKCFLAGS" \
     --mandir=/usr/man \
     --docdir=/usr/doc \
     --enable-static=no \
-    $libscrypt_kdf \
-  --build=$ARCH-slackware-linux
+    --enable-libscrypt-kdf \
+    --build=$ARCH-slackware-linux
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a FORMAT README.md $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+make install-strip DESTDIR=$PKG
+rm -f $PKG/usr/lib*/*.la
+gzip -9 $PKG/usr/man/man*/*
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a COPYRIGHT FORMAT README.md $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/scrypt/scrypt.info b/system/scrypt/scrypt.info
index 79869eb67d..723358e066 100644
--- a/system/scrypt/scrypt.info
+++ b/system/scrypt/scrypt.info
@@ -1,10 +1,10 @@
 PRGNAM="scrypt"
 VERSION="1.3.2"
-HOMEPAGE="http://www.tarsnap.com/scrypt.html"
-DOWNLOAD="http://www.tarsnap.com/scrypt/scrypt-1.3.2.tgz"
+HOMEPAGE="https://www.tarsnap.com/scrypt.html"
+DOWNLOAD="https://www.tarsnap.com/scrypt/scrypt-1.3.2.tgz"
 MD5SUM="82922531d2a0eafb72d1fe9cfaf23432"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Alexander Verbovetsky"
-EMAIL="alik@ejik.org"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/scrypt/slack-desc b/system/scrypt/slack-desc
index 2141b59125..4e176e86cf 100644
--- a/system/scrypt/slack-desc
+++ b/system/scrypt/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-scrypt: scrypt (scrypt encryption utility)
+scrypt: scrypt (scrypt encryption utility and library)
 scrypt:
 scrypt: The scrypt key derivation function was originally developed for use in
 scrypt: the Tarsnap online backup system and is designed to be far more secure