amavisd-new: adding amavisd-new (thanks to x-doctor) and updating dependencies

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

2 files changed, 97 insertions, 4 deletions

diff --git a/dev/perl/perl-mailtools/Manifest b/dev/perl/perl-mailtools/Manifest
new file mode 100644
index 00000000..e2630f83
--- /dev/null
+++ b/dev/perl/perl-mailtools/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST MailTools-2.04.tar.gz 52292 MD5 d21ea4f375d1e5f3da6b0a4e8ba1e2c6 RMD160 7a8d149e3d3c8fc9e65166590637eed5115b2cb2 SHA1 6fccd04f9db0f478e19eec047be3bf0a1d8297f5 SHA256 bda9734b212343d8e4ec2743a98e1383f354f3a2bb8a6d6d93176cf233cb2171 SHA512 63c3a5ca87597c42f9cdcc601101b17e9a6c61e86cd9d8428b014117c88b7b7a58a789b5f0dde156b135ea001173008287ac5c0b0d3629802cddef2bc96901f8
+MKBUILD perl-mailtools.mkbuild 2357 MD5 2e28f0c4073672c107fb63a80aaef5b9 RMD160 1a53cf6fce4882cf3bb0bb08f09b25bc9c554a15 SHA1 ca505032a8273955f96b1e17d820f1f17005ed9e SHA256 7cb8387ddfe218607073b1a1364319ac8791479d02374060867c03b648d6a73b SHA512 71b1d3b25ae14bcdbbe4de9f6e303f5ec143de037258fa9defc4fe433a01550a8c217e88a683b4e6d7b24e1094e333275162a5a4cee2d82355df14ada05ad170
+SLACKBUILD perl-mailtools.SlackBuild 7036 MD5 c8ff6b67b23c0e4cf07436310a6082ed RMD160 b79f47287b412849a843ae46d60fafcf8b93ebed SHA1 5b400ddf1f3c75d0ac2b5c284c209782d22d1be8 SHA256 b916f7be845dba879016e76b04645341d7607b0a39d8c821437ce830f35e9dfd SHA512 91012b00a3dbe8ce01a0333e86f711eec576bae62b22c6a60f276a05db35b1fdcc018bcbe2734faa2e51d4b05441c7065f5cbaf8f0665667e3f47346d8bb4081
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKr+RLAAoJEEHL93ESzgeiPt0QALMWZx3iR8xkCek0CwpcijsR
+sGOJryeUBQPnfbKCWU5ZURjIq7vF8BkarvpLzdWlCjgWpXFDJn9NdKgd+eeUBO3t
+sct8JCN2LTDKQdkWwQPRgBhwXy65fwSlKd7ysXdBnotU63YwsfqoapjP03L1aO7E
+/PPQjrPgahuUYGjkEjw8UBXRp4CkYZGyvJcRmhQHk1Q9tz5rAG5rY7VelzqtGXti
+c2rf5nNo9QxDP/syUaKmZHJnuzMFb03Zkul6BRwlnhFwhwpTESHz++ANJ8OFFMsG
+PJzaay9EYL5Ff/tiq9MNDe529gJ3vwezupdvag/2cO9LnvhvJwmjQp4kboa/4j4O
+Z8uYce6jPBwJ2+//TfdHbRc49yHFFev6hg+Skd9VEqzrfK8461TjU+Ub8NTx5gCs
+J0eQePh1UUMNox1yibJdniitGQGDQF73dECLL5jRFbQ4zaQ5sqwdxTtt5AGPrPaJ
+TSxqDD6pcIL65SwNkvF07kCZl3C2UGm4fwxQIO70oPr/0HsllHYFeD1QnpDBa5QA
+VsXVd72T7EFvvUTpkIetqQgn95yubtHZ0op53rpGu+FUODL0VhKBGsywlprIq6zC
+seu5WNOyrob0Cp9i+8mIqYBEQdZ3FyOYa3HFVi+snS2hZCV8B7COpXbS+LMyV4qG
+qk7yYCtn7g+Nb920Z9+k
+=iJoT
+-----END PGP SIGNATURE-----
diff --git a/dev/perl/perl-mailtools/perl-mailtools.SlackBuild b/dev/perl/perl-mailtools/perl-mailtools.SlackBuild
index 31ca5671..d7558aa0 100755
--- a/dev/perl/perl-mailtools/perl-mailtools.SlackBuild
+++ b/dev/perl/perl-mailtools/perl-mailtools.SlackBuild
@@ -16,7 +16,8 @@
 #
 # slackbuild for perl-mailtools, by Silvio Rhatto
 # requires:  
-# tested: perl-mailtools-2.03
+# tested: perl-mailtools-2.04
+# model: perl.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="MailTools"
 PKG_NAME="perl-mailtools"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.03}
+SRC_VERSION=${VERSION:=2.04}
 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-mailtools"}
 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