From 66c9336ba7824adaa53422f7029e39f7ad1aae47 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>
Date: Fri, 1 May 2009 18:39:03 +0000
Subject: qjackctl: updating to 0.3.4; duplicity: updating to 0.5.16

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2181 370017ae-e619-0410-ac65-c121f96126d4
---
 media/sound/qjackctl/Manifest            | 24 ++++++++
 media/sound/qjackctl/qjackctl.SlackBuild | 99 ++++++++++++++++++++++++++------
 media/sound/qjackctl/slack-required      |  1 +
 3 files changed, 106 insertions(+), 18 deletions(-)
 create mode 100644 media/sound/qjackctl/Manifest

(limited to 'media')

diff --git a/media/sound/qjackctl/Manifest b/media/sound/qjackctl/Manifest
new file mode 100644
index 00000000..86ab531e
--- /dev/null
+++ b/media/sound/qjackctl/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST qjackctl-0.3.4.tar.gz 343617 MD5 65736e83650468256ba22aa5d35fd0cb RMD160 1ab208e0c0f4e68c58b048a32d05ca3d47dfaca8 SHA1 33aa986c81b0cc6891c9c6cef6366470394d3eb6 SHA256 7b5fc1d359e30d0f739836af92d9b3336a99e9ccb029d0c0f75ba250ed8ddfde SHA512 a31e32ba1286fe6d4136ca3fb5c03b48aa9905fe507d8a29ee52110ebd8ccb585040b8c1af4816b896fdcb12e54df6ac0413a0ac9688f1857f32283d218e98fe
+MKBUILD qjackctl.mkbuild 2802 MD5 3cbde14e61616bc0996fbc36b683c7f5 RMD160 a652bd83247dc653fde7dd87b8d90f7064cfc60e SHA1 e5205f5ed656fed33df40427954d658ea0dce773 SHA256 494a3471c9b3291ac5e194286b5045e3abd19afb27ea9695dd4f3f7d927d7066 SHA512 e9e60fdaac8783ffca03485474396fd53d6474dd48bc8c5f0042c6c26ae7c3dcc4685da578384d3a8bf664d34cb0b1b249a97018def591b8e219b4cbc9513e19
+SLACK-REQUIRED slack-required 85 MD5 a110aa3d2b0a9a10a93f769a85a591d1 RMD160 4450f52a01e8cbfeab7c4813d9f0ecf3b9a798b1 SHA1 57d729ffaf862c111c90b1531ca7187cc74ecbdf SHA256 34e4953fdb6826ab78f9b8d451337abfdcaff91b3c83c7d78f775c152864ffe0 SHA512 eae7e57f3161956efd5a66560172d348823cc178e49c990c87ed3402af1d43cfc7aa89196968231bf943de7667a74d4890d943bd200f3bf308316c5b171c70b1
+SLACKBUILD qjackctl.SlackBuild 8125 MD5 b96ba5583b3e40c8dadadbf17048c463 RMD160 4416663d441f94e0e04b422504b5c27e5b1adb72 SHA1 9277bd73251adf5e573d007a58a48407082a607b SHA256 2203f247bdfa0f21298793d6ce1e41bb8a76e238d409474ea24e217fe569b0af SHA512 8b345e3dfdd3a0991afe0eaa8e7ce2919a8aab4fecf8fe1dd394f5e846058ada45d8f4db66d3fd46e7678f6ca1ce9db98664411fccc2a800ec089cd65ca27824
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ+y44AAoJEEHL93ESzgeifAIP+gI7m/T9M45lbwOP/UKDqcgl
+w+jF3Axm721MUYUv9IMYWiQH8QGQXHKhyKZTThP/OY633ldJk3RLevVB+e0sxOmT
+JuyuaBwUtf8VfPa8GvA4BRN427GU7bjpdwZ9ED9KPo6n0mbCXr9BNMqXUyNjPTYi
+WuaeB1nkctIYvJP4tXbibOVLPgNHAzRqm8j6us4hfbjyA0Ssar5OXg+o8QGOv7ZM
+PIma4Ec4PLhKR4zfiH7uCoUYfcLFzRgGwLXxZGU6Kh2BqleWRJUeB06OuSVu2ZeB
+gOYsrWDZwj/HTvOI0yBi7GgrEK73seW2bamFeruCf+ubGsJVlu9VAp7Sg+NNGXd3
+EDx/0ke9x/B1imxa4EidhlWhrbY3d5FaWtPTXJM87lsWpD2a0OGm2ykstvf/HplX
+B5rvIZzb/q7FX0G/3+vsDxUyWKmVNKyT4zmQEa5wLandgx2nD0DBmCfgclBEaN+E
+hA/G8giq9mQTS9NVzsE2nJI+ECmmLC8Dx70ykkZlvuVdRQ6y9uNFPDYWmaKBrU/r
+0N0FV/Uwy7CDJ/iCu19lNNPmgc/RDCMhoMA8zUERS2WakxR3L4FrILgpm2q5ydfj
+JCDEzHb59quLfDrm/uqlEqVyctNmv8x2DSqhhdr55HT/96idUDZMGJmC+sAbAZsF
+VsauOXYzXllXWNHcgnhx
+=foi1
+-----END PGP SIGNATURE-----
diff --git a/media/sound/qjackctl/qjackctl.SlackBuild b/media/sound/qjackctl/qjackctl.SlackBuild
index 24afb497..d923dc60 100755
--- a/media/sound/qjackctl/qjackctl.SlackBuild
+++ b/media/sound/qjackctl/qjackctl.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for qjackctl, by Silvio Rhatto
-# requires: jack 
-# tested: qjackctl-0.2.23
+# requires:  
+# tested: qjackctl-0.3.4
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="qjackctl"
 PKG_NAME="qjackctl"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.2.23}
+SRC_VERSION=${VERSION:=0.3.4}
 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:="media/sound/qjackctl"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc"}
@@ -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
@@ -91,10 +160,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
@@ -103,15 +173,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
@@ -119,8 +181,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" \
@@ -183,7 +245,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/media/sound/qjackctl/slack-required b/media/sound/qjackctl/slack-required
index 405e3b6d..ce3f9107 100644
--- a/media/sound/qjackctl/slack-required
+++ b/media/sound/qjackctl/slack-required
@@ -2,3 +2,4 @@
 #
 # dependency [condition] [version]]
 jack				
+qt4				
-- 
cgit v1.2.3