3 files changed, 105 insertions, 9 deletions
diff --git a/net/im/ekiga/Manifest b/net/im/ekiga/Manifest
new file mode 100644
index 00000000..f252af10
--- /dev/null
+++ b/net/im/ekiga/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST ekiga-3.0.2.tar.gz 8826118 MD5 616930d9ab92fb21c238c13101ce5879 RMD160 cbf820a8c8f715931a664d4e27e47d74f0a68dea SHA1 dacb75af3d1b4802865c4b27b2a8db62ce62ebbe SHA256 fefd63c13ca28713f7f03320c1e341430ea2d016d3ab3e49163a12f4df2123e7 SHA512 2c139e0c2ceeb29478458ff9eee6d1a60ee021dd76d0fd342e43cf3440e001a35b9650818d3e5871e45b0330e8683dfbdfc3584ff8c5a8c3c7dc91b7d697094a
+MKBUILD ekiga.mkbuild 4381 MD5 35f19440bb839a1ea3e4565ad30f0fc1 RMD160 b46f437b0d5d9d94439d395ff3364fd2eabdd19f SHA1 236d34677835003affc82940e80bdac0e5b834ab SHA256 c13847c27a1ddb50cf3fbc73787c10dd438a7afd757c3997055f75191a450c0d SHA512 93aa1fd22bf985e6742fc3d84fb5c90fb92f0fa094c976b9ec1b5db0cb19a9e3e37530e9dd6951d506c92f0d79d3e934ea06651b55201417c75651d8b8c41438
+SLACK-REQUIRED slack-required 152 MD5 68309f3129bd329974e43e7ae9199af4 RMD160 b88836016bc6e9554c5c97308050ed38e83cab24 SHA1 5d03de760e2b80fb1ab5f97432ab1b494dccc3e9 SHA256 bfd1cad993c911e500389d51e5f91f764bc33f101c6cc2e657023d1fbd002969 SHA512 8263a6fe62e42668135a6022c20647ff18e8334fd40c15582eb51c17fcb5cc16d63a364156b7ee33127f9f2bb31263d29011615bbd6b9d1d84c3db5cee7847a6
+SLACKBUILD ekiga.SlackBuild 7245 MD5 a1f2f4f2c78f5d21f8cf78d6bfd4365c RMD160 19b1178ec918872a10ebc378ff5748da21fa763f SHA1 e57fe5814088eac5a25ed57ea21deccae87eb418 SHA256 ac62296b19d2c981a0b0b374ea81fa70a4adda4466097ee2175d1dfe6cd05b2b SHA512 901bf8da511e4a6be1b0b60765a49ec8986934867b3d14d938f8c5b1456275905f33b7aa1ef9a1481ea6f19a51ce18622586b02a91e68149997eebd5d105b627
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJykTUAAoJEEHL93ESzgeitZ8P/0Ve8HwBWzP+lbpsmyAH3ZY5
+jbyo2LkTlRxj40ADZ4hn7w8CooUNVSBvx3NcD4q+eRrVD/HpgO737tzBG7UIR8iV
+Q3jXNrkeNJqxKcDxuh4ljySrdAaFKdjwErwgZ8HzTfIxP0xa+ia0vhLziavQ2gW4
+Cc60pi2p+lAojVsfSnbjD4M08MNc5layCDM3Q6fwXva3ih9JNIcx/LqfxJmtUZil
+DXXdR9OJiBtgs9kfzyQiRc9WjseL4DBVbohk3BIVzM52vJ7UYVwvqGam4w74615n
++oXskXOyjnezvQ52IEsAXpAWJgbWaGhlYltE3uzOr+KUfQs7+6O/70R1zDTwTHE8
+XqSY/B3yIm5LT+W9oJZC2Ht4oX551lsVPoOVyezC0DYiwb67nPLO0EC90aijzCi4
+o7yd4b39uxwVxHSAgcOpb0I6IxXODUQuOjSs1+edQtUO89vILmERdZ+j+IM7gc2s
+s7jBA0OLBRcocmyjG/i44DQNJWkHdSy6UyLtvTCgf+aZKkpUZYFbqGW9bmfKNLAl
+OCk1Zsfn2I7SkdDidR1BEC7fJjUsDeMPu6wAiqUcnpCeOpTu21sLGjnCHgMwI2Fv
+gDLAH+IxUsgv6ut5YsOXXEwkwHJDjcOyNLXJyKze4wOBfh3vjuAl06ddliJA6MnD
+gxakEaqkow/+r84T2C9Q
+=Zjm7
+-----END PGP SIGNATURE-----
diff --git a/net/im/ekiga/ekiga.SlackBuild b/net/im/ekiga/ekiga.SlackBuild
index 313639c6..37d6568f 100755
--- a/net/im/ekiga/ekiga.SlackBuild
+++ b/net/im/ekiga/ekiga.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for ekiga, by rafael
-# requires: opal gnome-doc-utils libgnome libgnomeui 
-# tested: ekiga-2.0.12
+# requires:  
+# tested: ekiga-3.0.2
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -31,25 +32,26 @@ CWD="$(pwd)"
 SRC_NAME="ekiga"
 PKG_NAME="ekiga"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.0.12}
+SRC_VERSION=${VERSION:=3.0.2}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rd}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="net/im/ekiga"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
-CONF_OPTIONS=${CONF_OPTIONS:=""}
-NUMJOBS=${NUMJOBS:="-j4"}
+CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc --disable-eds"}
+NUMJOBS=${NUMJOBS:=""}
 
 # Set system libraries' path and optmization flags based on $ARCH
 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
@@ -78,12 +81,78 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.gz"
-URL="http://www.ekiga.org/admin/downloads/latest/sources/sources/$SRC"
+URL="http://www.ekiga.org/admin/downloads/latest/sources/ekiga_3.0.2/$SRC"
 
 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
@@ -151,7 +220,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
diff --git a/net/im/ekiga/slack-required b/net/im/ekiga/slack-required
index a3bc9b66..7801ee91 100644
--- a/net/im/ekiga/slack-required
+++ b/net/im/ekiga/slack-required
@@ -6,3 +6,5 @@ gnome-doc-utils
 GConf				
 libgnome				
 libgnomeui				
+ptlib				
+avahi