Date: Thu, 4 Dec 2008 20:31:10 +0300 (MSK) From: Pavel I Volkov <pol@opk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ume@FreeBSD.org Subject: ports/129422: [PATCH] mail/cyrus-imapd: add patch for autocreate INBOX, change syslog facility, patch to compatible with DRAC support Message-ID: <200812041731.mB4HVA99077900@pol.iib.ru> Resent-Message-ID: <200812041800.mB4I02gD025588@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 129422 >Category: ports >Synopsis: [PATCH] mail/cyrus-imapd: add patch for autocreate INBOX, change syslog facility, patch to compatible with DRAC support >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: Thu Dec 04 18:00:02 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: Fri Jul 4 05:20:57 MSD >Description: [DESCRIBE CHANGES] This patch replace for ports/125045 change request. Please drop ports/125045 request. Added file(s): - files/extra-patch-autocreate-contrib::drac_auth.patch - 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@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- cyrus-imapd-2.3.13_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-10-20 20:11:47.000000000 +0400 +++ /usr/ports/mail/cyrus-imapd23/Makefile 2008-12-04 18:46:37.000000000 +0300 @@ -7,7 +7,7 @@ PORTNAME= cyrus-imapd PORTVERSION= 2.3.13 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus/ \ http://ftp.andrew.cmu.edu/pub/cyrus/ \ @@ -52,7 +52,9 @@ REPLICATION "Enable replication" off \ SQLITE "Use SQLite (experimental)" 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> @@ -118,6 +120,19 @@ CONFIGURE_ARGS+=--enable-netscapehack .endif +.if defined(WITH_AUTOCREATE) +# http://email.uoa.gr/projects/cyrus/autocreate/README.autocreate-cyrus-2.3 +PATCH_SITES= http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.13/ +PATCHFILES= cyrus-imapd-2.3.13-autosieve-0.6.0.diff cyrus-imapd-2.3.13-autocreate-0.10-0.diff +PATCH_DIST_STRIP= -E -p1 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-autocreate-contrib::drac_auth.patch +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_DRAC) EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \ @@ -158,6 +173,10 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure .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-10-20 20:11:47.000000000 +0400 +++ /usr/ports/mail/cyrus-imapd23/distinfo 2008-11-13 14:41:52.000000000 +0300 @@ -1,3 +1,9 @@ MD5 (cyrus-imapd-2.3.13.tar.gz) = 7dc48324c3a99e210bf777ea74aae694 SHA256 (cyrus-imapd-2.3.13.tar.gz) = f651c3f5112d3aefa5ab5250f9cb9bb012046a0c3bd72eabb82da9dde1150fba SIZE (cyrus-imapd-2.3.13.tar.gz) = 2328467 +MD5 (cyrus-imapd-2.3.13-autosieve-0.6.0.diff) = cce2e7fbc847791182b8f431c59e473a +SHA256 (cyrus-imapd-2.3.13-autosieve-0.6.0.diff) = c3144335e008219ac3fe25b69ece0841d3949d8c8f4195a4d894e38dce641d5c +SIZE (cyrus-imapd-2.3.13-autosieve-0.6.0.diff) = 7918 +MD5 (cyrus-imapd-2.3.13-autocreate-0.10-0.diff) = f1957096f173dcc9ea94d0544a07e9db +SHA256 (cyrus-imapd-2.3.13-autocreate-0.10-0.diff) = 3a9e2e2a970f957d61afd1df59dd60926bbc70f0891c6340974b6700c3d15d75 +SIZE (cyrus-imapd-2.3.13-autocreate-0.10-0.diff) = 85773 diff -ruN --exclude=CVS /usr/ports/mail/cyrus-imapd23.orig/files/extra-patch-autocreate-contrib::drac_auth.patch /usr/ports/mail/cyrus-imapd23/files/extra-patch-autocreate-contrib::drac_auth.patch --- /usr/ports/mail/cyrus-imapd23.orig/files/extra-patch-autocreate-contrib::drac_auth.patch 1970-01-01 03:00:00.000000000 +0300 +++ /usr/ports/mail/cyrus-imapd23/files/extra-patch-autocreate-contrib::drac_auth.patch 2008-12-04 11:26:58.000000000 +0300 @@ -0,0 +1,47 @@ +--- contrib/drac_auth.patch.orig 2008-12-03 19:37:19.000000000 +0300 ++++ contrib/drac_auth.patch 2008-12-04 11:24:25.000000000 +0300 +@@ -107,32 +107,32 @@ + DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ + + @@ -202,17 +203,17 @@ +- imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) ++ imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o imapd \ + $(SERVICE) $(IMAPDOBJS) mutex_fake.o \ +-- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) +-+ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) ++- libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) +++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) + +- imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) ++ imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \ + $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ +-- $(DEPLIBS) $(LIBS) $(LIB_WRAP) +-+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) ++- $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) +++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) + +- imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) ++ imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \ + $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ +-- $(DEPLIBS) $(LIBS) $(LIB_WRAP) +-+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) ++- $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) +++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) + + mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \ + libimap.a $(DEPLIBS) + @@ -230,7 +231,7 @@ + pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \ +- $(DEPLIBS) $(SERVICE) ++ $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \ +-- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) +-+ mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) ++- mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) +++ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) + + nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \ + mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE) 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 2005-12-20 20:35:41.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-12-04 19:26:32.000000000 +0300 @@ -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 2008-10-20 20:11:47.000000000 +0400 +++ /usr/ports/mail/cyrus-imapd23/pkg-plist 2008-11-13 12:08:27.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.13_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812041731.mB4HVA99077900>