Update to 1.2.1. From the changelog:

- The 'isync' compatibility wrapper is now deprecated.
- An IMAP Path/NAMESPACE rooted in INBOX won't be handled specially any more.
  This means that some Patterns may need adjustment.
- The default output is a lot less verbose now.
  The meanings of the -V and -D options changed significantly.
- The SSL/TLS configuration has been re-designed.
  SSL is now explicitly enabled or disabled - "use SSL if available" is gone.
  Notice: Tunnels are assumed to be secure and thus default to no SSL.
- Support for SASL (flexible authentication) has been added.
- Support for Windows file systems has been added.
- Support for compressed data transfer has been added.
- Folder deletions can be propagated now.

6 files changed, 32 insertions, 44 deletions

diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index 2b503db52e4..21bf28b68e8 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2016/12/07 00:00:42 wiedi Exp $
+# $NetBSD: Makefile,v 1.40 2016/12/15 14:15:01 schmonz Exp $
 
-DISTNAME=	isync-1.1.1
-PKGREVISION=	2
+DISTNAME=	isync-1.2.1
 CATEGORIES=	mail net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=isync/}
 
diff --git a/mail/isync/distinfo b/mail/isync/distinfo
index bf4b6a70f59..7d5061c2785 100644
--- a/mail/isync/distinfo
+++ b/mail/isync/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2015/11/03 23:27:07 agc Exp $
+$NetBSD: distinfo,v 1.16 2016/12/15 14:15:01 schmonz Exp $
 
-SHA1 (isync-1.1.1.tar.gz) = be759ff7e7e141b91fc242284ddeb256d54a5567
-RMD160 (isync-1.1.1.tar.gz) = a8207433d368d621da81b1c68540e0838c391c0f
-SHA512 (isync-1.1.1.tar.gz) = afd66319febebcf7a7857d78013c7137f48222478f6a9465409e4a85c18e899bcf08bcf5baac2a5fcc95b8a0af1877983159b5e3bd20d679fdcca32e77471ca7
-Size (isync-1.1.1.tar.gz) = 256217 bytes
+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 (patch-ae) = e1a1badcb99fe6089a15a259985933aceedfc110
-SHA1 (patch-af) = f3803de6c97733fa5fd17ab89dbd75910eec3301
-SHA1 (patch-src_Makefile.in) = f946bff2e0a2b9a50fdcc752b2d5e3767f42a03b
-SHA1 (patch-src_compat_Makefile.in) = 82ee8cb1abcb8479865856b085c2ca016242b6dd
-SHA1 (patch-src_socket.c) = 04d2e9d4db870b00ebd3bc9eb9571de581dee0a7
+SHA1 (patch-af) = e608d522945dbd991667be18de1c724eb6ee5e1d
+SHA1 (patch-src_Makefile.in) = 34f719b1e571db2b030d9f49d39c692628d724ee
+SHA1 (patch-src_compat_Makefile.in) = ffaba182c6b6b5c50fe82104d508438a3b62ecfd
+SHA1 (patch-src_socket.c) = e159a4b754e8fbd79c5b7f83710d32f02b12b6c5
diff --git a/mail/isync/patches/patch-af b/mail/isync/patches/patch-af
index d38d3036bd8..af09361328d 100644
--- a/mail/isync/patches/patch-af
+++ b/mail/isync/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.5 2014/04/24 14:48:44 schmonz Exp $
+$NetBSD: patch-af,v 1.6 2016/12/15 14:15:01 schmonz Exp $
 
 time_t may be 64-bit.
 
---- src/drv_maildir.c.orig	2013-12-18 17:58:26.000000000 +0000
+--- src/drv_maildir.c.orig	2015-09-27 09:47:19.000000000 +0000
 +++ src/drv_maildir.c
-@@ -1167,7 +1167,7 @@ maildir_store_msg( store_t *gctx, msg_da
+@@ -1336,7 +1336,7 @@ maildir_store_msg( store_t *gctx, msg_da
  	int ret, fd, bl, uid;
  	char buf[_POSIX_PATH_MAX], nbuf[_POSIX_PATH_MAX], fbuf[NUM_FLAGS + 3], base[128];
  
@@ -12,11 +12,11 @@ time_t may be 64-bit.
 +	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->db) {
-@@ -1347,8 +1347,8 @@ maildir_trash_msg( store_t *gctx, messag
+ 		if (ctx->usedb) {
+@@ -1518,8 +1518,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 );
- 		s = strstr( msg->base, ":2," );
+ 		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,
diff --git a/mail/isync/patches/patch-src_Makefile.in b/mail/isync/patches/patch-src_Makefile.in
index 89e050f49c6..9fa651bcf15 100644
--- a/mail/isync/patches/patch-src_Makefile.in
+++ b/mail/isync/patches/patch-src_Makefile.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2014/04/24 14:48:44 schmonz Exp $
+$NetBSD: patch-src_Makefile.in,v 1.2 2016/12/15 14:15:01 schmonz Exp $
 
 Install example config files in pkgsrc hierarchy.
 
---- src/Makefile.in.orig	2013-12-18 21:09:58.000000000 +0000
+--- src/Makefile.in.orig	2015-07-18 16:11:33.000000000 +0000
 +++ src/Makefile.in
-@@ -331,7 +331,7 @@ noinst_HEADERS = common.h config.h drive
- mdconvert_SOURCES = mdconvert.c
- mdconvert_LDADD = -ldb
- man_MANS = mbsync.1 mdconvert.1
+@@ -356,7 +356,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
diff --git a/mail/isync/patches/patch-src_compat_Makefile.in b/mail/isync/patches/patch-src_compat_Makefile.in
index da8e489480e..1b8d4ef25d1 100644
--- a/mail/isync/patches/patch-src_compat_Makefile.in
+++ b/mail/isync/patches/patch-src_compat_Makefile.in
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_compat_Makefile.in,v 1.1 2014/04/24 14:48:44 schmonz Exp $
+$NetBSD: patch-src_compat_Makefile.in,v 1.2 2016/12/15 14:15:01 schmonz Exp $
 
 Install example config files in pkgsrc hierarchy.
 
---- src/compat/Makefile.in.orig	2013-12-18 21:09:58.000000000 +0000
+--- src/compat/Makefile.in.orig	2015-07-18 16:11:33.000000000 +0000
 +++ src/compat/Makefile.in
-@@ -280,7 +280,7 @@ isync_SOURCES = main.c config.c convert.
- isync_LDADD = -ldb
+@@ -295,7 +295,7 @@ isync_SOURCES = main.c config.c convert.
+ isync_LDADD = $(DB_LIBS)
  noinst_HEADERS = isync.h
  man_MANS = isync.1
 -exampledir = $(docdir)/examples
diff --git a/mail/isync/patches/patch-src_socket.c b/mail/isync/patches/patch-src_socket.c
index a0b6ae2483e..1f9be3e0e9d 100644
--- a/mail/isync/patches/patch-src_socket.c
+++ b/mail/isync/patches/patch-src_socket.c
@@ -1,9 +1,10 @@
-$NetBSD: patch-src_socket.c,v 1.3 2015/07/04 15:52:51 bsiegert Exp $
+$NetBSD: patch-src_socket.c,v 1.4 2016/12/15 14:15:01 schmonz Exp $
+
 Prevent mbsync from crashing, PR pkg/49784.
 
---- src/socket.c.orig	2015-07-04 15:47:16.000000000 +0000
+--- src/socket.c.orig	2015-09-27 10:13:04.000000000 +0000
 +++ src/socket.c
-@@ -477,7 +477,10 @@ static void
+@@ -509,7 +509,10 @@ static void
  socket_connected( conn_t *conn )
  {
  #ifdef HAVE_IPV6
@@ -13,17 +14,5 @@ Prevent mbsync from crashing, PR pkg/49784.
 +		conn->addrs = NULL;
 +	}
  #endif
- 	conf_fd( conn->fd, 0, POLLIN );
+ 	conf_notifier( &conn->notify, 0, POLLIN );
  	conn->state = SCK_READY;
-@@ -488,7 +491,10 @@ static void
- socket_connect_bail( conn_t *conn )
- {
- #ifdef HAVE_IPV6
--	freeaddrinfo( conn->addrs );
-+	if ( conn->addrs ) {
-+		freeaddrinfo( conn->addrs );
-+		conn->addrs = NULL;
-+	}
- #endif
- 	free( conn->name );
- 	conn->name = 0;