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

3 files changed, 204 insertions, 85 deletions

diff --git a/net/libs/libsoup/Manifest b/net/libs/libsoup/Manifest
new file mode 100644
index 00000000..89b21a75
--- /dev/null
+++ b/net/libs/libsoup/Manifest
@@ -0,0 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libsoup-2.2.105.tar.bz2 505095 MD5 7fa48b06a0e2b0ff3d2fa45cf331f169 RMD160 c6850dbccd074ab5bc3178248d139ecc953fde63 SHA1 45756c61d48bc9ec3919d5375b06d952bb65bf58 SHA256 3760a127ee810cfd0fda257ff615d19a2dd8aeece199dad0d18690446df72e8f SHA512 00e60bab053a3924733f7c1638f5e1558c7ee437433f5e8b5a3a9fe9d274cf88dde4bd778f513a2b683fe3e45fe12be2cab978958840bbfc541a76f03ddc29fe
+DIST libsoup-2.26.0.tar.bz2 736527 MD5 9df9d2b3304213641d3214a774d75ee1 RMD160 51ddd3fb779be777be886f26a90366d746fe6ed4 SHA1 6236dc3795da226b52ae3087ab447111d4efa648 SHA256 47b749b20717df24393c83adcce9a3a10f0690517c18da8d0a1ddcb410a0ac1d SHA512 e12cbfff590af9cda97d84af4f863b8c089fa578c77782a460b0f74c8610733263be16843d81dd01efebed7d97e6af7808b460bb7aeaf70a0aaa681fc174c5bc
+DIST libsoup-2.4.1.tar.bz2 627890 MD5 d0fc91ccb9da401e9e40d2f4612bdac9 RMD160 8e3877aa929089a82aaaec3ae6d0d63e4cc82cca SHA1 a63a1124abffa1a335642c78ce87a606162361dc SHA256 774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd SHA512 fde5e775aa2b453919598f2ad4441286395e387599e8e2c09b21d077ffc9da34038b2647ffdcb9bcca69676b4b5d37ecd45846cfc3e0d4db4774d655597b2b66
+MKBUILD libsoup.mkbuild 4909 MD5 e6cf6bba657c5f83a1379af014cbc6dc RMD160 b5f0634462af94b8d4e0e77cb5763626a7b5b286 SHA1 8e5cf7f4b603bff5faec3b8aa5a2cb554393e7da SHA256 71c8a694f9b163acc7cd992d16d71968af4d3f86c8a844e0270b29fd6e27e1d5 SHA512 cb20d19d574437df590efa860f3192084fd994481f35d1d04c6623e7f985078873d536abd958f341dfdd121f3dc0c8f3dd031cc655ae62461af8e5fdd11f9a35
+SLACK-REQUIRED slack-required 80 MD5 e8a4078293e9072abf34c37721ea5076 RMD160 64581f68b0a5158f40c0086d05e72e8a96d25388 SHA1 7f8855d8b9a9fd162dfcc7390355ef6aab9f018d SHA256 1bace51a3df6d512d096cdb487206963bd6366abfbe71e95cff3a0ed4f71f261 SHA512 c299a8a8845337b2bae28e17e773d77ca28d4bdf661c2ce0c8a51d3b9038d2d692ef0b7940062ff47984b9737d59907a994b7324fd279b55f666ee02f145a467
+SLACKBUILD libsoup.SlackBuild 6959 MD5 e321cca264706252f435f4dccef253b0 RMD160 ae60ea9c7f4f7d68789c27ee7e3559ad34da883c SHA1 6c3aa5342323641534912b92bc55460e8fb31210 SHA256 957b848a8e791a7633435f60829f435ba5c9b91fd9657c82d760fac2e6e4f47d SHA512 d7fb236361c7cc73b55f4d82e3ec6e7f080547f4f21c59126d1229a5a3b4131367ae5a630e2f249260a07d8cf8d711fddc1e7ff1fb13c58c0de5f3525902cd7b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyajoAAoJEEHL93ESzgeiV4gP/1WPuUj8hoa3SrBS5UAHktrB
+FBDKAyXohaQxruQL5aIssNnNAarvB0IC7YtQ0WzCC9sa9scokyoaJ4xbGcMF+jpW
+9jiQoB6ysbSLuOARpn9AlEL3SZc2OUfdTrHmuuvbBeEoCM7fFxiz90PKuBuEUkMn
+jULFSmxp8VhKJ4g8cseOkdfIUzjgTVNOWpIa6W7H9sKrukYcE14bE2ZOcEeFBGXy
+SzdEmcVNjUiEfDrxXOlDExW58CqmcFSrFaTGz99SN9luWr75Ibx1f4TmIGIDhZf8
+uvqoTa+cV6JY6Xc9olmFYgFrXYj4U9/9cnphV5nuPMStKMIjPtV09WGi0lMRvMFl
+u4Z/uqieiueyj28nw4DskQ+ZXaoUOiJ774Z1EPfPsTMk3d1TIzKqcGRWUuz8bN5A
+UKtD0KxkLndjCCOw7O6qMAP6EOh5TIvcZ2XId1qlHwL3PXvuzpKtqVDY8KjuHt65
+glNttUe+3VaqI7zNoi+Tym6ns2Mm06qrN4avigrrVpuiSagabf9jgFU4HuYtKJIr
+RCp6EGkAeqFE0VtU+pHs4fDohmbIIVDH6Qw/fRRo+xsgt2b7tOggMulzWZITHprj
+LITK3hFygaGP18nP2ArNudddhOP0C06CZVKR3W3GM+RSpqZlDeY6QdfJHnGs6om0
+m/5eXJXM1VCBrhQTsqx/
+=5fwB
+-----END PGP SIGNATURE-----
diff --git a/net/libs/libsoup/libsoup.SlackBuild b/net/libs/libsoup/libsoup.SlackBuild
index 3fd81069..6fa1d7b7 100755
--- a/net/libs/libsoup/libsoup.SlackBuild
+++ b/net/libs/libsoup/libsoup.SlackBuild
@@ -1,133 +1,223 @@
 #!/bin/bash
 #
-#  libsoup.SlackBuild is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU General Public License as published by the Free Software
-#  Foundation; either version 2 of the License, or any later version.
+#  libsoup.SlackBuild is free software; you can redistribute
+#  it and/or modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the License,
+#  or any later version.
 #
-#  libsoup.SlackBuild is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-#  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#  libsoup.SlackBuild is distributed in the hope that it will
+#  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  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 script for libsoup
-# by rhatto at riseup.net
+# slackbuild for libsoup, by Silvio Rhatto
+# requires:  
+# tested: libsoup-2.4.1
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
-if [ -s "slack-required" ]; then
-  echo Recomended and required packages for building libsoup are:
-  cat slack-required | sed -e 's/^/\t/'
-  if [ "$INTERACT" != "no" ]; then
-    echo If you dont have those installed, press Ctrl-C. Otherwise, hit ENTER.
-    read crap
-#  else
-#    echo Sleeping 3 seconds...
-#    sleep 3
-  fi
-fi
-
-CWD="`pwd`"
-
+# Look for slackbuildrc
 if [ -f ~/.slackbuildrc ]; then
   source ~/.slackbuildrc
 elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-# default settings
-PACKAGE="libsoup"
+# Set variables
+CWD="$(pwd)"
+SRC_NAME="libsoup"
+PKG_NAME="libsoup"
 ARCH=${ARCH:=i486}
-VERSION=${VERSION:=2.4.1}
+SRC_VERSION=${VERSION:=2.4.1}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
-SRC_DIR=${SRC:=$CWD}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
+PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
-
-if [ "$ARCH" == "x86_64" ]; then
-  export LDFLAGS="-L/lib64 -L/usr/lib64"
-  LIBDIR=/usr/lib64
-else
-  LIBDIR=/usr/lib
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="net/libs/libsoup"}
+PREFIX=${PREFIX:=/usr}
+PKG_WORK="$TMP/$SRC_NAME"
+CONF_OPTIONS=${CONF_OPTIONS:=""}
+NUMJOBS=${NUMJOBS:="-j4"}
+
+# Set system libraries' path and optmization flags based on $ARCH
+LIBDIR="$PREFIX/lib"
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
+elif [ "$ARCH" = "i486" ]; then
+  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 -fPIC"
+  LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
-# -------  error codes for createpkg  --------------
+# Set error codes (used by createpkg)
 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_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
-RTOOL="wget"
-PACKAGE_EXT="gz"
-SRC=$PACKAGE-$VERSION.tar.$PACKAGE_EXT
-URL="http://ftp.acc.umu.se/pub/gnome/sources/libsoup/2.4/$SRC"
+# Clean up any leftovers of previous builds
+rm -rf "$PKG_WORK" 2> /dev/null
+rm -rf "$PKG" 2> /dev/null
 
-SRC_DIR="$SRC_DIR/$PACKAGE"
-mkdir -p $SRC_DIR
+# Create directories if necessary
+mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
+mkdir -p "$PKG" || exit $ERROR_MKDIR
+mkdir -p "$REPOS" || exit $ERROR_MKDIR
+mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
-if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
+# Dowload source if necessary
+SRC="$SRC_NAME-$VERSION.tar.bz2"
+URL="http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.4/$SRC"
+
+if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
-TMP="$TMP/$PACKAGE"
-rm -rf $TMP
-mkdir -p $TMP
-cd $TMP
-
-tar xvf $SRC_DIR/$SRC || exit $ERROR_TAR
-cd $PACKAGE-$VERSION
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
 
-if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then
-  patch -p1 < $CWD/$PACKAGE-$VERSION.diff || exit $ERROR_PATCH
-fi
-
-./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR || exit $ERROR_CONF
-make || exit $ERROR_MAKE
-make DESTDIR=$TMP/package-$PACKAGE install || exit $ERROR_INSTALL
+  # 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
 
-CWD="`pwd`"
+  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
 
-cd $TMP/package-$PACKAGE
+else
+  exit $ERROR_MANIFEST
+fi
 
-find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+# 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 $NF }'`"
+cd "$PKG_SRC"
+
+# Configure
+CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+  --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
+
+# Compile
+make $NUMJOBS || exit $ERROR_MAKE
+
+# Install
+make install DESTDIR="$PKG" || exit $ERROR_INSTALL
+
+# Strip binaries
+( cd "$PKG"
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Install documentation
+DOCS="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING LICENSE SIGNATURE readme.*"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+for doc in $DOCS; do
+  if [ -f "$doc" ]; then
+    cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
+  fi
+done
 
-mkdir install
-cat << EOF > install/slack-desc
+# Add package description (slack-desc)
+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 ':'.
 
-       |-----handy-ruler-----------------------------------------------------|
+       |-----handy-ruler------------------------------------------------------|
 libsoup: libsoup
 libsoup:
-libsoup: An HTTP library implementation in C.
-libsoup:
-libsoup:
+libsoup: libsoup is an HTTP client/server library. It uses GObjects
+libsoup: and the glib main loop and integrates well with GNOME and
+libsoup: GTK+ applications. 
 libsoup:
 libsoup:
 libsoup:
 libsoup:
 libsoup:
 libsoup:
-EOF
+EODESC
 
-# docs
-mkdir -p usr/doc/$PACKAGE-$VERSION
+# Build the package
+cd "$PKG"
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
-DOCS="AUTHORS COPYING ChangeLog NEWS README"
-
-for file in $DOCS; do
-  cp $CWD/$file* usr/doc/$PACKAGE-$VERSION/
-done
-
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
-
-if [ "$CLEANUP" == "yes" ]; then
-  rm -rf $TMP
+# Delete source and build directories if requested
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
+  rm -rf "$PKG_WORK" "$PKG"
 fi
-
diff --git a/net/libs/libsoup/slack-required b/net/libs/libsoup/slack-required
index db5ab1b3..db5940fb 100644
--- a/net/libs/libsoup/slack-required
+++ b/net/libs/libsoup/slack-required
@@ -1 +1,4 @@
-glib2 >= 2.15.3
+# Dependency list to libsoup
+#
+# dependency [condition] [version]]
+libproxy