secure-delete: adding secure-delete

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

4 files changed, 310 insertions, 21 deletions

diff --git a/app/misc/secure-delete/Manifest b/app/misc/secure-delete/Manifest
new file mode 100644
index 00000000..dad89641
--- /dev/null
+++ b/app/misc/secure-delete/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST secure_delete-3.1.tar.gz 62073 MD5 aabbd7e77bf96b326d260f16fb7f8bba RMD160 923807f99bcc7eed7f0e7f8823ef110b2d0070bc SHA1 ce6391003587b37bd3713a967de04de1f0759107 SHA256 a9d846d1dce3f1bdf13bbb306e8596bc1f263198a086f6beecd90ccf7bddf8d5 SHA512 9e7ae1458ffcce53fac23cf9b8df673d0754e6c3ff7791c445f2290dfa04f01fd2eda8b7c5d0045883159a32438783c380f770d7277ca77c9642c68e8f42dd07
+MKBUILD secure-delete.mkbuild 4101 MD5 91a6096a33a754787b6b074e65a6de33 RMD160 10dec63a7fc6d480a5e0ea8ac377dead54412575 SHA1 cc64179b45ed3519726c7c3ecfa152c888708c1c SHA256 c1737ba7fdd82b68a4e1e651bb83d81fdfd1d5765d7a2fec2866047c5e949892 SHA512 0cf5c4671733eb7ef7c0b9cb9011f902d39e5abf6096d72ee1aeb6f41d05098b0fe1c063f89fa38ddc4ae18897a72a0ade022a2dc8f267980cde9211885a5f16
+PATCH secure-delete_3.1-4.diff.gz 3350 MD5 4b4fee14e332b5b4b2e93648adf94f30 RMD160 b1ce17acf1cd068ed96a8c084818ea3008b74799 SHA1 9b908c7b34420367b91f6b76c89d735e46f4ded9 SHA256 1a623bca6dd8cf3f31b458ff5b476f6187890cfa5980627aeca27b6e2f0818a1 SHA512 c08f2cff02fe4e584988aff709b09e6527a205ee3a3244c2965b422cdc90011b477a77d56660e614a4318b5eada6babac297ecf0a1b653cb2577b1665b67fdd4
+SLACKBUILD secure-delete.SlackBuild 7707 MD5 88c296718a8da0503155b22c3042937e RMD160 7e60438ff8cefc332466cb4a7acc617b53a3205e SHA1 01a678c41f3bb42767984ad612ae484660271f69 SHA256 6bf6d81323d3da10936d486a439853bffb7862cc1f59a624d25164c3f2cff253 SHA512 e6efd6d151bd2568ea1be5c02ecfe3db225cab9adad4a6ff9ec3389e14286507d1edb5bcb1dd1d21e810f020a84ba0b81ab1213dc99e86aa2c5a18cc2301f476
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJma95AAoJEEHL93ESzgei4F0P/irkcuiX6e/7FojV3VhvzF9b
+iQmf7RFz6hJPoCP7USQjeUD/DQOGX02yetiTgjGzB2INZ1aR+HmambEoFHLoD5e1
+o2K++VK7/SMe4lycCinMFisBjUuTmvYo5CPx3OnW6Ah76bB0soBSbdL5D1PdX/bH
+AtDNROpcZtVJjJQQ7fzXFazOpJ4bVLNuZAfE3pCsSazOTRrV9lfd4DWN3zGeQYvW
+gqTHzu/syIn6uAlHafP2NDT9aZu1BEl/rh5yXh7p5zP+M68bSdslQE4qNDPgx+hL
+nEJbCEaZKQ5UI6FJf+83oqT+UCtHas71lJ/cxIGW2Z4Fh4RyicfEB2+McPMwTLMq
+HQvBCZcwR88gyOa5FRSz1DWikFYykLrIxHENpnMvoAyjvDrcukFvvR+dWwo3anTz
+citgKM148aP9vtu/XqNmU/Jci7Q82xMPLMToX++Yr7cFHcZWDZAen8zRN62ehneE
+0jmZP7Hg6+xklqHo5jTjY5kzGFIJyjWhwJzuK/LnJoIPZ7E600zOGsoWxAvGWVmf
+8sCiC/DuuxD/x9U6lO0mU4C4UUmTEniNyyamk7bJsKQGBvIULniI/RzBxeDVBS3A
+cIezbbp7IuYPI/jqJIQhPjHNEft6897A2K9zdQrSkNM81OHH54rqrcWynCa2348E
+3eqYTV+fPqkoO7iauXua
+=TyhQ
+-----END PGP SIGNATURE-----
diff --git a/app/misc/secure-delete/secure-delete.SlackBuild b/app/misc/secure-delete/secure-delete.SlackBuild
new file mode 100644
index 00000000..c6085df7
--- /dev/null
+++ b/app/misc/secure-delete/secure-delete.SlackBuild
@@ -0,0 +1,241 @@
+#!/bin/bash
+#
+#  secure-delete.SlackBuild is free software; you can redistribute
+#  it and/or modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the License,
+#  or any later version.
+#
+#  secure-delete.SlackBuild is distributed in the hope that it will
+#  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  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
+#
+# slackbuild for secure-delete, by Silvio Rhatto
+# requires:  
+# tested: secure-delete-3.1
+# model: generic.mkSlackBuild $Rev: 784 $
+#
+
+# Look for slackbuildrc
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
+  source /etc/slackbuildrc
+fi
+
+# Set variables
+CWD="$(pwd)"
+SRC_NAME="secure_delete"
+PKG_NAME="secure-delete"
+ARCH=${ARCH:=i486}
+SRC_VERSION=${VERSION:=3.1}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
+BUILD=${BUILD:=1rha}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
+TMP=${TMP:=/tmp}
+PKG=${PKG:=$TMP/package-$PKG_NAME}
+REPOS=${REPOS:=$TMP}
+PREFIX=${PREFIX:=/usr}
+PKG_WORK="$TMP/$SRC_NAME"
+CONF_OPTIONS=${CONF_OPTIONS:=""}
+NUMJOBS=${NUMJOBS:=""}
+
+# Set system libraries' path and optmization flags based on $ARCH
+LIBDIR="$PREFIX/lib"
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
+elif [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
+fi
+
+# Set error codes (used by createpkg)
+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
+rm -rf "$PKG" 2> /dev/null
+
+# Create directories if necessary
+mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
+mkdir -p "$PKG" || exit $ERROR_MKDIR
+mkdir -p "$REPOS" || exit $ERROR_MKDIR
+mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
+
+# Dowload source if necessary
+SRC="$SRC_NAME-$VERSION.tar.gz"
+URL="http://freeworld.thc.org/releases/$SRC"
+
+if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
+  wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
+fi
+
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+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 $NF }'`"
+cd "$PKG_SRC"
+
+# Patch source
+patches=" http://ftp.de.debian.org/debian/pool/main/s/secure-delete/secure-delete_3.1-4.diff.gz
+         $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
+  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
+      bzip2 -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
+    else
+      patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
+    fi
+  fi
+done
+
+# Compile
+make $NUMJOBS || exit $ERROR_MAKE
+
+# Install
+mkdir -p $PKG/bin
+cp -f srm sfill sswap smem $PKG/bin || exit $ERROR_INSTALL
+
+# Strip binaries
+( cd "$PKG"
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Install documentation
+DOCS="CHANGES FILES README TODO"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+for doc in $DOCS; do
+  if [ -f "$doc" ]; then
+    cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
+  fi
+done
+
+# Add package description (slack-desc)
+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
+# 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
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+             |-----handy-ruler------------------------------------------------|
+secure-delete: secure-delete
+secure-delete:
+secure-delete: Secure file/disk/swap/memory erasure utilities.
+secure-delete:
+secure-delete:
+secure-delete:
+secure-delete:
+secure-delete:
+secure-delete:
+secure-delete:
+secure-delete:
+EODESC
+
+# Build the package
+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" ] || [ "$1" = "--cleanup" ]; then
+  rm -rf "$PKG_WORK" "$PKG"
+fi
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