- Update isync to 1.0.1 - thanks to Antoine.Reilles@loria.fr for the

  first set of patches
- Many updates and bugfixes, in summary:
	- better OpenSSL detection
	- update c-client support
	- use legacy flock() only on linux
	- cope with out-of-disk-space halfways gracefully

9 files changed, 105 insertions, 72 deletions

diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index bbe96983af4..75aedfb2078 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/24 09:31:54 adrianp Exp $
 #
 
-DISTNAME=	isync-0.9.2
-PKGREVISION=	2
+DISTNAME=	isync-1.0.1
 CATEGORIES=	mail net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=isync/}
 
@@ -14,13 +13,18 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	YES
 
+BDB_ACCEPTED=		db4
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
 LDFLAGS+=		-lcrypto
 
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/isync
-	${INSTALL_DATA} ${WRKSRC}/isyncrc.sample ${PREFIX}/share/examples/isync/isyncrc.sample
+	${INSTALL_DATA} ${WRKSRC}/src/mbsyncrc.sample \
+		${PREFIX}/share/examples/isync/mbsyncrc.sample
+	${INSTALL_DATA} ${WRKSRC}/src/compat/isyncrc.sample \
+		${PREFIX}/share/examples/isync/isyncrc.sample
 
-.include "../../mk/bdb.buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/isync/PLIST b/mail/isync/PLIST
index 64097fc4db1..1d7cb80d984 100644
--- a/mail/isync/PLIST
+++ b/mail/isync/PLIST
@@ -1,5 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/27 16:54:06 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/04/24 09:31:54 adrianp Exp $
+bin/get-cert
 bin/isync
+bin/mbsync
+bin/mdconvert
 man/man1/isync.1
+man/man1/mbsync.1
+man/man1/mdconvert.1
 share/examples/isync/isyncrc.sample
+share/examples/isync/mbsyncrc.sample
 @dirrm share/examples/isync
diff --git a/mail/isync/distinfo b/mail/isync/distinfo
index 8af43900c80..b9a4d404a8a 100644
--- a/mail/isync/distinfo
+++ b/mail/isync/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:23 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/04/24 09:31:54 adrianp Exp $
 
-SHA1 (isync-0.9.2.tar.gz) = 9a683c8c3051d6d6a6a4d3166c3888c7c24ce8ef
-RMD160 (isync-0.9.2.tar.gz) = 3695ab87ab0e2256bac092fadb839c00bc2ec4d8
-Size (isync-0.9.2.tar.gz) = 110170 bytes
-SHA1 (patch-aa) = 0b91d8b5784d23bce5704f40d5b8a4aae1c70d22
-SHA1 (patch-ab) = 0230c871be84a7f6abad8ce8e19caa76fc60a782
-SHA1 (patch-ac) = bf110df62dcf4853e1deb1192720ebaa634445f9
+SHA1 (isync-1.0.1.tar.gz) = 622969588f85cb9fcaf4a61fe42a73e7f600bf87
+RMD160 (isync-1.0.1.tar.gz) = af1e04adc983b23f7c38404b6fcedf9791a546d9
+Size (isync-1.0.1.tar.gz) = 165617 bytes
+SHA1 (patch-aa) = 5ac207f7d7b634673e60ce34cc9a921846d205da
+SHA1 (patch-ab) = bee5b091f89a670b584b73ef58774ae992bb6637
+SHA1 (patch-ac) = d06d1444f66eaeab1fdf22e1aa2f1b9184abccfa
+SHA1 (patch-ad) = c4a86de19b3004752dc51da9453b702945fe6578
+SHA1 (patch-ae) = ad8ced1548ecd3eb224a2a81dffd5e0f1caaac87
+SHA1 (patch-af) = e07a7fcea29cf7f6a6507f7c399e1976623b9d37
diff --git a/mail/isync/patches/patch-aa b/mail/isync/patches/patch-aa
index 6df6457efd9..fc564fe7b7e 100644
--- a/mail/isync/patches/patch-aa
+++ b/mail/isync/patches/patch-aa
@@ -1,30 +1,18 @@
-$NetBSD: patch-aa,v 1.2 2003/12/27 16:54:06 seb Exp $
+$NetBSD: patch-aa,v 1.3 2005/04/24 09:31:54 adrianp Exp $
 
---- src/dotlock.c.orig	2003-05-07 00:06:37.000000000 +0000
-+++ src/dotlock.c
-@@ -34,13 +34,16 @@
- #include <stdio.h>
- #endif
+--- src/Makefile.am.orig	2005-03-05 21:49:31.000000000 +0100
++++ src/Makefile.am	2005-03-05 21:49:55.000000000 +0100
+@@ -6,11 +6,11 @@
+ bin_PROGRAMS = mbsync mdconvert
  
--static struct flock lck = { 0, SEEK_SET, 0, 0, 0 };
-+static struct flock lck;
-+
-+#define FLOCK_INIT(l) { (l).l_start = 0; (l).l_len = 0; (l).l_whence = SEEK_SET; }
+ mbsync_SOURCES = main.c sync.c config.c util.c drv_imap.c drv_maildir.c
+-mbsync_LDADD = -ldb $(SSL_LIBS) $(SOCK_LIBS)
++mbsync_LDADD = -ldb4 $(SSL_LIBS) $(SOCK_LIBS)
+ noinst_HEADERS = isync.h
  
- int dotlock_lock (const char *path, int *fd)
- {
-   *fd = open (path, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
-   if (*fd == -1)
-     return -1;
-+  FLOCK_INIT(lck);
-   lck.l_type = F_WRLCK;
-   if (fcntl (*fd, F_SETLK, &lck))
-   {
-@@ -57,6 +60,7 @@ int dotlock_unlock (int *fd)
+ mdconvert_SOURCES = mdconvert.c
+-mdconvert_LDADD = -ldb
++mdconvert_LDADD = -ldb4
  
-   if (*fd != -1)
-   {
-+    FLOCK_INIT(lck);
-     lck.l_type = F_UNLCK;
-     if (fcntl (*fd, F_SETLK, &lck))
-       r = -1;
+ man_MANS = mbsync.1 mdconvert.1
+ EXTRA_DIST = mbsyncrc.sample $(man_MANS)
diff --git a/mail/isync/patches/patch-ab b/mail/isync/patches/patch-ab
index 805bcf3474c..887a3258d45 100644
--- a/mail/isync/patches/patch-ab
+++ b/mail/isync/patches/patch-ab
@@ -1,22 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2003/12/27 16:54:06 seb Exp $
+$NetBSD: patch-ab,v 1.3 2005/04/24 09:31:54 adrianp Exp $
 
---- src/maildir.c.orig	2003-05-07 00:06:37.000000000 +0000
-+++ src/maildir.c
-@@ -239,7 +239,7 @@ maildir_open (const char *path, int flag
- 	     */
- 	    key.dptr = p->file;
- 	    s = strchr (key.dptr, ':');
--	    key.dsize = s ? (size_t) (s - key.dptr) : strlen (key.dptr);
-+	    key.dsize = s ? (size_t) (s - (char *)key.dptr) : strlen (key.dptr);
- 	    key = dbm_fetch (m->db, key);
- 	    if (key.dptr)
- 	    {
-@@ -294,7 +294,7 @@ maildir_expunge (mailbox_t * mbox, int d
- 	    /* remove the message from the UID map */
- 	    key.dptr = tmp->file;
- 	    s = strchr (key.dptr, ':');
--	    key.dsize = s ? (size_t) (s - key.dptr) : strlen (key.dptr);
-+	    key.dsize = s ? (size_t) (s - (char *)key.dptr) : strlen (key.dptr);
- 	    dbm_delete (mbox->db, key);
- 	    *cur = (*cur)->next;
- 	    free (tmp->file);
+--- src/Makefile.in.orig	2005-03-05 21:49:24.000000000 +0100
++++ src/Makefile.in	2005-03-05 21:49:44.000000000 +0100
+@@ -165,10 +165,10 @@
+ @with_compat_TRUE@compat_dir = compat
+ SUBDIRS = $(compat_dir)
+ mbsync_SOURCES = main.c sync.c config.c util.c drv_imap.c drv_maildir.c
+-mbsync_LDADD = -ldb $(SSL_LIBS) $(SOCK_LIBS)
++mbsync_LDADD = -ldb4 $(SSL_LIBS) $(SOCK_LIBS)
+ noinst_HEADERS = isync.h
+ mdconvert_SOURCES = mdconvert.c
+-mdconvert_LDADD = -ldb
++mdconvert_LDADD = -ldb4
+ man_MANS = mbsync.1 mdconvert.1
+ EXTRA_DIST = mbsyncrc.sample $(man_MANS)
+ all: all-recursive
diff --git a/mail/isync/patches/patch-ac b/mail/isync/patches/patch-ac
index 597570ea63b..c478d0791de 100644
--- a/mail/isync/patches/patch-ac
+++ b/mail/isync/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2003/12/27 16:54:06 seb Exp $
+$NetBSD: patch-ac,v 1.3 2005/04/24 09:31:54 adrianp Exp $
 
---- src/sync.c.orig	2003-05-07 00:06:37.000000000 +0000
-+++ src/sync.c
-@@ -53,7 +53,7 @@ set_uid (DBM * db, const char *f, unsign
+--- src/compat/Makefile.am.orig	2005-03-05 21:50:09.000000000 +0100
++++ src/compat/Makefile.am	2005-03-05 21:50:18.000000000 +0100
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS = isync
  
-     key.dptr = (void *) f;
-     s = strchr (f, ':');
--    key.dsize = s ? (size_t) (s - key.dptr) : strlen (f);
-+    key.dsize = s ? (size_t) (s - (char *)key.dptr) : strlen (f);
-     val.dptr = (void *) &uid;
-     val.dsize = sizeof (uid);
-     dbm_store (db, key, val, DBM_REPLACE);
+ isync_SOURCES = main.c config.c convert.c util.c
+-isync_LDADD = -ldb
++isync_LDADD = -ldb4
+ noinst_HEADERS = isync.h
+ 
+ man_MANS = isync.1
diff --git a/mail/isync/patches/patch-ad b/mail/isync/patches/patch-ad
new file mode 100644
index 00000000000..50fbf687230
--- /dev/null
+++ b/mail/isync/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2005/04/24 09:31:54 adrianp Exp $
+
+--- src/compat/Makefile.in.orig	2005-03-05 21:50:06.000000000 +0100
++++ src/compat/Makefile.in	2005-03-05 21:50:33.000000000 +0100
+@@ -152,7 +152,7 @@
+ with_compat_FALSE = @with_compat_FALSE@
+ with_compat_TRUE = @with_compat_TRUE@
+ isync_SOURCES = main.c config.c convert.c util.c
+-isync_LDADD = -ldb
++isync_LDADD = -ldb4
+ noinst_HEADERS = isync.h
+ man_MANS = isync.1
+ EXTRA_DIST = isyncrc.sample $(man_MANS)
diff --git a/mail/isync/patches/patch-ae b/mail/isync/patches/patch-ae
new file mode 100644
index 00000000000..7e6c4f7b418
--- /dev/null
+++ b/mail/isync/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.3 2005/04/24 09:31:54 adrianp Exp $
+
+--- src/isync.h.orig	2005-04-24 09:54:50.000000000 +0100
++++ src/isync.h
+@@ -28,6 +28,7 @@
+ #include <sys/types.h>
+ #include <stdarg.h>
+ #include <stdio.h>
++#include <stdarg.h>
+ 
+ #define as(ar) (sizeof(ar)/sizeof(ar[0]))
+ 
diff --git a/mail/isync/patches/patch-af b/mail/isync/patches/patch-af
new file mode 100644
index 00000000000..8f481a7d75f
--- /dev/null
+++ b/mail/isync/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2005/04/24 09:31:54 adrianp Exp $
+
+--- src/drv_imap.c.orig	2005-03-05 22:00:48.000000000 +0100
++++ src/drv_imap.c	2005-03-05 22:01:01.000000000 +0100
+@@ -41,6 +41,7 @@
+ #include <netinet/tcp.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <limits.h>
+ #if HAVE_LIBSSL
+ # include <openssl/ssl.h>
+ # include <openssl/err.h>