2 files changed, 102 insertions, 7 deletions
diff --git a/dev/python/twisted/Manifest b/dev/python/twisted/Manifest
new file mode 100644
index 00000000..f160255a
--- /dev/null
+++ b/dev/python/twisted/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST Twisted-8.1.0.tar.bz2 2371422 MD5 a575f29ead4cc02c54e9061d0e6ac7c3 RMD160 1348f5e384a7d9d8591bd67e6b1f0d54aa18700e SHA1 b10e523ab96032f5055ee02687b22bcd7cb02951 SHA256 344788c5894ea77a87b94f33e456e07814384fc1551c05e15376fe4ef2fa4560 SHA512 d8606c7aa0b5050d7fa184306241b01ca6b250511c93ebf8b9415c877a9b6bba11c7b36f72d91d1a2f7cad6612d2830b85c5af43306a57dabbd71ced5a279358
+DIST Twisted-8.2.0.tar.bz2 2453327 MD5 c85f151999df3ecf04c49a781b4438d2 RMD160 a942e6ee4c54d734111410b615754fbea0c9fb5e SHA1 ef5f475b8f38eafd9b83a325ce131fdf6af05255 SHA256 e0602bb05e31f6100b6f9ab35cfa93ab9f7a1c50a351a0ddfcd236a923bddfb0 SHA512 b32209765e528a64e17cbc3b9a972e48edde3ad29e9db69d796bd14340f1a55e86aa40635336a072121b70ee52ee0bd2bc8a757e31820c5e40492d3d04196f12
+MKBUILD Twisted.mkbuild 4139 MD5 f36e6942747dda16f77cc6f8cbfbc2df RMD160 fbfe5a03ec953c351834f7747e1de6790fdd41d2 SHA1 b4e35b7cb4652348400535da5057def2d5b28b73 SHA256 c6ed7ca1bd4f70f323511715f7ed96a717a2e63d90e68f62b8f35ccd0329e901 SHA512 772e1fa4afedbed4a0a9c69caced8864d05a22be4c0aae4b25df088395ace57de3e052275b0139d51778803747d200a542a92e3affc74f471cfcea45b4a7cf77
+SLACK-REQUIRED slack-required 114 MD5 8da91f7f53ff8dda6652329202acffed RMD160 c420edd926160f9bb0db42eb80a49e085107c612 SHA1 ddac3a38e86ea6915c7124fbaf8da179b3ae670d SHA256 b9e9eba3cfcb2f7e847966ae719cde550b9b794e24942044aa1291207ff1d1c3 SHA512 b97d4afbb2119a5465576f32364d3d30d8d8224209f900dcf771561a87a756ac3a32fc911d3fd058c48ed311fa8aeacee5ec1c7279bd572f662c5dd2ecbbc84c
+SLACKBUILD Twisted.SlackBuild 7157 MD5 2c0aad8e585870ee64b6d16076cd163c RMD160 a0738a9570e89bef63f58f23a667ede564d30da7 SHA1 8bb29df7734ee28ae81bce9864158c4d02dd5cee SHA256 7cb513df4ab48c1aa36f3602f8935fd0a82dbc4223d432323f2c6f16834a24a4 SHA512 b6a902f51ed24f9a92af72967cb57771eaefeda2e5cc465f4c1ce96b294f69bc3ea5c95e97ca75cc1509b11b96493ceaafacf65b45f340cfb442f3003f126977
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ+w+kAAoJEEHL93ESzgeij6oP/39TlfiNIBepFnAcwYDOhoV2
+tg7Wijd1OXTIfNVcfX+lXoJlugXJoAVd0zq6h4MwV8rtBSJwIvisVwRcY66BdODg
+8vGIyl1HgQQ5/7Jh5Hg23XFgyh7isaS5mb5d9CZM5WVhwdWDlzfTLp7N9T+gChpz
+1M4IH70f7OQJ5qsb3DZpKQFyCUCf7zeYNEUFI3DhYQ6iIP5d0GNV+Vn/pc0klqy9
+0VeG8hW5Zr74XtR/up94fsmvg6MB+sPDn03nxpfFfaXxQxR5ihW9C6bL6fsOYmp+
+m6rRBZ+5w9h0ZihRK5UH9Ikfur+IWKkgl2rDwG+Rt+0R3HhYzghUtM4MU6iEV1jL
+uzUV7UQe1yjPHqyrKQLZg9KD0mdrVvA31nYqwfjQHO1bk4MYCyaOyXw+TXEtUx6H
+5OJqrEaO2iO83ocvcka45UxzwcismcKcesxAnY+M72Yg6JUplc7YAHdv9+Lk1qEE
+kStwGPqHozk5TgegDkiQfLjE7QlNPfHNuo/FjcJKBOXe9u1x9UUbdxYzgEF9CToO
+A2T2tinhszg/BDVwDksv4Xkm/OIX9nDiVMrjfV1jUQQ4QkOLk3ytqqTtYGS3EpqV
+5tze7jTIHpZp/L1CLTOX/CiDE5oSMDd4aR0zD97fL6k9W/rdFLs5PhYRyik1LvcR
+od/uYzc8JOb0fIJKNvcn
+=+z1n
+-----END PGP SIGNATURE-----
diff --git a/dev/python/twisted/Twisted.SlackBuild b/dev/python/twisted/Twisted.SlackBuild
index 6c789b30..eab52877 100644
--- a/dev/python/twisted/Twisted.SlackBuild
+++ b/dev/python/twisted/Twisted.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for Twisted, by Rudson R. Alves
-# requires: glibc-solibs python zope.interface 
-# tested: Twisted-8.1.0
+# requires:  
+# tested: Twisted-8.2.0
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="Twisted"
 PKG_NAME="Twisted"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=8.1.0}
+SRC_VERSION=${VERSION:=8.2.0}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="dev/python/twisted"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j7"}
 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
@@ -78,12 +81,78 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.bz2"
-URL="http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/$SRC"
+URL="http://tmrc.mit.edu/mirror/twisted/Twisted/8.2/$SRC"
 
 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
@@ -142,7 +211,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