system/tiger: Updated for version 3.2.4rc1.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

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

9 files changed, 11 insertions, 174 deletions

diff --git a/system/tiger/patches/9a030129ceceba715dff801f8229e66de62a8083.patch b/system/tiger/patches/9a030129ceceba715dff801f8229e66de62a8083.patch
deleted file mode 100644
index a1069e2645def..0000000000000
--- a/system/tiger/patches/9a030129ceceba715dff801f8229e66de62a8083.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/scripts/check_rootdir b/scripts/check_rootdir
-index a34eb2a..5f55159 100755
---- a/scripts/check_rootdir
-+++ b/scripts/check_rootdir
-@@ -90,7 +90,7 @@ haveallvars TESTLINK HOSTNAME || exit 1
- # Checking to see if the root directory is on the correct INODE number
- inode=`$LS -di / | $AWK '{print $1}'`
- fstype=`$GETFS | $GREP " / " | $AWK -F " " '{ print $5;}'`
--[ $inode != 2 ] && [ "$fstype" = "ext2" -o "$fstype" = "ext3" ] &&
-+[ $inode != 2 ] && [ "$fstype" = "ext2" -o "$fstype" = "ext3" -o "$fstype" = "ext4" ] &&
-    message FAIL rootdir001f "" "Root directory on incorrect inode"
- 
- 
diff --git a/system/tiger/patches/check_signatures.patch b/system/tiger/patches/check_signatures.patch
deleted file mode 100644
index 5264ad57e39c2..0000000000000
--- a/system/tiger/patches/check_signatures.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urpN tiger-3.2.3.orig/scripts/check_signatures tiger-3.2.3/scripts/check_signatures
---- tiger-3.2.3.orig/scripts/check_signatures	2011-08-14 05:44:29.474729020 +0000
-+++ tiger-3.2.3/scripts/check_signatures	2011-08-14 05:46:36.840361481 +0000
-@@ -91,7 +91,7 @@ do
- 	  *[!0-9a-f]*) {
- 	    std_signature="$p1"
- 	    comment="$p2 $p3 $p4 $p5 $p6 $p7 $p8 $comment"
--	    [ -n "$MD5" ] && loc_signature="`$MD5 < $file`"
-+	    [ -n "$MD5" ] && loc_signature="`$MD5 < $file | $AWK '{print $1}'`"
- 	  }
- 	  ;;
- 	  *) {
diff --git a/system/tiger/patches/mkfilelst.patch b/system/tiger/patches/mkfilelst.patch
deleted file mode 100644
index b3d5c678c140f..0000000000000
--- a/system/tiger/patches/mkfilelst.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urpN tiger-3.2.3.orig/util/mkfilelst tiger-3.2.3/util/mkfilelst
---- tiger-3.2.3.orig/util/mkfilelst	2011-08-07 21:16:16.361620719 +0000
-+++ tiger-3.2.3/util/mkfilelst	2011-08-07 21:18:30.710039906 +0000
-@@ -138,7 +138,7 @@ do
- 	if [ $glob -lt 2 ] ; then
- 	   [ -f "$file" -o -d "$file" ] && \
- 	   getpermit $file |
--           while read _file owner group ur uw ux gr gw gx or ow ox stk suid sgid stk
-+           while read _file owner group ur uw ux gr gw gx or ow ox suid sgid stk
- 	  do
- 	    echo "$file $owner $group $suid $sgid $ur $uw $ux $gr $gw $gx $or $ow $ox $lvl $ownmid $grpmid $prmmid"
- 	  done
diff --git a/system/tiger/patches/tiger-3.2.3-build-fix.diff b/system/tiger/patches/tiger-3.2.3-build-fix.diff
deleted file mode 100644
index 28b6985360696..0000000000000
--- a/system/tiger/patches/tiger-3.2.3-build-fix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur tiger-3.2.3/util/genmsgidx tiger-3.2.3.new/util/genmsgidx
---- tiger-3.2.3/util/genmsgidx	2008-11-27 23:34:21.000000000 +0100
-+++ tiger-3.2.3.new/util/genmsgidx	2010-09-01 12:43:22.000000000 +0200
-@@ -96,10 +96,10 @@
- haveallof variables BASEDIR || exit 1
- 
- # Clear idx file and detect error
--> $BASEDIR/doc/explain.idx && {
--    echo "Error: Cannot write over the index file $BASEDIR/doc/explain.idx. Aborting"
--    exit 1
--}
-+#> $BASEDIR/doc/explain.idx && {
-+#    echo "Error: Cannot write over the index file $BASEDIR/doc/explain.idx. Aborting"
-+#    exit 1
-+#}
- 
- $LS $BASEDIR/doc/*.txt |
- while read infile 
diff --git a/system/tiger/patches/tiger-makefile.patch b/system/tiger/patches/tiger-makefile.patch
deleted file mode 100644
index 39a2571e3d077..0000000000000
--- a/system/tiger/patches/tiger-makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 160ba685d08651d1cc755d2bb0167dc7170f8e2b Mon Sep 17 00:00:00 2001
-From: pyllyukko <pyllyukko@maimed.org>
-Date: Sat, 6 Oct 2012 23:43:07 +0300
-Subject: Added facl.{tmpl|list} to Makefile.in.
-
----
- Makefile.in |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 9d6eab8..86ab714 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -167,6 +167,8 @@ MISCFILES=./initdefs \
- 	./util/mksig \
- 	./util/setsh \
- 	./util/sgrep \
-+	./util/facl.lst \
-+	./util/facl.tmpl \
-         ./doc/explain.idx
- 
- MISCDIRS=./bin \
--- 
-1.7.4.4
-
diff --git a/system/tiger/patches/tiger-sha512-1.patch b/system/tiger/patches/tiger-sha512-1.patch
deleted file mode 100644
index 70e087686a5d9..0000000000000
--- a/system/tiger/patches/tiger-sha512-1.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: scripts/check_passwd
-===================================================================
-RCS file: /sources/tiger/tiger/scripts/check_passwd,v
-retrieving revision 1.24
-diff -u -r1.24 check_passwd
---- scripts/check_passwd	27 Aug 2007 18:30:44 -0000	1.24
-+++ scripts/check_passwd	12 May 2010 06:23:57 -0000
-@@ -129,7 +129,7 @@
-   do
- 
-     # Check the password hash.
--    [ -z "$Tiger_Passwd_Hashes" ] && Tiger_Passwd_Hashes='crypt3|md5|xxxxxxxxxxxxx'
-+    [ -z "$Tiger_Passwd_Hashes" ] && Tiger_Passwd_Hashes='crypt3|md5|sha512|xxxxxxxxxxxxx'
-     eval "case \"$hash\" in
-       \"\")
-         message FAIL pass011f \"\" \"Username \\\`$login' has an empty password field.\"
-Index: systems/Linux/2/gen_passwd_sets
-===================================================================
-RCS file: /sources/tiger/tiger/systems/Linux/2/gen_passwd_sets,v
-retrieving revision 1.16
-diff -u -r1.16 gen_passwd_sets
---- systems/Linux/2/gen_passwd_sets	4 Aug 2005 08:48:15 -0000	1.16
-+++ systems/Linux/2/gen_passwd_sets	12 May 2010 06:23:57 -0000
-@@ -96,6 +96,10 @@
-       \$1\$[a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./]\$[a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./])
- 	     passwd="md5"
- 	   ;;
-+# For SHA512 passwds (98 chars) starting with $6$ (Linux)
-+      \$6\$[a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./])
-+	     passwd="md5"
-+	   ;;
-       " ") passwd=""
- 	   ;;
- 	*|!!)
diff --git a/system/tiger/patches/zappasswd-3.2.3.patch b/system/tiger/patches/zappasswd-3.2.3.patch
deleted file mode 100644
index 403ff6244c5d4..0000000000000
--- a/system/tiger/patches/zappasswd-3.2.3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/scripts/check_passwd b/scripts/check_passwd
-index 4a52092..8cb69be 100755
---- a/scripts/check_passwd
-+++ b/scripts/check_passwd
-@@ -129,7 +129,7 @@ check_passwd_entries()
-   do
- 
-     # Check the password hash.
--    [ -z "$Tiger_Passwd_Hashes" ] && Tiger_Passwd_Hashes='crypt3|md5|xxxxxxxxxxxxx'
-+    [ -z "$Tiger_Passwd_Hashes" ] && Tiger_Passwd_Hashes='crypt3|md5|blowfish|sha256|sha512|xxxxxxxxxxxxx'
-     eval "case \"$hash\" in
-       \"\")
-         message FAIL pass011f \"\" \"Username \\\`$login' has an empty password field.\"
-diff --git a/systems/Linux/2/gen_passwd_sets b/systems/Linux/2/gen_passwd_sets
-index ec48944..26d73f0 100755
---- a/systems/Linux/2/gen_passwd_sets
-+++ b/systems/Linux/2/gen_passwd_sets
-@@ -96,9 +96,19 @@ zappasswd()
-       \$1\$[a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./]\$[a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./])
- 	     passwd="md5"
- 	   ;;
-+      \$2a\$*)
-+	     passwd="blowfish"
-+	   ;;
-+      \$5\$*)
-+	     passwd="sha256"
-+	   ;;
-+# For SHA512 passwds starting with $6$ (Linux)
-+      \$6\$*)
-+	     passwd="sha512"
-+	   ;;
-       " ") passwd=""
- 	   ;;
--	*|!!)
-+	*|!!|!\*)
- 	     passwd="*"
- 	   ;;
-     esac
diff --git a/system/tiger/tiger.SlackBuild b/system/tiger/tiger.SlackBuild
index 19279694d0b1d..3a688508cf36b 100644
--- a/system/tiger/tiger.SlackBuild
+++ b/system/tiger/tiger.SlackBuild
@@ -12,8 +12,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=tiger
-VERSION=${VERSION:-3.2.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.2.4rc1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -71,13 +71,13 @@ then
   set -e
   # If we have the key and the signature file, we verify the package with GPG
   if [ ${GPG_RET} -eq 0 -a \
-       -f "${CWD}/${PRGNAM}-${VERSION}.tar.gz.sig" ]
+       -f "${CWD}/${PRGNAM}_${VERSION}.tar.gz.sig" ]
   then
-    /usr/bin/gpgv "${CWD}/${PRGNAM}-${VERSION}.tar.gz.sig"
+    /usr/bin/gpgv "${CWD}/${PRGNAM}_${VERSION}.tar.gz.sig"
   fi
 fi
 
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -86,23 +86,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# The build errs on this
-# see http://cvs.savannah.gnu.org/viewvc/tiger/tiger/util/genmsgidx?r1=1.6&r2=1.7
-patch --verbose -p1 < $CWD/patches/tiger-3.2.3-build-fix.diff
-# fix bug #7186 & #7675
+# fix bug #7675
 # see https://savannah.nongnu.org/patch/?7675
-patch --verbose -p1 < $CWD/patches/zappasswd-3.2.3.patch
-# fix bug #33969
-patch --verbose -p1 < $CWD/patches/mkfilelst.patch
-# fix bug #34028
-patch --verbose -p1 < $CWD/patches/check_signatures.patch
+patch --verbose -p1 < $CWD/patches/zappasswd.patch
 # see https://savannah.nongnu.org/patch/index.php?7859
 patch --verbose -p1 < $CWD/patches/tiger-aide.patch
-# fix bug #37517
-patch --verbose -p1 < $CWD/patches/tiger-makefile.patch
-# add support for ext4 in the check_rootdir script
-# see http://git.savannah.gnu.org/cgit/tiger.git/commit/?id=9a030129ceceba715dff801f8229e66de62a8083
-patch --verbose -p1 < $CWD/patches/9a030129ceceba715dff801f8229e66de62a8083.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS"
@@ -152,6 +140,7 @@ cp -a [A-Z][A-Z]* site-* tigerrc* \
 cp -a other/cert-usc20.txt contrib/fix_tiger_GROUPS.sh audit \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
+chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*.txt
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
 cp $PKG/usr/libexec/tiger/html/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html
diff --git a/system/tiger/tiger.info b/system/tiger/tiger.info
index de916f7aa2754..41c33eeceaf16 100644
--- a/system/tiger/tiger.info
+++ b/system/tiger/tiger.info
@@ -1,8 +1,8 @@
 PRGNAM="tiger"
-VERSION="3.2.3"
+VERSION="3.2.4rc1"
 HOMEPAGE="http://www.nongnu.org/tiger"
-DOWNLOAD="http://download.savannah.nongnu.org/releases/tiger/tiger-3.2.3.tar.gz http://download.savannah.gnu.org/releases/tiger/tiger-3.2.3.tar.gz.sig"
-MD5SUM="f41076f645da9de937819bf6d516e546 fee7fd065e57a3a763d3a99f7ebf7b02"
+DOWNLOAD="https://download.savannah.nongnu.org/releases/tiger/tiger_3.2.4rc1.tar.gz https://download.savannah.nongnu.org/releases/tiger/tiger_3.2.4rc1.tar.gz.sig"
+MD5SUM="169207ac9c211983a7ef9d19c1e5b3cb 26f45652e995f3ad9cb597fe3697aa75"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""