[pkgsrc/trunk]: pkgsrc/mail/cyrus-imapd22 Add patch from cyrus imap cvs repos...

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4691fe94685a
branches:  trunk
changeset: 481147:4691fe94685a
user:      seb <seb%pkgsrc.org@localhost>
date:      Sun Sep 26 20:40:37 2004 +0000

description:
Add patch from cyrus imap cvs repository: fix master(8) support for
debugging Cyrus services.

Bump PKGREVISION.

diffstat:

 mail/cyrus-imapd22/Makefile         |   4 ++--
 mail/cyrus-imapd22/distinfo         |   3 ++-
 mail/cyrus-imapd22/patches/patch-ao |  29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diffs (60 lines):

diff -r 2dffd4ed5116 -r 4691fe94685a mail/cyrus-imapd22/Makefile
--- a/mail/cyrus-imapd22/Makefile       Sun Sep 26 20:15:18 2004 +0000
+++ b/mail/cyrus-imapd22/Makefile       Sun Sep 26 20:40:37 2004 +0000
@@ -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 -r 2dffd4ed5116 -r 4691fe94685a mail/cyrus-imapd22/distinfo
--- a/mail/cyrus-imapd22/distinfo       Sun Sep 26 20:15:18 2004 +0000
+++ b/mail/cyrus-imapd22/distinfo       Sun Sep 26 20:40:37 2004 +0000
@@ -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-al) = a0e4d20bd11bf78f6ed2e8ee9e3cc7b8d7ba35c1
 SHA1 (patch-am) = 1508cc8520632628fba6f8a5658fe10ff801ecdd
 SHA1 (patch-an) = 4269f1c3be1ffb015bccb71c9d4f3d1347276b34
+SHA1 (patch-ao) = 155fd49ccba19e7324c87beef234e749d9d28b3a
diff -r 2dffd4ed5116 -r 4691fe94685a mail/cyrus-imapd22/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cyrus-imapd22/patches/patch-ao       Sun Sep 26 20:40:37 2004 +0000
@@ -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);