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-net-server/Manifest b/dev/perl/perl-net-server/Manifest
new file mode 100644
index 00000000..d20abef7
--- /dev/null
+++ b/dev/perl/perl-net-server/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST Net-Server-0.97.tar.gz 92158 MD5 f884b6c5b1d2698a82bbc7ba659690a1 RMD160 46d77235f4ef5d3166efbf36c4abfc4026b95548 SHA1 3c1adddc4e66b15c2973176ef66cac36400b2237 SHA256 4ebce7e92b8fcfcc127583b1dee49d40726860c080908ea381e619c047d8708f SHA512 855eed9ca1acab0684006a5b9efd46b55579462c9c8162d04379168a8b55758ca7716403a2284f8b8534c4f710c3f30d4b48e303ccd2490a848debe0c63c1396
+MKBUILD perl-net-server.mkbuild 2343 MD5 c0ee4c43b663db7b976f40f0510c52a9 RMD160 d3227aa26aec255f3b4e711428df8b57d473e2e0 SHA1 53cc0390f76b5a0ba959a4e3d7802e7990302e1e SHA256 ad73cefc7b4d336ef844693338260bba1b69279977a099d60297851b70eec2e1 SHA512 5560cddabd1d5465bc828bea391fb4a72d082bbe5f31b2b7234ed222de203da5285c09f65334f09c09ad88eec1695349325a14a3fa2b8b5634288e6906e0ecd1
+SLACKBUILD perl-net-server.SlackBuild 7026 MD5 eb097f69517d56ea4eda08d5e224b249 RMD160 216c1062d2f94b747dd19684db1a92d6f05d8195 SHA1 b279b4c97d91c4634c27cbfec7845561478cb147 SHA256 0ed1284540d3ff888acb09370f39c971d32ce4983c5ac07449c3fefbe849d548 SHA512 30bf0828a1abae481c9928ac2ae202b2700cf1b78f50c10ee014db042d6c25f59ae7edd90b98db385d5acad9732a2f2f21392ca6513ba9f775fa4b35a8672b1f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKr/QfAAoJEEHL93ESzgeiw6QP/RUy2bGFLqlTMNmRmZcwyxEB
+JXtbwQRN50Rm++lJjFiLNlK+l3D2/FVSL/HXGGKJkz36G4zbUOLwTwUAlyV9ltkD
+mhbrs1M4Fmzc1YJ+z+KUVp8TYplg0V3cOdLDq6X8Iyx87qXiDrhtJwDLB9jJqMOw
+EQbcosGqYXTi/1l9Ct4W6SSlXC1GywnyYJPncUN0HZnHBpnPRV0x2Cq3tfG//163
+bK2JWmNf2I1VE4tjs/eQsZ/23clF4RBt7E1d/gd92D3X578XZekeJ3SemW3l/bZO
+rkbYmJsPKPa/laoi6yYI0zu1VJhDO8LTyMa22D/lgJIuw4SoA4LLfP0CApzuuLGM
+cAE/fO6XGyRf3qckNYZKpX01eXfmZXKFlPhf+0y/kqrQDPgaj1O7RHU3MTdmka0a
+ZQywoOMipTkE6pp8iVsTdPkX+8lrTccM1vL7BaQv5zI6PilsULUJM9ti10suYWZ9
+1pmkzU3GpMQblaya/YfqA57D3TSJ3yA6pgrih07yCgsoE5bPdYx4ziNTqAgDgyXI
+xv+z99w9xvmu/vj+tm3T6W6VkIbkTa9yuYVfjIrChyA2Ftbc/h/fPwY7ApMXIBGH
+uXK1m1sl6QFckaAD0ctn5P8uFjExb/MNXTZPV/kNxnlUJ8EMt/7W9KtjGg5xxEQR
+Sni8V/oXyC1OzYGPTuG6
+=5Us9
+-----END PGP SIGNATURE-----
diff --git a/dev/perl/perl-net-server/perl-net-server.SlackBuild b/dev/perl/perl-net-server/perl-net-server.SlackBuild
index 620de56b..fe660000 100755
--- a/dev/perl/perl-net-server/perl-net-server.SlackBuild
+++ b/dev/perl/perl-net-server/perl-net-server.SlackBuild
@@ -17,6 +17,7 @@
 # slackbuild for perl-net-server, by Silvio Rhatto
 # requires:  
 # tested: perl-net-server-0.97
+# 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-net-server"}
 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