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, 101 insertions, 6 deletions

diff --git a/dev/python/nevow/Manifest b/dev/python/nevow/Manifest
new file mode 100644
index 00000000..dc0aca5e
--- /dev/null
+++ b/dev/python/nevow/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST Nevow-0.9.31.tar.gz?format=raw 505637 MD5 ca4c6196a71140122018a1334faa0f06 RMD160 4a178b4836628a394fe7fa4b648bcb0d2bfd4f98 SHA1 2e8fcd58a50108ebbbf365fdea93335191285fbd SHA256 b6377fe3727032c29182afc6d1e07e0b63262e989434513dc3c9385d1af072d7 SHA512 055c21ece307f2255c4a2bcd6cba055f70fd86af47543e7164a1b45177d97211c98d5f337a67c7195dd0cd3021ab285d4c2b8a6f8c82cdd2eae3adc993242315
+DIST Nevow-0.9.32.tar.gz?format=raw 530459 MD5 75828090af2b26f69fe4a7f148a400f6 RMD160 a86b3c6e122c1cddad0a4d07a17564ceb9cc19a0 SHA1 e3a96fcdbf2f3d0292ee6d170974cdb16a35788c SHA256 bc35ce187481db91f047055b3edbce49c14d291b1a2eb3e915e9c1c511620f9a SHA512 235ba0a18970dc74177e82416513546cc2299bff6bf61d422b69057e056efc03680988eb544e59f0929849facc161872b210938734cd36f8f22baf7e30153f46
+MKBUILD Nevow.mkbuild 3012 MD5 8972b2990e1142d94e4a1c605a00f31d RMD160 9c0496408fc0e36cc4c24d9cc8b3ee66f52ba454 SHA1 683c4089ec6b71d902c938ae383ec4282ec62042 SHA256 5658d8a30e46b98deb24bc62f48fb87c6d17ec4cf5ed56ccc6a47add85fdb80c SHA512 880462128b760c8e942001a95a6777e9df93e191caf0f540a3b0f96c1a8d1ecbac4a344a1940cbc44f394e2c4468740fe2b8e94270ed7ffe905e10f53ae49b65
+SLACK-REQUIRED slack-required 77 MD5 96fe657236330e7efb68b4b64e683d18 RMD160 007474a8c479a2e4bc3ff4330be9aeae63a7743c SHA1 460b1a0f7fc15e25908ca694ac4d09d55e674d59 SHA256 c801883906454754b2d8198d3f3e01b307c9b05e56b76062e5dbd494725358fc SHA512 af7543c88df9ad85188a93ebd2949fedc379f61622051ebe8fadb046507249b45e13f348ae9bae910c5d5af9cf1d7c5eec1d7e887d7c74c75b2f294e224045f5
+SLACKBUILD Nevow.SlackBuild 7030 MD5 3ef693110458eb19f3f7ba13e34bd412 RMD160 a0b9985e39c94307c3a718b01127cfa193d77dc9 SHA1 f9478f352a85af58fc349785428fffebb31004eb SHA256 975dad7c5a5bba21a333685d304a47825290b764ff69606bf6b53c38bb00c153 SHA512 09ca61f99ea83fca8e6e7e52667101ecd26cb9f3108f74e98ab073fd4d61f5eeee5c99fe77e34f1dea77d63c83ef438b349d8d89f698842da5bda4df69a78a2e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ+xCOAAoJEEHL93ESzgeiRK8QALVre+bsW8xYaRrtrbCiu40+
+kP7lQVzBh1Sr11ijzpYuG8b0XTE4ScbLWOc0ZSLojpJfUCotSBeCLZgkFZTQg4/l
+/U5EQXZ4HmLIjJ4EWI4WPEFggzHeLsCN9+7ugIvo0xhxu3RpP/tNhE6py6wh/fOo
+6LTQdZfAB1xYCOeTEqqP4NiAANuvoVRGwPEwOvPhqM5vLMW7P6ZW04WGy8L2V+Ry
+PqrgjtzjJmtom7aLi6x6qrl/kbmpjGtMLAegAcEuaaXgdQKT+Xo2vB2wqrMXPe6R
+LTQvXRnWA/J43/69HYLW2YQFyhi0mPIKedpTLMW6a6RYoj2roYOAsy1M1B1w4cen
+BRseONhr87qzChoiOkjz/p48zL46hf+99u9TwOlmRtuv9zPx9BZnifgHxaqSEDkg
+hS0ItFEJ2iNhILoFNz+ho00YS+OMhNmbGXypD11gTxltjk+kzG9Su1bfhY4OtOuj
+/fLpFiCf3x5X80QvSf6CUU/VelveBoKefmPojxfhNeYPWwFXLMPR6i9uoDN9UsBh
+xwlvPPvCUEB67IpDbcMWamz5IPXAnVj+qMCDIqZclgV1k4uhct/JzBFgkaqyhYF7
+96u+yoAlH0X2AafpSgDzUwa+EtX50EtzaT07RGAstVvnI+OZEN1v0lokELyzqf6r
+10DPaiehHJ8EPt9N6TEJ
+=mQQJ
+-----END PGP SIGNATURE-----
diff --git a/dev/python/nevow/Nevow.SlackBuild b/dev/python/nevow/Nevow.SlackBuild
index f922522a..b13408ed 100755
--- a/dev/python/nevow/Nevow.SlackBuild
+++ b/dev/python/nevow/Nevow.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for Nevow, by Silvio Rhatto
-# requires: 
-# tested: Nevow-0.9.31
+# requires:  
+# tested: Nevow-0.9.32
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="Nevow"
 PKG_NAME="Nevow"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.9.31}
+SRC_VERSION=${VERSION:=0.9.32}
 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/python/Nevow"}
 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
@@ -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