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, 109 insertions, 15 deletions

diff --git a/dev/libs/pwlib/Manifest b/dev/libs/pwlib/Manifest
new file mode 100644
index 00000000..30c8d4fd
--- /dev/null
+++ b/dev/libs/pwlib/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST pwlib-v1_11_1-src.tar.gz 2327497 MD5 8b7a7a2ed8da6792006922476dd3b2f3 RMD160 434307ecaec5c7c5a145641890e5f8287a17689a SHA1 1cdda88e2de3be0186811d466052569b3a771668 SHA256 a909b9d52ab19ba516f31e96e5875e6a336810ac929eeb5ca13f95b0e7b8572e SHA512 64d19ac0a6c36b4f394bc5211245deab5cde8d05edd0f59a34000a6234f4bdfdcd8ec1c78ff88b59ced40539d93688ab18d6e3aafa34699ba93bf32dcb7c7400
+MKBUILD pwlib.mkbuild 4274 MD5 598b0c6fef77619657d6a3215c55fe5a RMD160 5f8084f36f84a6b008154d9d3dfe7d53953122b1 SHA1 40ce70eeb429f0072dcd3a4fe09e8040dd5d7e9f SHA256 a08de32d79ecbfdc5d4da9174a00f106ca47a284d9504490a044fd2b69450933 SHA512 811d84ea4f862b5ca8a9fb0852d313f955aee4f32578162d214e08b5559ecda989ebbc29a6c74295957234ad45889c4b8f50b7a997d8dfeae3f7e5b21a401ad3
+SLACKBUILD pwlib.SlackBuild 7060 MD5 051d66dfcfa3c5f803b52b65b30f3dc5 RMD160 49406db4996cb4d8988f032dca6aa6db8bfda4b6 SHA1 179a72a1506e8368916f3679209fcce08c7942f8 SHA256 8be9e8d0980b5a0f3df631007dbc70d98e195a3ba2b40d6c14ebd1a4bc14c0a6 SHA512 b5b0361c93a77e63be77ac283c2129bcbff21acd7683825887664c0902ba4361cda5fbe3e098c94566cbc343a33f1fd37fd300f8582538292661f504aebbb26e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyXaZAAoJEEHL93ESzgeiB14P/iS/ZewLyVUg1Ds5TIhS0nbg
+Ie0KQIqjvZ3vSAWoSrBfueTjGJRqdKh5NKpDQ2lyBIZA1bD1vdRb9k/4B9T9K3DD
+CwPQ+AoqIAGr9/rpONb4f9pM+F8zsA6n1kx99uyqa6fQMBvTelw7GR97keNEQiFT
+4UcvxBeh1GSUaZO/jTDIQS5fO0vsnd6etaNMkiGTSR8uvBdnbNShKJ//ye6qGzsI
+9YJ+4pCxlcad4WJPrxDQIg9wEFy9gxbt3HR/c0YeDF2rz83z0W3naJuDm0cVfFkc
+g9kZKUGcyVAY+x9fIx/9Er5tN1bw5uy/+iFiZ30qNxWaqbHN+bXlpmSWxU8N8GHL
+xRYO8J+KG1x1q6vwmNK2x1/Pj+exdpYvy6v/B0++XTyYlDp+TOzT6w9Zd5e5CeqG
+euGv3dtr3afDzzBLzAFD3eTbQi+yjBB8OAt6VjP/HKpGQ/OeFib5kN5gODwvCUZe
+8UOLGB16IhqsJLdLnnpw0YIFeM/GShxsCl6GKWbpv26TPbByF6AuAX3vi9FgFSHl
+NpJb+wICAkXONuzwEj43iEO2iRvaUOud1V6rhZspv4tz3dJ3D4W9PjRp+olhHd2x
+BuLWC7LvZ1Jw9BpEdQmXBt95YjDyD+kkR//vzYeR2LFlV0ddPNUR+pXKuddZUCVz
+z+fmfQCgRuxW/Q4Ythuc
+=9Ncj
+-----END PGP SIGNATURE-----
diff --git a/dev/libs/pwlib/pwlib.SlackBuild b/dev/libs/pwlib/pwlib.SlackBuild
index 3c966f75..8c686be1 100755
--- a/dev/libs/pwlib/pwlib.SlackBuild
+++ b/dev/libs/pwlib/pwlib.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 pwlib, by Rudson R. Alves
 # requires:  
-# tested: pwlib-1.10.10
+# tested: pwlib-1_11_1
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="pwlib"
 PKG_NAME="pwlib"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.10.10}
+SRC_VERSION=${VERSION:=1_11_1}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 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/pwlib"}
 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
@@ -76,17 +80,83 @@ mkdir -p "$REPOS" || exit $ERROR_MKDIR
 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"
+SRC="$SRC_NAME-v$VERSION-src.tar.gz"
+URL="http://www.voxgratia.org/releases/$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
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -122,9 +192,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 ':'.
 
@@ -144,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