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, 95 insertions, 2 deletions

diff --git a/dev/perl/perl-digest-md5/Manifest b/dev/perl/perl-digest-md5/Manifest
new file mode 100644
index 00000000..5cfbd29e
--- /dev/null
+++ b/dev/perl/perl-digest-md5/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST Digest-Perl-MD5-1.8.tar.gz 74077 MD5 8b54271ffe5f174456dd68b79bf3f8f3 RMD160 da78c85c87a7e8af191193fb778d9fbdc2d48999 SHA1 44742433b6a6d06401b78ff8672277e887fc3d82 SHA256 86b1f32a09ced075606d98a1b6ed24a44b2e18bfd0ab515dc987f99d9112d860 SHA512 d2648aa3c675c31f0af044668ef773ba7ad244412028b0f8f60d4c3bf1cfd33bb68d6398a645684df737ce7775b516ed67fbef5495c3610e82c58aea3abc8870
+MKBUILD perl-digest-md5.mkbuild 2343 MD5 c06653905c3380f383f53b60de3b8e40 RMD160 8d58936d21a37ff934be82a37d9c5ed5b2f68f5e SHA1 22906ee47de473c0b3fd7ed14fc466b82f49e844 SHA256 7644296d9aae895655dda5b0664ce39e410c3930bee74a6d140d1712c85284dc SHA512 d87b7feb09de5d7b6c1f21b29e3fb43e172844534db889879d7d7441d370173fa9e55a298ad3df897f21d4e6d70e0604e52f7aed5c8d66cbecf535bb62ed1cfb
+SLACKBUILD perl-digest-md5.SlackBuild 7025 MD5 caa8cdb17a25c7c7aeacb583ab406c7a RMD160 fe3dd309f8af210c1af83e2b136c4e111d135cd3 SHA1 6744463715f24ad4b87d4ca6216b3d13cdd6f82c SHA256 1d0e942db2f8fb2f6980cb03ee95e6edf9883be42dfd33e23bbf4fa8e81ebadd SHA512 1e523a9f3de23f56bdbc9d5068a163a23b7fd503e233a05d6e45579b14b5a739f8d80617421324ec4aef05e2b6d74a206d9424a947057669bdddeabee6079d26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKr/SsAAoJEEHL93ESzgei5CEQAJxEjq87cfCWyykC/ROqJc66
+t0JvUeb5cYoFOiInhzCOiQ7TVNw9SBuQyxZUXU6viqW3IKH+ND+v685D2IR2WKnR
+dKgNqN26mlvw9kGsIoADVD+91RAVZkHV79BOmOgMZzpJmBWdxFZT72YJ/msZELFS
+9dggGm5wwkNRHxXJ9HLhwienH0EKxzM6QLcndpieJGSEwfbiz5ElOs88+VR0Jr69
+XB1Hg6BnUkXHK/I3LtjzsImufqSHj7MPcf6r+/FkH6Wvx/GJsxwyEYE1OGAsazeM
+rYTw4zq5ZQWzhVr7S8Q95yo6z71w3DA+k3uuIRA3fVG1yrlhvlHbFq4XTfoXjDrQ
+wECVvQD86XUGSh1KDqRM997AlA63Vsf9KpXC25pBEA6A4Hu83L5fHKyzORp1zD0q
+LSatK4RKqTfCluGw4hC4ETVWfvtu65nim7iobVou0+MIgArnb2Lpc328f26NlO/M
+aAsfwFS4VlXDQKKxDyyQLQV899wvnVlVdJKHtbn6H616mTKMWDQKSpI0QGVxlkVJ
+lKS2EHACmXTKH+66cfiijrN0/Qr30Ra8PJAV0DGcLDP5bog202cUiXmd0Vybhtt7
+hlxWFcN++r9i4n7+emmIdG38yj8JUsmJ1g5NcjdqdMHBjHVbCjNC9uEalQT/BmGr
+Pan7S9bvwJHc0r+hSr7U
+=qagE
+-----END PGP SIGNATURE-----
diff --git a/dev/perl/perl-digest-md5/perl-digest-md5.SlackBuild b/dev/perl/perl-digest-md5/perl-digest-md5.SlackBuild
index 7e8de6e5..d74d074c 100755
--- a/dev/perl/perl-digest-md5/perl-digest-md5.SlackBuild
+++ b/dev/perl/perl-digest-md5/perl-digest-md5.SlackBuild
@@ -17,6 +17,7 @@
 # slackbuild for perl-digest-md5, by Silvio Rhatto
 # requires:  
 # tested: perl-digest-md5-1.8
+# model: perl.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ 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-digest-md5"}
 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