2 files changed, 101 insertions, 6 deletions
diff --git a/dev/python/simplejson/Manifest b/dev/python/simplejson/Manifest
new file mode 100644
index 00000000..7a2a507f
--- /dev/null
+++ b/dev/python/simplejson/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST simplejson-2.0.4.tar.gz 111781 MD5 9a888ea017ef2fcd42a2823454950b16 RMD160 c67dffc46b59b494530dd01447597e5b20a10e51 SHA1 bf339dd0e93df34b72f81702902cfd29d9b31a68 SHA256 1b6868ab49a15519eb54fbb0901272a612b2c2a3d8820844df6b1b7fc19754f9 SHA512 e4a01a1ba23c754836044cfbbaaf6c7fa0be6975d7e9465910ced48737b2fd9263913deb18002d502de1321b04bdcafd6f7eb5191d4cfe5cf3d96d9834ecb777
+DIST simplejson-2.0.9.tar.gz 115443 MD5 af5e67a39ca3408563411d357e6d5e47 RMD160 814a0b7aa11a361ba5eda0be93e30505c44409ad SHA1 b5b26059adbe677b06c299bed30557fcb0c7df8c SHA256 abcdf460778beff48ba13faf5b5810cf3803e5c8d872b5fc529226aa56ec93ee SHA512 31a63a05b6215412cfbc42256f376f20c762f99c40b72b184cc3ee4e50a047cdfd21e70f6cfff784fc3bb72352bb5f4115cb7e1f95f32b5aa6d5d363ae963f46
+MKBUILD simplejson.mkbuild 2750 MD5 034b6050b502a322ca19e473decf4fa2 RMD160 7d681698a245847ce674de3d9bab670880e7bc9b SHA1 5d59d5a15ff5f0fc5a3cb2371b4e0ea17f489e3f SHA256 febe3661a62eaa8607efba24aea91c4aa3c7d7e1eb2a82ee27e165b5d9eefb64 SHA512 97b7e732b8065dfbebd1527d0ae9983c757965c7b5b123e88ff0b25ac9c4b8bd9512aa0cc1c93a91757ffc30030e18c1b35144aea1bec99d4d877843e559b752
+SLACK-REQUIRED slack-required 85 MD5 3d41e03668e89867d50aec1fc5058b4d RMD160 6c7056e126ec640ca8d6f8e933ea94799557f9ce SHA1 0b9b8c1a0a47fcb65645877969207f47c8af2f9a SHA256 bb06841db9b4789a611310302e05ad0f18430075aa69290d9249a5f7aada6d0e SHA512 3f637f299b0d02a9b2b1aac39866f2c58c48c17d099b58790277a2efa47b65c3b5abb5343fb9723bc8b4ed79c1b2c91f4d131f1d7c8a59a01c8da37fefade405
+SLACKBUILD simplejson.SlackBuild 7028 MD5 80cb998ad4837a7e87818a1432e661cf RMD160 d9cca8fa0d37eeec0b2a847eda54ce7a3a8b7371 SHA1 5fa39e2bc298f206739fdb84be8abd1071642f0e SHA256 4713e5612828ea1100dec907b1c6af5121361239343fe720226b52646b72e7c0 SHA512 477df3946bd39415a82d56858acf7acf136fa6176b9df9ea0c33eb63ec023cbb3383060b8922b370125c526d1fcebff36ecc47c488d3f80c2f877b4d705cb3e4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ+wy7AAoJEEHL93ESzgeiCzMQAKSdq3MjLMMkygAECIyovs5x
+0+FhK6yp758ET5wEol0iVxZ+wSFwloSCVJYKygAvhbfoPBAZZONQ+jgLhNsrcmlf
+h3WlRLynLiUYHbjGTbCfYuANvgtJrC6X1Wk+epzIH+9XiZoWrX/U6JJXvR1dEN1/
+m/Fv7/RZbOMBzIrRkBZEGa7MaGwJi7JzJ5Bt2F7ox1JoeGUAAL3Tl/x6R7mObXGe
+axAxee3SwdzL5KgrgkQSagZV8t8ZQffjrKhzoa0R+3tNZiDHZ1Z1Cxd0yg9zSKtk
+GiGmbXgTC+X7m8h+u0LOBhi9MHf0r8gpY4GiGkDqbN6skphFgXlA7+ENjO6AxiFJ
+GGvCEGhqRavFBij4JuJyp2xmImf+sPYk1GochbCZcG1JOCPLil6XoWTaPBRCYVw4
+GJrDheqCBnQnoYDfFNGsxYam+6/xryMOqZPEt3X8WNInxTRZzRtmGI9gpmMymQV5
+Xa6BCMgB8/hZ93at9JnbooJ5iG8OB5bzPt8v3qdI6BOu+B8pSFxtbjF6GOQNoAVZ
+1nakdGOvOrrf2ecRL1HEehP2eHSWfDWiIxe/K8EKrHDSJJ9uukJZzSVJC+i9li97
+Pa+zYkM4UruY+VXCBnk5Kd3e1D31ICQB5ABkMji6N0T6zPDhQzjK9GJ/eSPgwSIu
+4gyj5A1qK3k553znbhZl
+=Vqkv
+-----END PGP SIGNATURE-----
diff --git a/dev/python/simplejson/simplejson.SlackBuild b/dev/python/simplejson/simplejson.SlackBuild
index 3acb6b3b..2d6f1596 100755
--- a/dev/python/simplejson/simplejson.SlackBuild
+++ b/dev/python/simplejson/simplejson.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for simplejson, by Silvio Rhatto
-# requires: setuptools 
-# tested: simplejson-2.0.4
+# requires:  
+# tested: simplejson-2.0.9
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="simplejson"
 PKG_NAME="simplejson"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.0.4}
+SRC_VERSION=${VERSION:=2.0.9}
 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/simplejson"}
 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