Hi, Here's an update to latest libetpan release. I bumped the SHARED_LIBS as some functions seems to have been removed: -T hmac_md5 -T hmac_md5_final -T hmac_md5_import -T hmac_md5_init -T hmac_md5_precalc
I removed a trailing whitespace in DESCR to make portcheck happy. Claws-mail is fine with it. Cheers, Daniel Index: Makefile =================================================================== RCS file: /cvs/ports/mail/libetpan/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile 20 Apr 2016 10:18:16 -0000 1.20 +++ Makefile 1 May 2016 10:46:44 -0000 @@ -4,12 +4,11 @@ COMMENT= mail purpose library GH_ACCOUNT= dinhviethoa GH_PROJECT= libetpan -GH_TAGNAME= 1.6 -DISTNAME= libetpan-1.6 -REVISION= 1 +GH_TAGNAME= 1.7 +DISTNAME= libetpan-${GH_TAGNAME} CATEGORIES= mail devel -SHARED_LIBS= etpan 15.0 +SHARED_LIBS= etpan 16.0 HOMEPAGE= http://www.etpan.org/libetpan.html Index: distinfo =================================================================== RCS file: /cvs/ports/mail/libetpan/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo 17 Sep 2015 20:28:33 -0000 1.7 +++ distinfo 1 May 2016 10:46:44 -0000 @@ -1,2 +1,2 @@ -SHA256 (libetpan-1.6.tar.gz) = eWKx+URb4k0ety2t2rrrtCcHTBSlDp2tDOvewETHHhc= -SIZE (libetpan-1.6.tar.gz) = 6144117 +SHA256 (libetpan-1.7.tar.gz) = R9DASditzc/QaY6fH8uFQWsLL0du7R9SqucsKIPPBbA= +SIZE (libetpan-1.7.tar.gz) = 6184289 Index: patches/patch-configure_ac =================================================================== RCS file: patches/patch-configure_ac diff -N patches/patch-configure_ac --- patches/patch-configure_ac 17 Sep 2015 20:28:33 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-configure_ac,v 1.1 2015/09/17 20:28:33 jca Exp $ - -Fix wrong logic that turns off curl and expat support. - ---- configure.ac.orig Fri Oct 31 22:41:02 2014 -+++ configure.ac Thu Sep 17 19:08:19 2015 -@@ -581,7 +581,7 @@ dnl libcurl - libcurl=no - AC_ARG_WITH(curl, [ --with-curl[=DIR] curl install directory (default=auto)], - [], [with_curl=auto]) --if test "x$with_curl" != "xno"; then -+if test "x$with_curl" = "xno"; then - : - elif test "x$with_curl" != "xauto"; then - OCPPFLAGS="$CPPFLAGS" -@@ -639,7 +639,7 @@ dnl expat - libexpat=no - AC_ARG_WITH(expat, [ --with-expat[=DIR] expat install directory (default=auto)], - [], [with_expat=auto]) --if test "x$with_expat" != "xno"; then -+if test "x$with_expat" = "xno"; then - : - elif test "x$with_expat" != "xauto"; then - OCPPFLAGS="$CPPFLAGS" Index: patches/patch-src_data-types_mailstream_ssl_c =================================================================== RCS file: patches/patch-src_data-types_mailstream_ssl_c diff -N patches/patch-src_data-types_mailstream_ssl_c --- patches/patch-src_data-types_mailstream_ssl_c 20 Apr 2016 10:18:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,66 +0,0 @@ -$OpenBSD: patch-src_data-types_mailstream_ssl_c,v 1.1 2016/04/20 10:18:16 danj Exp $ - -When encrypting the connection with STARTTLS the only method -allowed was TLSv1. Change this to allow TLSv1.2 (or whatever the -strongest method is). - -Additionally tls_data_new() and ssl_data_new() did the same (with -exception to the nailed method in tls_data_new()), so drop one -of them. -https://github.com/dinhviethoa/libetpan/commit/7f1f97f4d59d5724af97f4d32424c2841715561c.patch - ---- src/data-types/mailstream_ssl.c.orig Tue Apr 19 14:04:46 2016 -+++ src/data-types/mailstream_ssl.c Tue Apr 19 14:03:25 2016 -@@ -485,15 +485,21 @@ again: - static struct mailstream_ssl_data * ssl_data_new(int fd, time_t timeout, - void (* callback)(struct mailstream_ssl_context * ssl_context, void * cb_data), void * cb_data) - { -- return ssl_data_new_full(fd, timeout, SSLv23_client_method(), callback, cb_data); -+ return ssl_data_new_full(fd, timeout, -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ TLS_client_method(), -+#else -+ /* Despite their name the SSLv23_*method() functions have nothing to do -+ * with the availability of SSLv2 or SSLv3. What these functions do is -+ * negotiate with the peer the highest available SSL/TLS protocol version -+ * available. The name is as it is for historic reasons. This is a very -+ * common confusion and is the main reason why these names have been -+ * deprecated in the latest dev version of OpenSSL. */ -+ SSLv23_client_method(), -+#endif -+ callback, cb_data); - } - --static struct mailstream_ssl_data * tls_data_new(int fd, time_t timeout, -- void (* callback)(struct mailstream_ssl_context * ssl_context, void * cb_data), void * cb_data) --{ -- return ssl_data_new_full(fd, timeout, TLSv1_client_method(), callback, cb_data); --} -- - #else - - static struct mailstream_ssl_context * mailstream_ssl_context_new(gnutls_session session, int fd); -@@ -625,11 +631,6 @@ static struct mailstream_ssl_data * ssl_data_new(int f - err: - return NULL; - } --static struct mailstream_ssl_data * tls_data_new(int fd, time_t timeout, -- void (* callback)(struct mailstream_ssl_context * ssl_context, void * cb_data), void * cb_data) --{ -- return ssl_data_new(fd, timeout, callback, cb_data); --} - #endif - - static void ssl_data_free(struct mailstream_ssl_data * ssl_data) -@@ -681,10 +682,7 @@ static mailstream_low * mailstream_low_ssl_open_full(i - mailstream_low * s; - struct mailstream_ssl_data * ssl_data; - -- if (starttls) -- ssl_data = tls_data_new(fd, timeout, callback, cb_data); -- else -- ssl_data = ssl_data_new(fd, timeout, callback, cb_data); -+ ssl_data = ssl_data_new(fd, timeout, callback, cb_data); - - if (ssl_data == NULL) - goto err; Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/mail/libetpan/pkg/DESCR,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 DESCR --- pkg/DESCR 23 Mar 2007 17:32:58 -0000 1.1.1.1 +++ pkg/DESCR 1 May 2016 10:46:44 -0000 @@ -3,7 +3,7 @@ middleware for different kinds of mail a interface, the interface is the same for all kinds of mail access, remote and local mailboxes. -It will be used for low-level mail handling: +It will be used for low-level mail handling: - network protocols over TCP/IP and SSL / TCP/IP (including IPv6) + IMAP + NNTP