3 files changed, 101 insertions, 7 deletions
diff --git a/dev/python/numpy/Manifest b/dev/python/numpy/Manifest
new file mode 100644
index 00000000..945a8b39
--- /dev/null
+++ b/dev/python/numpy/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST numpy-1.0.4.tar.gz 1547541 MD5 8f011e9d7697da570efaac61c51725e0 RMD160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5 SHA1 9a1f09358c3310cf990eecd06dc2eb54aec78321 SHA256 b993ecc060aa2bdca9a45a552f4ea77d96959ce0f429d5f9019e05738d68c9bd SHA512 97d1631639afa248d5ecdc213264dc150a78a5cd7a7c146b34b221e6d538ea513a653e208dfb454787d2ee713b6fd9e406daef555d08e18493a6ad9904eca5e2
+DIST numpy-1.3.0.tar.gz 1995868 MD5 3f7773ff0971a5ebb8591536d8ec7bd6 RMD160 a75155d2014204e16c59857b92356353505c39b9 SHA1 c04998a1fbf7d990c9a2b99a7b62486012c570ac SHA256 7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d SHA512 f52027b5e9411a60d98376d9f2f12eb0afa9dc0414abd5b2d95c757e1f154cb1eb0804c4bf4a313c90ae228d61393d2f995728c10721f39a38b0aa64a6bccac6
+MKBUILD numpy.mkbuild 4453 MD5 b59b12bb41dffad1facf3881b70f4c40 RMD160 ac198d0d20c1bc5ef421622a78f8505f7d206abc SHA1 b95ecda53f5dd38795cb97b76e63d9071311e8f0 SHA256 48c66aa400902ec86699165a6f33e6fdc644008df17c17f6c424f78919cbf28b SHA512 30abac16e3d2491f7faf4266465dc9c84782e487dff950cdef95d502b611eb90a6cb6481212f8305b34b6e5188889ce3db7acf719725b46a2b96b9970789905f
+SLACK-REQUIRED slack-required 76 MD5 be7600d3d2486e1db43fc328218625dd RMD160 6e9a735c86aeeaf29adb3ab95d52032e1988ddd9 SHA1 8aa80197fa133e1794bdd0a58353f830ba6a4cc8 SHA256 080dda42d596aee9f388853234a837072473da5e823171fdfa55ef4516f914fa SHA512 9b27ded2a98cc178b1367e82508a7e3b2a7002b2322f068f4aeb62c2cb0902f62862bc026475526ff754746ea28cc005f7140d79d864a97b42c848aab90f2f67
+SLACKBUILD numpy.SlackBuild 6879 MD5 d3bdfdc13afc6927336b0a9efd86766b RMD160 ad5484b83ed48b12ba606fe9be1dad5e4ed8f157 SHA1 ee71ea090c121d7ea0f55d6349d42ad84132dcae SHA256 a80ff137458c95bc33f316e7c8ff01dc8e16b5da0c8856cf3626aea11a3690d5 SHA512 b77886bb318efb080a2930f486074774c40b2d5763b890a7b18e1d13a6915510076d2883fe6440f4924125e2cf832dc1e29b4eddf22c1577872815069497b462
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ+1FiAAoJEEHL93ESzgeiNjMP/1gyPRdK/xiUryMs8NWDwRqw
+0iQNdJt8DMshPqJNQCcUSRpFeHp6meAJjSKP+1X3c7FKm1a1aSdu9q9vJhohrpSq
+cl1ZR8uf8edkx8s9IcLEahO8L80Y2vhckIrK+e8l3ss5wCfcf6oIJaw1NlNBHLhB
+JghbXFr/4nKJfCi8SqByFrHGqq0eHtPZ9i6paDP40Z9eQo8voLYhj8iBHG5iC7eG
+xiC4V16St6yieHg2rs8CVq1MJNQxLJPJjyiKeehEDRnsU2/+l56FIetBSTuk9m2y
+Q7RjNO1BqlVMy99kTkFO3nHngRWaBTGKGmV8R2rQ4cpQoV17dcapJ6J7KWQPE9N5
+lnW1tdYEozz6eRL1mgp3FR0puNBNKw8L8+DdTghA7fCFG2vvMuz3wu0c3cPpauB3
+T921Gh8oTs8sYJiBiT6XSU9qijrJS5iA2sJnS7dd5PwJyNdmkTnKiayneFwaiJI0
+9cOV4Awy1/OrkcRE0xczQLQCHkqpjP+ouU4Zrfk4E43rtRqDPTvthfYDYIL+awDn
+fnhRRaljdmyN0hUaeiWMDjRbQJxzOPcUmJDdJxvLguCDtPdzhu6hjg4pD6aGzmax
+a92T6FF5J6z/6d/GRa46ESm18fEXdYFuJkwg0eZEYSMZbjB7wyCWdlCl3xU20Fbk
+iH4+DpbsSF+OqiTsrK8w
+=RhZB
+-----END PGP SIGNATURE-----
diff --git a/dev/python/numpy/numpy.SlackBuild b/dev/python/numpy/numpy.SlackBuild
index 7009dec7..d753b59c 100755
--- a/dev/python/numpy/numpy.SlackBuild
+++ b/dev/python/numpy/numpy.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for numpy, by Rudson R. Alves
-# requires: python lapack 
-# tested: numpy-1.0.4
+# requires:  
+# tested: numpy-1.3.0
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="numpy"
 PKG_NAME="numpy"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.0.4}
+SRC_VERSION=${VERSION:=1.3.0}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1srv}
 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/numpy"}
 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
@@ -145,7 +214,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
diff --git a/dev/python/numpy/slack-required b/dev/python/numpy/slack-required
index a8ce98af..28dc4159 100644
--- a/dev/python/numpy/slack-required
+++ b/dev/python/numpy/slack-required
@@ -1,5 +1,4 @@
 # Dependency list to numpy
 #
 # dependency [condition] [version]]
-python				
 lapack