summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorseb <seb@pkgsrc.org>2004-09-26 20:40:37 +0000
committerseb <seb@pkgsrc.org>2004-09-26 20:40:37 +0000
commitbc3f02f96481d1cbc8a0823cc3794e155d9be3f2 (patch)
tree82f0b0de1f4c488a46155955d7b320e83967202c /mail
parentfcab37eae0d1cf95ee1616634c02310fc9134325 (diff)
downloadpkgsrc-bc3f02f96481d1cbc8a0823cc3794e155d9be3f2.tar.gz
Add patch from cyrus imap cvs repository: fix master(8) support for
debugging Cyrus services. Bump PKGREVISION.
Diffstat (limited to 'mail')
-rw-r--r--mail/cyrus-imapd22/Makefile4
-rw-r--r--mail/cyrus-imapd22/distinfo3
-rw-r--r--mail/cyrus-imapd22/patches/patch-ao29
3 files changed, 33 insertions, 3 deletions
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 3c85f140707..9a0fba92522 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2004/08/22 19:32:51 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2004/09/26 20:40:37 seb Exp $
DISTNAME= cyrus-imapd-2.2.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
index 51d00061acf..6a34f4b4cab 100644
--- a/mail/cyrus-imapd22/distinfo
+++ b/mail/cyrus-imapd22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/08/11 22:09:04 jlam Exp $
+$NetBSD: distinfo,v 1.12 2004/09/26 20:40:37 seb Exp $
SHA1 (cyrus-imapd-2.2.8.tar.gz) = ee9e52598728d77d69850db3781aa4388d9a453a
Size (cyrus-imapd-2.2.8.tar.gz) = 1937828 bytes
@@ -6,3 +6,4 @@ SHA1 (patch-af) = 57ae4ef1a5ab39dfe22472945f4eccd29d70fb88
SHA1 (patch-al) = a0e4d20bd11bf78f6ed2e8ee9e3cc7b8d7ba35c1
SHA1 (patch-am) = 1508cc8520632628fba6f8a5658fe10ff801ecdd
SHA1 (patch-an) = 4269f1c3be1ffb015bccb71c9d4f3d1347276b34
+SHA1 (patch-ao) = 155fd49ccba19e7324c87beef234e749d9d28b3a
diff --git a/mail/cyrus-imapd22/patches/patch-ao b/mail/cyrus-imapd22/patches/patch-ao
new file mode 100644
index 00000000000..417abd5e8fa
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-ao
@@ -0,0 +1,29 @@
+$NetBSD: patch-ao,v 1.1 2004/09/26 20:40:37 seb Exp $
+
+--- master/service.c.orig 2004-03-22 20:05:47.000000000 +0000
++++ master/service.c
+@@ -68,6 +68,7 @@
+ #include <limits.h>
+
+ #include "service.h"
++#include "libconfig.h"
+ #include "xmalloc.h"
+
+ extern int optind, opterr;
+@@ -145,7 +146,6 @@ static int libwrap_ask(struct request_in
+ #endif
+
+ extern void cyrus_init(const char *, const char *, unsigned);
+-extern const char *config_getstring(const char *key, const char *def);
+ extern const char *config_dir;
+
+ static int getlockfd(char *service, int id)
+@@ -365,7 +365,7 @@ int main(int argc, char **argv, char **e
+ if (call_debugger) {
+ char debugbuf[1024];
+ int ret;
+- const char *debugger = config_getstring("debug_command", NULL);
++ const char *debugger = config_getstring(IMAPOPT_DEBUG_COMMAND);
+ if (debugger) {
+ snprintf(debugbuf, sizeof(debugbuf), debugger,
+ argv[0], getpid(), service);