system/md5deep: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

2 files changed, 32 insertions, 18 deletions

diff --git a/system/md5deep/README b/system/md5deep/README
index 20824fe48f..9d15711dfa 100644
--- a/system/md5deep/README
+++ b/system/md5deep/README
@@ -1,4 +1,6 @@
-md5deep is a cross-platform set of programs to compute MD5, SHA-1, SHA-256,
-Tiger, or Whirlpool message digests on an arbitrary number of files. md5deep
-is similar to the md5sum program found in the GNU Coreutils package, but has
-additional features.
+md5deep (tools to compare digests)
+
+md5deep is a cross-platform set of programs to compute MD5, SHA-1,
+SHA-256, Tiger, or Whirlpool message digests on an arbitrary number
+of files. md5deep is similar to the md5sum program found in the GNU
+Coreutils package, but has additional features.
diff --git a/system/md5deep/md5deep.SlackBuild b/system/md5deep/md5deep.SlackBuild
index 3505837c1b..57e4e075eb 100644
--- a/system/md5deep/md5deep.SlackBuild
+++ b/system/md5deep/md5deep.SlackBuild
@@ -23,12 +23,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org to fix the build on 15.0.
+# Also, install missing symlinks (e.g. hashdeep => md5deep) and
+# de-duplicate man pages.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=md5deep
 SRCNAM=hashdeep
 VERSION=${VERSION:-4.4}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -40,9 +44,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -81,13 +82,17 @@ rm -rf tests/testfiles/symlinktest/
 
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220210 bkw: ordered comparison of pointer and int...
+sed -i 's,base>0,base,' src/hash.cpp
+
+sh bootstrap.sh
 
-chmod +x bootstrap.sh
 CFLAGS="$SLKCFLAGS" \
-./bootstrap.sh
+CXXFLAGS="$SLKCFLAGS -std=gnu++98" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
@@ -95,16 +100,23 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip 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
+gzip -9 $PKG/usr/man/man*/*
 
-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
+# 20220210 bkw: program alters its behaviour based on the name it's
+# called as. So provide the alternate names. Also, the man pages are
+# identical, so make them symlinks too.
+for i in md5 sha1 sha256 tiger whirlpool; do
+  ln -s hashdeep $PKG/usr/bin/${i}deep
+  if [ "$i" != "md5" ]; then
+    rm -f $PKG/usr/man/man1/${i}deep.1.gz
+    ln -s md5deep.1.gz $PKG/usr/man/man1/${i}deep.1.gz
+  fi
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install