From 97a4064d0b54bdf015240f32d87d7ba8046d51ca Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>
Date: Wed, 25 Mar 2009 15:00:39 +0000
Subject: ekiga: updating ekiga (to 3.0.0) and its dependencies

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2124 370017ae-e619-0410-ac65-c121f96126d4
---
 gnome/base/gnome-keyring/Manifest                 | 24 +++++++
 gnome/base/gnome-keyring/gnome-keyring.SlackBuild | 78 +++++++++++++++++++++--
 2 files changed, 98 insertions(+), 4 deletions(-)
 create mode 100644 gnome/base/gnome-keyring/Manifest

(limited to 'gnome/base/gnome-keyring')

diff --git a/gnome/base/gnome-keyring/Manifest b/gnome/base/gnome-keyring/Manifest
new file mode 100644
index 00000000..873601a0
--- /dev/null
+++ b/gnome/base/gnome-keyring/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST gnome-keyring-2.22.3.tar.bz2 894308 MD5 f9e5cd9efac383076aaefc1086520656 RMD160 551f4a4d734e0196522be9276ae7e76110a96556 SHA1 0f52095590a684920cc683d1985ac66263702114 SHA256 1e14eed00d386763352896e540929760264885e1296ac11cfb8ca1c08dcea7f6 SHA512 4c0d16dab23a7152426c6621f233286c97269d15577a7031cd3ff201509c7f936650d8a933492f4968481c94a9f7a6feb96b36db47fdb610dd63984564c4f70c
+MKBUILD gnome-keyring.mkbuild 4453 MD5 09a499f7b10b242b43204d3207dd3dc3 RMD160 3666b8bf3544fccc93797410b57cca4e5065505c SHA1 2c59dba2b42381abca7cea318720b6c49f815676 SHA256 c9cbad9cf41458ec27980b10bb96e036b000496ab48a9e46aef20e7fe5ddba5a SHA512 dc897799f59050b946affac8fd701e69fa99bef96a6466cbb345ea16578f90eb294700ba58779a2a8cc432d3d71469d79b4fc59fdf82b91dea2ef97c78e67983
+SLACK-REQUIRED slack-required 109 MD5 822d8cf1736e9f2399afe433d3808050 RMD160 0c7752e0b040d5f9d1395fc478b945bbda61571f SHA1 1b3e732d845c3d8d3292c71979fc0049c415fbe7 SHA256 de234d75bdc0de6a5e645d49b3740cf715050e5a5a8eaa404f56405e8718fcdb SHA512 797a10478cdf4b7275df98a2472af1bd4806dbf490af7476a627ef07d1a022a85deefccc4d8b54b9729fe4d3452cc3b5b32123d8c647679423457ee779a2d637
+SLACKBUILD gnome-keyring.SlackBuild 7270 MD5 dc8c77877e5f612b9c870d4d902443d2 RMD160 2f75d42437678917fa66449147404265743e8d88 SHA1 61de0a83b587160f766b1d6d7ddeb2117a60b811 SHA256 631117de94cffb5be96c977a3a9d84ffd277413d8538ed1b993b3ab52abd1079 SHA512 f9b0334bcb92dea8290ff239bedeff2a9b57fdfa8ae29e7c0d6262975cd395b9f7cc35ae7719588b92f1b8e8561cbb4416a7ab324debc866935b9526858fcaac
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyZJ5AAoJEEHL93ESzgeiJswQAIqygHtIUeKtMnHgpzvF4i2g
+CBW/9BXievdgiUt3SrvX0lAOgtObXYFVzl6xLp12Qn1uXtfTdkbKLoLcdg4B7F5A
+DboIX5v3KAT46ul0Cnab/osrWyU8Nn02dD4a8cRmm8OrFtIuMhAXlk2PNzBCy7nF
+sa8p9Bq4rN+7XCDXAP9CiEOzBwHahpKb7RDbunho0raqOKrVeOOCTATSalVIFJQ4
+kFaQKtRglVOUoayxsFpq+Y374VC0zy5UlCV7dCdyiQY9vrshO2o+z4YcFrAeugg2
+mlGhn0jbZ5X9/Pr71DVevNRVXb9u0lH4K8cgeUOJFyXs3nrach15HzL0holHNhM8
+f9KwcDzjEJK9Y5pEiG7xV+VIsAa9K3Na3bBaD/xSXSv61UjrduQb/jndf5KerJSb
+867+4coFy7s7zJh2TKYWCI+dHh+dkWN9wqt2+vs5cmPbDP7kYNLhtpvv6ZxKMVIS
+yQ7X4w1MYFobw82/vbOJWJVcFeNZ4iZh0La7hDYMU1iYvKO0LbsR3BbSq0yvBo+F
+y3FdB0JwE+m7uKL1SpTwVwwqaoUc/v5h0ooP0cZbfovzrZEl48McqO0d77NlO3Mx
+HdVIgBbyW5ULg9OgUa6qGjfXjtPSxePg73OUIFJtsI+LXQVPI1gwS8OB3Zuc4hKX
+lhqTc9cNP/7lDbdlJMQG
+=bpWH
+-----END PGP SIGNATURE-----
diff --git a/gnome/base/gnome-keyring/gnome-keyring.SlackBuild b/gnome/base/gnome-keyring/gnome-keyring.SlackBuild
index 968b44c6..18f9e65e 100644
--- a/gnome/base/gnome-keyring/gnome-keyring.SlackBuild
+++ b/gnome/base/gnome-keyring/gnome-keyring.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for gnome-keyring, by Alexandre Vieira de Souza
-# requires: libtasn1 
+# requires:  
 # tested: gnome-keyring-2.22.3
+# 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:="gnome/base/gnome-keyring"}
 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" ] || ! bunzip2 -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
@@ -151,7 +220,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
-- 
cgit v1.2.3