[pkgsrc/trunk]: pkgsrc/mail/isync Update to 1.3.1

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/238b81f122e4
branches:  trunk
changeset: 346115:238b81f122e4
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sun Dec 29 01:00:22 2019 +0000

description:
Update to 1.3.1

* Enable SASL support

Changelog:
This is a long overdue maintenance release:
- SSL now uses SNI, which for example GMail requires
- fixed fallbacks for missing UIDPLUS extension (with e.g. DavMail)
- fixed UIDVALIDITY recovery with really long Message-id headers
- fixed GSSAPI authentication with Kerberos
- fixed support for IMAP servers which do not sort search results (e.g.,
  poczta.o2.pl)
- fixed CopyArrivalDate on platforms without glibc
- fixed useless SASL warnings with certain plugins
- the perl 5.14 requirement is now made explicit
- improved OpenBSD support
- fixed a bunch of compiler warnings

diffstat:

 mail/isync/Makefile                   |   7 ++++---
 mail/isync/distinfo                   |  12 +++++-------
 mail/isync/patches/patch-af           |  26 --------------------------
 mail/isync/patches/patch-src_socket.c |  30 ------------------------------
 4 files changed, 9 insertions(+), 66 deletions(-)

diffs (112 lines):

diff -r 36fefb9e17ed -r 238b81f122e4 mail/isync/Makefile
--- a/mail/isync/Makefile       Sun Dec 29 00:52:24 2019 +0000
+++ b/mail/isync/Makefile       Sun Dec 29 01:00:22 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2019/08/11 13:21:28 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2019/12/29 01:00:22 ryoon Exp $
 
-DISTNAME=      isync-1.3.0
-PKGREVISION=   2
+DISTNAME=      isync-1.3.1
 CATEGORIES=    mail net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=isync/}
 
@@ -15,6 +14,7 @@
 BDB_ACCEPTED=          db4 db5
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=       --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
 LDFLAGS+=              -lcrypto
 
 post-patch:
@@ -22,5 +22,6 @@
 
 BUILDLINK_TRANSFORM+=  l:db:${BDB_TYPE}
 .include "../../security/openssl/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 36fefb9e17ed -r 238b81f122e4 mail/isync/distinfo
--- a/mail/isync/distinfo       Sun Dec 29 00:52:24 2019 +0000
+++ b/mail/isync/distinfo       Sun Dec 29 01:00:22 2019 +0000
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.18 2019/03/08 18:14:45 ryoon Exp $
+$NetBSD: distinfo,v 1.19 2019/12/29 01:00:22 ryoon Exp $
 
-SHA1 (isync-1.3.0.tar.gz) = 07f6d7cfc39ed2678791f625de70cdeff3d3bfba
-RMD160 (isync-1.3.0.tar.gz) = 01d7b028fc61e7ad3b51b529a082637fbc4a6816
-SHA512 (isync-1.3.0.tar.gz) = b5186f2afe97cab58ce55d3ec19ae7371676ae614448614a9e3e02d09662c34b74e559f0926661fa0300ab22dab9e2e9089b78ee38b94141ff3f8b4d75578ffa
-Size (isync-1.3.0.tar.gz) = 309459 bytes
+SHA1 (isync-1.3.1.tar.gz) = 6806fbe99537c119d2c4e40b9189d4d05f870bda
+RMD160 (isync-1.3.1.tar.gz) = 65ce1693e2eec5619fc9648e6c568eb4bf9679be
+SHA512 (isync-1.3.1.tar.gz) = 59d702d41d4a4e72f03cb282b414d0bb859593171763e845bc24d116a74f807a79e5be61f1dd1f59a9ece492322bceac156b08958a246cbfbe7f230fab4cdda2
+Size (isync-1.3.1.tar.gz) = 311868 bytes
 SHA1 (patch-ae) = e1a1badcb99fe6089a15a259985933aceedfc110
-SHA1 (patch-af) = 14e50c12d34af78b379ea9b8bacbf835b6a009ce
 SHA1 (patch-src_Makefile.in) = b989a7627dbb7c989dd26c3e20beeceb000a7a47
 SHA1 (patch-src_compat_Makefile.in) = ffaba182c6b6b5c50fe82104d508438a3b62ecfd
-SHA1 (patch-src_socket.c) = 33706f994ccd5f2f1263174bfe9d357bd8afe7c1
diff -r 36fefb9e17ed -r 238b81f122e4 mail/isync/patches/patch-af
--- a/mail/isync/patches/patch-af       Sun Dec 29 00:52:24 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-af,v 1.7 2018/09/19 13:08:14 schmonz Exp $
-
-time_t may be 64-bit.
-
---- src/drv_maildir.c.orig     2017-10-01 08:41:29.000000000 +0000
-+++ src/drv_maildir.c
-@@ -1569,7 +1569,7 @@ maildir_store_msg( store_t *gctx, msg_da
-       uint uid;
-       char buf[_POSIX_PATH_MAX], nbuf[_POSIX_PATH_MAX], fbuf[NUM_FLAGS + 3], base[128];
- 
--      bl = nfsnprintf( base, sizeof(base), "%ld.%d_%d.%s", (long)time( 0 ), Pid, ++MaildirCount, Hostname );
-+      bl = nfsnprintf( base, sizeof(base), "%lld.%d_%d.%s", (long long int)time( 0 ), Pid, ++MaildirCount, Hostname );
-       if (!to_trash) {
- #ifdef USE_DB
-               if (ctx->usedb) {
-@@ -1750,8 +1750,8 @@ maildir_trash_msg( store_t *gctx, messag
-       for (;;) {
-               nfsnprintf( buf, sizeof(buf), "%s/%s/%s", ctx->path, subdirs[gmsg->status & M_RECENT], msg->base );
-               s = strstr( msg->base, ((maildir_store_conf_t *)gctx->conf)->info_prefix );
--              nfsnprintf( nbuf, sizeof(nbuf), "%s/%s/%ld.%d_%d.%s%s", ctx->trash,
--                          subdirs[gmsg->status & M_RECENT], (long)time( 0 ), Pid, ++MaildirCount, Hostname, s ? s : "" );
-+              nfsnprintf( nbuf, sizeof(nbuf), "%s/%s/%lld.%d_%d.%s%s", ctx->trash,
-+                          subdirs[gmsg->status & M_RECENT], (long long int)time( 0 ), Pid, ++MaildirCount, Hostname, s ? s : "" );
-               if (!rename( buf, nbuf ))
-                       break;
-               if (!stat( buf, &st )) {
diff -r 36fefb9e17ed -r 238b81f122e4 mail/isync/patches/patch-src_socket.c
--- a/mail/isync/patches/patch-src_socket.c     Sun Dec 29 00:52:24 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_socket.c,v 1.6 2019/03/08 18:14:45 ryoon Exp $
-
-Support SNI, from https://sourceforge.net/p/isync/isync/ci/17babc1695e82ca80d032b79e920fcb86ede2347/tree/src/socket.c?diff=f698f16967ae8341ff4b506f96b8cd5790c05d27
-
-Prevent mbsync from crashing, PR pkg/49784.
-
---- src/socket.c.orig  2017-10-01 08:42:35.000000000 +0000
-+++ src/socket.c
-@@ -270,6 +270,8 @@ socket_start_tls( conn_t *conn, void (*c
- 
-       init_wakeup( &conn->ssl_fake, ssl_fake_cb, conn );
-       conn->ssl = SSL_new( ((server_conf_t *)conn->conf)->SSLContext );
-+      if (ssl_return( "set server name", conn, SSL_set_tlsext_host_name( conn->ssl, conn->conf->host ) ) < 0)
-+              return;
-       SSL_set_fd( conn->ssl, conn->fd );
-       SSL_set_mode( conn->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER );
-       socket_expect_read( conn, 1 );
-@@ -542,8 +544,10 @@ static void
- socket_connected( conn_t *conn )
- {
- #ifdef HAVE_IPV6
--      freeaddrinfo( conn->addrs );
--      conn->addrs = 0;
-+      if (conn->addrs) {
-+              freeaddrinfo( conn->addrs );
-+              conn->addrs = 0;
-+      }
- #endif
-       conf_notifier( &conn->notify, 0, POLLIN );
-       socket_expect_read( conn, 0 );