From 19042cca6c0673e25dcb2bd16730c0a6924f80a7 Mon Sep 17 00:00:00 2001
From: Heiko Rosemann <heiko.rosemann@web.de>
Date: Sat, 20 Aug 2016 07:13:38 +0700
Subject: libraries/gwenhywfar: Updated for version 4.15.3.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/gwenhywfar/gwen-gnutls.patch     | 19 -------------------
 libraries/gwenhywfar/gwenhywfar.SlackBuild | 16 +++++-----------
 libraries/gwenhywfar/gwenhywfar.info       |  6 +++---
 3 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 libraries/gwenhywfar/gwen-gnutls.patch

(limited to 'libraries/gwenhywfar')

diff --git a/libraries/gwenhywfar/gwen-gnutls.patch b/libraries/gwenhywfar/gwen-gnutls.patch
deleted file mode 100644
index b83015293c..0000000000
--- a/libraries/gwenhywfar/gwen-gnutls.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up gwenhywfar-4.13.1/src/sio/syncio_tls.c.foo gwenhywfar-4.13.1/src/sio/syncio_tls.c
---- gwenhywfar-4.13.1/src/sio/syncio_tls.c.foo	2015-12-11 22:35:48.474181431 -0500
-+++ gwenhywfar-4.13.1/src/sio/syncio_tls.c	2015-12-11 22:41:27.414733356 -0500
-@@ -361,12 +361,12 @@ int GWEN_SyncIo_Tls_Prepare(GWEN_SYNCIO
- 
-   /* possibly force protocol priority */
-   if (lflags & GWEN_SYNCIO_TLS_FLAGS_FORCE_SSL_V3) {
--    const int proto_prio[2] = { GNUTLS_SSL3, 0 };
-+    char *force_sslv3_str = "NORMAL:-VERS-TLS-ALL:+VERS-SSL3.0";
- 
-     DBG_INFO(GWEN_LOGDOMAIN, "Forcing SSL v3");
--    rv=gnutls_protocol_set_priority(xio->session, proto_prio);
-+    rv=gnutls_priority_set_direct(xio->session, force_sslv3_str, NULL);
-     if (rv) {
--      DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_protocol_set_priority: %d (%s)", rv, gnutls_strerror(rv));
-+      DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_priority_set_direct: %d (%s)", rv, gnutls_strerror(rv));
-       gnutls_deinit(xio->session);
-       return GWEN_ERROR_GENERIC;
-     }
diff --git a/libraries/gwenhywfar/gwenhywfar.SlackBuild b/libraries/gwenhywfar/gwenhywfar.SlackBuild
index 1c25efe4fd..1a96ec52a7 100644
--- a/libraries/gwenhywfar/gwenhywfar.SlackBuild
+++ b/libraries/gwenhywfar/gwenhywfar.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gwenhywfar
-VERSION=${VERSION:-4.13.1}
+VERSION=${VERSION:-4.15.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,11 +69,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Don't use deprecated/removed gnutls functions
-# Patch from Fedora:
-# http://pkgs.fedoraproject.org/cgit/rpms/gwenhywfar.git/tree/gwen-gnutls.patch
-patch -p1 < $CWD/gwen-gnutls.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -94,8 +89,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README RELEASES TODO  \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/gwenhywfar/gwenhywfar.info b/libraries/gwenhywfar/gwenhywfar.info
index a3c4e86949..e37d80be6f 100644
--- a/libraries/gwenhywfar/gwenhywfar.info
+++ b/libraries/gwenhywfar/gwenhywfar.info
@@ -1,8 +1,8 @@
 PRGNAM="gwenhywfar"
-VERSION="4.13.1"
+VERSION="4.15.3"
 HOMEPAGE="http://www.aquamaniac.de/sites/download/packages.php?package=01&showall=1"
-DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/gwenhywfar/gwenhywfar-4.13.1.tar.gz"
-MD5SUM="231b4af546c791a85d0f042773e6bd82"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/gwenhywfar/gwenhywfar-4.15.3.tar.gz"
+MD5SUM="4e96e68482a3cf1cfc00bd3645684c82"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3