summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/isync/Makefile16
-rw-r--r--mail/isync/PLIST4
-rw-r--r--mail/isync/distinfo14
-rw-r--r--mail/isync/patches/patch-aa41
-rw-r--r--mail/isync/patches/patch-ab33
-rw-r--r--mail/isync/patches/patch-ac8
-rw-r--r--mail/isync/patches/patch-ad13
-rw-r--r--mail/isync/patches/patch-ae22
8 files changed, 74 insertions, 77 deletions
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index e378a491a00..921f700b145 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -1,17 +1,23 @@
-# $NetBSD: Makefile,v 1.2 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/27 16:54:06 seb Exp $
#
-DISTNAME= isync-0.8
-PKGREVISION= 1
+DISTNAME= isync-0.9.2
CATEGORIES= mail net
-MASTER_SITES= http://www.cs.hmc.edu/~me/isync/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/}
MAINTAINER= cez+misc.pkgsrc@compsoc.man.ac.uk
-HOMEPAGE= http://www.cs.hmc.edu/~me/isync/
+HOMEPAGE= http://isync.sourceforge.net/
COMMENT= Syncronize a maildir with an imap server
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
+CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
+LDFLAGS+= -lcrypto
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/isync
+ ${INSTALL_DATA} ${WRKSRC}/isyncrc.sample ${PREFIX}/share/examples/isync/isyncrc.sample
+
.include "../../security/openssl/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/isync/PLIST b/mail/isync/PLIST
index 7eb4262b125..64097fc4db1 100644
--- a/mail/isync/PLIST
+++ b/mail/isync/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/07 15:12:41 cjep Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/12/27 16:54:06 seb Exp $
bin/isync
man/man1/isync.1
+share/examples/isync/isyncrc.sample
+@dirrm share/examples/isync
diff --git a/mail/isync/distinfo b/mail/isync/distinfo
index 27439599cb0..1d5b51910d8 100644
--- a/mail/isync/distinfo
+++ b/mail/isync/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/07 15:12:41 cjep Exp $
+$NetBSD: distinfo,v 1.2 2003/12/27 16:54:06 seb Exp $
-SHA1 (isync-0.8.tar.gz) = d93b2e63f3239ea5ff15a037f957e252f380c3ac
-Size (isync-0.8.tar.gz) = 66347 bytes
-SHA1 (patch-aa) = 3c73e5b5b9d8a1a9e7eccc463b2489ef52e45184
-SHA1 (patch-ab) = 72c16339f5e588c71bd133bff2bbf345d1f91e53
-SHA1 (patch-ac) = e691332efb46c56c92e6a4e8fa0dfe3d126b91a7
-SHA1 (patch-ad) = 1862831c101c0d68e8bb2695f5803a705096ac74
-SHA1 (patch-ae) = 54440ab2d23b7a1808476b1b3d26061c62d19b44
+SHA1 (isync-0.9.2.tar.gz) = 9a683c8c3051d6d6a6a4d3166c3888c7c24ce8ef
+Size (isync-0.9.2.tar.gz) = 110170 bytes
+SHA1 (patch-aa) = 0b91d8b5784d23bce5704f40d5b8a4aae1c70d22
+SHA1 (patch-ab) = 0230c871be84a7f6abad8ce8e19caa76fc60a782
+SHA1 (patch-ac) = bf110df62dcf4853e1deb1192720ebaa634445f9
diff --git a/mail/isync/patches/patch-aa b/mail/isync/patches/patch-aa
index 735d7d9c2e5..6df6457efd9 100644
--- a/mail/isync/patches/patch-aa
+++ b/mail/isync/patches/patch-aa
@@ -1,13 +1,30 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/07 15:12:41 cjep Exp $
+$NetBSD: patch-aa,v 1.2 2003/12/27 16:54:06 seb Exp $
---- configure.orig Sat Dec 7 13:58:13 2002
-+++ configure
-@@ -1386,7 +1386,7 @@ else
- #line 1387 "configure"
- #include "confdefs.h"
- #define DB_DBM_HSEARCH 1
--#include <db.h>
-+#include <ndbm.h>
- int main() {
- dbm_open(0,0,0);
- ; return 0; }
+--- src/dotlock.c.orig 2003-05-07 00:06:37.000000000 +0000
++++ src/dotlock.c
+@@ -34,13 +34,16 @@
+ #include <stdio.h>
+ #endif
+
+-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; }
+
+ 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)
+
+ if (*fd != -1)
+ {
++ FLOCK_INIT(lck);
+ lck.l_type = F_UNLCK;
+ if (fcntl (*fd, F_SETLK, &lck))
+ r = -1;
diff --git a/mail/isync/patches/patch-ab b/mail/isync/patches/patch-ab
index 77e1b34c0b1..805bcf3474c 100644
--- a/mail/isync/patches/patch-ab
+++ b/mail/isync/patches/patch-ab
@@ -1,13 +1,22 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/12/07 15:12:41 cjep Exp $
+$NetBSD: patch-ab,v 1.2 2003/12/27 16:54:06 seb Exp $
---- configure.in.orig Mon Jan 28 19:32:58 2002
-+++ configure.in
-@@ -30,7 +30,7 @@ if test $ac_cv_dbmopen = no; then
- LIBS="$LIBS -ldb"
- ac_cv_libdb=no
- AC_TRY_LINK([#define DB_DBM_HSEARCH 1
--#include <db.h>],
-+#include <ndbm.h>],
- [dbm_open(0,0,0);],
- [ac_cv_libdb=yes])
- LIBS="$save_LIBS"])
+--- 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);
diff --git a/mail/isync/patches/patch-ac b/mail/isync/patches/patch-ac
index ca74449f45a..597570ea63b 100644
--- a/mail/isync/patches/patch-ac
+++ b/mail/isync/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/12/07 15:12:41 cjep Exp $
+$NetBSD: patch-ac,v 1.2 2003/12/27 16:54:06 seb Exp $
---- sync.c.orig Mon Jan 28 19:19:56 2002
-+++ sync.c
-@@ -48,7 +48,7 @@ set_uid (DBM * db, const char *f, unsign
+--- 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
key.dptr = (void *) f;
s = strchr (f, ':');
diff --git a/mail/isync/patches/patch-ad b/mail/isync/patches/patch-ad
deleted file mode 100644
index 78e4c9675c6..00000000000
--- a/mail/isync/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/12/07 15:12:41 cjep Exp $
-
---- isync.h.orig Wed Jan 16 19:47:28 2002
-+++ isync.h
-@@ -25,7 +25,7 @@
- #if HAVE_LIBSSL
- #include <openssl/ssl.h>
- #endif
--#include <db.h>
-+#include <ndbm.h>
- #include "debug.h"
-
- typedef struct
diff --git a/mail/isync/patches/patch-ae b/mail/isync/patches/patch-ae
deleted file mode 100644
index 9330296192d..00000000000
--- a/mail/isync/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/12/07 15:12:41 cjep Exp $
-
---- maildir.c.orig Wed Jan 16 22:17:54 2002
-+++ maildir.c
-@@ -280,7 +280,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)
- {
-@@ -336,7 +336,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);
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-15 16:35:54 +0000