tahoe: updating tahoe and dependencies

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

2 files changed, 97 insertions, 4 deletions

diff --git a/net/zope/zope.interface/Manifest b/net/zope/zope.interface/Manifest
new file mode 100644
index 00000000..577fefdf
--- /dev/null
+++ b/net/zope/zope.interface/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST zope.interface-3.3.0.tar.gz 104204 MD5 93668855e37b4691c5c956665c33392c RMD160 e44ad35c94e517130cb3dd951f9a637e9407cb1c SHA1 6a5cdb2c03c9dfbaec51b243a4eb8328909f7e30 SHA256 c049ef6f0748a2db26c7d01de1566e52f048e5fa6fbbb8da90c43e55597a5075 SHA512 4e5979874fd0cc32e0d83ba8d914a29422130d9a15a499559c8b3594ee709f6401c1e98ce1d771c9e0f26379ce38068183516a40a41f9e197ea6e7951ef8d437
+MKBUILD zope.interface.mkbuild 2605 MD5 ac40fcce266e487584ecb2e68d792bc8 RMD160 c2679780c410da318db3d74c46615b98335e809d SHA1 2a39edc4ad5f161ce1d8d32cb69e72e652c38067 SHA256 fc2964d5c422f6859a27f90fdc0ce47baef2e5a59f6d1db4cb4748ca89cabebf SHA512 f2ecf898543e9bcade9bc3a2205ffb60754aebd0e80c0dee830547d6b5be817c6d224cb9afb683918811077d0af832e203459c4f473b4f23df69c106c94efac4
+SLACKBUILD zope.interface.SlackBuild 6827 MD5 faaeb9b166f561cbc88feb0337dd8692 RMD160 1995ffaa721a44296aabdc108f05c5f29ef4fabe SHA1 61129f202af66bafbbe9e61b88ea88d7f8af91a4 SHA256 98cf1183ae9501c13bc70de31cb81de7f7f70243b9191300f9ced12979bd917d SHA512 8656dfc8cb3746f6853fb58d1b6ecc320023d67ec2b4e6bb19d73e1a5ae7b7a2d49b38b607e499cc482437d9cda6b39ecbd7b665e6251b7befcac286478ef423
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ+w5hAAoJEEHL93ESzgeiF40P/0SA/AqrW+b6EgIzgx+X0LXX
+xOKjrhEo1nB8JnrvQd7jgfn+7JR1/S8rbZ5cuAwjMYxyF5YBThzsmeeUeFlZvf82
+Gg29udHDcYCd005iv9wMG+nujuQSoEn/D44Mu5gYEPn25ly/0kb/3Vgu1tV8cq/t
+7NlB4crZe2VFdUUTZzxr/zpj3QgekFpY1jvGCdXY5dplecv3YtH6fPyyWmCheRoG
+pYZ20lN3uj4qOjfWLl9aWzNNMBIqtTE09uLmu+0Di3JAx+jiUvMbX5OoMmTWp+UZ
+M0NSEDtateGJl4zlPq/avfE2sL4+YNwm+jEZfMOgvw1yX+XqDPBCjZVthBUhj2JP
+42HJXnSZmumAd2nnC+OPQZZO48//dSESUAN9eKxi2FsmkHZNNwSlLAxLd8M9JBT1
+9bqOenvaE62yZnSu+pJFqaMJj6b9usmE3pA7onzFknRb7ckRrzztBPLrkTJj7vcN
+VSM3NBEXpOqj9yivH62rcxNwOT4XSi1wV4vHVCI4nG6qd3kpUozmaJa5m5/GhPKl
+hgZtpPD5hpPvgdBHT9M3u1Lm6T9N+uNKeuJ1W5FIBCv4hpMv27oA7j3ovW1LzwPQ
+CQE0EIPoelZ6gCXaMr3wBEytMTWBLbKFw97ycEwMhHyD4M4jSrYr0RggsIo42Hsn
+YO0iFiPkWAYhuql2MXyY
+=1rsF
+-----END PGP SIGNATURE-----
diff --git a/net/zope/zope.interface/zope.interface.SlackBuild b/net/zope/zope.interface/zope.interface.SlackBuild
index 4daf23a9..609303ad 100755
--- a/net/zope/zope.interface/zope.interface.SlackBuild
+++ b/net/zope/zope.interface/zope.interface.SlackBuild
@@ -17,6 +17,7 @@
 # slackbuild for zope.interface, by Silvio Rhatto
 # requires:  
 # tested: zope.interface-3.3.0
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # 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:="net/zope/zope.interface"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
 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
@@ -84,6 +87,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 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
@@ -136,9 +205,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