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, 97 insertions, 4 deletions

diff --git a/dev/libs/libtasn1/Manifest b/dev/libs/libtasn1/Manifest
new file mode 100644
index 00000000..d93a77cc
--- /dev/null
+++ b/dev/libs/libtasn1/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libtasn1-1.4.tar.gz 1552101 MD5 a733ecdfed3517910e627d24e050979f RMD160 8553984f8992151b1086f6b3d7196a3916e61edd SHA1 684c9dc343b0155a074c2127ac8050f983528bc8 SHA256 84aa37835fe4f967d3b7cb6037d101db5d507b637af0050d6f92913128236196 SHA512 37d9ff9726ecc20ff07a2acded3a2e934f8f0eea5827745f2b61b99c5865df5392f24574fd08d098538257f2891eb811c6b1b86c2f1874ddbafc314ff540e4d7
+MKBUILD libtasn1.mkbuild 4203 MD5 4e0a847152bd1a11edf69c315c37dc30 RMD160 18396722462afc26a9bfa2c29b2388569820e6ec SHA1 4e6c261c48f3e53769c831233340a0a2ac1ed0cb SHA256 7c70d303de353b5023f89a20d5468137e27656efdf9bc9e82756061487993c20 SHA512 b594a9a5428ef20182b042915f6a34c265104af61669b053d4f2720f202a9a37ba9c37e7681ed8b369428990e7c0a09a902ff0297a69907aefd1fb89d687d918
+SLACKBUILD libtasn1.SlackBuild 6902 MD5 e3e64c83dea129a8854f0d38bebe5380 RMD160 535ff602e90fe6b23cbd26d7613f114c0e7db3d8 SHA1 b2f528e260e5cffd823d34d8f73daf6d6827ad20 SHA256 f12fbac5c35fbf2a8c8e26d0439cfe06574122fbd3d3954a0e5e03f2acc48ebf SHA512 5de6ab48852096ee4025021d010ce759b74837da181eccf64819870be6a0feace1cc544cb90a12b6962116224aa03ac9eb539b862af320f0665313e4a08eb03e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyZHZAAoJEEHL93ESzgei93kP/iYxT5oricVdB7Luvgxiqbqf
+kI4z7iq+DZ2NzI6grMGd/5XEFz4iLdDU1W1I0ZSC6DNekrIGNtQESEXJEvuOIFxZ
+ecxr/t7OIhR4OoluLoqxUbZ/bB+BqcyTj/n+eTmP3QHFtvJTH+CkDLzVzu5d6KrD
+kPrBlfSIlVGcrq/MF9AOLfAY8UoOwUyESs0oHZK2ujL7/TjSBCTeDXsErScANDtY
+aKbJXTO8Re4R2HK8W7UFF7DZ5A1d9Z8/LRmjgBR/B3l3iwQDLHfauvdyHKsjbeYr
+B5iOvse168CHINt9aR95/YtujPqMufTWOvUBecK72b5MA3YbpknKqMQfVmJaU0bt
+WrRuhmAUl6PDS0HmqjXa3TLqY4gHbdKxoHoGw6T0PPQOQIY0EOsiYDIWFZErnc/t
+TIOYyGHyByP8oS3hYsuxmYZ3XO2kC9V3Kc5akXc1T/n29HPxAcGlsh6gKM3i8d5T
+8EZVEIjPwLAgvKiF7vHkve1bnIe6SAnUDoU6PjP25QFYrKBdRmn4pXw3+OW85fPx
+RZhcZrF4yLaQX6kLCY8YnQXGt/jJH50peD6qTDC1GN4WlMhy/1OzNweCBuCmZRxi
+SV9V88CIRV9WQ2206oMwmGOKh6BRSdk1Ej3aH7XsDZpgMNlPE2wMSOc4YIQeQgdp
+kwC5AIkUunCizdkH/Z+R
+=b6ZM
+-----END PGP SIGNATURE-----
diff --git a/dev/libs/libtasn1/libtasn1.SlackBuild b/dev/libs/libtasn1/libtasn1.SlackBuild
index 32da0584..72c1b594 100644
--- a/dev/libs/libtasn1/libtasn1.SlackBuild
+++ b/dev/libs/libtasn1/libtasn1.SlackBuild
@@ -17,6 +17,7 @@
 # slackbuild for libtasn1, by Alexandre Vieira de Souza
 # requires:  
 # tested: libtasn1-1.4
+# 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:="dev/libs/libtasn1"}
 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" ] || ! 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
@@ -145,9 +214,10 @@ EODESC
 
 # 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" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi