[pkgsrc/trunk]: pkgsrc/mail/isync Update to 1.3.0. From the changelog:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/998b7919d5ac
branches:  trunk
changeset: 312926:998b7919d5ac
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Sep 19 13:08:14 2018 +0000

description:
Update to 1.3.0. From the changelog:

- Network timeout handling has been added.

- Support for proper Maildir++ and a Maildir sub-folder naming style
  without extra dots have been added.

- Support for TLS client certificates was added.

- Support for recovering from baseless UID validity changes was added.

- The get-cert script was renamed to mbsync-get-cert.

diffstat:

 mail/isync/Makefile                      |   5 +++--
 mail/isync/PLIST                         |   4 ++--
 mail/isync/distinfo                      |  16 ++++++++--------
 mail/isync/patches/patch-af              |  12 ++++++------
 mail/isync/patches/patch-src_Makefile.in |  10 +++++-----
 mail/isync/patches/patch-src_socket.c    |  13 +++++++------
 6 files changed, 31 insertions(+), 29 deletions(-)

diffs (140 lines):

diff -r e9c923a5cbf3 -r 998b7919d5ac mail/isync/Makefile
--- a/mail/isync/Makefile       Wed Sep 19 11:36:03 2018 +0000
+++ b/mail/isync/Makefile       Wed Sep 19 13:08:14 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2016/12/15 14:15:01 schmonz Exp $
+# $NetBSD: Makefile,v 1.41 2018/09/19 13:08:14 schmonz Exp $
 
-DISTNAME=      isync-1.2.1
+DISTNAME=      isync-1.3.0
 CATEGORIES=    mail net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=isync/}
 
@@ -10,6 +10,7 @@
 LICENSE=       gnu-gpl-v2
 
 USE_LANGUAGES=         c99
+USE_TOOLS+=            perl
 BDB_ACCEPTED=          db4 db5
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}
diff -r e9c923a5cbf3 -r 998b7919d5ac mail/isync/PLIST
--- a/mail/isync/PLIST  Wed Sep 19 11:36:03 2018 +0000
+++ b/mail/isync/PLIST  Wed Sep 19 13:08:14 2018 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:04:35 joerg Exp $
-bin/get-cert
+@comment $NetBSD: PLIST,v 1.6 2018/09/19 13:08:14 schmonz Exp $
 bin/isync
 bin/mbsync
+bin/mbsync-get-cert
 bin/mdconvert
 man/man1/isync.1
 man/man1/mbsync.1
diff -r e9c923a5cbf3 -r 998b7919d5ac mail/isync/distinfo
--- a/mail/isync/distinfo       Wed Sep 19 11:36:03 2018 +0000
+++ b/mail/isync/distinfo       Wed Sep 19 13:08:14 2018 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.16 2016/12/15 14:15:01 schmonz Exp $
+$NetBSD: distinfo,v 1.17 2018/09/19 13:08:14 schmonz Exp $
 
-SHA1 (isync-1.2.1.tar.gz) = 35a048dd15bd8779d3abb300c1e5ac84afb60e7f
-RMD160 (isync-1.2.1.tar.gz) = dcf41159675ab2bd06a0070ac65b49fe13fb07b9
-SHA512 (isync-1.2.1.tar.gz) = 706379e602cdcef3a1ca7eaf2301cfea15b9bbb5ee46c8f598308ad68a48725c6a4d13a2e73cc4633efec34fda1dbcb89bdd0e4c2e06993fa24db69cce9ff50b
-Size (isync-1.2.1.tar.gz) = 281990 bytes
+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 (patch-ae) = e1a1badcb99fe6089a15a259985933aceedfc110
-SHA1 (patch-af) = e608d522945dbd991667be18de1c724eb6ee5e1d
-SHA1 (patch-src_Makefile.in) = 34f719b1e571db2b030d9f49d39c692628d724ee
+SHA1 (patch-af) = 14e50c12d34af78b379ea9b8bacbf835b6a009ce
+SHA1 (patch-src_Makefile.in) = b989a7627dbb7c989dd26c3e20beeceb000a7a47
 SHA1 (patch-src_compat_Makefile.in) = ffaba182c6b6b5c50fe82104d508438a3b62ecfd
-SHA1 (patch-src_socket.c) = e159a4b754e8fbd79c5b7f83710d32f02b12b6c5
+SHA1 (patch-src_socket.c) = a2dc6ed4a03f265456d73a01dee23e219ece75da
diff -r e9c923a5cbf3 -r 998b7919d5ac mail/isync/patches/patch-af
--- a/mail/isync/patches/patch-af       Wed Sep 19 11:36:03 2018 +0000
+++ b/mail/isync/patches/patch-af       Wed Sep 19 13:08:14 2018 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.6 2016/12/15 14:15:01 schmonz Exp $
+$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     2015-09-27 09:47:19.000000000 +0000
+--- src/drv_maildir.c.orig     2017-10-01 08:41:29.000000000 +0000
 +++ src/drv_maildir.c
-@@ -1336,7 +1336,7 @@ maildir_store_msg( store_t *gctx, msg_da
-       int ret, fd, bl, uid;
+@@ -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 );
@@ -13,9 +13,9 @@
        if (!to_trash) {
  #ifdef USE_DB
                if (ctx->usedb) {
-@@ -1518,8 +1518,8 @@ maildir_trash_msg( store_t *gctx, messag
+@@ -1750,8 +1750,8 @@ maildir_trash_msg( store_t *gctx, messag
        for (;;) {
-               nfsnprintf( buf, sizeof(buf), "%s/%s/%s", gctx->path, subdirs[gmsg->status & M_RECENT], msg->base );
+               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 : "" );
diff -r e9c923a5cbf3 -r 998b7919d5ac mail/isync/patches/patch-src_Makefile.in
--- a/mail/isync/patches/patch-src_Makefile.in  Wed Sep 19 11:36:03 2018 +0000
+++ b/mail/isync/patches/patch-src_Makefile.in  Wed Sep 19 13:08:14 2018 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_Makefile.in,v 1.2 2016/12/15 14:15:01 schmonz Exp $
+$NetBSD: patch-src_Makefile.in,v 1.3 2018/09/19 13:08:14 schmonz Exp $
 
 Install example config files in pkgsrc hierarchy.
 
---- src/Makefile.in.orig       2015-07-18 16:11:33.000000000 +0000
+--- src/Makefile.in.orig       2017-10-01 08:46:50.000000000 +0000
 +++ src/Makefile.in
-@@ -356,7 +356,7 @@ mdconvert_LDADD = $(DB_LIBS)
+@@ -359,7 +359,7 @@ mdconvert_LDADD = $(DB_LIBS)
  @with_mdconvert_TRUE@mdconvert_man = mdconvert.1
  tst_timers_SOURCES = tst_timers.c util.c
  man_MANS = mbsync.1 $(mdconvert_man)
 -exampledir = $(docdir)/examples
 +exampledir = $(datadir)/examples/isync
  example_DATA = mbsyncrc.sample
- EXTRA_DIST = run-tests.pl $(example_DATA) $(man_MANS)
- all: all-recursive
+ EXTRA_DIST = drv_proxy_gen.pl run-tests.pl $(example_DATA) $(man_MANS)
+ CLEANFILES = drv_proxy.inc
diff -r e9c923a5cbf3 -r 998b7919d5ac mail/isync/patches/patch-src_socket.c
--- a/mail/isync/patches/patch-src_socket.c     Wed Sep 19 11:36:03 2018 +0000
+++ b/mail/isync/patches/patch-src_socket.c     Wed Sep 19 13:08:14 2018 +0000
@@ -1,18 +1,19 @@
-$NetBSD: patch-src_socket.c,v 1.4 2016/12/15 14:15:01 schmonz Exp $
+$NetBSD: patch-src_socket.c,v 1.5 2018/09/19 13:08:14 schmonz Exp $
 
 Prevent mbsync from crashing, PR pkg/49784.
 
---- src/socket.c.orig  2015-09-27 10:13:04.000000000 +0000
+--- src/socket.c.orig  2017-10-01 08:42:35.000000000 +0000
 +++ src/socket.c
-@@ -509,7 +509,10 @@ static void
+@@ -542,8 +542,10 @@ static void
  socket_connected( conn_t *conn )
  {
  #ifdef HAVE_IPV6
 -      freeaddrinfo( conn->addrs );
-+      if ( conn->addrs ) {
+-      conn->addrs = 0;
++      if (conn->addrs) {
 +              freeaddrinfo( conn->addrs );
-+              conn->addrs = NULL;
++              conn->addrs = 0;
 +      }
  #endif
        conf_notifier( &conn->notify, 0, POLLIN );
-       conn->state = SCK_READY;
+       socket_expect_read( conn, 0 );