ports/125045: [PATCH] mail/cyrus-imapd: add patch for autocreate INBOX, change syslog facility
Pavel I Volkov
pol at opk.ru
Fri Jun 27 16:40:05 UTC 2008
>Number: 125045
>Category: ports
>Synopsis: [PATCH] mail/cyrus-imapd: add patch for autocreate INBOX, change syslog facility
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 27 16:40:04 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Pavel I Volkov
>Release: FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD pol.iib.ru 7.0-STABLE FreeBSD 7.0-STABLE #0: Mon May 26 13:48:12 MSD 2008
>Description:
Added file(s):
- files/extra-patch-autocreate-imap::Makefile.in
- files/extra-patch-imap::Makefile.in
- files/patch-imap::fud.c
- files/patch-imap::mbexamine.c
Removed file(s):
- files/patch-imap::Makefile.in
Port maintainer (ume at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- cyrus-imapd-2.3.12p2_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/cyrus-imapd23.orig/Makefile /usr/ports/mail/cyrus-imapd23/Makefile
--- /usr/ports/mail/cyrus-imapd23.orig/Makefile 2008-06-23 02:46:15.000000000 +0400
+++ /usr/ports/mail/cyrus-imapd23/Makefile 2008-06-27 16:54:34.000000000 +0400
@@ -49,7 +49,9 @@
NNTP "Enable NNTP support" off \
REPLICATION "Enable replication" off \
SNMP_4 "Enable SNMP support using net-snmp v4" off \
- SNMP_5 "Enable SNMP support using net-snmp v5" off
+ SNMP_5 "Enable SNMP support using net-snmp v5" off \
+ AUTOCREATE "Enable autocreate users INBOX folders" off \
+ SYSLOG_MAIL "Change syslog facility from local6 to mail" off
.include <bsd.port.pre.mk>
@@ -140,6 +142,22 @@
BROKEN= does not compile
.endif
+.if defined(WITH_AUTOCREATE) || make(makesum)
+# http://email.uoa.gr/projects/cyrus/autocreate/README.autocreate-cyrus-2.3
+PATCH_SITES= http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.12/
+PATCHFILES= cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
+PATCH_DIST_STRIP= -E -p1
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-autocreate-imap::Makefile.in
+PLIST_SUB+= AUTOCREATE=""
+.else
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-imap::Makefile.in
+PLIST_SUB+= AUTOCREATE="@comment "
+.endif
+
+.if defined(WITH_SYSLOG_MAIL)
+CONFIGURE_ARGS+=--with-syslogfacility=MAIL
+.endif
+
CYRUS_USER?= cyrus
CYRUS_GROUP?= cyrus
diff -ruN --exclude=CVS /usr/ports/mail/cyrus-imapd23.orig/distinfo /usr/ports/mail/cyrus-imapd23/distinfo
--- /usr/ports/mail/cyrus-imapd23.orig/distinfo 2008-04-27 04:55:49.000000000 +0400
+++ /usr/ports/mail/cyrus-imapd23/distinfo 2008-06-27 11:21:54.000000000 +0400
@@ -1,3 +1,9 @@
MD5 (cyrus-imapd-2.3.12p2.tar.gz) = ee2c300687994e4982c6af6aa154c742
SHA256 (cyrus-imapd-2.3.12p2.tar.gz) = c4ea8af68d2b14d93f662fc97f805450ef0cb98ddb986b2b7330cb4aba93c4c4
SIZE (cyrus-imapd-2.3.12p2.tar.gz) = 2305996
+MD5 (cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff) = fcdbde312ca775eaa479d52d342411db
+SHA256 (cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff) = 805d08b69c949004605b1df0d7004a40b672fad40cb92bdccae8eb8dd773afff
+SIZE (cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff) = 7942
+MD5 (cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff) = 05e9712df8d7e0152d8da3ebd0efe7ec
+SHA256 (cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff) = 0db58af681bb01e58dfed155f862fb0be5202dee5a3b4616c9bf237c7d951bfc
+SIZE (cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff) = 85597
diff -ruN --exclude=CVS /usr/ports/mail/cyrus-imapd23.orig/files/extra-patch-autocreate-imap::Makefile.in /usr/ports/mail/cyrus-imapd23/files/extra-patch-autocreate-imap::Makefile.in
--- /usr/ports/mail/cyrus-imapd23.orig/files/extra-patch-autocreate-imap::Makefile.in 1970-01-01 03:00:00.000000000 +0300
+++ /usr/ports/mail/cyrus-imapd23/files/extra-patch-autocreate-imap::Makefile.in 2007-12-03 15:03:12.000000000 +0300
@@ -0,0 +1,33 @@
+Index: imap/Makefile.in
+diff -u imap/Makefile.in.orig imap/Makefile.in
+--- imap/Makefile.in.orig Fri Nov 18 00:46:14 2005
++++ imap/Makefile.in Sat Dec 10 16:46:31 2005
+@@ -130,10 +130,10 @@
+
+
+ install:
+- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
++ $(INSTALL) -d ${DESTDIR}$(service_path)
+ for file in $(PROGS); \
+ do \
+- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
++ $(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
+ done
+ ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
+ ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
+@@ -219,13 +219,13 @@
+ $(CC) $(LDFLAGS) -o mupdate \
+ $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
+ mutex_pthread.o tls.o libimap.a \
+- $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
+
+ mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
+ libimap.a $(SIEVE_LIBS) $(DEPLIBS)
+ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
+ $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
+- mutex_pthread.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
++ mutex_pthread.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
+
+ pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
+ $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
diff -ruN --exclude=CVS /usr/ports/mail/cyrus-imapd23.orig/files/extra-patch-imap::Makefile.in /usr/ports/mail/cyrus-imapd23/files/extra-patch-imap::Makefile.in
--- /usr/ports/mail/cyrus-imapd23.orig/files/extra-patch-imap::Makefile.in 1970-01-01 03:00:00.000000000 +0300
+++ /usr/ports/mail/cyrus-imapd23/files/extra-patch-imap::Makefile.in 2007-12-03 14:37:48.000000000 +0300
@@ -0,0 +1,33 @@
+Index: imap/Makefile.in
+diff -u imap/Makefile.in.orig imap/Makefile.in
+--- imap/Makefile.in.orig Fri Nov 18 00:46:14 2005
++++ imap/Makefile.in Sat Dec 10 16:46:31 2005
+@@ -130,10 +130,10 @@
+
+
+ install:
+- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
++ $(INSTALL) -d ${DESTDIR}$(service_path)
+ for file in $(PROGS); \
+ do \
+- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
++ $(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
+ done
+ ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
+ ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
+@@ -219,13 +219,13 @@
+ $(CC) $(LDFLAGS) -o mupdate \
+ $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
+ mutex_pthread.o tls.o libimap.a \
+- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
++ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
+
+ mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
+ libimap.a $(DEPLIBS)
+ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
+ $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
+- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
++ mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
+
+ pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
+ $(DEPLIBS) $(SERVICE)
diff -ruN --exclude=CVS /usr/ports/mail/cyrus-imapd23.orig/files/patch-imap::Makefile.in /usr/ports/mail/cyrus-imapd23/files/patch-imap::Makefile.in
--- /usr/ports/mail/cyrus-imapd23.orig/files/patch-imap::Makefile.in 2005-12-20 20:35:41.000000000 +0300
+++ /usr/ports/mail/cyrus-imapd23/files/patch-imap::Makefile.in 1970-01-01 03:00:00.000000000 +0300
@@ -1,33 +0,0 @@
-Index: imap/Makefile.in
-diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig Fri Nov 18 00:46:14 2005
-+++ imap/Makefile.in Sat Dec 10 16:46:31 2005
-@@ -130,10 +130,10 @@
-
-
- install:
-- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-+ $(INSTALL) -d ${DESTDIR}$(service_path)
- for file in $(PROGS); \
- do \
-- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
-+ $(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
- done
- ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
- ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
-@@ -219,13 +219,13 @@
- $(CC) $(LDFLAGS) -o mupdate \
- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- mutex_pthread.o tls.o libimap.a \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
-
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- libimap.a $(DEPLIBS)
- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
-- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+ mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
-
- pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
- $(DEPLIBS) $(SERVICE)
diff -ruN --exclude=CVS /usr/ports/mail/cyrus-imapd23.orig/files/patch-imap::fud.c /usr/ports/mail/cyrus-imapd23/files/patch-imap::fud.c
--- /usr/ports/mail/cyrus-imapd23.orig/files/patch-imap::fud.c 1970-01-01 03:00:00.000000000 +0300
+++ /usr/ports/mail/cyrus-imapd23/files/patch-imap::fud.c 2008-06-27 13:47:49.000000000 +0400
@@ -0,0 +1,14 @@
+--- imap/fud.c.orig 2008-06-27 13:41:16.000000000 +0400
++++ imap/fud.c 2008-06-27 13:45:58.000000000 +0400
+@@ -102,9 +102,9 @@
+
+ int soc = 0; /* inetd (master) has handed us the port as stdin */
+
+-char who[16];
++char who[MAXLOGNAME];
+
+-#define MAXLOGNAME 16 /* should find out for real */
++/* #define MAXLOGNAME 16 /* should find out for real */
+ #define MAXDOMNAME 20 /* should find out for real */
+
+ int begin_handling(void)
diff -ruN --exclude=CVS /usr/ports/mail/cyrus-imapd23.orig/files/patch-imap::mbexamine.c /usr/ports/mail/cyrus-imapd23/files/patch-imap::mbexamine.c
--- /usr/ports/mail/cyrus-imapd23.orig/files/patch-imap::mbexamine.c 1970-01-01 03:00:00.000000000 +0300
+++ /usr/ports/mail/cyrus-imapd23/files/patch-imap::mbexamine.c 2008-06-27 14:03:21.000000000 +0400
@@ -0,0 +1,11 @@
+--- imap/mbexamine.c.orig 2008-06-27 13:49:28.000000000 +0400
++++ imap/mbexamine.c 2008-06-27 14:02:34.000000000 +0400
+@@ -311,7 +311,7 @@
+ printf("\n");
+ }
+ printf(" Last POP3 Login: (%ld) %s", mailbox.pop3_last_login,
+- ctime((const long *) &mailbox.pop3_last_login));
++ ctime((time_t *) &mailbox.pop3_last_login));
+ if (mailbox.minor_version >= 8) {
+ printf(" Highest Mod Sequence: " MODSEQ_FMT "\n",
+ mailbox.highestmodseq);
diff -ruN --exclude=CVS /usr/ports/mail/cyrus-imapd23.orig/pkg-message /usr/ports/mail/cyrus-imapd23/pkg-message
--- /usr/ports/mail/cyrus-imapd23.orig/pkg-message 2003-08-31 11:05:45.000000000 +0400
+++ /usr/ports/mail/cyrus-imapd23/pkg-message 2008-06-27 20:22:17.000000000 +0400
@@ -1,8 +1,8 @@
****************************************************************************
-To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
-then run /usr/local/cyrus/bin/mkimap.
+To setup mail spool, modify ${PREFIX}/etc/imapd.conf appropriately,
+then run ${PREFIX}/cyrus/bin/mkimap.
To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your
-/etc/rc.conf.
+/etc/rc.conf[.local]
****************************************************************************
diff -ruN --exclude=CVS /usr/ports/mail/cyrus-imapd23.orig/pkg-plist /usr/ports/mail/cyrus-imapd23/pkg-plist
--- /usr/ports/mail/cyrus-imapd23.orig/pkg-plist 2007-12-15 05:08:51.000000000 +0300
+++ /usr/ports/mail/cyrus-imapd23/pkg-plist 2007-12-03 15:53:55.000000000 +0300
@@ -11,6 +11,7 @@
bin/synctest
cyrus/bin/arbitron
cyrus/bin/chk_cyrus
+%%AUTOCREATE%%cyrus/bin/compile_sieve
cyrus/bin/ctl_cyrusdb
cyrus/bin/ctl_deliver
cyrus/bin/ctl_mboxlist
--- cyrus-imapd-2.3.12p2_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list