1 files changed, 12 insertions, 13 deletions
diff --git a/system/secure-delete/secure-delete.SlackBuild b/system/secure-delete/secure-delete.SlackBuild
index bcaca870f26e6..538c63015670b 100644
--- a/system/secure-delete/secure-delete.SlackBuild
+++ b/system/secure-delete/secure-delete.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for secure-delete.
 #
-# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,12 @@
 
 PRGNAM=secure-delete
 VERSION=${VERSION:-3.1}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -54,16 +54,17 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+SRCNAM=${SRCNAM:-secure-delete}
+SRCVER=${SRCVER:-3.1.orig}
 
-SRCNAM="secure_delete"
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-mv $SRCNAM-$VERSION $PRGNAM-$VERSION
+tar xvf $CWD/${SRCNAM}_${SRCVER}.tar.gz
+mv $SRCNAM-$SRCVER $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -83,7 +84,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/man/man1
-cp -a sfill.1 smem.1 srm.1 sswap.1 $PKG/usr/man/man1
+cp sfill.1 smem.1 srm.1 sswap.1 $PKG/usr/man/man1
 
 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
@@ -91,10 +92,8 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 mkdir -p $PKG/usr/bin
 cp -a sfill smem srm sswap $PKG/usr/bin
 
-DOCS="CHANGES README secure_delete.doc TODO usenix6-gutmann.doc"
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp CHANGES README secure_delete.doc TODO usenix6-gutmann.doc $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install