Update to 1.1.0. From the changelog: * Support for hierarchical mailboxes in Patterns. * Full support for IMAP pipelining (streaming, parallelization) added. This is considerably faster especially with high-latency networks. * Faster and hopefully more reliable support for IMAP servers without the UIDPLUS extension (e.g., M$ Exchange). * More automatic handling of SSL certificates. * IPv6 support. * IMAP password query can be scripted. * Message arrival dates can be propagated. * Data safety in case of system crashes was improved. * MaxMessages was made vastly more useful.diff -r1.32 -r1.33 pkgsrc/mail/isync/Makefile
(schmonz)
| @@ -1,31 +1,22 @@ | @@ -1,31 +1,22 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.32 2014/02/12 23:18:08 tron Exp $ | 1 | # $NetBSD: Makefile,v 1.33 2014/04/24 14:48:44 schmonz Exp $ | |
| 2 | 2 | |||
| 3 | DISTNAME= isync-1.0.4 | 3 | DISTNAME= isync-1.1.0 | |
| 4 | PKGREVISION= 6 | |||
| 5 | CATEGORIES= mail net | 4 | CATEGORIES= mail net | |
| 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/} | 5 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/} | |
| 7 | 6 | |||
| 8 | MAINTAINER= tonio@NetBSD.org | 7 | MAINTAINER= tonio@NetBSD.org | |
| 9 | HOMEPAGE= http://isync.sourceforge.net/ | 8 | HOMEPAGE= http://isync.sourceforge.net/ | |
| 10 | COMMENT= Synchronize a maildir with an imap server | 9 | COMMENT= Synchronize a maildir with an imap server | |
| 11 | LICENSE= gnu-gpl-v2 | 10 | LICENSE= gnu-gpl-v2 | |
| 12 | 11 | |||
| 13 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 12 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
| 14 | 13 | |||
| 15 | BDB_ACCEPTED= db4 db5 | 14 | BDB_ACCEPTED= db4 db5 | |
| 16 | GNU_CONFIGURE= yes | 15 | GNU_CONFIGURE= yes | |
| 17 | CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} | 16 | CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} | |
| 18 | LDFLAGS+= -lcrypto | 17 | LDFLAGS+= -lcrypto | |
| 19 | 18 | |||
| 20 | INSTALLATION_DIRS+= share/examples/isync | |||
| 21 | ||||
| 22 | post-install: | |||
| 23 | ${INSTALL_DATA} ${WRKSRC}/src/mbsyncrc.sample \ | |||
| 24 | ${DESTDIR}${PREFIX}/share/examples/isync/mbsyncrc.sample | |||
| 25 | ${INSTALL_DATA} ${WRKSRC}/src/compat/isyncrc.sample \ | |||
| 26 | ${DESTDIR}${PREFIX}/share/examples/isync/isyncrc.sample | |||
| 27 | ||||
| 28 | BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} | 19 | BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} | |
| 29 | .include "../../security/openssl/buildlink3.mk" | 20 | .include "../../security/openssl/buildlink3.mk" | |
| 30 | .include "../../mk/bdb.buildlink3.mk" | 21 | .include "../../mk/bdb.buildlink3.mk" | |
| 31 | .include "../../mk/bsd.pkg.mk" | 22 | .include "../../mk/bsd.pkg.mk" |
| @@ -1,7 +1,9 @@ | @@ -1,7 +1,9 @@ | |||
| 1 | $NetBSD: distinfo,v 1.10 2010/06/02 13:05:01 adam Exp $ | 1 | $NetBSD: distinfo,v 1.11 2014/04/24 14:48:44 schmonz Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (isync-1.0.4.tar.gz) = a327cc5b81946c7ccb3a26ddd971933e2e006ed3 | 3 | SHA1 (isync-1.1.0.tar.gz) = d99bd9603e17f94ebe4af1691482a6676ea0fb42 | |
| 4 | RMD160 (isync-1.0.4.tar.gz) = 23475533ff9848c38b95911eae6191ca03132185 | 4 | RMD160 (isync-1.1.0.tar.gz) = 0060ef3249accc4e48bf7cd0a4b24be3c570337d | |
| 5 | Size (isync-1.0.4.tar.gz) = 170264 bytes | 5 | Size (isync-1.1.0.tar.gz) = 249374 bytes | |
| 6 | SHA1 (patch-ae) = 2fddc575e8824ecbbb4b8c51a56193840b43d647 | 6 | SHA1 (patch-ae) = e1a1badcb99fe6089a15a259985933aceedfc110 | |
| 7 | SHA1 (patch-af) = 12fc0ec1b2292c422e7c3347b37167438866728d | 7 | SHA1 (patch-af) = f3803de6c97733fa5fd17ab89dbd75910eec3301 | |
| 8 | SHA1 (patch-src_Makefile.in) = f946bff2e0a2b9a50fdcc752b2d5e3767f42a03b | |||
| 9 | SHA1 (patch-src_compat_Makefile.in) = 82ee8cb1abcb8479865856b085c2ca016242b6dd |
| @@ -1,13 +1,15 @@ | @@ -1,13 +1,15 @@ | |||
| 1 | $NetBSD: patch-ae,v 1.5 2007/01/18 18:26:21 tonio Exp $ | 1 | $NetBSD: patch-ae,v 1.6 2014/04/24 14:48:44 schmonz Exp $ | |
| 2 | 2 | |||
| 3 | --- src/config.c.orig 2006-11-01 07:54:31.000000000 +0100 | 3 | Avoid segfault when parsing configuration file under NetBSD. | |
| 4 | ||||
| 5 | --- src/config.c.orig 2013-12-13 17:54:37.000000000 +0000 | |||
| 4 | +++ src/config.c | 6 | +++ src/config.c | |
| 5 | @@ -252,7 +252,7 @@ int | 7 | @@ -316,7 +316,7 @@ int | |
| 6 | load_config( const char *where, int pseudo ) | 8 | load_config( const char *where, int pseudo ) | |
| 7 | { | 9 | { | |
| 8 | conffile_t cfile; | 10 | conffile_t cfile; | |
| 9 | - store_conf_t *store, **storeapp = &stores, **sptarg; | 11 | - store_conf_t *store, **storeapp = &stores; | |
| 10 | + store_conf_t *store = NULL, **storeapp = &stores, **sptarg; | 12 | + store_conf_t *store = NULL, **storeapp = &stores; | |
| 11 | channel_conf_t *channel, **channelapp = &channels; | 13 | channel_conf_t *channel, **channelapp = &channels; | |
| 12 | group_conf_t *group, **groupapp = &groups; | 14 | group_conf_t *group, **groupapp = &groups; | |
| 13 | string_list_t *chanlist, **chanlistapp; | 15 | string_list_t *chanlist, **chanlistapp; |
| @@ -1,26 +1,26 @@ | @@ -1,26 +1,26 @@ | |||
| 1 | $NetBSD: patch-af,v 1.4 2009/07/12 20:26:59 tonio Exp $ | 1 | $NetBSD: patch-af,v 1.5 2014/04/24 14:48:44 schmonz Exp $ | |
| 2 | 2 | |||
| 3 | time_t may be 64bits | 3 | time_t may be 64-bit. | |
| 4 | 4 | |||
| 5 | --- src/drv_maildir.c.orig 2008-02-23 10:02:21.000000000 +0100 | 5 | --- src/drv_maildir.c.orig 2013-12-18 17:58:26.000000000 +0000 | |
| 6 | +++ src/drv_maildir.c | 6 | +++ src/drv_maildir.c | |
| 7 | @@ -936,7 +936,7 @@ maildir_store_msg( store_t *gctx, msg_da | 7 | @@ -1167,7 +1167,7 @@ maildir_store_msg( store_t *gctx, msg_da | |
| 8 | int ret, fd, bl; | 8 | int ret, fd, bl, uid; | |
| 9 | char buf[_POSIX_PATH_MAX], nbuf[_POSIX_PATH_MAX], fbuf[NUM_FLAGS + 3], base[128]; | 9 | char buf[_POSIX_PATH_MAX], nbuf[_POSIX_PATH_MAX], fbuf[NUM_FLAGS + 3], base[128]; | |
| 10 | 10 | |||
| 11 | - bl = nfsnprintf( base, sizeof(base), "%ld.%d_%d.%s", time( 0 ), Pid, ++MaildirCount, Hostname ); | 11 | - bl = nfsnprintf( base, sizeof(base), "%ld.%d_%d.%s", (long)time( 0 ), Pid, ++MaildirCount, Hostname ); | |
| 12 | + bl = nfsnprintf( base, sizeof(base), "%lld.%d_%d.%s", (long long int) time( 0 ), Pid, ++MaildirCount, Hostname ); | 12 | + bl = nfsnprintf( base, sizeof(base), "%lld.%d_%d.%s", (long long int)time( 0 ), Pid, ++MaildirCount, Hostname ); | |
| 13 | if (uid) { | 13 | if (!to_trash) { | |
| 14 | #ifdef USE_DB | 14 | #ifdef USE_DB | |
| 15 | if (ctx->db) { | 15 | if (ctx->db) { | |
| 16 | @@ -1086,8 +1086,8 @@ maildir_trash_msg( store_t *gctx, messag | 16 | @@ -1347,8 +1347,8 @@ maildir_trash_msg( store_t *gctx, messag | |
| 17 | for (;;) { | 17 | for (;;) { | |
| 18 | nfsnprintf( buf, sizeof(buf), "%s/%s/%s", gctx->path, subdirs[gmsg->status & M_RECENT], msg->base ); | 18 | nfsnprintf( buf, sizeof(buf), "%s/%s/%s", gctx->path, subdirs[gmsg->status & M_RECENT], msg->base ); | |
| 19 | s = strstr( msg->base, ":2," ); | 19 | s = strstr( msg->base, ":2," ); | |
| 20 | - nfsnprintf( nbuf, sizeof(nbuf), "%s%s/%s/%ld.%d_%d.%s%s", gctx->conf->path, gctx->conf->trash, | 20 | - nfsnprintf( nbuf, sizeof(nbuf), "%s/%s/%ld.%d_%d.%s%s", ctx->trash, | |
| 21 | - subdirs[gmsg->status & M_RECENT], time( 0 ), Pid, ++MaildirCount, Hostname, s ? s : "" ); | 21 | - subdirs[gmsg->status & M_RECENT], (long)time( 0 ), Pid, ++MaildirCount, Hostname, s ? s : "" ); | |
| 22 | + nfsnprintf( nbuf, sizeof(nbuf), "%s%s/%s/%lld.%d_%d.%s%s", gctx->conf->path, gctx->conf->trash, | 22 | + nfsnprintf( nbuf, sizeof(nbuf), "%s/%s/%lld.%d_%d.%s%s", ctx->trash, | |
| 23 | + subdirs[gmsg->status & M_RECENT], (long long int) time( 0 ), Pid, ++MaildirCount, Hostname, s ? s : "" ); | 23 | + subdirs[gmsg->status & M_RECENT], (long long int)time( 0 ), Pid, ++MaildirCount, Hostname, s ? s : "" ); | |
| 24 | if (!rename( buf, nbuf )) | 24 | if (!rename( buf, nbuf )) | |
| 25 | break; | 25 | break; | |
| 26 | if (!stat( buf, &st )) { | 26 | if (!stat( buf, &st )) { |
$NetBSD: patch-src_Makefile.in,v 1.1 2014/04/24 14:48:44 schmonz Exp $
Install example config files in pkgsrc hierarchy.
--- src/Makefile.in.orig 2013-12-18 21:09:58.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
-exampledir = $(docdir)/examples
+exampledir = $(datadir)/examples/isync
example_DATA = mbsyncrc.sample
EXTRA_DIST = run-tests.pl $(example_DATA) $(man_MANS)
all: all-recursive
$NetBSD: patch-src_compat_Makefile.in,v 1.1 2014/04/24 14:48:44 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
@@ -280,7 +280,7 @@ isync_SOURCES = main.c config.c convert.
isync_LDADD = -ldb
noinst_HEADERS = isync.h
man_MANS = isync.1
-exampledir = $(docdir)/examples
+exampledir = $(datadir)/examples/isync
example_DATA = isyncrc.sample
EXTRA_DIST = $(example_DATA) $(man_MANS)
all: all-am