jack-rack: adding manifest

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

2 files changed, 103 insertions, 16 deletions

diff --git a/media/sound/jack-rack/Manifest b/media/sound/jack-rack/Manifest
new file mode 100644
index 00000000..fcd0ab93
--- /dev/null
+++ b/media/sound/jack-rack/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST jack-rack-1.4.7.tar.bz2 269478 MD5 a29ef4001ee2916a1b758952c936adca RMD160 62fcef8d550ce77b241ba15dc249045c3fcfd2d9 SHA1 42e0e1b9b42db3249d565c5458f585f16b39974f SHA256 85808713edf7ad8da5f65fa35ee8a4084483213692291dd9654fb1f8525fb1d2 SHA512 f037a54ab5cc2670c716384d643310679eccb42ae248f2b9dc75a40cd38bb865e968d3c90a19c9a76c7a4668aa6e3b9657a648a27261c02e6313174e8ce12774
+MKBUILD jack-rack.mkbuild 2914 MD5 0e1effa419773204212351fc92987c3a RMD160 f764a107006166f8a9a08bb2032f9cff94b615b4 SHA1 02d735fe12c8605c00dd3b49476870ca5cb63386 SHA256 238b6d43bda8767c773cfbb72e9129cc8f6007adc656f5f279154b165128864a SHA512 9cc751eb068ec9602d7f3e331708e69133841a06d0bc0641558c8b3d4b0461133c2ca5e777678168a5123ff03ae86f7cdeb757e8c948f8fb22202a66c9816a6b
+SLACK-REQUIRED slack-required 89 MD5 f851cb23b2bb0b23fca27f81f3502acb RMD160 e53414e30561e048b3ed726398409e268f7adda1 SHA1 5b3ddcf3b518841fc9e21c017497c55acef1d3a5 SHA256 80a333abb24fe0bfdd9810908f7d61fce6b14b60c4e4231c9be8953b2a5a8268 SHA512 aa47ef381acddfb638ea869d70e35f591e6a3dff66fa7517de69531f8badb40b02df003c1da5e0a36f7a26a7dde513167ef3362d0d5de29e7aa176540e76ee84
+SLACKBUILD jack-rack.SlackBuild 9654 MD5 d82a182d3b4c58b9ad061b97d0eb11c1 RMD160 9b7f81393c8df980583d7995ae729307c834b725 SHA1 9813b2fc555983a117c381c740e954264462f50d SHA256 c77f9288ab2fa7e8d3e0cf65f0bae82334c81439c89bbd15ee473701ce8ff6f2 SHA512 60e9bc01a1ac868430c4b8474ed74dd9dca88fe0db8eefba6a46282a021ee93d26de03ad8e8d111305299895482f3556faefac7a193950469f833d1c2d393a3d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJuTn/AAoJEEHL93ESzgeiblMQAIOSBUTwuQij80/bkqlh4a5W
+Kadj6p/RZbMEKMs3Lo8wY2+gvsJuTbcd6/XwOHalWcag2BrhP81t6V8OGqREF5Tz
+T756TLfopMF6YjrUClBv4qDH7xoB7h50ztEs1sdFnuC/Ymjy3G14nyRRhKqq/OKv
+dhETUKNHnJuSl18fyiG5YvX92Lrn0wQM/1MjVe1cAJZHRPhXtrD2iEt8IgqveXOz
+Yn5BCXJ6vlAKkAM4ZLdfBwGITmy87bcFrcVgwRbn5qVC3lHoWDHWdzBCPdSLmEdz
+J1VO1JrgKV8+T77MQioRphFWZzxDxzhMbioKEyOQY4dFl2HAt3C5d6HT39aH7mMo
+MIICnhmPAgN2J4dYrJD2RN42JnX07zPQYdcG8C89cNTit0iyhotxjC9a5CG38KOk
+KU9DXGQy6MClWEkD1qpIEXq3ueJECj2JUe+mXEGISzF1PEoL4HH9puuuK9P4rjtr
+z2VRxdu0hnxNd750y5qYEwOB33Jjc/TyVcNI0OmudXRnjqt3FTTA9G1qTC6c+3yw
+lcRrFTzK9fSdqhgLhf4AdWYbSX+E6caO0BzFy4zuGKYAZFmFhl6hClqcoIAoOAUy
+ge9ytv7RWm3WC9W/aPTzTYVfK6iaHhnyTSRTtOJi6Cl8xQI5FZgTs+J31x2WMoeG
+2PMxwY3HyXm5NH2KYbCw
+=hXrg
+-----END PGP SIGNATURE-----
diff --git a/media/sound/jack-rack/jack-rack.SlackBuild b/media/sound/jack-rack/jack-rack.SlackBuild
index 43891fa6..df317db5 100755
--- a/media/sound/jack-rack/jack-rack.SlackBuild
+++ b/media/sound/jack-rack/jack-rack.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for jack-rack, by Silvio Rhatto
-# requires: jack ladspa 
+# requires:  
 # tested: jack-rack-1.4.7
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # 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:="media/sound/jack-rack"}
 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
@@ -128,6 +131,72 @@ echo Checking $SRC_DIR/$SRC with gpg using $SRC_DIR/$SIGNATURE...
 gpg --verify "$SRC_DIR/$SIGNATURE" "$SRC_DIR/$SRC" || exit $ERROR_GPG
 echo Success.
 
+# 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
@@ -135,10 +204,11 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Patch source
-patches="
+patches=" [[PATCH URLS]]
          $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
          $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
 for patch in $patches; do
+  patch="`basename $patch`"
   if [ -f "$CWD/$patch" ]; then
     patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
   elif [ -f "$CWD/patches/$patch" ]; then
@@ -147,15 +217,7 @@ for patch in $patches; do
     gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
   elif [ -f "$CWD/patches/$patch.gz" ]; then
     gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
-  fi
-done
-
-if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
-  for patch_url in [[PATCH URLS]]; do
-    patch="`basename $patch_url`"
-    if [ ! -s "$SRC_DIR/$patch" ]; then
-      wget "$patch_url" -O "$SRC_DIR/$patch" || exit $ERROR_WGET
-    fi
+  elif [ -f "$SRC_DIR/$patch" ]; then
     if [ "`basename $patch .gz`" != "$patch" ]; then
       gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
     elif [ "`basename $patch .bz2`" != "$patch" ]; then
@@ -163,8 +225,8 @@ if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
     else
       patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
     fi
-  done
-fi
+  fi
+done
 
 # Configure
 CFLAGS="$SLKCFLAGS" \
@@ -227,7 +289,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