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, 103 insertions, 16 deletions

diff --git a/gnome/extra/evolution-data-server/Manifest b/gnome/extra/evolution-data-server/Manifest
new file mode 100644
index 00000000..6082c7ff
--- /dev/null
+++ b/gnome/extra/evolution-data-server/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST evolution-data-server-2.22.1.tar.bz2 7602166 MD5 1972fa3dbd46c25216b00c1d35f83eaf RMD160 d0082d45c40d8a76897343778dcca00df4f511e6 SHA1 b78f6865db1358c1dbece6c09f92e9ba6a523d6d SHA256 c68cdbfa960068adb76bd3e14affcc7f919435b4b17e12306e641f2a0aceed11 SHA512 242a839fe3b54410584d454c28db06fd9e57ead392e688e93565ef13f20dec95dae88f84b705ecd9103cf506341f7afffa071bbeb3b802ed51e1daf5e6396a27
+MKBUILD evolution-data-server.mkbuild 5833 MD5 e4ad1c1f7ccc7e7eb08a314e775919cd RMD160 bb6a272d3f228ace68bf99702c06c688a455d8e2 SHA1 a49f23935f1b223b0658d91ef1e9df9f2ef0733a SHA256 1d053d295b1ca5a564d5ef8dfce4e8f1594a358fa10afcca4e8d029310154743 SHA512 b3056e57a97c7b602251e1d375d7e2c48414c7eac8f1eb3a7f73575e8f8c3165b2c170b5990c5f3b7254dc317cf25bca82bff21ef7c3f7893eaeb539c76ac7de
+SLACK-REQUIRED slack-required 252 MD5 d72822c27958d8918b033ebba68117d1 RMD160 aa8c8c135690ea8b7e327a281fff7944eb60b91e SHA1 a20b85bf38d7643bc03c2b9ef74bbc17a205b162 SHA256 08c139405034d16be9a2d51115379bf53ffb3e38904899d4449a75c7676e64bb SHA512 49baed9f55c750e1c1cb0df19f4dd0d5b1c8106c20c65c99a3bde19c773fb06cab4fd56f5280f18db8dad3fd885de3f8a0c1f41998ed038dff50fc339b16df0f
+SLACKBUILD evolution-data-server.SlackBuild 8503 MD5 a511d98bbb6ff706b8ffffdb447a2ef6 RMD160 6a458a55c3a2e2e954aa293e52f0ef3e474b4337 SHA1 a9f4e6aa81f9d048661a50b40ef50020dc685645 SHA256 ca645df6ba06ddd6733a557baddd7fe8c1ac5709a0d143ef3069de8663e4c36b SHA512 a0d70b24d933f0c2ba8947941b264987d5a835aea5c42c2b1cfba70a3065d41256b43cebd5851bd904505ed113410b5f3dd3b1b4d3fca67b735a2592e54900ab
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyanGAAoJEEHL93ESzgei+wAP/i/uMrahOjz0A89v5RxbLv2R
+c9U6cIqUiHrvUSru21seBfjx4mZi4DmofdRT6XYzpaO9ChC45ajtMQKPexjSHVeA
+kmJ64db2uDNJ+kv9+cpCuNqZRmE4RcXEf7eyNwr0f1GCbKFhSavrlx3BwV00Olok
+iZRGvu/GkHkxUF3HviAFaeeiN26euDVjbkS9m82KatKTN6SULirIiHTPYWcn8Eew
+qxEGYXtdDJoVnWgsFdQMR7ZrxP32VbLtamyldEqPLLQyFj4kv1rGY9cRksQSECWU
+UmVPPRq1pWxYvOZCbmXCmOC2m7SU/3th4LuvAg6REK7RZ3yew1Cqfr1orDXo95JS
+l5Fmp8ZC0VE1+73g1QE2KaXH9f5ZpJy+NLszroOtGnQ6e+N78YwMIQ6L0cokcik7
+XuBZPUIUJmhYU2pYZwrbO9Oj13xpdYlIUKCUi3pd3P10rXm81X6vcK4VTRgUaL68
+3FZncmFXboHpv5zWjgvSj3yltIwkllM/mmJ1zktHKbyiLcwfDItFb+KxZrwZxUgl
+JBfZypROLbV4qZr88WYF3nQoDI+O0TAJdadXXMrnrwz1KG2adKmln92VNHxBcMHo
+Qz9Zr8c/K6ieLneYr2tEdPjiNaNeUz5dxr0uxC/I6y/idsMF+KtIzjAd5O/tmWGS
+62e5W9DUHniqJ43Ll2T2
+=7k6B
+-----END PGP SIGNATURE-----
diff --git a/gnome/extra/evolution-data-server/evolution-data-server.SlackBuild b/gnome/extra/evolution-data-server/evolution-data-server.SlackBuild
index 9a67319b..037d9cf5 100755
--- a/gnome/extra/evolution-data-server/evolution-data-server.SlackBuild
+++ b/gnome/extra/evolution-data-server/evolution-data-server.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for evolution-data-server, by Alexandre Vieira de Souza
-# requires: gtk+ gnome-vfs libbonobo gconf libglade libgnome libxml libsoup 
+# requires:  
 # tested: evolution-data-server-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/extra/evolution-data-server"}
 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
@@ -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