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

2 files changed, 98 insertions, 4 deletions

diff --git a/gnome/base/libgnomeui/Manifest b/gnome/base/libgnomeui/Manifest
new file mode 100644
index 00000000..bc5378f9
--- /dev/null
+++ b/gnome/base/libgnomeui/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libgnomeui-2.22.1.tar.bz2 1450063 MD5 5a60405f006e873ba7bc97ec9c8e4c5d RMD160 222362add689353aa5f7a68767b60588d33245cf SHA1 fedbc56ac42d32e97310220469a8d6c52c3732cc SHA256 7631bc19eab79412ec621e3bc98e94185d79ae59946990f54a09b80940385ad7 SHA512 b064d0e55ce1601fe5c284d5e465952b1e9d4400106c0aa0f54eeb0ee18bf26d7363214703a319e2ab712a5dc6b5f34c6cccd6645942716e2b11684b3d7b452d
+MKBUILD libgnomeui.mkbuild 4518 MD5 fff69fc4bdd11d98888b830d449f3c19 RMD160 28aec31802231da03079e5deb5bb0dff60d86a0e SHA1 f2f12b82861ed1236bc1c522380b5bbca2fccb63 SHA256 ef2650fffa8ee00319f92a0a4bc0369b052dc5670cc64048c4c1e73d55e5e74e SHA512 99e44ff4f309e8204b1367eca3f8b6893b655eca52767597d87fc79eb51ab2019b254d63d5d15e7af9cc68716a3bcb179c281a34840647f23b263fcb8cafbf6b
+SLACK-REQUIRED slack-required 257 MD5 137b8f6e3c2fe5fcff7e566067ce7a43 RMD160 60ab0773176fc34439206fdd88c02be584db5c5b SHA1 89b6981c287256c31378bbb50dfed0729e18dd0b SHA256 44e2408c41d90701a492ab54d01b539c28ecbec8ac1a3ca79149b1492865341c SHA512 f97e02788ff35c4e5b6044fc56ac8e1a9fc98e6e1730cf7e0e25b92b6694e4a8ebf5a0e9fc786d3ee88943d81e6ba16f1ffa8ce30e2f83f4012c1b725247cced
+SLACKBUILD libgnomeui.SlackBuild 7104 MD5 f6b69b8220cd46d51fa61469ec4a9533 RMD160 cccbd26454065ee59fdddb2ba3500ccdd2dbfd65 SHA1 d6f43e2ab948ccff2c9d4278cc9fda5201b19d7b SHA256 e86500a18638277a815387d0d3f0eb6897c21e3e25dcef5242c2375883af50e5 SHA512 1fff06be7327db69ee87d691f4bb7a919194020f73f09a7d3c96c21b41147f73fc247ee4c60b1b68fe36b45f6741ac810d957c66a95b7427c556b205a0ad90bd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyY4XAAoJEEHL93ESzgeicEoP/3aXhm72+z30jyxEAe9lsd5Y
+G0THEMsZqGVydFzUm3d48bNpG88nyDwMJsBZYFtKQvU5HD3UZ1iGzPp3BaDl1+03
+RJv2JNFXmtqhvnMvIQEr/8wNgfI/BzTpD3scEhXNC9B1Lk3023jFJsnXgWNsusZM
+5Tgkr+GkKccTBAn8FLn4jTPRkssIFd0t4Rh6g0/x9sNXyj0o30nKkcmJdSQ+aMyI
+/FPc9WSUf20tqBBXTn3oAmzFhp/iEvdbUI2uGj/edeBZ/umXWqFERpPmZFkVumGT
+lCLgwrLpLfeKCyh1/7eS5thWZJtHG8URxHBhL+hTx9MrdESrCM3xn6FsDDpAJ0S3
+/mjHGzCu5dcgCVCgqJqMP4jju9NgyKsgTxYDR9sqLLPOco+mHbs5rCEGDtSXxiUd
+C07CP3KHV2HtXpAqyS92zBDmJPCVzwqplgYM9AMyXxjDCFAgT0rIQMvadsn/5Olc
+uoQQjcBFCNAnlbgaUu2O0Y1IJ5KjWUh/m4521/iF8GtYhGeMwH5lQ/djWg21cFsi
+4PCvCAh6f2gxHrpoKLzuVIL0eIqM8xBc+yKTkLDR/XBoSphdJCLSfHRctY77oAHv
+FeDikFYNmEGoXijLvCLRONu6mz7itvgJRnoJVl4ruZIWY+XjkaBPiD4J5cLTK+NU
+9NzKs5X7/fUbrC6p4FGo
+=QwqX
+-----END PGP SIGNATURE-----
diff --git a/gnome/base/libgnomeui/libgnomeui.SlackBuild b/gnome/base/libgnomeui/libgnomeui.SlackBuild
index 087ae18c..8649c9be 100644
--- a/gnome/base/libgnomeui/libgnomeui.SlackBuild
+++ b/gnome/base/libgnomeui/libgnomeui.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for libgnomeui, by Rudson R. Alves
-# requires: libxml2 libgnome libgnomecanvas libbonoboui pango glib gnome-vfs gnome-keyring 
+# requires:  
 # tested: libgnomeui-2.22.1
+# 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/libgnomeui"}
 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
@@ -85,6 +88,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
@@ -152,7 +221,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