perl-mail-clamav: updating perl-mail-clamav and dependencies

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

6 files changed, 229 insertions, 14 deletions

diff --git a/dev/perl/perl-inline/Manifest b/dev/perl/perl-inline/Manifest
new file mode 100644
index 00000000..972e6c1b
--- /dev/null
+++ b/dev/perl/perl-inline/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST Inline-0.45.tar.gz 93844 MD5 63140a6c911f1576fdee71ba4457610f RMD160 0563af1b2c52c26190cd2bef4f724395d92101e0 SHA1 a2d9ef44861e66e573fc7ffb7e6ed7ab92a59038 SHA256 3db1e20529f22b847a87ce1d4319d9c0441b2a3a311392f41ac30b68c7cab6cc SHA512 f2025ac6e150a04097af94fefc81af7ea3379a281cdc7a7a181950296f95524db758522350605cb41651f2664c1cae36a8cfbe09999c7cbb20188a6f5e4c8c3d
+MKBUILD perl-inline.mkbuild 2389 MD5 e688ce4b092c904b69be91d6a9c009eb RMD160 6c2c1429b90ea27233b0226b537567f1131aa6c0 SHA1 3a8701f7a89edf78fd9dc088a5fbb6cd41c99be3 SHA256 59ad310d410f90b92e90caca16bab287d180c7211904275b848fcc2f4400ddfd SHA512 8e9c2d125044b96ad9797b15b4c2649fca066daafdad192ffc3b4cbb84ae9e12921e85c2add10c9bfea6b010acd05cd38e5120c27a1a68abe7916df73a0955ff
+SLACK-REQUIRED slack-required 92 MD5 898456f0fc95a095c70d8a6f090e6010 RMD160 15466f70c9b47ea62ffdcc0a3ff2694a6cc4fc86 SHA1 8f5fcf0904dd61ccce1567c70e026788b360e400 SHA256 b58a7cbc6705ca17d0514b8023d82d0ff22c8aff30057743111508993e49157e SHA512 4382272a137768b9c562130d3babe1f07798d6b6064c71f54450a4a1544008e85b1e73373953a45f3d2079290ccbd621dc92b1c22d76e1791fd51bfdcfa3a360
+SLACKBUILD perl-inline.SlackBuild 7113 MD5 f9ed659614b833cda9dcf2ef7e89895b RMD160 25a79486094f13272ec58a4b65708fb5ac2181fc SHA1 4f4b76b15bbe9eddd606e8d696079746f781763c SHA256 22344654efe6656260b37c2f484b78e6731a07cac22bde8e8a97822a10ab4bcf SHA512 e88c2f4314fbe20ce255c1b8cecd66ddec23f0c8c710f0cc1ef62f66f8bedd96424ba34f768d8f5ffe0e27d62a0df2e2b71268866ddb53141aad7df095ad5f98
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ81txAAoJEEHL93ESzgeiH+MQALhApO+7sx98No/SMvnA/BNo
+uX09tWTJ9s/cC5QIbdyYK2W7cuIhA94DvHYBDEAZ6+yNEeLV5PbV0YDdFGymWIjo
+ah/Rc5mpqpB1d9Lk1Pik06fS4xs3EX+EuAyc+f9LtFwUPq9bUfhR096Bk0FE7+WS
+aQyfjytvlvpscYiDYaw7c5HXHOXDvoN96LTJ42q+tYstgxkHYDdncS61oIuFO3Xi
+v143Z7yrofzPoyoAFJaw9zlu1llAQ9g3DOPAPIREtmwk/tGtdf4tMKqwtUMKTR9o
+nJnEP/y3B1weJD5WjCRcl8tWY/Coqn52XJcGnz7WF8G8Ld8n2ySdhXpP+k7YF3ck
+TT1ROwYfolI1Dz83kIboGEUWIdMYiE08QDZrHX7PjY6Mk1hyLkzy4D+IH0JKpglS
+vo07udGxq3g98YxzFS/gTUAa/XsR5Yr7kYO0YXtiakOApfI9mef3MLoFDh5JM3bg
+847dLKIG2x7Hn6aSYMJlpxeovveZv9yWPLM1fzjHALugs7OGLNKSTROCRoObkJMe
+IRSCvQO/6M1ZomNsXa1E9xe4ArPiC5RmesbSEonFnj3IcFO767KjHF7FFZFFfM9L
+zMAsc6FLar+2hSAUwTwuSUdX30JDBdhZtuJvw08HxSfbZ6j2URH+bfwuqkCmMbsk
+w28UXlI7Z+95CRsjjqhv
+=BAi/
+-----END PGP SIGNATURE-----
diff --git a/dev/perl/perl-inline/perl-inline.SlackBuild b/dev/perl/perl-inline/perl-inline.SlackBuild
index 0cbaf637..c2099e8d 100755
--- a/dev/perl/perl-inline/perl-inline.SlackBuild
+++ b/dev/perl/perl-inline/perl-inline.SlackBuild
@@ -15,8 +15,9 @@
 #  Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for perl-inline, by Silvio Rhatto
-# requires: perl-parse-recdescent 
-# tested: perl-inline-0.44
+# requires:  
+# tested: perl-inline-0.45
+# model: perl.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="Inline"
 PKG_NAME="perl-inline"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.44}
+SRC_VERSION=${VERSION:=0.45}
 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:="dev/perl/perl-inline"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -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_SRC" 2> /dev/null
@@ -77,12 +80,78 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.gz"
-URL="http://search.cpan.org/CPAN/authors/id/I/IN/INGY/$SRC"
+URL="http://search.cpan.org/CPAN/authors/id/S/SI/SISYPHUS/$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 sha1 sha256 sha512 rmd160; 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
@@ -154,7 +223,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/dev/perl/perl-mail-clamav/Manifest b/dev/perl/perl-mail-clamav/Manifest
new file mode 100644
index 00000000..5899d954
--- /dev/null
+++ b/dev/perl/perl-mail-clamav/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST Mail-ClamAV-0.26.tar.gz 17187 MD5 e70fc21d74d1960ed284825edb82a5fd RMD160 8b5d6325205a75d7966f725317a5ddb6926d6c58 SHA1 18e08f9a7f0fc74cc065842efa7226c31b904fe2 SHA256 8222ca36caf60451b496e83daad5aa74c1d8fc00a60b06c490c00fdb1a17b5b5 SHA512 9695bdb3748170d87dfc398edd53a337d0424977e12318b2d95cf1c21ec3f4b5e2da5da665468bf08cf7a212f5624d78f653d8814370993d91174f1f40e3a98f
+MKBUILD perl-mail-clamav.mkbuild 2569 MD5 39a137da2428e9e44ea1ab34e352e384 RMD160 96dca49a7f8114b96502ae1a3a2061b661cba74f SHA1 024000e07e095f46abe2cd329393a4fe16a863ba SHA256 a8d6ce8d84117a7a0bacdac20d27ea2c0d2708adef3a54426ae941befd1318a4 SHA512 d773b388f51339f938d50316568cc73249c1cddda035e3160a8600d776f7c103f80c13a9dd4ef432ddad94f73276e34de647320f9a5fd4d40bf876f7794a22dc
+SLACK-REQUIRED slack-required 98 MD5 f4069775b2a91b5c27709e1062c1d610 RMD160 6f8292c1c1c2a25b9055a7dd01e61920f1624c40 SHA1 5051351f695470c0e801eff410fa2368a5c9db28 SHA256 4a61eb1654e580fc01380ffb26e44ad378a479aa7de11334e8adc3b7e9744ad9 SHA512 e4a3385e756bec84dbe85a9ff3ccf8d6e8b0e995b11cac8b9bc2592a98993a6a6fe4c935b42ad2744e1067ca6a08dcf4a9da56239b35cc1a377dc3446b64cd91
+SLACKBUILD perl-mail-clamav.SlackBuild 5154 MD5 6b8146529b1c8f0109d77eebfb50deab RMD160 3b0a3aa7279286ae6ed07fb737e8eaef4349c654 SHA1 64b61326f08eead935efb388f1fe50a905f7eb80 SHA256 ec718bffd7ec9e9821073732e093776685107a2e03e1ec276f0cded9ea18177b SHA512 68ad723141d71de23914c37c8459fa7ea6e644d7c2b3af27c2c197faa612c5905d24f2efa9a273d5244e3a7d96bcfdc6aa6a0692c36d63abe26bcc8c00124edd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ81rJAAoJEEHL93ESzgeiwigQALetFsbLyihPB9JTdqo8RZI/
+4CpfEkAgOvLuymTDYkEYintrbJnM57IjNv+uTY30qgUuix+C+fFm3sTaCSLGC4Rw
+TyJ0FzK9vtMgAHIqcqhSI1PQGwxtks20mgNtOxmgBhHEelIAt6GPezys1VzfcCHp
+bAlRoH8WiA4Apq5qspwYIvfhrd15TnTj18za6GS+CxTA0rt5bjOylXy+yJHNcKOC
+ncE7N8Xk+vq1D/dpHK8PxnPCSBR7EaD3EZ/5wf95ORp0aGFacFZUtuL/kQWcH+RE
+bnE2K+KJbgsDyRThZd2AkZ+wn0Tb4xSdTWEW+/HSdAtc83M4ITVRhPNCK7l1l2dQ
+mzMDXZACXpNAWfUtHMVr+tLyvVz+gyKXefYUTt34Yq+yxBNt14netzkSxIn/tRPn
+neYIuKgtU4qBFhPVYJWecze0c6DBfDVUJ9x3RMni8VNN3h2jW+xiiTlk7XuDDItg
+390Rzr67itvQUD1tBsp0OTX22ryQ8kJalKdbREnQB1hQf3cRqH7O9Ipn10YTMFU2
+HHOL9nm+sOaDb0eFCcXlknsTUvtUzF52E8u67kfidegw75D1tbUnIXXI7dFFr53W
+sA4ztceik4p51RB/4a3ppaHX5i1yqrUnX+kv3M1ohU9buKQJF8zQIkAu4P+2DMAM
+yYaxOnMAJiqUL5uFJlBu
+=+RyI
+-----END PGP SIGNATURE-----
diff --git a/dev/perl/perl-mail-clamav/perl-mail-clamav.SlackBuild b/dev/perl/perl-mail-clamav/perl-mail-clamav.SlackBuild
index 23dd8375..cab31c59 100755
--- a/dev/perl/perl-mail-clamav/perl-mail-clamav.SlackBuild
+++ b/dev/perl/perl-mail-clamav/perl-mail-clamav.SlackBuild
@@ -15,8 +15,9 @@
 #  Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for perl-mail-clamav, by Silvio Rhatto
-# requires: clamav perl-inline 
-# tested: perl-mail-clamav-0.21
+# requires:  
+# tested: perl-mail-clamav-0.26
+# model: perl.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="Mail-ClamAV"
 PKG_NAME="perl-mail-clamav"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.21}
+SRC_VERSION=${VERSION:=0.26}
 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:="dev/perl/perl-mail-clamav"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -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_SRC" 2> /dev/null
@@ -77,7 +80,7 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.gz"
-URL="http://search.cpan.org/CPAN/authors/id/S/SA/SABECK/$SRC"
+URL="http://search.cpan.org/CPAN/authors/id/C/CO/CONVERTER/$SRC"
 
 if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
@@ -154,7 +157,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/dev/perl/perl-parse-recdescent/Manifest b/dev/perl/perl-parse-recdescent/Manifest
new file mode 100644
index 00000000..f1416d4e
--- /dev/null
+++ b/dev/perl/perl-parse-recdescent/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST Parse-RecDescent-1.96.0.tar.gz 152818 MD5 373dc01e102d81d01a4fb1431c5ff3fb RMD160 c204d3adcbbad29e098c44aafdf0a74de7621a96 SHA1 9588b31e1e3f79361be185b66dfdf975295cc417 SHA256 36f9416bec324c6c6db4619ed9facd019e7efa2be5ababb55d9733defeb5dac2 SHA512 fdd41457b8d80a4d91cdf173689231f9ca4188f3cae9aca16187c95767f592f43cfa56456f4368cca315b85044b750d721336639f056801dd01eef2239eee327
+MKBUILD perl-parse-recdescent.mkbuild 2431 MD5 078e62440db498be7d54778affb494f1 RMD160 edf996e0146172bb4c2b923d5c334a5482693cd4 SHA1 f937cc2ff61d6d7ea2e8f1985cf12c5d2a6fda4b SHA256 f1c26f464f0e8ffe481ba2ea6d95eee44b6eb89489a11ac42c37236768320b85 SHA512 f85d63517d6e244b971ae02e65547c1dd0f1d4eecfe01110b40f91b15c22ab02e47067f03970dc0058f4bf76247c9fd5c09378ff20d8d67891b846b3d8bb93f3
+SLACKBUILD perl-parse-recdescent.SlackBuild 7140 MD5 ba1c6495651d87b782b6727f4b263adf RMD160 a0195b8fce0ff14e82e412b1bee4d31ac7d22d4f SHA1 45578dd3e5aedd9b5a5a1447d3c887c628dc2edf SHA256 b26c273d55574f719b320cc3ac2477acc5a804308ece15acdb3e7b164acb9c48 SHA512 e8724b731b79b84fce026ea5fb55edccb70ee82e766c01b34606f776f1c5fb319ba4b7237698b204cb8965e1c1c6494f2c13fc7c7ea9cfd9e0f68eb7cd3cf794
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ81s0AAoJEEHL93ESzgeiPeMQAJnG5iZ/X/uhZZWxeLhDYDlT
+uD1nzNFQRCK+kUgeiXwSr2JIU0AYhDLoaPaGnYVP58gqnz4MgF1SBnSHvWaRp191
+capJC4AFJUbp2ElEbOaUV0zcr6Tblr5f8OVZIo5gBrdaVyfmytja9/ag0xuenkFp
+x6lOGNN45bMZJWz+3mXPgWQCFNvFrnfiE9ZKutd0RJ11zEBH8kai536AWAFgWW+h
+/L9vzrc3FaVcI+1aH+l0e4Hn1z861DtmLHrDhXbLGWqx3MxiGUER5e1FLI75yEcx
+D7LweQ8WGheTmlnJtnimOLb8BL105Y9tt5uRO5QsVn9dONCznWrjjlRIlQNYKdnN
+V31Y8Vvp67SqQuE3jRALc2Cpc9kY9bXH0ZMrew33QJ22KgprNFqcg6BrU/Ak9Fn4
+NQU0Q5RmI18SxT2OaDwTgX0UTJUERIO512cuYmE9u8fBwkGMsFMMoYSso186edkJ
+qY7OdjNVa+iPEhUJ2VrM5kyRvhBQup3DbaNFKQ1umYknxE+WgQwJMseCDnjOycGB
+51Fgke3QcNWRIdZuYQB9soiiSMUrVSpHGfmON3zIIsKAa18Y8Z1j8TddJ8NMErXV
+0BQzdtWcFX/6IH6+1Qfr8gtWRDG58lraIFdC1Rsm3cXvgpnAY0X8/Dho0SA/JGq3
+txBPChzh0DOVEZ0iOuJv
+=VeDS
+-----END PGP SIGNATURE-----
diff --git a/dev/perl/perl-parse-recdescent/perl-parse-recdescent.SlackBuild b/dev/perl/perl-parse-recdescent/perl-parse-recdescent.SlackBuild
index 6ea679d1..638fc899 100755
--- a/dev/perl/perl-parse-recdescent/perl-parse-recdescent.SlackBuild
+++ b/dev/perl/perl-parse-recdescent/perl-parse-recdescent.SlackBuild
@@ -16,7 +16,8 @@
 #
 # slackbuild for perl-parse-recdescent, by Silvio Rhatto
 # requires:  
-# tested: perl-parse-recdescent-v1.95.1
+# tested: perl-parse-recdescent-1.96.0
+# model: perl.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="Parse-RecDescent"
 PKG_NAME="perl-parse-recdescent"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=v1.95.1}
+SRC_VERSION=${VERSION:=1.96.0}
 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:="dev/perl/perl-parse-recdescent"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -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_SRC" 2> /dev/null
@@ -83,6 +86,72 @@ 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 sha1 sha256 sha512 rmd160; 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
@@ -148,9 +217,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