update to isync 0.9.2

from rich cannings and maintainer Dan Harnett <danh at openbsd.org>
This commit is contained in:
sturm 2004-04-20 19:11:34 +00:00
parent 2701fe536c
commit bbb5dd63b6
10 changed files with 63 additions and 59 deletions

View File

@ -1,15 +1,16 @@
# $OpenBSD: Makefile,v 1.7 2002/09/12 14:45:33 danh Exp $
# $OpenBSD: Makefile,v 1.8 2004/04/20 19:11:34 sturm Exp $
COMMENT= "synchronize IMAP4 and maildir mailboxes"
DISTNAME= isync-0.8
DISTNAME= isync-0.9.2
CATEGORIES= mail
MASTER_SITES= http://www.cs.hmc.edu/~me/isync/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/}
HOMEPAGE= http://www.cs.hmc.edu/~me/isync/
HOMEPAGE= http://isync.sourceforge.net/
MAINTAINER= Dan Harnett <danh@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -20,6 +21,6 @@ CONFIGURE_STYLE= gnu
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/isync
${INSTALL_DATA} ${WRKSRC}/sample.isyncrc ${PREFIX}/share/examples/isync
${INSTALL_DATA} ${WRKSRC}/isyncrc.sample ${PREFIX}/share/examples/isync
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (isync-0.8.tar.gz) = a932d0f349f7224192f0cabf06642cfb
RMD160 (isync-0.8.tar.gz) = 67a463ec04675cf42463b2e91fffe8cd8f89d9e5
SHA1 (isync-0.8.tar.gz) = d93b2e63f3239ea5ff15a037f957e252f380c3ac
MD5 (isync-0.9.2.tar.gz) = 5b15353372ecd2212d8ea61df82e50f6
RMD160 (isync-0.9.2.tar.gz) = 3695ab87ab0e2256bac092fadb839c00bc2ec4d8
SHA1 (isync-0.9.2.tar.gz) = 9a683c8c3051d6d6a6a4d3166c3888c7c24ce8ef

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-config_c,v 1.1 2002/04/24 18:16:22 danh Exp $
--- config.c.orig Wed Apr 24 13:53:28 2002
+++ config.c Wed Apr 24 13:56:36 2002
@@ -324,8 +324,12 @@ find_box (const char *s)
void
free_config (void)
{
- free (global.user);
- free (global.maildir);
- free (global.host);
- free (global.pass);
+ if (global.user)
+ free (global.user);
+ if (global.maildir)
+ free (global.maildir);
+ if (global.host)
+ free (global.host);
+ if (global.pass)
+ free (global.pass);
}

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.1 2004/04/20 19:11:34 sturm Exp $
--- configure.orig 2003-12-07 10:11:33.000000000 -0500
+++ configure 2004-04-20 07:57:07.000000000 -0400
@@ -3202,7 +3202,7 @@ if test "${ac_cv_lib_ssl_SSL_library_ini
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl $LIBS"
+LIBS="-lssl -lcrypto $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-isync_h,v 1.1 2002/04/24 17:43:34 danh Exp $
--- isync.h.orig Wed Apr 24 13:31:44 2002
+++ isync.h Wed Apr 24 13:32:49 2002
@@ -25,7 +25,7 @@
#if HAVE_LIBSSL
#include <openssl/ssl.h>
#endif
-#include <db.h>
+#include <ndbm.h>
#include "debug.h"
typedef struct

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-main_c,v 1.1 2002/04/24 18:16:22 danh Exp $
--- main.c.orig Wed Apr 24 13:58:36 2002
+++ main.c Wed Apr 24 14:00:23 2002
@@ -212,11 +212,11 @@ main (int argc, char **argv)
optarg += 6;
}
#endif
- global.host = optarg;
+ global.host = strdup(optarg);
break;
case 'u':
free (global.user);
- global.user = optarg;
+ global.user = strdup(optarg);
break;
case 'V':
Verbose = 1;

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_imap_c,v 1.1 2004/04/20 19:11:34 sturm Exp $
--- src/imap.c.orig 2003-12-07 10:36:38.000000000 -0500
+++ src/imap.c 2004-04-20 00:43:35.000000000 -0400
@@ -666,7 +666,7 @@ imap_connect (config_t * cfg)
}
close (a[0]);
close (a[1]);
- execl ("/bin/sh", "sh", "-c", cfg->tunnel, 0);
+ execl ("/bin/sh", "sh", "-c", cfg->tunnel, (void *)NULL);
_exit (127);
}

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_main_c,v 1.1 2004/04/20 19:11:34 sturm Exp $
--- src/main.c.orig 2004-02-26 10:26:14.000000000 -0700
+++ src/main.c 2004-02-26 10:27:18.000000000 -0700
@@ -290,10 +290,10 @@ main (int argc, char **argv)
optarg += 6;
}
#endif
- global.host = optarg;
+ global.host = strdup(optarg);
break;
case 'u':
- global.user = optarg;
+ global.user = strdup(optarg);
break;
case 'V':
Verbose = 1;

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_sync_c,v 1.1 2004/04/20 19:11:34 sturm Exp $
--- src/sync.c.orig 2003-05-06 20:06:37.000000000 -0400
+++ src/sync.c 2004-04-20 00:45:43.000000000 -0400
@@ -325,7 +325,7 @@ sync_mailbox (mailbox_t * mbox, imap_t *
for (;;)
{
/* create new file */
- snprintf (path, sizeof (path), "%s/tmp/%ld_%d.%d.%s%s",
+ snprintf (path, sizeof (path), "%s/tmp/%d_%d.%d.%s%s",
mbox->path, time (0), MaildirCount++, getpid (),
Hostname, suffix);

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2002/04/24 18:16:22 danh Exp $
@comment $OpenBSD: PLIST,v 1.3 2004/04/20 19:11:35 sturm Exp $
bin/isync
man/man1/isync.1
share/examples/isync/sample.isyncrc
share/examples/isync/isyncrc.sample
@dirrm share/examples/isync