Update to 1.1.1. From the changelog:

* src/mbsync.1:
    * don't lie about the default of User
    * fix typos
* src/drv_maildir.c:
    * don't forget to reset message counts when skipping scan
    * remove apparently pointless resetting of recent message count
* src/compat/convert.c:
    * error-check renaming of uid mapping database
    * error-check reading of old uidvalidity and maxuid files
* src/sync.c:
    * error-check committing of sync state
    * better error messages for sync state and journal related errors
    * remove pointless/counterproductive "Disk full?" error message suffixes
    * don't crash in message expiration debug print
* src/compat/config.c:
    * fix "inverse copy&pasto" in account labeling code
    * don't needlessly quote strings
    * write Sync and Expunge to global section if applicable
    * don't bother checking impossible condition
* src/main.c:
    * fix segfault on passing --{create,expunge}-{master,slave}
    * don't needlessly spell out INBOX
* src/drv_imap.c:
    * don't crash on malformed response code
    * don't crash on truncated LIST response
    * fix crash on store without prior fetch with non-UIDPLUS servers
    * don't error out if we don't get an X-TUID header
* src/compat/main.c:
    * remove pointless pointer assignment
* src/: drv_maildir.c, mdconvert.c:
    * fix hypothetical buffer overflows
    * close a bunch of fd leaks in error paths
* src/util.c:
    * actually use prime numbers for all hash bucket sizes
* src/config.c:
    * fix zero MaxSize override in Channels
* src/compat/: config.c, isync.h, util.c:
    * rework maildir store mapping
* src/socket.c:
    * remove pointless use of AI_V4MAPPED flag
* configure.ac, src/common.h, src/drv_imap.c, src/util.c:
    * make date parsing portable, take 2
* src/: drv_maildir.c, sync.c:
    * fix _POSIX_SYNCHRONIZED_IO usage

Many of these changes were in response to findings from a Coverity scan.

5 files changed, 6 insertions, 118 deletions

diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index d27c067d640..26d24cb50cc 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2014/05/17 04:06:56 schmonz Exp $
+# $NetBSD: Makefile,v 1.35 2014/06/09 17:29:09 schmonz Exp $
 
-DISTNAME=	isync-1.1.0
+DISTNAME=	isync-1.1.1
 CATEGORIES=	mail net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=isync/}
 
diff --git a/mail/isync/distinfo b/mail/isync/distinfo
index cbf1211ad04..82f68f93022 100644
--- a/mail/isync/distinfo
+++ b/mail/isync/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.12 2014/05/17 04:06:56 schmonz Exp $
+$NetBSD: distinfo,v 1.13 2014/06/09 17:29:09 schmonz Exp $
 
-SHA1 (isync-1.1.0.tar.gz) = d99bd9603e17f94ebe4af1691482a6676ea0fb42
-RMD160 (isync-1.1.0.tar.gz) = 0060ef3249accc4e48bf7cd0a4b24be3c570337d
-Size (isync-1.1.0.tar.gz) = 249374 bytes
+SHA1 (isync-1.1.1.tar.gz) = be759ff7e7e141b91fc242284ddeb256d54a5567
+RMD160 (isync-1.1.1.tar.gz) = a8207433d368d621da81b1c68540e0838c391c0f
+Size (isync-1.1.1.tar.gz) = 256217 bytes
 SHA1 (patch-ae) = e1a1badcb99fe6089a15a259985933aceedfc110
 SHA1 (patch-af) = f3803de6c97733fa5fd17ab89dbd75910eec3301
-SHA1 (patch-configure) = c43a4d860dd92f8e22459f8fef8f024017e90137
-SHA1 (patch-configure.ac) = b629267faa8bf9756d497b3d950a71366b529743
 SHA1 (patch-src_Makefile.in) = f946bff2e0a2b9a50fdcc752b2d5e3767f42a03b
 SHA1 (patch-src_compat_Makefile.in) = 82ee8cb1abcb8479865856b085c2ca016242b6dd
-SHA1 (patch-src_socket.c) = a962c02b05df1c3ad50155264c3e7c0ab5c291b8
diff --git a/mail/isync/patches/patch-configure b/mail/isync/patches/patch-configure
deleted file mode 100644
index f4159ca739b..00000000000
--- a/mail/isync/patches/patch-configure
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2014/05/17 04:06:56 schmonz Exp $
-
-NetBSD does not support AI_V4MAPPED.
-
---- configure.orig	2014-05-17 03:55:53.000000000 +0000
-+++ configure
-@@ -1799,6 +1799,52 @@ $as_echo "$ac_res" >&6; }
-   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- 
- } # ac_fn_c_check_func
-+
-+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-+# ---------------------------------------------
-+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-+# accordingly.
-+ac_fn_c_check_decl ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  as_decl_name=`echo $2|sed 's/ *(.*//'`
-+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-+if eval \${$3+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+#ifndef $as_decl_name
-+#ifdef __cplusplus
-+  (void) $as_decl_use;
-+#else
-+  (void) $as_decl_name;
-+#endif
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+
-+} # ac_fn_c_check_decl
- cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
-@@ -4290,6 +4336,17 @@ _ACEOF
- fi
- done
- 
-+ac_fn_c_check_decl "$LINENO" "AI_V4MAPPED" "ac_cv_have_decl_AI_V4MAPPED" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_AI_V4MAPPED" = xyes; then :
-+  ac_have_decl=1
-+else
-+  ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_AI_V4MAPPED $ac_have_decl
-+_ACEOF
-+
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
- $as_echo_n "checking for socket in -lsocket... " >&6; }
diff --git a/mail/isync/patches/patch-configure.ac b/mail/isync/patches/patch-configure.ac
deleted file mode 100644
index 59a78628a06..00000000000
--- a/mail/isync/patches/patch-configure.ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2014/05/17 04:06:56 schmonz Exp $
-
-NetBSD does not support AI_V4MAPPED.
-
---- configure.ac.orig	2013-12-13 17:54:37.000000000 +0000
-+++ configure.ac
-@@ -30,6 +30,7 @@ fi
- 
- AC_CHECK_HEADERS(sys/poll.h sys/select.h)
- AC_CHECK_FUNCS(vasprintf memrchr)
-+AC_CHECK_DECLS([AI_V4MAPPED])
- 
- AC_CHECK_LIB(socket, socket, [SOCK_LIBS="-lsocket"])
- AC_CHECK_LIB(nsl, inet_ntoa, [SOCK_LIBS="$SOCK_LIBS -lnsl"])
diff --git a/mail/isync/patches/patch-src_socket.c b/mail/isync/patches/patch-src_socket.c
deleted file mode 100644
index 93cb24abb19..00000000000
--- a/mail/isync/patches/patch-src_socket.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_socket.c,v 1.1 2014/05/17 04:06:56 schmonz Exp $
-
-NetBSD does not support AI_V4MAPPED.
-
---- src/socket.c.orig	2013-12-13 17:54:37.000000000 +0000
-+++ src/socket.c
-@@ -349,7 +349,11 @@ socket_connect( conn_t *sock, void (*cb)
- 		memset( &hints, 0, sizeof(hints) );
- 		hints.ai_family = AF_UNSPEC;
- 		hints.ai_socktype = SOCK_STREAM;
-+#if defined(HAVE_DECL_AI_V4MAPPED)
- 		hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
-+#else
-+		hints.ai_flags = AI_ADDRCONFIG;
-+#endif
- 		infon( "Resolving %s... ", conf->host );
- 		if ((gaierr = getaddrinfo( conf->host, NULL, &hints, &sock->addrs ))) {
- 			error( "IMAP error: Cannot resolve server '%s': %s\n", conf->host, gai_strerror( gaierr ) );