Date: Tue, 11 Nov 2008 11:48:41 +0100 (CET) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/128782: [PATCH] mail/cyrus-imapd23 2.3.13 Message-ID: <20081111104842.004894AE5D@mail.vx.sk> Resent-Message-ID: <200811111050.mABAo4LC053544@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 128782 >Category: ports >Synopsis: [PATCH] mail/cyrus-imapd23 2.3.13 >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: Tue Nov 11 10:50:04 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 7.1-PRERELEASE i386/amd64 >Organization: >Environment: FreeBSD 7.1-PRERELEASE i386/amd64 >Description: Add OPTIONS to support autocreate and autosieve UoA patches (very useful in e.g. LDAP environments) Patch project website and original patches: http://email.uoa.gr/projects/cyrus/ Compressed and freebsd port-stripped patches are under: http://people.freebsd.org/~mm/cyrus-imapd/uoa/ To support UoA patches, move small part from files/patch-imap::Makefile.in to post-patch Makefile section I am running these patches on several FreeBSD systems for years now without any issues. UoA updates patches with new versions of cyrus-imapd around one-two weeks after release. >How-To-Repeat: >Fix: Index: ports/mail/cyrus-imapd23/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/cyrus-imapd23/Makefile,v retrieving revision 1.175 diff -u -r1.175 Makefile --- ports/mail/cyrus-imapd23/Makefile 20 Oct 2008 16:11:47 -0000 1.175 +++ ports/mail/cyrus-imapd23/Makefile 11 Nov 2008 10:42:42 -0000 @@ -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/ \ @@ -39,7 +39,9 @@ --with-openssl=${OPENSSLBASE} \ --with-perl=${PERL5} -OPTIONS= BDB "Use Berkeley DB" on \ +OPTIONS= AUTOCREATE "Enable autocreate support (UoA)" off \ + AUTOSIEVE "Enable autosieve support (UoA)" off \ + BDB "Use Berkeley DB" on \ DRAC "Enable DRAC support" off \ IDLED "Enable IMAP idled support" off \ LDAP_PTLOADER "Enable LDAP ptloader" off \ @@ -158,6 +160,25 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure .endif +# +# Patches from University of Athens +# http://email.uoa.gr/projects/cyrus/ +# + +.if defined(WITH_AUTOCREATE) +AUTOCREATE_VERSION= 0.10-0 +PATCH_SITES+= http://people.freebsd.org/~mm/cyrus-imapd/uoa/ +PATCHFILES+= cyrus-imapd-${PORTVERSION}-autocreate-${AUTOCREATE_VERSION}.diff.gz +ROOTDOCS+= README.autocreate +.endif + +.if defined(WITH_AUTOSIEVE) +AUTOSIEVE_VERSION= 0.6.0 +PATCH_SITES+= http://people.freebsd.org/~mm/cyrus-imapd/uoa/ +PATCHFILES+= cyrus-imapd-${PORTVERSION}-autosieve-${AUTOSIEVE_VERSION}.diff.gz +ROOTDOCS+= README.autosieve +.endif + CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus @@ -206,6 +227,8 @@ @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ -e "s|/usr/sieve|/var/imap/sieve|g" \ ${WRKSRC}/tools/masssievec + @${REINPLACE_CMD} -e "s|-lpthread|\$$(PTHREAD_LIBS)|g" \ + ${WRKSRC}/imap/Makefile.in .if defined(WITH_DRAC) @${RM} -rf ${WRKSRC}/autom4te.cache .endif Index: ports/mail/cyrus-imapd23/distinfo =================================================================== RCS file: /home/pcvs/ports/mail/cyrus-imapd23/distinfo,v retrieving revision 1.50 diff -u -r1.50 distinfo --- ports/mail/cyrus-imapd23/distinfo 20 Oct 2008 16:11:47 -0000 1.50 +++ ports/mail/cyrus-imapd23/distinfo 11 Nov 2008 10:42:42 -0000 @@ -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-autocreate-0.10-0.diff.gz) = beba7e4ea1208addb2d7c76552c45060 +SHA256 (cyrus-imapd-2.3.13-autocreate-0.10-0.diff.gz) = e51d60001dd3cfb1747abdf2c3eadcd30213baf356a30e8619abbc824656cc9a +SIZE (cyrus-imapd-2.3.13-autocreate-0.10-0.diff.gz) = 17941 +MD5 (cyrus-imapd-2.3.13-autosieve-0.6.0.diff.gz) = a2c66fc78494f4ab052dc63131e8cae6 +SHA256 (cyrus-imapd-2.3.13-autosieve-0.6.0.diff.gz) = d7835cff9ffd8114cd68ad264d1259c3e195a4705c82e5d6f61ad8f6fa00fb71 +SIZE (cyrus-imapd-2.3.13-autosieve-0.6.0.diff.gz) = 2626 Index: ports/mail/cyrus-imapd23/files/patch-imap::Makefile.in =================================================================== RCS file: /home/pcvs/ports/mail/cyrus-imapd23/files/patch-imap::Makefile.in,v retrieving revision 1.2 diff -u -r1.2 patch-imap::Makefile.in --- ports/mail/cyrus-imapd23/files/patch-imap::Makefile.in 20 Dec 2005 17:35:41 -0000 1.2 +++ ports/mail/cyrus-imapd23/files/patch-imap::Makefile.in 11 Nov 2008 10:42:42 -0000 @@ -15,19 +15,3 @@ 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) >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20081111104842.004894AE5D>