secure-delete: adding secure-delete

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2105 370017ae-e619-0410-ac65-c121f96126d4

2 files changed, 45 insertions, 21 deletions

diff --git a/app/misc/wipe/Manifest b/app/misc/wipe/Manifest
new file mode 100644
index 00000000..b0b23013
--- /dev/null
+++ b/app/misc/wipe/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST wipe-2.2.0.tar.bz2 70134 MD5 1e1366c6407e7910f6131ebfee9f1ea6 RMD160 5d1861bd893e01e94205a7ac2efadb1c756da700 SHA1 4dd18f260ecd91b726336b2788fa33db04d6691a SHA256 ea8956c31538b43f04ec3c4999a567a61f34fff0faf6ea02090c860b7f391be6 SHA512 5d156712b07b579018324b714dad2d3fae3c3cac1a9b1fd76ec44596b9d738bb3e460dedf23898e12ed87ee5dced28d1792c905c9869756914e21ad95efbbbbb
+MKBUILD wipe.mkbuild 2993 MD5 3b7605152bf9306a98e9e4d27d3ea3a7 RMD160 1aa15d66bc69f96957633f10ee5ecd2581db007d SHA1 88b1803f1d36376f055720edc6251584756c2a75 SHA256 5636193914996b25914a04841c64dc68c1918a5879bf02e11fe48b6a6486f5ac SHA512 8d75db174d3d9097ae72a5c6079b23e284e602561446e70dc3aa0e8989051d3eda736af3c7f9f0c4504ebc64a87c997d3fa865a4a4511a521d419cc1cb563c69
+PATCH wipe-2.2.0.diff 958 MD5 5bb5e3fbfa1a2cb1a71ce85d89ba22b3 RMD160 a683f3df7bc47a575b778f3252a6a8d7c6769377 SHA1 aa9c6f5732c028821ac4abd3faa473c5f9f9d497 SHA256 cd119c95a7da4a58458efb72d02a043cba6cf7acfd46487cfdcdd412ee07e5b1 SHA512 a73e525c223a4272ddea2ea16ec5bf1ca1c0bac9b07fb1b3ada8f608af78a066d9dcf6eb22f3a2c874e4e4aa0a8f56ae56908e886f5d32d45900768b363e6bac
+SLACKBUILD wipe.SlackBuild 5845 MD5 267da61930de401c5992059ba257bab4 RMD160 58f82e54ef57d24d471dfcc3f8ae69aa7b58eeb9 SHA1 1f9bb92d2f9195c916b0ba79dbe17218f8d1a768 SHA256 26301f9b4142b14e6e9395855831aeb0939404ea5ba931669f881eb1f9f508d6 SHA512 3386a18ec4bf0d6cfaedc340236a1eb62adbba1ca7c5d5514325d5e9b988971d5f4ec5618149b9fa8611901664ea3611695036a862317368c3a0c0e8a4cabb8e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJmaDKAAoJEEHL93ESzgeiIFIP/1cr40bxKVJ579FYhS5tB4ev
+SIAeQRBD7vvp4JEWHBLqhVIhrkoVgpStGc+J0RGYtEJoE+LMeqVVTFcV/IUcmeow
+KU6FZdWAHjnPsl1XSJvK4GI8mO04ZhEPoJkMiKZs5dxY+W3WWqd+5+opXokSKwsR
+XL4yNQUgs/UttL6nfYT/irnDpaats+Al8LHW7MTeYH7AiaYJekwPP7rxWshcvFuX
+8RdrK7PejLelrufdIboOexk5kuOhRCWHJtcbUj6LsvVW7z7KjgojJ3iNaXWmlQnt
+lOyXdyAQGa+DLNgUuNyBCSP086li9dsrxqiqPlwdAppAicXpUIQxmHurJE3r2rHt
+sxVjtOXgP+2xBKI6Zcu75OxSysaXXOJvg5f0tVbxoXyg/08OFKUPok/CgOt9l6Iq
+uoL/RsWys3qhK+SvIpP4cFgvT77lYYilNFEje5OFW7IIaxr2r7FXtJEo2+464MnJ
+YZII/Ij0JCNZKPh3Olzxna6h56jjCtE28jf7NacVnZeM/jL4Uaa9t63ZcCMDqJg7
+Kp/EoFo5IwV5K4wSRw+0gb485G8LOyXk2SxU+s0fcKE7EyNwRwlthdkbknSPTRmg
+ZVUuH27OyUOVCKjSAJ2otEBnhfb1sRYjxW0ybcJRwrsP7sRbq0bvNj+bPvIQAf3k
+/xTNWtv3Z4PVjgzW2D10
+=0uSz
+-----END PGP SIGNATURE-----
diff --git a/app/misc/wipe/wipe.SlackBuild b/app/misc/wipe/wipe.SlackBuild
index 21def4f3..0471c851 100755
--- a/app/misc/wipe/wipe.SlackBuild
+++ b/app/misc/wipe/wipe.SlackBuild
@@ -10,13 +10,14 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for wipe, by Silvio Rhatto
 # requires:  
 # tested: wipe-2.2.0
+# model: generic.mkSlackBuild $Rev: 784 $
 #
 
 # Look for slackbuildrc
@@ -47,9 +48,9 @@ NUMJOBS=${NUMJOBS:=""}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -57,6 +58,7 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -64,6 +66,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -86,27 +89,24 @@ fi
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Patch source
-patches="
+patches=" [[PATCH URLS]]
          $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
          $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
 for patch in $patches; do
+  patch="`basename $patch`"
   if [ -f "$CWD/$patch" ]; then
     patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
   elif [ -f "$CWD/patches/$patch" ]; then
     patch -Np1 < "$CWD/patches/$patch" || exit $ERROR_PATCH
-  fi
-done
-
-if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
-  for patch_url in [[PATCH URLS]]; do
-    patch="`basename $patch_url`" 
-    if [ ! -s "$SRC_DIR/$patch" ]; then
-      wget "$patch_url" -O "$SRC_DIR/$patch" || exit $ERROR_WGET
-    fi
+  elif [ -f "$CWD/$patch.gz" ]; then
+    gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
+  elif [ -f "$CWD/patches/$patch.gz" ]; then
+    gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
+  elif [ -f "$SRC_DIR/$patch" ]; then
     if [ "`basename $patch .gz`" != "$patch" ]; then
       gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
     elif [ "`basename $patch .bz2`" != "$patch" ]; then
@@ -114,8 +114,8 @@ if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
     else
       patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
     fi
-  done
-fi
+  fi
+done
 
 # Configure
 autoheader
@@ -152,9 +152,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
+# on the right side marks the last column you can put a character in. You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
@@ -177,6 +177,6 @@ cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi