From da54a35be17ef4846797cdd824fba3f8e7443216 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>
Date: Sun, 20 Sep 2009 15:05:35 +0000
Subject: gwhere: adding gwhere; avahi: updating; arno-iptables-firewall:
 adding arno-iptables-firewall; glib2: updating; orbit: updating; afterstep:
 updating

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2243 370017ae-e619-0410-ac65-c121f96126d4
---
 app/misc/gwhere/Manifest                           |  23 ++
 app/misc/gwhere/gwhere.SlackBuild                  | 223 +++++++++++++++++++
 gnome/base/orbit/Manifest                          |  34 +--
 gnome/base/orbit/ORBit2.SlackBuild                 |   8 +-
 net/dns/avahi/Manifest                             |  34 +--
 net/dns/avahi/avahi.SlackBuild                     |   8 +-
 net/firewall/arno-iptables-firewall/Manifest       |  24 +++
 .../arno-iptables-firewall.SlackBuild              | 235 ++++++++++++++-------
 patches/glib2/Manifest                             |  23 ++
 patches/glib2/glib2.SlackBuild                     |  86 +++++++-
 x11/wm/afterstep/AfterStep.SlackBuild              |  82 ++++++-
 x11/wm/afterstep/Manifest                          |  23 ++
 12 files changed, 671 insertions(+), 132 deletions(-)
 create mode 100644 app/misc/gwhere/Manifest
 create mode 100644 app/misc/gwhere/gwhere.SlackBuild
 create mode 100644 net/firewall/arno-iptables-firewall/Manifest
 create mode 100644 patches/glib2/Manifest
 create mode 100644 x11/wm/afterstep/Manifest

diff --git a/app/misc/gwhere/Manifest b/app/misc/gwhere/Manifest
new file mode 100644
index 00000000..616d5e1b
--- /dev/null
+++ b/app/misc/gwhere/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST gwhere-0.2.2.tar.gz 1284775 MD5 838db0e07214f324420e8a87baf540ad RMD160 d024318c1c36d7e447f88a555fb268fb03391b1a SHA1 3b8f5f2b4df893734ee95ec8193f66baad4fdc4a SHA256 0f67e8863ba24dd7f8b0b50b91d6e8167c924546293e1ffc3c673c04417c73ef SHA512 383303c7fd946ff255f9d629f72f6800c1763fcdfbf553b6db2922f01b3086794b274ef60851507d1834790fbbbd69599dc6a072ca60487e711c51d9a78125dc
+MKBUILD gwhere.mkbuild 5082 MD5 02a869f19972024f97d50677596586c4 RMD160 15cdea5c3a4e8757a831a911b996bf6d5d15f215 SHA1 cb3ee56c73f3243331a1b3e5d93c2fd18dfad19c SHA256 801bbaa45c8f522eff35e14ffcb3cdbce844cbbd786a8f1fd70f23ab5098a865 SHA512 199dc2c07d24fccc9b08aa8774ef1adeb6c43b01d9b5f73d5488e9216159a8fb15b8c46140c12a2cc91dd0ed61445f42e0f16d7e423a60dcd656c9011355ea43
+SLACKBUILD gwhere.SlackBuild 7121 MD5 a32dc1fa1e4efd7a8d42dab73fbbdb99 RMD160 369a6f1e75d843abc458fda1d06534b166b30cf6 SHA1 b4314adbf9c40f91b65f55af78e813c06f18b2c1 SHA256 607e4cdc0a408ce2e83938da18526d18ebbde68393550ea548c68592aea57691 SHA512 1dcc83a1265d0d144585e63a1b5b0ab50a2b9b6a07489ec92173b4c8cf4de07fd04c405f84c5974e50f825e759e2a29e8250695c180cb88192e390e654c72fb6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKtjPZAAoJEEHL93ESzgeirZoP/jFuSJD2UvNtMrgLGgh2O+lj
+5UJIjBO9HQRhJdo498TjF08o045EEzaIBWKsGpHZAEiWI/nrr4gkMq5ntuwW5/Rv
+ybfDjsVPaK5JK4aaDAkPfElk2Q2TaAazDG6qypDHeT+GcocnCzj95lXsGJn7Mpi5
+eEx3CYSuGZ+766HfU/eBPFOwhuiOfZqTjYU/mxssDDuCxur2tacH3qlo8p2yG0qz
+wysoEiKfvqLC5VQcfC1V2zZZuB3OnnBb6Eu4eXRKHFaAH8+TzW27dgRPEEebtOic
+7+4627u0wo4p4+4yKEobo/EOETLrZw8G/5zQaX2A5n9CylNFH5t0Hy2K0aKK/vRx
+SAFpcGHgTVSR13SZa1xW5tNuB3Hxc5J6c9OyTBihw/jznQSDgjlvO2M5NRMaemog
+rSMolaNaHoHcbpY75xh1CgEXD30+Z9eRUjaiZOfCEDssXZVtOh0zf/QKvBKbivkL
+HHyZznYbeKNy68Lpo4OgosT3REHPLYSzstSRAcpGwqJgRVTX0QJmUJVCgSq33/eg
+/+kOMlnJxlNiVZQo4Sk23ToUzC2mZA47sxTf7Oa0krNssfA7q4se3do7icFRMrZI
+lQryYHh9JtpHLly61yX9ZlzeR88OMAZfqy117leRICpwLQha7MD8qcRxDMEoBAHG
+f+S6ebOEdj/5XW/a0n0T
+=ssXh
+-----END PGP SIGNATURE-----
diff --git a/app/misc/gwhere/gwhere.SlackBuild b/app/misc/gwhere/gwhere.SlackBuild
new file mode 100644
index 00000000..93693a31
--- /dev/null
+++ b/app/misc/gwhere/gwhere.SlackBuild
@@ -0,0 +1,223 @@
+#!/bin/bash
+#
+#  gwhere.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.
+#
+#  gwhere.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 gwhere, by Alexandre Vieira de Souza
+# requires:  
+# tested: gwhere-0.2.2
+# model: generic.mkSlackBuild $Rev: 808 $
+#
+
+# Look for slackbuildrc
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
+  source /etc/slackbuildrc
+fi
+
+# Set variables
+CWD="$(pwd)"
+SRC_NAME="gwhere"
+PKG_NAME="gwhere"
+ARCH=${ARCH:=i486}
+SRC_VERSION=${VERSION:=0.2.2}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
+BUILD=${BUILD:=1avs}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
+TMP=${TMP:=/tmp}
+PKG=${PKG:=$TMP/package-$PKG_NAME}
+REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="app/misc/gwhere"}
+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="ftp://ftp2.gwhere.org/gwhere/download/source/$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"
+
+# Configure
+CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+  --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
+
+# Compile
+make $NUMJOBS || exit $ERROR_MAKE
+
+# Install
+make install DESTDIR="$PKG" || 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="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING LICENSE SIGNATURE readme.*"
+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-------------------------------------------------------|
+gwhere: Gwhere by Slack.Sarava  
+gwhere:
+gwhere:   GWhere allows you to manage a catalog of your CDs and any other 
+gwhere: removable media (such as hard disks, floppy disks, Zip disks, 
+gwhere: CD-ROMs, etc...) indexed in a database. With GWhere it is easy to
+gwhere: browse your CDs or to make a quick search without needing to 
+gwhere: insert each CD one after another.
+gwhere:
+gwhere:
+gwhere: by avs
+gwhere:
+EODESC
+
+# Build the package
+cd "$PKG"
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$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/gnome/base/orbit/Manifest b/gnome/base/orbit/Manifest
index 4956c9a7..93d419e7 100644
--- a/gnome/base/orbit/Manifest
+++ b/gnome/base/orbit/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST ORBit2-2.14.13.tar.bz2 739650 MD5 1326b6775aaa87601b4cb7579234e1ce RMD160 917d5011af564b84653166ecd490823bfc0ae277 SHA1 eb565df83480ccab606821a7d1942c0c23a4e8d7 SHA256 3321a816a5053eb25e5b4f5d099331871bdc09ece38924a7e8a8d80fbafd733a SHA512 29fb54f2ea809419e412c908f58dfc2a2a14172d8c2cc2c1f8f2da4c4f4f646b157ffb8427b7f9fd5685f2fd5cbcf516aa29d64cdb341e279659a2b26f909f0a
-MKBUILD ORBit2.mkbuild 4237 MD5 e91bc288e962cbacc0ca4bd289bf2e0b RMD160 5891483ff9c92524b9dd4d0a638f908c3611cfb6 SHA1 a9769416205fad0e1ca387edd8a0658b0644e0fa SHA256 c84e81066a0afa266ef8756db266ca5be2dd15563a901cd95669d4e4fedc2e50 SHA512 46d9c320df2c11a75f61d2cf02d99f9752d32f7877fa573059e617680cc0bd82f9985900c07438fb1de799ddb71dc58b02c14dbc8af50eceee27b0a36aa80ada
-SLACKBUILD ORBit2.SlackBuild 6964 MD5 22514f1d0ade8b29c7ddcbac9b184bff RMD160 fec21032a38196553577c1a46e0525f01970d96d SHA1 3626053ff4384134f0137aa823ff941e4be4e785 SHA256 7e29be7df64d8d3d0e66a29052cebabf451c863e912d19a727058f21ae32de55 SHA512 c10fb3813c36df30cbf1c593a09e25cbf02772ac55fa110f009704a74a298d5fe16afe2b2ec55f550abb6f2b913e72ce1d484db2c87a324580c0287878e46e63
+DIST ORBit2-2.14.17.tar.bz2 747503 MD5 10bfb957fa4a8935a0b4afaee7d71df7 RMD160 7e76fe543163fe9763e4a7e293640c7c87a160e8 SHA1 d1f38e9df5efc219f3a5cfb4d0a0cbc1b381fe1c SHA256 62bfce3f678f9347a19c766944e8aef7b89bc32b25ac23eb3e4c25929ce8974c SHA512 394e2ff9f93e7bbfdb5562c3a212aa888eacc9d7bf10940e196f63672d08f99917b5eabb9b822adb9bbfcd472b8aeee70d094fce292f5870d16edd558854d48d
+MKBUILD ORBit2.mkbuild 4267 MD5 ab0a3ad18bbeb34bcb087493322dd924 RMD160 dc33324ea41c84400bd971e2965b88c7be0a8114 SHA1 2354b1609d9c23220044e5770ed48ebd83ef901e SHA256 a07b712f117af616a295b95a077d0fe1174b4ae7af3466f24e09d4e0c0590d19 SHA512 c86a04799095e6e41730e389a576fb1c7fc30f01d5d78b8713c9388402694366c0235aaf95107d1cdd5522fe780230a47e641e3fe0215653669b1c5f44930f77
+SLACKBUILD ORBit2.SlackBuild 6994 MD5 0054226903c70a386a5920dc5e2d678a RMD160 57299ed493ff1f1d39e0b2ba47ba1196e1c2cb6b SHA1 13da78970337d0e69aaa70559f411979c5ee1457 SHA256 4adbffa91aa11979270e631bbe14e5b8cffbbacfb1c7223198ed51395cca09e0 SHA512 3ba5f231573149265eda2f633849849501fd6697dd6a5d748eb09030c9d3b09b5b69b11017338e91373c9563a9d6517beb6d3747ba01d9fe96a7a72401ca1f4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iQIcBAEBAgAGBQJJyYSXAAoJEEHL93ESzgei3eUP/1L8KJvqLyo5jI3a8weYDgCM
-hvFjIYxnsgIVmAzu9H+e1k37IC9XZn+NnCkjBZSXkeyuO3HCFCN1ar8cpIFM72g4
-DtbfWTXW24HlSihyHTm5pb/VGGEjTffUjI8TvIna0tQb4V5tzQWxth4ZfAOlvhxF
-3fXKtxH427GjQqEex+1nTGw/eUu4n+EXAeeQ8n5iljfX4cxHk1zhzDrxkH6rr/jY
-V2ybYh27BdASR2woWkYcS1s14fsdanBzkhuY6YBe32LrU/i1mlb2jDx45gL2wHOm
-1TArdLTfqSdG2Jkc/gtNPZ1ZeDbYxajG/w+aRFwNghFENQk9QMQU2WvjFoh+Exf4
-evF91G3wd15A9jbf+ZVto532VW8K9UIVwzEM59h3hm6W3wJD1sud4DYJHj4Sc4pY
-ASNxy1zHjP8AGtMFl4RqFIihx6z6QGBr+yRTYTw8JxoXDMb/cHH/H4OTjY4cBiHr
-KKHlyqADNhU4qScajb+6Aj69IltSfDgeL1R/mEIu+/YGaUntBJvnlSlDEfEBSAcw
-pXJpZyn/JSHkmse0jMtzfe7yat4T49Dsn8AuDHqGuoF8OzRuqcZFFaqtGgYxzFRk
-EFNZ1IVIFFX7MfpEdQKNTx6D5dhLWxmW33kdsERsiPSFXPblBZqjC9wiOKZZybW/
-N+Gps0L4HflNPGSh4Bmk
-=RMhl
+iQIcBAEBCAAGBQJKtjVfAAoJEEHL93ESzgeiMswP/15zkUTSF2SKnZ8HWs9FYqee
+fg+ctcTlGQGHqTk2eB+MPMsG8Ms+wITAQrk/+KToFcKXwlX+U34g+wJ7hJx5brQr
+1s5lAzBT1wk3tSo1eEQhDqmWgbXWjcSQcyrLJ2k6Y7A3LhXt4/zsIxn+KPwrHnfe
+IL86iI1AYQvKBOfG8oZAfMVMmxwTN6kAwn+23tDS7xNqUYofjckZRyQduC5/YbFO
+NvYu1acLJCLoz6JxFKf4pcPI1VTzgwKNLYUp3RQDCZi5wYocIgAQMVsFWmlVBxho
+czPno4EuBbBOp9yF3q4mrPr0BLvkwbdN752U1sEVk3BgbQzywdYMAE8zHmT159jk
+3wQB6hb3uJglTojMC64NN7GgZGwO9PggWvbBa46zCtSuMtjyIthxjntXYnMUlUED
+PM6ndf1GhcjdJdGSuECMzZIr7p+S/u/pw301moE5gN2dFNMEm/RZhseN750vLk4Y
+q6bDlCC8DZH8MLqDLD6VuJF/SLFJvmBBvCNvPfhvrPwTpVi+6ma5YvdL5UO5t6C4
+uxcfQwunikTzkzXtJg2BYUoR88eStaYSiylYeHASUXkjWu5gr/g0Gk1ivbxPcve0
+7jkc7hcPjR9iJlmf/1M5z1EZpTMEoDloHetQxTdv3jZhkAQQFEhbSRm9eXaffzzR
+dfXA4DzQ4/tBriVk1M28
+=C6IZ
 -----END PGP SIGNATURE-----
diff --git a/gnome/base/orbit/ORBit2.SlackBuild b/gnome/base/orbit/ORBit2.SlackBuild
index ab105522..aa8a0a08 100644
--- a/gnome/base/orbit/ORBit2.SlackBuild
+++ b/gnome/base/orbit/ORBit2.SlackBuild
@@ -16,8 +16,8 @@
 #
 # slackbuild for ORBit2, by Rudson R. Alves
 # requires:  
-# tested: ORBit2-2.14.13
-# model: generic.mkSlackBuild $Rev: 796 $
+# tested: ORBit2-2.14.17
+# model: generic.mkSlackBuild $Rev: 808 $
 #
 
 # Look for slackbuildrc
@@ -32,7 +32,7 @@ CWD="$(pwd)"
 SRC_NAME="ORBit2"
 PKG_NAME="ORBit2"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.14.13}
+SRC_VERSION=${VERSION:=2.14.17}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -42,7 +42,7 @@ REPOS=${REPOS:=$TMP}
 SLACKBUILD_PATH=${SLACKBUILD_PATH:="gnome/base/orbit"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
-CONF_OPTIONS=${CONF_OPTIONS:=""}
+CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc/gnome/2.26.3"}
 NUMJOBS="-j1"
 
 # Set system libraries' path and optmization flags based on $ARCH
diff --git a/net/dns/avahi/Manifest b/net/dns/avahi/Manifest
index aca0e5c2..01440cf3 100644
--- a/net/dns/avahi/Manifest
+++ b/net/dns/avahi/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST avahi-0.6.24.tar.gz 1115626 MD5 068c1d220b07037e64caf87d4a7a0504 RMD160 94f59ccbd14d99e91e259b27dd7f03404c6691e6 SHA1 a187af361fefc8bda026936bb07ccdeb41dc74bc SHA256 260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950 SHA512 bc72304caad87205ca52c46b695605d678c22c9ac219d31e4f6c244c59d523e8370ac707f2b6b283ca866246a8c0440b6bcc48af996b1eafd2f002d8940b2ede
-MKBUILD avahi.mkbuild 4513 MD5 a577507bf6be1b638e562698988c2422 RMD160 859d94caef035454cdbe3791cc96e55bcdf55bf5 SHA1 b46023941c5b6fd8767a613c0444df41f5d890a7 SHA256 51c9efb18146aba00769af461d7b0f49b3963b6daea8b3573b8b8769adce6913 SHA512 d65f3543cf19a7652f7311bdb999d1eb57f794b28c621483acd54afa5858327ba7f24e340901894fd207737ea579d2f99f05a12a6562946f4dee127ee936cd53
+DIST avahi-0.6.25.tar.gz 1103653 MD5 a83155a6e29e3988f07e5eea3287b21e RMD160 3025f774360a8ea3b9de87e2df0b00387569aaf2 SHA1 7ce8ed5a494d72401dd81f64594fda59d2ec91fd SHA256 9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59 SHA512 92eea55ac3e2ea00863c0d63383856e77632664db12ffcaf07e6cf047adad655d986142a63228b583d2ef888aa4cb3979051a4a0d2aaac6bad709f4605de9614
+MKBUILD avahi.mkbuild 4513 MD5 ad08241e9fbeae40eb559d30d06c83d5 RMD160 50ba4ad9c8ecc6d3de01ec66c289ce1ca83a84a1 SHA1 f73c7bbf29da1614622fe72c9c5d8c92fa3540b2 SHA256 210e637b6226bf058bb1f38e6ae14f2b276a267b4a1c3a2bd59f4a12a26e3712 SHA512 062fe429883bef4192e079622c408f33b862b099f257c010acfba0ef0a7cc70888db7315b1c49988aa82c1fc92acd9256fc632c7407288a4fdd2647716c269ab
 SLACK-REQUIRED slack-required 112 MD5 48cea600e27ae5b6861f02631f6e41b0 RMD160 8f39f0e02e6f639e7120c85d92d448cbe05e893b SHA1 d6cf690e660163122e5471013cc095298b5a9e09 SHA256 af8712865f6fc6fe5a0268819f59ef95be31f708fd2e2e86ab18500a7e92699b SHA512 e47d5d36ebb340e8d5f26f75395586182e74f6700eaf4e5493fece9370932fd7deabd87cbf950927a179df73da61e3ab620308d9602429a7850f121763595183
-SLACKBUILD avahi.SlackBuild 7725 MD5 5d1357d3b09c11d60f21959afc67ca5a RMD160 abee8060957c48a39c6fef98ee9cf79ee503d958 SHA1 d6e5a367a46c1a339965d445c123c907bc630c0a SHA256 0984130423f6c2d25216661b2ba64b3d29fbc1914a1f77625299a9faa3c4c499 SHA512 51a785458d0eaebcd987305780d1019b97d66a328915f16d1dbfa4591eb78b3078b80c430cea2ed8c9f65784c6fa391fb6aacd7ac091fc14364dbb0d38941d39
+SLACKBUILD avahi.SlackBuild 7755 MD5 0d6e1c4c94328aeb5acc2d8b617e08a3 RMD160 3edfd4e0a9c64973f859fde0beb2908a5280b548 SHA1 9ead7112ff03e29b5ce106a7e145b1aec8a7492b SHA256 58d17a813f3ead675f7659b9e840cb0f84a371c46b335c87028dc07282f7288d SHA512 79f740d862a4672bacabcbe786a875bfc0204b24ff5da41fd53a4c8835b8235932c9342392c5d35ecb0237d0a4cb7362bcc5b4ab5d37732b0807028df572bab9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iQIcBAEBAgAGBQJJybHZAAoJEEHL93ESzgeiLlgP/20ISj2GmYuZiW9Bxe84dq6U
-TbP2LXEhDq3FtbToLCDJFv9bfv6LnZ8ca08dcwCcFYDW/O7eFMywyX4wqofYHN3E
-YUOmzCVRAKD6eWJOgJG2DXGyuWovUly8gHZ1ESNJ9YHPrZlZorLfkjoXdV5UW7pP
-w9uQcq5PTIvragTjTSDphzJNOT7iZ21a1Osj0jO7m3GTZTUln2+KltE2xOKGdgIn
-8Mp+3V0nHJ9+6wlxf+i5bnwPnkCwSEEhBaPWKwPnbl/wEXC7v9aoe99f5h8iEs84
-DGH5NFoR0bqhCpMJfKi/Gc6fBfwKaIGS1dwDne9uuT6vECLNETaqBxsLs2yU3ofb
-WIA6K8SIWb7If04oVKvhHor7TbUurToUqS5jZvCcUgZRhLVBgX10mu2pDCGM2cyh
-RPwFIPQ+jZtZOOCFFumE1DZyXi5XqCfeCF9oKSBYSOREvZ66mEE+gIVxpPC3LzOg
-eoJVItb27hG7+rDolwiA4fBQKFLobzfiW6AR/DPSefYamxsOVs2sxN9tQszNL7/3
-4Jdivg8QnUS0SzgiWjk1nzPlKmdHmx5+vRls5AQxxAiyFVYvUMVjZvEjeNdr1amc
-7iFf9JHbWjn80xPr8ihVSb5rJkrnGs4kbbrCANcs/gCrXx7WzgqDcEDQ7SykKu/9
-eibS6SeDgIM9RnkAvvZa
-=Qgtk
+iQIcBAEBCAAGBQJKsUa4AAoJEEHL93ESzgeiBE8P/23/bO03cvAif4yURqd7mys0
+pbV6EC5zMy3BLd3o580KN5yyz1OmSLQdqtEYY2sGUFcY6duYRB4xZYRi1XgNiHD9
+5UAa1mlqUxC+mjlWW+F9RZ3Ovp91HZFvLYcP47oRZqJUqvvPNTWs8Yp6mN5Qy8+N
+ZIaF5mzjlbheL5fThBQFfIIcu8mp5kFZ5vWuEWTNgL49jPFoDFt+lt74eaHMYqcB
+oWGIvtI1QJX2Q/sPpcts/i2ZWeX2Q5qLLrzXmzwIN25KtxRsXEXYzRcvC9xrqyMs
+vICMAaSpqbXX2xLgtPsuuWR86FmmyU3JsB8SlKqzffaZGmD3JFQud45j5mqJ90yc
+tOn9Bcac/Y/WvhutsDw4JkLFUJOWYwPRrj5rCi8gH6n1itE2U2UgGU+JRPlCiDjs
+zq9NhOvy4r+X46FHKkLRZtpU/Sgn4a/4J7u0g9qh53NZ2hLV4+AXr/DnIxE54xpZ
+2bf+O3HmRnyaokEeaEMEtl7MxvyU2Pi4fPwfUmktoCL6YlmlcIodS/hswuDSic69
+r9FTotXhy7NC+/Xmj14cJB5zbB8FqkeO1ePh48pjFNuNykf3kdUh6xGDEG7CmfG/
+X+DV3f4bYI5cGPKWarGDiIpk7/4s6ZaY8DnQdNUPjPD0JqIUZ8kqy9y3XKxyWbu0
+B8BgOBgB+LFsLN/smsOy
+=AiwY
 -----END PGP SIGNATURE-----
diff --git a/net/dns/avahi/avahi.SlackBuild b/net/dns/avahi/avahi.SlackBuild
index 58ec33ac..0e7da5ee 100755
--- a/net/dns/avahi/avahi.SlackBuild
+++ b/net/dns/avahi/avahi.SlackBuild
@@ -15,9 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for avahi, by Rudson R. Alves
-# requires:  
-# tested: avahi-0.6.24
-# model: generic.mkSlackBuild $Rev: 796 $
+# requires: glib2 expat libdaemon xmltoman 
+# tested: avahi-0.6.25
+# model: generic.mkSlackBuild $Rev: 808 $
 #
 
 # Look for slackbuildrc
@@ -32,7 +32,7 @@ CWD="$(pwd)"
 SRC_NAME="avahi"
 PKG_NAME="avahi"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.6.24}
+SRC_VERSION=${VERSION:=0.6.25}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
diff --git a/net/firewall/arno-iptables-firewall/Manifest b/net/firewall/arno-iptables-firewall/Manifest
new file mode 100644
index 00000000..fc03ff28
--- /dev/null
+++ b/net/firewall/arno-iptables-firewall/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST arno-iptables-firewall_1.9.2d.tar.gz 97797 MD5 f6a3f1fbc3dac2790fe95f36587d14d8 RMD160 a3fa3d54b71788458e5000c68c6de73879dd3c4f SHA1 aac2853f07c9711701ba3f2ec48921a6bbcf93bc SHA256 2644299bffbf035bce28e5360a08941ce3fc773906fd7300e94cdf948cffd469 SHA512 ce7c55a767f2acac72dae23f6fa02f8774750a8f627fb42eac2662087e01973309a15a0f4cefef8a2c046e2e0e16e74ca4d9fc1d8f19abb431647928f503b964
+MKBUILD arno-iptables-firewall.mkbuild 7626 MD5 8f008e40f0b2b4f538d426dc7cf14606 RMD160 fd5499b0f8930d99a522d97cafa24cab23c07d9d SHA1 67c9d4798b0c70c952c9a46a0049682123fa9735 SHA256 66b14c8d5d3cbf8403f3bc2aec8f91e00d2b543a2cfb44cfbc6cbe79dd32696e SHA512 2baeec0f9449873d15cdb73b8ad5b075a4607ab4a7049d81c6a27aa74b33c8175a77858112644011afd79aa3723570db4f5b38dada8b00cedaf1ed2ca3a9ae25
+SLACKBUILD arno-iptables-firewall.SlackBuild 9424 MD5 1c8bb81ba0e9f1acb52a39fcfef1e0e3 RMD160 6174300215be9ff236f32c5b5432960de6d81dd2 SHA1 928bcec4f68a332422f54a9e6fc78f0cc5021be6 SHA256 217394cd1a6f8d912309213c3eaafd4bb01be2a6fd94de1e78ef00939baeda10 SHA512 01bd8e52041c96c41d3204dd3e818a100ee4a1cdaea09076e855886fef86726349ee7f6e01fd07f9db0ea26fcec71aca194a77f9dec78d501c21f029309fc144
+SLACKBUILD arno-iptables.SlackBuild 9307 MD5 94a34cc7bd82f6fdb0cbb9ddbaf02837 RMD160 47325300b57cfa6560c9dec7e8285f5a87777ada SHA1 45e62d098d36282b0b0cf8c431d61423dab26f01 SHA256 6c27ebbcf8a0073fd8339bebfdefdd8ba864fa4fab5b2de03c7f46a69e299de9 SHA512 bd61efb62b48245f3f4d738ce838312c8966f1fb645542c4299ee6ac4e3e40a13a5c199347f6d5502d20134a0d49075d6e14ff6292496cce64159c7082f7e12d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKtj3FAAoJEEHL93ESzgeibdoP/1Hca9kaXc9JMLU4Ff6XSotz
+uyfleB3e4HJ15cE5XnDUAAAUsN0htSk6ZdF3wGTkXoFNKD8ydNMvPQdNJx3q6r1m
+N607o+SOlG49NmOJKa+VrBpIOSm0lUre3CM2cX1YGw/L5DWYlC0zgM5awSoWBmRD
+/rAPDoRS6gXy7EBhQZEN1tdKbIo4ZsH9pr0V49a+L5cZ5aG/EPiGVNtwKLmN/pNF
+ImcHABqHFE3i0nzDvkuHmT5czrdnk5Kp2f6472T3FWxdknaEtJp7OYgulJS04/fQ
+Rh+nYI7NDusuBwr8uvDa9ZSsHevp70O8x7dZL2K9iFH6tKhDjqdwXUro8v4ydJkh
+QbJ9Xg4sqLX4sZEEDTpeeAwAxj211i93nk/PNBXxhaoY6n1tw8dfkbnKPz1OCGy0
+MJhmpc9c8w6ZGm8kXJGtQWD7xgDNOy7vA8tdqBBNrbLbZp+iFqOKdsLgxdeJ77iV
+UpHCv82Ojq4jmTtgr4b8f4db9s9Lt8PwIXUhO4XdxrJjHtrCfkqPxpFqPSdflz0u
+09Cpu31lI+aXMdpu4+GVQ/Ca2BZSPobr0efvj/I/k8Nl6zH9hGxpdcvksu4w7dHw
+QyIyrhjdYh3pqhXWbHfzrlaTjKzJkk/OqvYpF5h7cJug5k+iuN72GFIH4sn2MODj
+lxe5nI3o7JauAecFumUv
+=j4Nf
+-----END PGP SIGNATURE-----
diff --git a/net/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild b/net/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
index a4f3f3eb..f48bc053 100755
--- a/net/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
+++ b/net/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
@@ -1,24 +1,23 @@
 #!/bin/bash
 #
 #  arno-iptables-firewall.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.
+#  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.
 #
-#  arno-iptables-firewall.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.
+#  arno-iptables-firewall.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
+#  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 arno-iptables-firewall
-# http://rocky.eld.leidenuniv.nl/page/iptables/iptframe.htm
-#
-# Author: Luis ( luis at riseup d0t net )
+# slackbuild for arno-iptables-firewall, by Luis
+# requires:  
+# tested: arno-iptables-firewall-1.9.2d
+# model: generic.mkSlackBuild $Rev: 808 $
 #
 
 # Look for slackbuildrc
@@ -32,24 +31,43 @@ fi
 CWD="$(pwd)"
 SRC_NAME="arno-iptables-firewall"
 PKG_NAME="arno-iptables-firewall"
-ARCH="noarch"
-SRC_VERSION=${VERSION:=1.8.8o}
+ARCH=${ARCH:=i486}
+SRC_VERSION=${VERSION:=1.9.2d}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1ls}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="net/firewall/arno-iptables-firewall"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
-CONF_OPTIONS=${CONF_OPTIONS:=}
-NUMJOBS=${NUMJOBS:=}
+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
@@ -62,17 +80,83 @@ mkdir -p "$REPOS" || exit $ERROR_MKDIR
 mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
-SRC="${SRC_NAME}_$SRC_VERSION.tar.gz"
-URL="http://rocky.eld.leidenuniv.nl/iptables-firewall/$SRC"
+SRC="$SRC_NAME"_"$VERSION.tar.gz"
+URL="http://rocky.eld.leidenuniv.nl/arno-iptables-firewall/$SRC"
 
-if [ ! -s "$SRC_DIR/$SRC" ] || ! gzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
+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=`ls -l | awk '/^d/ { print $8 }'`
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Install
@@ -81,13 +165,13 @@ mkdir -p "$PKG/etc/logrotate.d" || exit $ERROR_MKDIR
 mkdir -p "$PKG/$PREFIX/bin" || exit $ERROR_MKDIR
 mkdir -p "$PKG/$PREFIX/man/man1" || exit $ERROR_MKDIR
 mkdir -p "$PKG/$PREFIX/man/man8" || exit $ERROR_MKDIR
-cp -a arno-iptables-firewall "$PKG/etc/rc.d/rc.firewall.new"
-cp -a etc/arno-iptables-firewall "$PKG/etc"
-cp -a Slackware/syslog.conf "$PKG/etc/syslog.conf.new"
-cp -a "$CWD/syslog.new" "$PKG/etc/logrotate.d"
-cp -a arno-fwfilter "$PKG/$PREFIX/bin"
-cp -a man/arno-fwfilter.1 "$PKG/$PREFIX/man/man1"
-cp -a man/arno-iptables-firewall.8 "$PKG/$PREFIX/man/man8"
+cp -r "etc/init.d/arno-iptables-firewall" "$PKG/etc/rc.d/rc.firewall.new"
+cp -r "etc/arno-iptables-firewall" "$PKG/etc"
+cp -r "contrib/Slackware/syslog.conf" "$PKG/etc/syslog.conf.new"
+cp -r "$CWD/syslog.new" "$PKG/etc/logrotate.d"
+cp -r "bin/arno-fwfilter" "$PKG/$PREFIX/bin"
+cp -r "share/man/man1/arno-fwfilter.1" "$PKG/$PREFIX/man/man1"
+cp -r "share/man/man8/arno-iptables-firewall.8" "$PKG/$PREFIX/man/man8"
 mv -f "$PKG/etc/arno-iptables-firewall/firewall.conf" \
   "$PKG/etc/arno-iptables-firewall/firewall.conf.new"
 mv -f "$PKG/etc/arno-iptables-firewall/custom-rules" \
@@ -96,51 +180,8 @@ for file in $('ls' -1 "$PKG/etc/arno-iptables-firewall/plugins/"*.conf); do
   mv -f "$file" "${file}.new"
 done
 
-# Compress and link manpages
-if [ -d "$PKG/$PREFIX/man" ]; then
-  ( cd "$PKG/$PREFIX/man"
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $(find . -type l -maxdepth 1) ; do
-          ln -s $(readlink $eachpage).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
-
-# Install documentation
-DOCS="CHANGELOG README gpl_license.txt"
-mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
-cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" 2> /dev/null
-
-# 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----------------------------------------|
-arno-iptables-firewall: arno-iptables-firewall (Arno's iptables firewall)
-arno-iptables-firewall:
-arno-iptables-firewall: A  highly  customizable  iptables  firewall  script,
-arno-iptables-firewall: featuring stealth scan detection,  extensive  user-
-arno-iptables-firewall: definable logging,  masquerading and port forwarding
-arno-iptables-firewall: (NAT),  protection against SYN/ICMP flooding,  etc.
-arno-iptables-firewall: It also includes a filter script (arno-fwfilter) to
-arno-iptables-firewall: make its logs more easily readable.
-arno-iptables-firewall:
-arno-iptables-firewall: For more information, http://rocky.eld.leidenuniv.nl/
-arno-iptables-firewall:
-EODESC
-
 # Add a post-installation script (doinst.sh)
+mkdir -p $PKG/install
 cat << EOSCRIPT > "$PKG/install/doinst.sh"
 config() {
   NEW="\$1"
@@ -178,11 +219,53 @@ echo " this firewall to work."
 echo
 EOSCRIPT
 
+# 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="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING LICENSE SIGNATURE readme.*"
+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---------------------------------------|
+arno-iptables-firewall: arno-iptables-firewall (Arno's iptables firewall)
+arno-iptables-firewall:
+arno-iptables-firewall: A  highly  customizable  iptables  firewall  script,
+arno-iptables-firewall: featuring stealth scan detection,  extensive  user-
+arno-iptables-firewall: definable logging,  masquerading and port forwarding
+arno-iptables-firewall: (NAT),  protection against SYN/ICMP flooding,  etc.
+arno-iptables-firewall: It also includes a filter script (arno-fwfilter) to
+arno-iptables-firewall: make its logs more easily readable.
+arno-iptables-firewall:
+arno-iptables-firewall: For more information, http://rocky.eld.leidenuniv.nl/
+arno-iptables-firewall:
+EODESC
+
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$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
diff --git a/patches/glib2/Manifest b/patches/glib2/Manifest
new file mode 100644
index 00000000..07443a93
--- /dev/null
+++ b/patches/glib2/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST glib-2.20.5.tar.gz 7207305 MD5 59dc2682bb4f94aa9585a541369a4543 RMD160 085043b7201298fad1d817059ae92aa26bb39250 SHA1 23ff228ad5b6816f70938ef785b25ed83ae99d6f SHA256 9462c43b1bb54042103c541ed38af9e5ec7ecdbfd2c912ff51ef759385cac8ea SHA512 18b5122e6a4fc294a6602acb305b85b1a10648925d9b7edeee91e6594bc7d199abf437b66e4dfdd5d249b4f1b747c0eb15f0def5d9b5ac46615a39f2cef6aa55
+MKBUILD glib2.mkbuild 4296 MD5 787c819281de6a269284f16f9681361a RMD160 8fbd30af89ac90354005a98292bce79393f01aab SHA1 6d107d390304e603ed60d94d74917b0ef0cec875 SHA256 f36303ef54180a667894c56076f80b2574db5015c394f930fafbd23f4743df3d SHA512 c93d4b8a32c3fe601ee2b16716cd460668194a943118206eae6f97fc1c223fdf7988f0190d1a0d87de4633cd061683eaeb3c8985dbe62c9d0f295837a568fdfd
+SLACKBUILD glib2.SlackBuild 6977 MD5 0af5f0ae36ededcdce27843439a17671 RMD160 bcc44f554a665af8ec69a123eef7cc2d5a6be8e1 SHA1 a0c624f7a05cd891eb5e74dd58822236c6dec41a SHA256 2ac1246e1d71fa8c9fd695c058482101bc36e9ad0ab78af74e8548ffc1a8ef25 SHA512 e35da80f99f3dab4370ff5e6e9d5136cda9abca53a2921241c20faf36d0b671660c03951e9e8a74d3250836c7c434a82732c40f76f6a0b3360232cd7905c6d14
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKtkNLAAoJEEHL93ESzgeiIXQQALEl2n4dVAJ3gHQkyoizRsPY
+KGjoxWbtyfOtdofNpOJuUhrs50op9vYxj7e1V7X325AyawJ6NpG5H/IUBvxGUbJe
+U5sWzC1pZv5skIg+dTaD5Ss503SycjBMMUTzY3CM9ts5+n/ZLK4LlfVt6NWufK6P
+G7xcaZ8h6BXanjFYy60Qd0p5yeOuLpCAuMvXlVBpigfHa6HhvEy6YarQCv6NvL8V
+jD1Ea6/A3L5tsMN9r7eQubizoSyhh9F38SN/Gw8PfpB+84AGwsqDapyIfzOl6g1/
+59UIRLXtIBP/3lF+Ae9BtlYgEV1AZ6hDIjnFQlj15cUWOvGJ5Ov8syjXrVf39d85
+K43gGFSqtj/V90h241qOlrcQ95/0q3R/NQofxRSiWIzUcxTT80m5A1LcojisPG46
+NUhyQIw1fDK0VfubicaXs87PDKqnqvupAT9RaYKI9u+yPn3V+HZqDNGNByeeE+D9
+Z3euGpISAwN9jiIqymWYYa9Z0v5JB1j2dHnO34DVvrKPQ489JnWaHBIWePdrKyRL
+IArPd4U6KCVktpJwfyY2AYIivH+1wNM4SbmXvkNKMSHy+o3ovV+Zvc/ekTPDilE7
+iLPg/RiKNMznt1S5+HefQ8cFc56HRusD9G06rApPUl/81t+WoicR5MzxHGcEcoaP
+p9gJqWA8Y+MKLJ/czPRZ
+=/nba
+-----END PGP SIGNATURE-----
diff --git a/patches/glib2/glib2.SlackBuild b/patches/glib2/glib2.SlackBuild
index a365b92c..6d1ea5d3 100644
--- a/patches/glib2/glib2.SlackBuild
+++ b/patches/glib2/glib2.SlackBuild
@@ -16,7 +16,8 @@
 #
 # slackbuild for glib2, by Rafael Diniz
 # requires:  
-# tested: glib2-2.16.3
+# tested: glib2-2.20.5
+# model: generic.mkSlackBuild $Rev: 808 $
 #
 
 # Look for slackbuildrc
@@ -31,25 +32,26 @@ CWD="$(pwd)"
 SRC_NAME="glib"
 PKG_NAME="glib2"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.16.3}
+SRC_VERSION=${VERSION:=2.20.5}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rd}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="patches/glib2"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
-CONF_OPTIONS=${CONF_OPTIONS:=""}
+CONF_OPTIONS=${CONF_OPTIONS:="--with-libiconv=gnu"}
 NUMJOBS=${NUMJOBS:="-j3"}
 
 # Set system libraries' path and optmization flags based on $ARCH
 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
@@ -65,6 +67,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
@@ -78,12 +81,78 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.gz"
-URL="http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/$SRC"
+URL="http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/$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
@@ -145,9 +214,10 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$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
diff --git a/x11/wm/afterstep/AfterStep.SlackBuild b/x11/wm/afterstep/AfterStep.SlackBuild
index 7f3f7dd5..00f9766a 100644
--- a/x11/wm/afterstep/AfterStep.SlackBuild
+++ b/x11/wm/afterstep/AfterStep.SlackBuild
@@ -16,7 +16,8 @@
 #
 # slackbuild for AfterStep, by Rudson R. Alves
 # requires:  
-# tested: AfterStep-2.2.8
+# tested: AfterStep-2.2.9
+# model: generic.mkSlackBuild $Rev: 808 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="AfterStep"
 PKG_NAME="AfterStep"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.2.8}
+SRC_VERSION=${VERSION:=2.2.9}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1srv}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="x11/wm/afterstep"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 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
@@ -65,6 +67,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
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -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
@@ -145,9 +214,10 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$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
diff --git a/x11/wm/afterstep/Manifest b/x11/wm/afterstep/Manifest
new file mode 100644
index 00000000..a65c0b94
--- /dev/null
+++ b/x11/wm/afterstep/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST AfterStep-2.2.9.tar.bz2 6094706 MD5 59d739b2416ac18201027d7cc0888c20 RMD160 b332078efa50abde522438c825fca91f31c4d554 SHA1 dfd7dd912866316e93c3be7a8460d34b95cd54a2 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148 SHA512 1191d918785d3e57f1921b1df21639eeae3298fb5f0f6e23a551f47afc5f0e0c945bae17b1ab8ba908ab0bd8476f5d358051593ff977c442783f94bd2e655ea5
+MKBUILD afterstep.mkbuild 4601 MD5 159b5c3a35d173f792933f4bce2586b7 RMD160 cd3266c9543049482ad22369443bce05e946add1 SHA1 daef1e6091cc0b352db40cb5d7c7ba2b9c9c99f0 SHA256 83d73f46093f979205293474c5ae359f2c47c49204dda38e3d19bbfac34969d3 SHA512 a1706521c3e73bbc3b168a261d89bb777c316c31f14997d8e03363917d6b4c179940ce2d53529b2583ab1d5145c2dd4adfca548c8fe80a3de1145fb136bc768c
+SLACKBUILD AfterStep.SlackBuild 7241 MD5 134d7279e0ec1e5adbab0e05cc4b0195 RMD160 ba49ea32d855b0c013fc55348db1567a225bf920 SHA1 30b48d5895886e95c45055d88d9f540ba4354748 SHA256 dfc7f9875875543eabe1e3121d3b4a1d3355f1cd6b67a82a3f34536be9eb750b SHA512 bb95045f3e4c72e33a900bf5d2409c58af1159e2d1810d9d479c64428ce7ae4eb39bf9ed27b726a066780c1aa91f86c3424ab85160e7464360a879688e4d2f13
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKtjjPAAoJEEHL93ESzgeikcoQAJWv4n+FcY342s7jIb+8ueqm
+nbpukomLTWV+zrTBIyTPzMATuBRK1IHddRZCQEuxKpmGBYKiPsrlgHeo6GSwxhW7
+1ASiibzSVGDvnkJaikTkHi3D5Zk6b5tI3f2ssiZ3NAqMJZzjTkJbeMD1hxjoArw2
+pMkAKLzfcnZefKX/DciVvzFs+SyXUesIGi1/CPcIh2BMgfmbZ1/cp45WKUo2b9/o
+JKwY6D0wyTEwRoftGyNB7S+7L93biJQqRFPAfO/s3P5WgVJgd5QoEBWXTS5KCWMW
+7oY4J74iX8YC4qTkZ1OasiEO7r57UjaQcT8xGS6mnmO8N/XdhtNKht64N0cpAF/j
+B24DsZ1HOzWUJTqibPExsa2rKgVRkbaD+TRFewAP948nJRGHn+ichRdoCf45u8bZ
+Kk2NbesveC/ydePN4NgBWBnaR6IR06msdtGTiQIAkztDYQaZg1dmVunpukkl7Gl/
+3YDejivHoMj7SyUriiWgOccCTRI+Prij7afGNFr5ngyGfKKvI8n+eDyqe8Y53fYX
+JFYn1tcm7quQmWXN5Gdy33MWkvsxJPWiDlQGQhg53xl/9iktiTJvd7PQLXiVcdpw
+sxFt7Yng5Jdh9C15akSXkk0KmnG6JIZWraT2B2STga5c27jkEUBasSLHzekG4JFz
+ipKtnQNg8GEWPjqre6fV
+=Rl7+
+-----END PGP SIGNATURE-----
-- 
cgit v1.2.3