Hi!
New version of isync was released earlier today. It features support
for SASL, changes in configuration file, "isync" deprecation and changes
in output.
Unfortunately, they use memcpy for overlapping regions, so patch is now
needed.
Comments? OKs?
--
Dmitrij D. Czarkoff
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/isync/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile 1 Apr 2015 08:26:03 -0000 1.26
+++ Makefile 3 Apr 2015 15:40:15 -0000
@@ -2,7 +2,7 @@
COMMENT= synchronize IMAP4 and maildir mailboxes
-DISTNAME= isync-1.1.2
+DISTNAME= isync-1.2.0
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/}
@@ -11,17 +11,19 @@ HOMEPAGE= http://isync.sourceforge.net/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c crypto ssl lib/db4/db>=4
+WANTLIB= c crypto db sasl2 ssl z
-LIB_DEPENDS= databases/db/v4
+LIB_DEPENDS= databases/db/v4 \
+ security/cyrus-sasl2
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include/db4"
\
- LDFLAGS=-L${LOCALBASE}/lib/db4
+CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include/db4
-g" \
+ CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/isync
- ${INSTALL_DATA} ${WRKSRC}/src/mbsyncrc.sample
${PREFIX}/share/examples/isync
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples
+ mv ${PREFIX}/share/doc/isync/examples ${PREFIX}/share/examples/isync
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/mail/isync/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 1 Apr 2015 08:26:03 -0000 1.9
+++ distinfo 3 Apr 2015 13:33:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (isync-1.1.2.tar.gz) = oiW11ZFbbg+dowPKprTbHuBiQemMGtCmYuXc6gZUwKQ=
-SIZE (isync-1.1.2.tar.gz) = 260177
+SHA256 (isync-1.2.0.tar.gz) = gzh43hZH1APLVphHV8xBYJTuA3xTiKDx0fdAhPbmDlk=
+SIZE (isync-1.2.0.tar.gz) = 278536
Index: patches/patch-src_drv_maildir_c
===================================================================
RCS file: patches/patch-src_drv_maildir_c
diff -N patches/patch-src_drv_maildir_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_drv_maildir_c 3 Apr 2015 15:25:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/drv_maildir.c.orig Fri Apr 3 17:24:41 2015
++++ src/drv_maildir.c Fri Apr 3 17:25:15 2015
+@@ -1464,7 +1464,7 @@ maildir_set_msg_flags( store_t *gctx, message_t *gmsg,
+ for (i = 0; i < as(Flags); i++) {
+ if ((p = strchr( s, Flags[i] ))) {
+ if (del & (1 << i)) {
+- memcpy( p, p + 1, fl - (p - s)
);
++ memmove( p, p + 1, fl - (p - s)
);
+ fl--;
+ }
+ } else if (add & (1 << i)) {
Index: pkg/MESSAGE
===================================================================
RCS file: /var/cvs/ports/mail/isync/pkg/MESSAGE,v
retrieving revision 1.1
diff -u -p -r1.1 MESSAGE
--- pkg/MESSAGE 1 Apr 2015 08:26:03 -0000 1.1
+++ pkg/MESSAGE 3 Apr 2015 16:30:05 -0000
@@ -1,2 +1,3 @@
-Gmail users upgrading from isync-1.0.x, note: now mbsync recurses into
"[Gmail]"
-IMAP folder, so changes to mbsync configuration may be needed.
+Configuration format has changed; consult manual page for details.
+
+The "isync" wrapper is deprecated and will be removed in future versions.
Index: pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/mail/isync/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 12 Oct 2012 13:43:00 -0000 1.6
+++ pkg/PLIST 3 Apr 2015 13:45:27 -0000
@@ -13,4 +13,5 @@ share/doc/isync/NEWS
share/doc/isync/README
share/doc/isync/TODO
share/examples/isync/
+share/examples/isync/isyncrc.sample
share/examples/isync/mbsyncrc.sample
