From 62c0270ef676a18dccbcc2b475323b66fadee9c5 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 15 Dec 2018 17:18:09 +0100
Subject: 20181215.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 libraries/libetpan/curl-7.62.0.patch   | 26 ++++++++++++++++++++++++++
 libraries/libetpan/libetpan.SlackBuild | 11 +++++++----
 libraries/libetpan/libetpan.info       |  8 ++++----
 libraries/libetpan/slack-desc          |  2 +-
 4 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 libraries/libetpan/curl-7.62.0.patch

(limited to 'libraries/libetpan')

diff --git a/libraries/libetpan/curl-7.62.0.patch b/libraries/libetpan/curl-7.62.0.patch
new file mode 100644
index 0000000000..1685ae7289
--- /dev/null
+++ b/libraries/libetpan/curl-7.62.0.patch
@@ -0,0 +1,26 @@
+From 945f3702182a7b7920c440512c15cce23ad1bacd Mon Sep 17 00:00:00 2001
+From: Po-Chuan Hsieh <sunpoet@sunpoet.net>
+Date: Sun, 4 Nov 2018 01:52:05 +0800
+Subject: [PATCH] Fix build with curl 7.62.0 (#311)
+
+from CHANGES:
+ssl: deprecate CURLE_SSL_CACERT in favour of a unified error code
+Long live CURLE_PEER_FAILED_VERIFICATION
+---
+ src/low-level/feed/newsfeed.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/low-level/feed/newsfeed.c b/src/low-level/feed/newsfeed.c
+index 97e292b7..13472801 100644
+--- a/src/low-level/feed/newsfeed.c
++++ b/src/low-level/feed/newsfeed.c
+@@ -535,7 +535,9 @@ static int curl_error_convert(int curl_res)
+   case CURLE_SSL_ENGINE_SETFAILED:
+   case CURLE_SSL_CERTPROBLEM:
+   case CURLE_SSL_CIPHER:
++#if LIBCURL_VERSION_NUM < 0x073e00
+   case CURLE_SSL_CACERT:
++#endif
+   case CURLE_FTP_SSL_FAILED:
+   case CURLE_SSL_ENGINE_INITFAILED:
+     return NEWSFEED_ERROR_SSL;
diff --git a/libraries/libetpan/libetpan.SlackBuild b/libraries/libetpan/libetpan.SlackBuild
index f6fd171474..d0646b35e1 100644
--- a/libraries/libetpan/libetpan.SlackBuild
+++ b/libraries/libetpan/libetpan.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for libetpan
 #
-# Copyright 2009-2012  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2018  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libetpan
-VERSION=${VERSION:-1.8}
+VERSION=${VERSION:-1.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,7 +69,10 @@ 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 {} \;
 
-./autogen.sh
+# From upstream
+patch -p1 < $CWD/curl-7.62.0.patch
+
+NOCONFIGURE=yes ./autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/libetpan/libetpan.info b/libraries/libetpan/libetpan.info
index bcb9e82e04..fd43af7819 100644
--- a/libraries/libetpan/libetpan.info
+++ b/libraries/libetpan/libetpan.info
@@ -1,8 +1,8 @@
 PRGNAM="libetpan"
-VERSION="1.8"
-HOMEPAGE="http://www.etpan.org/"
-DOWNLOAD="https://github.com/dinhviethoa/libetpan/archive/1.8.tar.gz"
-MD5SUM="65fa7a40548e3b29eb789dd4ac719726"
+VERSION="1.9.1"
+HOMEPAGE="https://www.etpan.org/"
+DOWNLOAD="https://github.com/dinhviethoa/libetpan/archive/1.9.1/libetpan-1.9.1.tar.gz"
+MD5SUM="0882ab84c1d53c3d7033f351c9781fcd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libetpan/slack-desc b/libraries/libetpan/slack-desc
index d8f858e20c..67d3f2f6e9 100644
--- a/libraries/libetpan/slack-desc
+++ b/libraries/libetpan/slack-desc
@@ -13,7 +13,7 @@ libetpan: and efficient middleware for different kinds of mail access. When
 libetpan: using the drivers interface, the interface is the same for all
 libetpan: kinds of mail access, both remote and local mailboxes.
 libetpan:
-libetpan: http://www.etpan.org/
+libetpan: https://www.etpan.org/
 libetpan:
 libetpan:
 libetpan:
-- 
cgit v1.2.3