silc-toolkit: updating to fix DSA-1879-1 (updated silc-client as well)

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

6 files changed, 302 insertions, 19 deletions

diff --git a/net/im/silc-client/Manifest b/net/im/silc-client/Manifest
new file mode 100644
index 00000000..2e3f9636
--- /dev/null
+++ b/net/im/silc-client/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST silc-client-1.1.8.tar.bz2 1532816 MD5 4219d96f6adc2eed406c6dbf8072ae90 RMD160 a010384b5e498a62cc6cd69e97602f3118b64d2f SHA1 5936ab682e746ae413f938ce9c9b72215d6524c0 SHA256 623fec16aef312cc98a8a97c640b9451d3ea81d7690abc86bece2e8d5e19d3e2 SHA512 3b9850557c7f82679a686948f7487ca7bfa53bca320ed798f83f172a1d4eff418c15bcda164bb9ade7051a5e2b19987f0a2145e7e860d0f7f63cd1032206e67d
+MKBUILD silc-client.mkbuild 3383 MD5 cda9174e3881abd1fe7b8f3ae8415ea9 RMD160 b0b031659ae26a4d329519d220337bb7f43230f9 SHA1 d8d61fa542702144576a456f264b039112fa7659 SHA256 94955a926c43c858a1c50d51565b842b4092c80e5a41efa80916b0a71f101caf SHA512 1188c586e66a41ddb8d84130c6231079b275fbe346a4e036f5417d46786c86699cf2cffc5e7f70ff1531e543ca61f2e01e7c3031715634e3be55906cfe5356f1
+SLACK-REQUIRED slack-required 88 MD5 05e6f1899f1ed815324e8e9877bc5c89 RMD160 f4e3d40f5ac39b6919c066339a44636ec06b40c1 SHA1 9112b64c6c1cc94187dc014df91a8a1f58a54274 SHA256 9deec51ead084748da12bef6ebc4f462e146686bd190000cdfc24769738c9002 SHA512 5e700a8b283da6692b8edfa91032707f925b6d98a4845bcc1348c702d641c99f1305f85c1a8982523144c6dd19a7a6e0e72bb84179cb7ed34e576f0472f4a5cc
+SLACKBUILD silc-client.SlackBuild 8735 MD5 794b96df83cd77e3f78eb1274f4e2fdb RMD160 bacf02f66f8fe1d4b33ab1b50b8b05743820a842 SHA1 a3c043b7b395fc952c11eebc027fe2a561b62fc3 SHA256 9034503c6462d51a0583794279ac16c66ef995cccd0bff4903685a6410ffabd7 SHA512 1f19d53e38c101fd01b59d3d6520f00a22936decff8d8ca1d9a356c6ef2754a1473c322906870c52d08bd812a4382c030bd3cc06c8aeb64abc8d858eec4fb8e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKpZunAAoJEEHL93ESzgeiAUQQAIeohnoTrxtrhvthUaXdo3qP
+1ITBuBLOCVKHwRuMlkWXzwNCJ/x61Hu9BhOEw8lLB0AeKqqIWPnpf38RvM73j0ud
+qJ7LfIgf40PGgZ008841dEd6w0jkEYXnOVuDYrHXmHMV9VQuVLL0iuCLbD44CyEx
+Z9VOzoET8JpJ7VFHLIgjDSYhMJqcpt15++cNbETLcIgSUbPv2c7RPomgai2pcTfS
+Tbnt96JBSLUtZaF/bydxsn1yh3OpU6K9w1GkX2HT7GVIuH6lYCHhwenzS+rZLKr+
+T7RnXhp99LOeZk4sRD8bJTSDaetMXDcM+Pmt2IJyECRr7sjJsJcUwM0XWSmKph39
+TFzi/61AGP+8pmOyRvwa1c6oDhvE6ypm9PNh63PzQWkaFBq3+JD20y+Hwiaaj0kT
+y/ogpoLOwaXcjkogfsjZsZWhhJBjQVDIxpYHkzzIyGbJhsWq5L7NxV/zYib0ds90
+hykFmCzP3pmk2lbCksl8s9YFPH3Q4zXVqal9JKy5KaaF+wJQyR+zuMOnj+4CcAKG
+V3CARmC7iWEkUr0Uqdq2ZyCGJyL61Qy1tRM4qIU5wg2hIEtKEEWTKyaKG/puioYP
+txV2gNM2m0TA3/RGhLn80GrygCoKSC53q02PGRZ/7nN96/HOGAaIfTDICj8l/U0b
+wkbK/R3O31qYFT1qZAbH
+=HVGr
+-----END PGP SIGNATURE-----
diff --git a/net/im/silc-client/silc-client.SlackBuild b/net/im/silc-client/silc-client.SlackBuild
index d5d1f3f6..4a99f5d5 100755
--- a/net/im/silc-client/silc-client.SlackBuild
+++ b/net/im/silc-client/silc-client.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for silc-client, by Silvio Rhatto
-# requires: silc-toolkit 
-# tested: silc-client-1.1.6
+# requires:  
+# tested: silc-client-1.1.8
+# model: generic.mkSlackBuild $Rev: 808 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="silc-client"
 PKG_NAME="silc-client"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.1.6}
+SRC_VERSION=${VERSION:=1.1.8}
 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}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="net/im/silc-client"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc --docdir=/usr/doc/$PKG_NAME-$PKG_VERSION"}
@@ -47,9 +49,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
@@ -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
@@ -188,7 +257,7 @@ mkuser() {
   fi
 }
 
-config etc/silc.conf
+config etc/silc.conf.new
 EOSCRIPT
 
 # Copy slack-required
@@ -199,7 +268,8 @@ fi
 
 # 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" ] || [ "$1" = "--cleanup" ]; then
diff --git a/net/im/silc-server/Manifest b/net/im/silc-server/Manifest
new file mode 100644
index 00000000..ea93931d
--- /dev/null
+++ b/net/im/silc-server/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST silc-server-1.1.14.tar.bz2 924903 MD5 67ecd25be796bfe660fbfb7018c959db RMD160 499927a4b45785fefd3679490a456bce2afb9b74 SHA1 9a9f38309e34ce1f583783fee2f37d175ef40271 SHA256 f06fc8d61790c082556852293c46eaba5af3afdb51d067b448592b9dc5489cd9 SHA512 13da3f72b8a7cbbe66953f1c4296c1cc169063f9081f2c5caae763863e31ea2268dc09567d6faed45b58ef1a14cca19fec93d51355ee06d21f2f4a60ce1c23da
+DIST silc-server-1.1.17.tar.bz2 911126 MD5 7fbe00dd3509750a6b464dbd097be32b RMD160 c9f413590c36c3cae1b1ca5904414f40169c5964 SHA1 80f8d7dbadde7b7d3cde2b5a64b0a1ef9ff639c7 SHA256 46fecdc0233c32cbfbfbb261d45cbe6d7e7003649e65e320086391d3f48cf1ad SHA512 482149ce39a8acfc174a3d0a783a4714cff298a2f13bdbf14fdb8c668fc8fbc338fc95abb8683f1b086dd2e114f2700c344986c85a1502063d65a5e17bc5e06e
+MKBUILD silc-server.mkbuild 3433 MD5 1f4d3e9736b7da282034d16b8e68dcb8 RMD160 97316db6ef1a68ca44f0991ede7293d68d42f9d1 SHA1 93ec35fb5469f67c1acb05ad17a2da0876798355 SHA256 ceb2203aeee6736e1040874124f4be7e9b51025f151d29da254979b7d452b692 SHA512 217a8ad677eab4a248712ad4d77f2fb04fb2d005fb5c0b2222ba9b22f43f11938615e3e09da1d606427673a14fdc2b894f155d43c46ff196a73d79aa97cb9077
+SLACK-REQUIRED slack-required 88 MD5 7523351008e3f8246b89677380053efb RMD160 3ab9accaa60c6a751e7e8653211a4fd3cfb44bac SHA1 555a08a861228a441385691dc935b1ba449b9066 SHA256 44a042d89a0c0a8d0c2fd0d96439980389e488eecef98114a4312dfb1c021665 SHA512 c65302f8012827a5faa2f903fdb6c9a79be38995b2957d28551f4b4f086d01ac304f9f13ef1c4207dfb58a3df2d0f211751b58a8309865e5132a7592bef8f122
+SLACKBUILD silc-server.SlackBuild 8786 MD5 3c069ac84bcd6b441b83b37539398fed RMD160 81a796c1e96985a21d1088278f9d7d85d284325d SHA1 d5a3a2bac56aec5db80ea0f45e7a423569589784 SHA256 2448f1ef316ec977ec295c9de3795a7374d40f324c0dc3f67584cf47f56a1e7d SHA512 9230c30e4db945f450254932e767d31a8dc7d62f38ecc83d59f0dd6d152b3fc2b1c571a31c58d43702567f1432cd1a8c2ab11b7570992ba336a4d80c818fad5c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKpZj+AAoJEEHL93ESzgeimNUP/RNORqMv1CSmOF2BULAVc/T/
+LRWml6HdujbOkbl156ywtVKOqL5+ldA3IQiFwI349TgUp8mAOpNjNr7h0ieEKRMP
+XBhy6GcoJNJsSNDqCR5HWeguCq7vPYXrzYgMhM6qf4sHRj/oE9e0TwGuSrsX0nGt
+DYfRvWset9jCkdxMe8L1w3EKqG9SKNvHhniFasI8V4wfbNkbpF29VcEiwHoadWCm
+p0pHZm8JIu0vK5gQObKLGla1DUPdZgWTumKx70TMMuBT1mbFj69Wh271nvCTt+Qt
+AYFWP0Kcuxq4m9K4FH5F1SoN4WCkRYMaiv1XXNrJIdcqKgOgcxFqmcRPDuHfsVrg
+zZEAH0v1kgm6RY51fU7dR0Zx4chHLoOhakYiVcXRka0EWcgT1su+2WgRJj5hjY4l
+3MF/5/lD5P26DDAfJ2gzfyeHQxv05ZIGFc5e7cN9BoDqROcAUCV52oCG1Idlngzp
+QkGyZKelXFz7Lh7XHbuwk25ajJzx+l6nrD/+gbGdgTrBCJJ7zNM9xd12Szn2zlBA
+3/gDYl5iLp8MJrkxBGnbVPqmKOIk5/B0D7KHZwZfAqFr+dEKvYe9W2XX68ePbBAH
+lDetQfWzbZrjoD9vN+y4BK5IVc6cY5p8jg0a3YBBd9Ciosvn6+xEfh8+xUiZQD5B
+kf8Q+cDhXCiDa2pv4KTM
+=R+5Y
+-----END PGP SIGNATURE-----
diff --git a/net/im/silc-server/silc-server.SlackBuild b/net/im/silc-server/silc-server.SlackBuild
index 61dfa947..4cfaca74 100755
--- a/net/im/silc-server/silc-server.SlackBuild
+++ b/net/im/silc-server/silc-server.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for silc-server, by Silvio Rhatto
-# requires: silc-toolkit 
-# tested: silc-server-1.1.14
+# requires:  
+# tested: silc-server-1.1.17
+# model: generic.mkSlackBuild $Rev: 808 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="silc-server"
 PKG_NAME="silc-server"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.1.14}
+SRC_VERSION=${VERSION:=1.1.17}
 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}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="net/im/silc-server"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc --docdir=/usr/doc/$PKG_NAME-$PKG_VERSION"}
@@ -47,9 +49,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
@@ -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
@@ -199,7 +268,8 @@ fi
 
 # 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" ] || [ "$1" = "--cleanup" ]; then
diff --git a/net/im/silc-toolkit/Manifest b/net/im/silc-toolkit/Manifest
new file mode 100644
index 00000000..dd77d11b
--- /dev/null
+++ b/net/im/silc-toolkit/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST silc-toolkit-1.1.10.tar.bz2 1830280 MD5 f742b64064c40a2d22520549746cf2b4 RMD160 9a505420569e8595eaee684c2e4bde7e4570654d SHA1 0bd4b1b410424733687fd2ad33c1b09cbbf8673f SHA256 a76cc364813b2d09dee7a9e99fda77db71b5bf752297176eb8de4fb0466eed76 SHA512 b23b956a79cff6b0471d0fe3b7b57a473272416deaf8546b66987247bef2ee1fc3a8d3db03165a8c3d7f012549f02834d70e3473704e5b39f647a025f4e6befc
+MKBUILD silc-toolkit.mkbuild 3247 MD5 e49fda7e826bdc318a2feb38227a3757 RMD160 bc41bf8e98800113c321a16ed55ddfa966e4f387 SHA1 9af0a454dcd8e0e7c8704288f5385afc3b3f1110 SHA256 84c4cdc2566fdac9e571587b3d398ed6da84c13c7b5b3c2539a79d40739f9948 SHA512 827c5d8fa060b56076281689a71fd5225f4c21fa616f78e3835f7fd47a53ebc3e2a72874045ec5138d5e6398e11d1a4a0b4ac70e76a637e4412245a822cdc2fe
+SLACK-REQUIRED slack-required 85 MD5 8da5376864b7cdc9ea7d5548a87806cb RMD160 c8a17704fc536a2c6384dcc58277db2e008f17ed SHA1 4434771f6e04e1f4f91723a897b4b394207cb62c SHA256 d358836cd2baa5d32f0f9bde6ef648c67694ee417c941397fa0b59001aca0fd6 SHA512 578a3d533866848ff737d329dee358030e3434ae3e7e01dc9a5c9b9684632d5a78a432d102d7ac3b9a47b733cd1a8799ea046e6e20e504de472a973969d69724
+SLACKBUILD silc-toolkit.SlackBuild 7574 MD5 7f3a417dbe0a3e97ca3a96afd5595a0d RMD160 4b4e41d60a8091ba03f38697b58a2b15486b8d4d SHA1 1bc21bec3fd063924f027a352ce078ef323a6ab6 SHA256 0f4fcf9d15fa3bb5d26c5b8c74bf677e35b5ab73e80d034a1e835e067ec629ea SHA512 4d78b747117725c15b41c33b320377f803d6ad7e1fdfa515404f315a305c3274ca0cc7e17e45a68ac305ffc8dfd60d013000da70aaae2bef7dfe984fae002e7c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKpZf0AAoJEEHL93ESzgei+UoP/1hjHJBo5Zk6stGJDtmzft4d
+yFdlnkV8oBuouF+Zg7c38bm5qTSWTZGfvTZ4WMETNiIZ4DdHWAQJj0EdhJFLiZsl
+Gq0W8RhkcxRNYfoU/GZeElGP9I6WF00OastOfwGXToY4IX/wEWGGG4GCDMgq0FG/
+USf3+LhtHQznPE/eZG/C46rIoGH3jC+t3flUmc+dU4hJbLwdJGGdsPltzywFFeD3
+JBGpp5M+RuzqtneyHm0gSKkb/YtbDrpV/CTYWNdHjSiadL8g7KP3xk1R6nkDm7Rn
+y45En4IXRO1J1H+jJjLXelMAiu4nPhW02bw0MH3pLFVA9A/pkiYU1uZbwcA6RgwI
+MpvDrYFjRq4f6WueGYjhz8VGXTWFauiTtyygJVdB6CWykYpNIjk+KCNh0npJcGSa
+WsykyWGLd0vezbYI4KyDtBRzrgd2vv8NgGUC0MI+lbNlbqfaaA6IkJqQUCn5Nxmd
+8YpGcAjJiuIMueUVACYqOEHdm3wAl8NmFq0q2m042P16oBhNiDNswfG2mjetWwS/
+EG5ySEgq61ElDYzEQaO9mt2kXmQ+H0XZ93vUPx9cIKz0SUhaUNx/OEKqmj15ZJXN
+Bt0U8B7NOu8DxdA2NIEHFdZwQhmURAU/zEvtk48H6q/zD/4ob51yvhdfwQ1803fS
+z1nNvExAPUsKoYSijboW
+=2+nC
+-----END PGP SIGNATURE-----
diff --git a/net/im/silc-toolkit/silc-toolkit.SlackBuild b/net/im/silc-toolkit/silc-toolkit.SlackBuild
index e6e1971c..c4280ea0 100755
--- a/net/im/silc-toolkit/silc-toolkit.SlackBuild
+++ b/net/im/silc-toolkit/silc-toolkit.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for silc-toolkit, by Silvio Rhatto
-# requires: libiconv 
-# tested: silc-toolkit-1.1.8
+# requires:  
+# tested: silc-toolkit-1.1.10
+# model: generic.mkSlackBuild $Rev: 808 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="silc-toolkit"
 PKG_NAME="silc-toolkit"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.1.8}
+SRC_VERSION=${VERSION:=1.1.10}
 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}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="net/im/silc-toolkit"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--docdir=/usr/doc/$PKG_NAME-$PKG_VERSION"}
@@ -47,9 +49,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
@@ -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
@@ -151,7 +220,8 @@ fi
 
 # 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" ] || [ "$1" = "--cleanup" ]; then