tahoe: updating dependencies

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

2 files changed, 97 insertions, 4 deletions

diff --git a/sci/libs/lapack/Manifest b/sci/libs/lapack/Manifest
new file mode 100644
index 00000000..87db12d5
--- /dev/null
+++ b/sci/libs/lapack/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST lapack.tgz 4792502 MD5 a3202a4f9e2f15ffd05d15dab4ac7857 RMD160 e8fabba2fdd944afbc02a83599cf45a0d721030d SHA1 c75223fdef3258c461370af5d2b889d580d7f38a SHA256 5825f83971157001fd4235514afe8ff5fc16e1c06b2e872e442c242efd6c166d SHA512 a89b88540f8e5b05b7c58e8e301a5068729ceb35fcb2143edfff1644458ff1a375e5185492cf116b50409fe0c17b51c253a2987f4df83e9f9c3968a4b77e5d97
+MKBUILD lapack.mkbuild 4823 MD5 e453dafab8313e000e3339e13f5b69fa RMD160 8175005aa824bd3bfca6d3a7766df933a66d38f6 SHA1 5e2844e1580903083661b7886fbe3e6ff8638045 SHA256 f774d7a8d42ea8f5d241f8daadbea178e160c303a76ad8b235b24be75f767ca7 SHA512 663998a129763b90102df2d23343263e550809a382f0276824b1df0c80655ecfbc7cb67ed386a88db0491c78f6cf6bb4c6a62d08931bdff71da539f1e3c99bc8
+SLACKBUILD lapack.SlackBuild 7083 MD5 10138b5bcad9e559d319e148e8446eff RMD160 28b6358145acc59f906a141d1465c125b71f64c2 SHA1 b7e5326cf41a1de277cbcd0f785c62feed781c54 SHA256 84bf3232ce4e7098c0c948910cf54387a15739b8fac372d775ed6c399c67ab89 SHA512 c75ae18bbd2ce85d542f03445810716a6bd42a7539060c7f8fb2d7a291eb6e48d7b9e5421354c782066ead6830f84db2f903a3b37026c78b3b817128d56d1fc1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ+0+nAAoJEEHL93ESzgeioM8QALmgolbKL+yBogLvkJwK68+y
+I+L2pBdFznOHQlVdoKkHD8aLKolDsQjcNNvBAGlK82ieW7vi9KVdKY4Ed4JpKRuc
+57/f1p2ERPQTiCnnldGbsSta4o598VPxTLx3P9wsrUB48ASZsdWGwHN7YuK54oCu
+111y8o0dIrGAqlhF3uCmiy3mSgeXM8Et/Xld/6RmlaEs/bqIq6gy91e5AVXnt14Y
+7HyWD+srKB2sL5W4XqvW9n2MVyhh8y5k0TU91wPMCXGMR0gXdB+NA2wBz8sXlkR7
+OVUc6SIayj3zaQJH0W7RINj4uMZOoUh66Js9ENL8Lz78j5OecuGt9hEFbBzGCAA8
+yjBTiCiNdSDJxMBS+ATJMMCkZJATQFYQyQKVQFlYYulkqL7yPnsRFww6m2vdcKr8
+Fw+EWPRHTG/ybdxMu4LPCyoWtFYPkNJUjvwezAM+4raEI5mFvwlwesHLN27a6E3g
+WS+O9gkAaxHISLuCSqN4/jEpaQjLi3ZjO7+B8QeAwoZoDXHN8C9HfJlASgOd4MIL
+0HkpoO7EYpLL43Di0NnLHxr9e6MB9vwZZyR+ujJ1agwAc3pRxrfqndTTTUavUEaa
+J0ef5iJE9lxhU3j+R5Py7EtrOYb7g4IFD53e6fsBRRNRqW5aTmtzPWQ8ADiiLWQ9
+rSYYb/BT1n8rsJaqWOP3
+=B0UR
+-----END PGP SIGNATURE-----
diff --git a/sci/libs/lapack/lapack.SlackBuild b/sci/libs/lapack/lapack.SlackBuild
index d68259ca..94b9645f 100644
--- a/sci/libs/lapack/lapack.SlackBuild
+++ b/sci/libs/lapack/lapack.SlackBuild
@@ -17,6 +17,7 @@
 # slackbuild for lapack, by Rudson R. Alves
 # requires:  
 # tested: lapack-3.1.1
+# 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:="sci/libs/lapack"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 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
@@ -152,9 +221,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