2 files changed, 98 insertions, 4 deletions
diff --git a/dev/python/pysqlite/Manifest b/dev/python/pysqlite/Manifest
new file mode 100644
index 00000000..8b5a2b44
--- /dev/null
+++ b/dev/python/pysqlite/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST pysqlite-2.4.1.tar.gz 84996 MD5 7d9a4875a7107b94eb4aa2dc861a2537 RMD160 693f4d789388ef0456449d01b0d342aaf1990832 SHA1 03d2c52c65e017e657d852c0583aa39bb6563a73 SHA256 8240f1ac057e2e38982cc0a8a1299bd88c7b84ef144487f3c7c6e01a34f2c807 SHA512 9240ac97ca545313c9d6cbf50da2348a4e6d8cedea443ca75e72dcd1957e6cf99147a3ed3421a354da602bf63a1e102682802dc5105ec67514ec9a3be5ea6283
+MKBUILD pysqlite.mkbuild 2650 MD5 a9fdafb328bb93cf611b2112934931de RMD160 44152091cfb65b9af2afc17404968ee7b8f82948 SHA1 05120b15b200417cbadb71a1efaefaf9c856701f SHA256 c84e472c45187fd7d7cd02a86d6093fd73f8d96b124f53bbfe4bdbfa3a66e59e SHA512 abcf99767cfc898252b8772333ad3ec26af9f9f1c1112f14876aba73a0c2d5ee44a3fe815939ac194fab635ac16525ec9a2c7a95012c52e4cb0e2b88a7facd94
+SLACK-REQUIRED slack-required 79 MD5 eef00f70e247114c9fd8e85138ba1dbb RMD160 123f6e9e78a63952280b67ba707a3a1befd48851 SHA1 146fa1e84d6c93f5db5bd6e19bb62e2b953694e2 SHA256 5e9dbdb14a8184cc44b832a52a8c4131ad56d04ec3137b39430cc9c8eb3c954f SHA512 64e434b7139f4e072009125802e58dee72861d054f93ea46a1c7276e91fa82c94a1ab36421cc405074e9d5f221b71750b2a689e04a288df9f71587c3546f9709
+SLACKBUILD pysqlite.SlackBuild 6973 MD5 647a13b5e6020cf4d2516b79a43b0427 RMD160 8443b0e992413e3b95a1eb6adcb0c979220a0677 SHA1 75e0c1bdb7a837551568f754dc8385f2843a0559 SHA256 091a9d686969c7bc4baadd52ecf0931123f2dbfbcfd38ff3118aa008154d7d82 SHA512 cd38240c515d1fd131484a59af29840fa7f187c7c7f860086b19c604d5807172c140826f1c5e456288e5d4073e4ebe0391884b89b64a56eeeae2567a28be3bcb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ07y7AAoJEEHL93ESzgei0fEP/3IMS9HPrzYXaMwxtr5oc4x4
+8EunOkdBegpKGXkCiRZ4KkoOAOUmdfYPErum72bgV5FMpXQGztS6JEoIkl76FKJG
+3qK3tJwQB/l1D1nuUIAx12lHI/AEWHgGpoBM6RARIIjtCpeK6wqTwMYSladEquQY
+8LOLMntlp3MSwXHqdSoqoxmNQZ5xKXNo+htIHnljhufJ2xILclz3ybqnT7MeLP2t
+Ll5Fh/Zss5GieCBI+zrHV/Suysp3YlJllWyTbpyIMSVS9it1pYOWFRlRrItMB5CB
+aZnoOzBKrvoZuuJZkIYqy5YnEFo1LVmmbfnXC6R9nfAuuP0BUhRMObqv5pi6cXE3
+9lu3LHdU09K55jSJd6Hx+ifUTJLSIy/YJAIx98MEGqT+MClNR8H4+/gl7NvUWyuF
+XDxj4cyADYGIR603uXNGYiGRy6/RsqU+Ahk1q6PXJ8L2q2Wbn/eRfLmZGUL1tUxn
+A+qx/v8bVSSYXvyh2V4dPBWaeUdz4Zs7ZYnXTX+OGyxB5Zo9fxeNIs4gatzBf0N/
+kkzNUl8IdK1iUau4K4tx1+lWx2BLGFziQvyeTvRpXglfjeq29X9YIhfSMnTfr2T+
+SBEQQ9uuqlYdkhgMXFe7NxEhT2rJSf91E48EaGyhGGW/KRSLJSHd0y3UGPfJqlvg
+Ux/sfDPMprsMWjTztR4E
+=cdpk
+-----END PGP SIGNATURE-----
diff --git a/dev/python/pysqlite/pysqlite.SlackBuild b/dev/python/pysqlite/pysqlite.SlackBuild
index 0434c30f..7ee8fda5 100755
--- a/dev/python/pysqlite/pysqlite.SlackBuild
+++ b/dev/python/pysqlite/pysqlite.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for pysqlite, by Silvio Rhatto
-# requires: sqlite 
+# requires:  
 # tested: pysqlite-2.4.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:="dev/python/pysqlite"}
 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
@@ -144,7 +213,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