Hello ports@
please find attached diff for isync-1.0.6 - previously at misc@ (
http://marc.info/?l=openbsd-misc&m=142520260120104&w=2 )
works for me on i386/current (snapshot from yesterday)
can you please test it? feedback?
Thank you,
Jan Vlach
---
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/isync/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile 11 Mar 2013 11:23:51 -0000 1.25
+++ Makefile 1 Apr 2015 20:33:23 -0000
@@ -3,6 +3,7 @@
COMMENT= synchronize IMAP4 and maildir mailboxes
DISTNAME= isync-1.0.6
+REVISION= 0
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/}
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 1 Apr 2015 20:33:23 -0000
@@ -0,0 +1,23 @@
+$OpenBSD drv_maildir.c,v 0.1 2015/04/01 22:25:49 [email protected] Exp$
+--- src/drv_maildir.c.orig Wed Feb 20 08:28:19 2013
++++ src/drv_maildir.c Wed Apr 1 22:21:49 2015
+@@ -936,7 +936,7 @@ maildir_store_msg( store_t *gctx, msg_data_t *data, in
+ int ret, fd, bl;
+ char buf[_POSIX_PATH_MAX], nbuf[_POSIX_PATH_MAX], fbuf[NUM_FLAGS + 3],
base[128];
+
+- bl = nfsnprintf( base, sizeof(base), "%ld.%d_%d.%s", time( 0 ), Pid,
++MaildirCount, Hostname );
++ bl = nfsnprintf( base, sizeof(base), "%lld.%d_%d.%s", (long long)time(
0 ), Pid, ++MaildirCount, Hostname );
+ if (uid) {
+ #ifdef USE_DB
+ if (ctx->db) {
+@@ -1086,8 +1086,8 @@ maildir_trash_msg( store_t *gctx, message_t *gmsg )
+ for (;;) {
+ nfsnprintf( buf, sizeof(buf), "%s/%s/%s", gctx->path,
subdirs[gmsg->status & M_RECENT], msg->base );
+ s = strstr( msg->base, ":2," );
+- nfsnprintf( nbuf, sizeof(nbuf), "%s%s/%s/%ld.%d_%d.%s%s",
gctx->conf->path, gctx->conf->trash,
+- subdirs[gmsg->status & M_RECENT], time( 0 ), Pid,
++MaildirCount, Hostname, s ? s : "" );
++ nfsnprintf( nbuf, sizeof(nbuf), "%s%s/%s/%lld.%d_%d.%s%s",
gctx->conf->path, gctx->conf->trash,
++ subdirs[gmsg->status & M_RECENT], (long long)time(
0 ), Pid, ++MaildirCount, Hostname, s ? s : "" );
+ if (!rename( buf, nbuf ))
+ break;
+ if (!stat( buf, &st )) {
---
On Sun, Mar 01, 2015 at 09:35:57AM +0000, Stuart Henderson wrote:
>
> No need; the patched version is fine for both 32-bit and 64-bit arches,
> and doesn't cause problems for OS with 32-bit time_t, either.
>
> Yes if you could send to ports@ that would be helpful, are you able to
> include a diff to the port? Since you already copied the unpatched files
> with a .orig suffix, "make update-patches" should create patch files for
> you (cvs add the patches directory then patch-* files, add REVISION=0 to
> the port Makefile, and cvs diff -uNp).
>
