gnutls: updating to 2.6.6

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2200 370017ae-e619-0410-ac65-c121f96126d4

2 files changed, 100 insertions, 6 deletions

diff --git a/net/libs/gnutls/Manifest b/net/libs/gnutls/Manifest
new file mode 100644
index 00000000..2e2921fd
--- /dev/null
+++ b/net/libs/gnutls/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST gnutls-2.6.2.tar.bz2 5113586 MD5 f42e7342cf9c12755577d207fffa9713 RMD160 10a37efe6bd90add75e338ca98eb09cc4ab69dc7 SHA1 2c7701b61c86d5cec8305f8741bc18bc64f33b31 SHA256 00b1f84bd2d5d10a457c3abf22371b5829fe6f0a2b2886eaf7f0a58f1cabe7c9 SHA512 2a8d7abd9641516f01eb5f661d3f48aa3172195c4fa66e50a42546386e6df7bf62181c7b8e9a0c1901231151f67e15fa8334766705a68aad85277f3cce91db4b
+DIST gnutls-2.6.6.tar.bz2 5116385 MD5 ca2489e29f9dc313a79b9747bb1090e5 RMD160 dc6e717e38741628508208244f07fed8faedb13c SHA1 d1693e611aa7270f14bc500bd56ef529ffcb1703 SHA256 03d85b8b51ca7885740c69b87663963c58fe7c9672da0a43e45732078fabdc9e SHA512 89f4763dec0f21aa90dd44a59b90a9715edb07daac16dc93441ba14de4a2107af432bd8d61c989206d370feb879448abd83704646a80de3ab29fefd55e3306db
+MKBUILD gnutls.mkbuild 2918 MD5 f6ff1c3154c39cb0d9fed9b5ce588ddf RMD160 c75c116d22daf34490e83341cb6a2c3bd58c2944 SHA1 468584750c28a1b4a992669ae4d6a7d54a255116 SHA256 a617acd25baceb35623844058ed1a614bbaa100e3a536bd590c3b99969c41bb9 SHA512 1ba797c60bb5fa55d5c7febddf4c752d2682fa4b17cb5425835eaacbe061876ab49c2c878da604252a54f7e25918a36846612e8f1785982a1c7ee1b0196b5be4
+SLACKBUILD gnutls.SlackBuild 8426 MD5 0bb5fd65d07148817ae66c5d843f0778 RMD160 f77c7e9c749c98b0ddd75e002ed1a7388b02e01e SHA1 8a03e71e47e9ff1a13af35d35950200200110ee0 SHA256 d1acfad1d5183d608a76caad1de24ab8b7fa572bf0054ef486415ca8ba134fee SHA512 3b24ecb82de1c053b170b4e6bc8c16071432cb9105be7b121945550f8f57563a6a3bbfd038bc60c87c5a66846ddb43eab03bc9c8a10f7f48670662710d06fcf1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKBlTgAAoJEEHL93ESzgeiQUAQAJ0/xhs8+PdNeFT1Aoa3csjZ
+gv9QrRhXbwdIGstuP1c6hAxIW6R9Y9VnmzcGvrw7oktH5PdBRC2ARWG9aMczOD9u
+Swi0JEyq4rQbjMB0VXbmnrcllA9yXNAxK7/Pzr5YmjJm1bDnbXqpz7S8NI7oxpVQ
+NCr9IHNR7zzKSP4B0DE9Z66Vcu9HSAfyOi17uYlZXoTtln+CCEvWDLe2fNw+7Oqa
+/8JBh8Zrqc1g8jES9hBau1NQ7zwa2amnDl4YKv2C/qm7YzCSGSRABoB4cwrGguc8
+odoyQWF3NWd9jzKwejdhED/jU056lXw236Uc82mUaUcbIW1pS7uZZBqa6otUBjxZ
+lxXtcB2ewmM0OjWv13qu91UFZs+6CuT7qW+4ObZvY+i0k6OIrXjJqKRwNLdgLhXE
+yFlTM/yq+tMMAwm4t2VA+wVUSNQ3aOcuDpsseAOHptKwAin7+s0j5znOAbieseRJ
+Kv8L7ICgbsVKJzqf6mnbmzn3ckXZsRkR6BvidXtwcNN5xOQb8iJo3dyA29CRkpC9
+HT3Mf+beKWe9iHBOtgUxBncHM5RsucEc9zTieKEUUI0KqlKTjVBktO6vvk27kqm6
+H4zcZIo0rtGcGlih3EujnG4+0jHEo8FE74LP3sChFdpqfH57LeCuuq90dK8/x4CC
+o7vm6BgNfuFSGTe+wMp/
+=eZO7
+-----END PGP SIGNATURE-----
diff --git a/patches/gnutls/gnutls.SlackBuild b/net/libs/gnutls/gnutls.SlackBuild
index ad6bb0b6..679eb0f0 100755..100644
--- a/patches/gnutls/gnutls.SlackBuild
+++ b/net/libs/gnutls/gnutls.SlackBuild
@@ -16,7 +16,8 @@
 #
 # slackbuild for gnutls, by Silvio Rhatto
 # requires:  
-# tested: gnutls-2.6.1
+# tested: gnutls-2.6.6
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="gnutls"
 PKG_NAME="gnutls"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.6.1}
+SRC_VERSION=${VERSION:=2.6.6}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="net/libs/gnutls"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=" --sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man --enable-static=no --enable-guile=no"}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
 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
@@ -128,6 +131,72 @@ echo Checking $SRC_DIR/$SRC with gpg using $SRC_DIR/$SIGNATURE...
 gpg --verify "$SRC_DIR/$SIGNATURE" "$SRC_DIR/$SRC" || exit $ERROR_GPG
 echo Success.
 
+# 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
@@ -189,9 +258,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