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, 105 insertions, 11 deletions

diff --git a/gnome/base/libbonoboui/Manifest b/gnome/base/libbonoboui/Manifest
new file mode 100644
index 00000000..4dc04e61
--- /dev/null
+++ b/gnome/base/libbonoboui/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libbonoboui-2.22.0.tar.bz2 1006030 MD5 e4e4d74c9387d08c956574f981cf91f2 RMD160 77bee2de7e4eff77885d68eb717df188cc62b1ca SHA1 48fcf81966b839b328ab63bae4ee128246eb0a63 SHA256 a1f2cc830a67cf02ea66812624d92f369b7d9e0231dc05ee1d0a0374b7706926 SHA512 8792fd6052ef21fbd271de94de274e2728fd296eeb6001b793be3b864c332611e08c2b4bc18873dc39f849ac22e6e82ba5f0380aa81004758aec01c8a6e1aa1a
+MKBUILD libbonoboui.mkbuild 4358 MD5 813819edf8095984944aedf711789bb4 RMD160 d5214b8c2800d10d8181a040bc3d74f4ce009b08 SHA1 f8c971808fecd8af62cc72c1ef2ff2f6293b3c2e SHA256 4176dcabef82b4f72e058f682363018f1d69c549b94203ed7cc42d5ff9326b63 SHA512 c01ddba162b8f0b6b751a46b9bd4ab0ad687a0abd923696bc56c25ec427e7a4819d0d56662b52c5cccca736bd340d0d28aa146715c3582484003d9386f3ad5a6
+SLACKBUILD libbonoboui.SlackBuild 6996 MD5 e7b8a4d8daecac1c7ca9f853a67da66f RMD160 7b5e175303e0944381a3dc6fe630313ba74f7afc SHA1 8e923b2cfa2ae0f1001c1e708093357fb5bc83f2 SHA256 489c542312f93c89c3373e71edcd19a8a97e5e8a528514991f3466a5debc3129 SHA512 ecac9abb885ace02f9858e1f09a7b0d292ce5f2cc077ac09583763daa9245ebe0c645729b46c3aea8f3189717bc8436658fbe091825e44198e386f54440e62dd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyZEVAAoJEEHL93ESzgeiXpYQAI1SndH94jt/zjfAQeix1tLs
+TfNV0ArLLbDYrh/dQ9WZm6j2jNbVh8TX+5miJoxGlTsiZjeVn4Gay3cThvPY9JEZ
+LHCp979d9IETv8z0QDvXkVWP6n5vIARP0vrKjlfBABFQ+XqVhUVPsTvFPPgdrP2k
+qVPvcIIbcTvHv/kbf31Ep3m9Sat+zYzzOlEIPVidqSWinkzV841RRX9S8TtDCafU
+WRxKnKx3KdGscnHuzBROxljnp7qDCuGXEMVavlRwLurx5DM7uwGCtejGlay3qN+M
+YPXd+92F+3NwhFYWJATIDwFdWepNgWY5w20HHwboHksXlM7zOoaadSVsWQ+Aese7
+cRawYITTXiXIr7XjLTMXt/kE/B5HlR2ff5jGkkNixZg3yN7h1NntFW7ZRopBBhF4
+EQRXyv5Epyhtke9qog5kZ8JhE1NHo/IqEPP3o1ITN9SJfZdLJIroOBB5xCUIBx8p
+Khcfg+Z32bF6ZX4aCIoVOGcC97QyowiSB6qd6BsS40JyB5kdKQ0EzGEn+XrLWUQj
++TDPV4NykrTy2LumOGDFajQCqA3jarJLX0RyYVPHhtX6Y8bwj8inIYeyh7ZSyLlh
+XckU38EmmW6ooYXQYVcotSp0BXt+wbzqhx5XzjtC73bIRV++ZSLO9eLNWjLGDa+V
+2lrLP959v+dvorXHgXqH
+=8PkJ
+-----END PGP SIGNATURE-----
diff --git a/gnome/base/libbonoboui/libbonoboui.SlackBuild b/gnome/base/libbonoboui/libbonoboui.SlackBuild
index 86ceb7a3..8fe02c93 100644
--- a/gnome/base/libbonoboui/libbonoboui.SlackBuild
+++ b/gnome/base/libbonoboui/libbonoboui.SlackBuild
@@ -10,13 +10,14 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for libbonoboui, by Rudson R. Alves
 # requires:  
 # tested: libbonoboui-2.22.0
+# 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/libbonoboui"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,16 +49,17 @@ 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
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -64,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,10 +88,76 @@ 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
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -123,9 +193,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
+# on the right side marks the last column you can put a character in. You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
@@ -145,9 +215,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