[csw-devel] SF.net SVN: gar:[13231] csw/mgar/pkg/cyrus_imapd/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Mon Feb 7 23:45:02 CET 2011
Revision: 13231
http://gar.svn.sourceforge.net/gar/?rev=13231&view=rev
Author: chninkel
Date: 2011-02-07 22:45:02 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
cyrus_imapd: upgraded to 2.4.6
Modified Paths:
--------------
csw/mgar/pkg/cyrus_imapd/trunk/Makefile
csw/mgar/pkg/cyrus_imapd/trunk/checksums
csw/mgar/pkg/cyrus_imapd/trunk/files/0001-Force-linkage-to-libperl.so.patch
csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW
csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW
csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW
Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2011-02-07 19:11:53 UTC (rev 13230)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2011-02-07 22:45:02 UTC (rev 13231)
@@ -13,7 +13,7 @@
###### Package information #######
NAME = cyrus_imapd
-VERSION = 2.3.16
+VERSION = 2.4.6
CATEGORIES = server
DESCRIPTION = Pop and Imap server from the Cyrus mail system
@@ -33,12 +33,12 @@
SPKG_DESC_CSWcyrusimapd = Pop and Imap server from the Cyrus mail system
CATALOGNAME_CSWcyrusimapd = cyrus_imapd
-RUNTIME_DEP_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWnetsnmp CSWpcrert CSWzlib CSWtcpwrap
+RUNTIME_DEP_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWnetsnmp CSWzlib CSWtcpwrap
#SPKG_CLASSES_CSWcyrusimapd = none services cswpreserveconf cswinitsmf
SPKG_DESC_CSWcyrusimapdutils = Various admin utilities for Cyrus Imapd/Popd
CATALOGNAME_CSWcyrusimapdutils = cyrus_imapd_utils
-RUNTIME_DEP_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWpcrert CSWzlib
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWzlib
#SPKG_CLASSES_CSWcyrusimapdutils = none
SPKG_DESC_CSWpmcyrus = Perl interface to Cyrus Imap functions
@@ -81,9 +81,13 @@
CHECKPKG_OVERRIDES_CSWcyrusimapdutils += surplus-dependency|CSWpmcyrus
+# Don't how to properly solve this now
+CHECKPKG_OVERRIDES_CSWcyrusimapd += file-collision|/opt/csw/share/man/man8/imapd.8|CSWcourierimap|CSWcyrusimapd
+
+
###### Upstream and opencsw files information #######
-MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(VERSION)/
+MASTER_SITES = ftp://ftp.cyrusimap.org/cyrus-imapd/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(VERSION)/ http://www.vx.sk/download/patches/cyrus-imapd/
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(shell echo $(NAME) | tr '_' '-')-(\d+(?:\.\d+)*).tar.gz
@@ -111,17 +115,15 @@
# taken from the krb5 source.
DISTFILES += compile_et et_c.awk et_h.awk
-# le fichier install-upgrade de cyrus 2.3.11 est incomplet
-DISTFILES += install-upgrade
-
# University of Athens patchs to allow autocreation of mailboxes
# and autocreation of sub-lolders for filter rules
-PATCHFILES = cyrus-imapd-$(VERSION)-autocreate-0.10-0.diff cyrus-imapd-$(VERSION)-autosieve-0.6.0.diff
+#PATCHFILES = cyrus-imapd-$(VERSION)-autocreate-0.10-0.diff cyrus-imapd-$(VERSION)-autosieve-0.6.0.diff
+PATCHFILES = cyrus-imapd-2.4.4-autocreate-0.10-0.patch cyrus-imapd-2.4.4-autosieve-0.6.0.patch
# This patch makes cyrus more tolerant with mails containing
# invalid From headers
# This avoids "Invalid Message header" error messages
-PATCHFILES += cyrus-imapd-acceptinvalidfrom.patch
+#PATCHFILES += cyrus-imapd-acceptinvalidfrom.patch
# This patch makes cyrus more tolerant with mails containing
# contains bare newlines
@@ -167,6 +169,7 @@
CONFIGURE_ARGS += --enable-replication
CONFIGURE_ARGS += --with-snmp=$(prefix)
CONFIGURE_ARGS += --with-libwrap=$(prefix)
+CONFIGURE_ARGS += --disable-nntp
# we add the args so perl libraries are installed
# in the correct path
@@ -181,9 +184,6 @@
# compile_et is missing so we want our to be used
CONFIGURE_ENV += COMPILE_ET="$(CURDIR)/files/compile_et -d $(CURDIR)/files/"
-pre-patch:
- cp $(WORKDIR)/install-upgrade $(WORKSRC)/doc/text
-
pre-configure-modulated:
# master is a too common name, so we rename it cyrus-master
cp $(WORKSRC)/man/master.8 $(WORKSRC)/man/cyrus-master.8
@@ -193,7 +193,7 @@
perl -pi -e 's/(cyrus-)?master/cyrus-master/' $(WORKSRC)/master/Makefile.in
# we delete autogenerated error files to force regeneration
- find $(WORKSRC) \( -name "*_err.c" -o -name "*_err.h" \) ! -name "com_err.*" -exec rm {} \;
+ # find $(WORKSRC) \( -name "*_err.c" -o -name "*_err.h" \) ! -name "com_err.*" -exec rm {} \;
@$(MAKECOOKIE)
@@ -213,7 +213,11 @@
mkdir -p $(PKGROOT)/$(prefix)/share/doc/cyrus_imapd
@$(MAKECOOKIE)
-post-merge:
+post-merge: fix2build install-tools cyrus-rename install-docs libexec-in-sbin install-cyrus-directory install-additional-files
+
+
+# Let's install the files
+install-additional-files:
# we provide our class action scripts to modify /etc/inet/services
ginstall -D $(WORKDIR_FIRSTMOD)/services $(PKGROOT)/etc/opt/csw/pkg/CSWcyrusimapd/services
@@ -223,51 +227,78 @@
ginstall -D "$(WORKDIR_FIRSTMOD)/imapd.conf" "$(PKGROOT)/$(sysconfdir)/cyrus/imapd.conf.CSW"
ginstall -D "$(WORKDIR_FIRSTMOD)/cyrus.conf" "$(PKGROOT)/$(sysconfdir)/cyrus/cyrus.conf.CSW"
+ @$(MAKECOOKIE)
+
+
+# Some binaries put under libexec/cyrus should be put under sbin
+# to be more easily used
+libexec-in-sbin:
( cd "$(PKGROOT)$(libexecdir)/cyrus/" && \
for E in *; do \
echo $(CYRUS_DAEMONS) | grep -w $$E >/dev/null && continue; \
[ -L $$E ] || ( mv -f $$E ../../sbin/$$E && ln -sf ../../sbin/$$E ); \
done )
+ @$(MAKECOOKIE)
- # let's create the directory structure where mails
- # and other cyrus stuffs will be stored
+
+# let's create the directory structure where mails
+# and other cyrus stuffs will be stored
+install-cyrus-directory:
for D in sieve config/proc config/db config/socket config/log \
config/msg config/ptclient mail mail/stage.; do \
mkdir -p "$(PKGROOT)/$(localstatedir)/cyrus/$$D"; \
done
+ @$(MAKECOOKIE)
- # we install binary under tools as part of the package
+
+
+# Some fixes and cleaning to correctly build the package
+fix2build:
+ # we fix some permission problems
+ chmod -R u+w "$(PKGROOT)/"
+
+ # let's remove pod files
+ gfind $(PKGROOT) -name "perllocal.pod" -exec rm '{}' ';'
+ # and CVS directories
+ gfind $(PKGROOT) -depth -type d -name "CVS" -exec rm -rf '{}' ';'
+
+ # We remove fetchnews man and doc page as we did not build nntp support
+ # and as it clashes with leafnode
+ rm -f $(PKGROOT)$(mandir)/man8/fetchnews.8
+ rm -f $(PKGROOT)$(docdir)/cyrus_imapd/man/fetchnews.8.html
+
+ @$(MAKECOOKIE)
+
+
+# we rename some tools with too generic names
+cyrus-rename:
+ mv $(PKGROOT)/$(sbindir)/mkimap $(PKGROOT)/$(sbindir)/mkdirs
+ ( for FILE in mkdirs mknewsgroups dohash undohash rehash; do \
+ mv $(PKGROOT)/$(sbindir)/$$FILE $(PKGROOT)/$(sbindir)/cyrus-$$FILE; \
+ done )
+ @$(MAKECOOKIE)
+
+
+# we install the documentation
+install-docs:
+ cp -r $(WORKSRC_FIRSTMOD)/doc/* $(PKGROOT)/$(docdir)/cyrus_imapd
+ ( for PKG in cyrus_imapd cyrus_imapd_utils pm_cyrus; do \
+ ginstall -D $(WORKDIR_FIRSTMOD)/$$PKG.changelog.CSW $(PKGROOT)/$(docdir)/$$PKG/changelog.CSW; \
+ ginstall -D $(WORKDIR_FIRSTMOD)/README.CSW $(PKGROOT)/$(docdir)/$$PKG/README.CSW; \
+ done )
+ @$(MAKECOOKIE)
+
+# we install binary under tools as part of the package
+install-tools:
cp -r $(WORKSRC_FIRSTMOD)/tools/* $(PKGROOT)$(sbindir)
[ -f "$(PKGROOT)$(sbindir)/arbitronsort.pl" ] && mv "$(PKGROOT)$(sbindir)/arbitronsort.pl" "$(PKGROOT)$(sbindir)/arbitronsort"
for F in config2header config2man not-mkdep migrate-metadata mupdate-loadgen.pl upgradesieve convert-sieve.pl; do \
rm -f $(PKGROOT)$(sbindir)/$$F; \
done
- # we want perl script to use opencsw perl
+ # we want perl scripts to use opencsw perl
perl -pi -e 's/exec\s+perl/exec \/opt\/csw\/bin\/perl/g' $(PKGROOT)$(sbindir)/* $(PKGROOT)$(bindir)/*
- ( for FILE in convert-sieve.pl mupdate-loadgen.pl translatesieve undohash upgradesieve arbitronsort; do \
+ ( for FILE in translatesieve undohash arbitronsort; do \
perl -pi -e 's/^#!\/usr\/(local\/)?bin\/perl/#!\/usr\/bin\/perl/' $(PKGROOT)$(sbindir)/$$FILE; \
done )
-
- # we install the documentation
- cp -r $(WORKSRC_FIRSTMOD)/doc/* $(PKGROOT)/$(docdir)/cyrus_imapd
- ( for PKG in cyrus_imapd cyrus_imapd_utils pm_cyrus; do \
- ginstall -D $(WORKDIR_FIRSTMOD)/$$PKG.changelog.CSW $(PKGROOT)/$(docdir)/$$PKG/changelog.CSW; \
- ginstall -D $(WORKDIR_FIRSTMOD)/README.CSW $(PKGROOT)/$(docdir)/$$PKG/README.CSW; \
- done )
-
- # we rename some tools with too generic names
- mv $(PKGROOT)/$(sbindir)/mkimap $(PKGROOT)/$(sbindir)/mkdirs
- ( for FILE in mkdirs mknewsgroups dohash undohash rehash; do \
- mv $(PKGROOT)/$(sbindir)/$$FILE $(PKGROOT)/$(sbindir)/cyrus-$$FILE; \
- done )
-
- # we fix some permission problems
- chmod -R u+w "$(PKGROOT)/"
-
- # let's remove pod files
- gfind $(PKGROOT)$(perllib) -name "perllocal.pod" -exec rm '{}' ';'
- # and CVS directories
- gfind $(PKGROOT) -depth -type d -name "CVS" -exec rm -rf '{}' ';'
-
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2011-02-07 19:11:53 UTC (rev 13230)
+++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2011-02-07 22:45:02 UTC (rev 13231)
@@ -1,27 +1,3 @@
-c86246806025404625c98a2348d0739d 0001-Force-linkage-to-libperl.so.patch
-585646739e9403c02e868900ebed892a CSWcyrusimapd.checkinstall
-5111a5573aa6d4878b852780aeae8a27 CSWcyrusimapd.preinstall
-940d00efcc42b92f05e92e6dd2764f61 CSWcyrusimapd.prototype
-7e99e825a1d6b134b91392beec1807f4 CSWcyrusimapdutils.prototype
-404a6d2b6608c26aaef4e37095200105 CSWpmcyrus.prototype
-d0b97b33e75ac75f89ee6236a2d53f05 README.CSW
-9cbebaeeafa6eb3320eafa594c253bc1 compile_et
-1c2b850f7a264704eefec741a75977ab cswcyrus
-628c5cf5f5b01f9e173e090ee0c969aa cswcyrus.xml
-98b88f89e72bbabfd3da35fc94809247 cyrus-imapd-2.3.16-autocreate-0.10-0.diff
-bb5171a5824f600b8a41cb00ab36cf02 cyrus-imapd-2.3.16-autosieve-0.6.0.diff
-6a37feb1985974eee8a4a4b2932dd54c cyrus-imapd-2.3.16.tar.gz
-b4c99489eacf0fb7befeef5e3098a5c1 cyrus-imapd-2.3.7-nobarenewlinescheck.patch
-6127a7b62ec4679a54985f6a2d915e52 cyrus-imapd-acceptinvalidfrom.patch
-fdb3416ec41f3a56d1594ca25a6dcd7d cyrus.conf
-20ed8433b045ef9c55a5c4e05a228ce7 cyrus_imapd.changelog.CSW
-51011023b9b2474a6d5d7aefae54b812 cyrus_imapd_utils.changelog.CSW
-5375c25c8bc325a90553d0be87a64a04 et_c.awk
-d1d86e61463a1dfefccbadedb11a8604 et_h.awk
-79211aee56db01e15566ced1ba4078da i.services
-908dbf764d3ccd541c4de881ac81a6ae imapd.conf
-14bb6e8c6d6914351f80df293982e88a install-upgrade
-9178809b3f1f7698725346d56c37049a pm_cyrus.changelog.CSW
-149ac6b6d82ef9ef4bb1b314f1a1cac4 r.services
-dce627f9a464ae4efe8a66c8dbd358d5 restore_allowplaintext_default.patch
-6dfee20f7c02139350caf9f75199e587 services
+81126a0e0ca7c8f099e8de8d4ee4b6fb cyrus-imapd-2.4.4-autocreate-0.10-0.patch
+84ceba44f5a2b834e95ba1b4eaee6900 cyrus-imapd-2.4.4-autosieve-0.6.0.patch
+c37b06ce2419734d8edf3d67004e5b0c cyrus-imapd-2.4.6.tar.gz
Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/0001-Force-linkage-to-libperl.so.patch
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/0001-Force-linkage-to-libperl.so.patch 2011-02-07 19:11:53 UTC (rev 13230)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/0001-Force-linkage-to-libperl.so.patch 2011-02-07 22:45:02 UTC (rev 13231)
@@ -1,18 +1,7 @@
-From 46de9238dc1925a468812b315e9095600279c33f Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 24 Feb 2010 15:17:57 +0100
-Subject: [PATCH] Force linkage to libperl.so
-
----
- perl/imap/Makefile.PL | 2 +-
- perl/sieve/managesieve/Makefile.PL | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/perl/imap/Makefile.PL b/perl/imap/Makefile.PL
-index 27ae4ca..ea8080f 100644
---- a/perl/imap/Makefile.PL
-+++ b/perl/imap/Makefile.PL
-@@ -65,7 +65,7 @@ WriteMakefile(
+diff -ur cyrus-imapd-2.4.4/perl/imap/Makefile.PL cyrus-imapd-2.4.4.new/perl/imap/Makefile.PL
+--- cyrus-imapd-2.4.4/perl/imap/Makefile.PL 2010-11-11 23:15:33.000000000 +0100
++++ cyrus-imapd-2.4.4.new/perl/imap/Makefile.PL 2010-11-21 22:36:28.368907061 +0100
+@@ -65,7 +65,7 @@
'clean' => {'FILES' => 'libcyrperl.a cyradm'},
'OBJECT' => 'IMAP.o',
'MYEXTLIB' => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
@@ -21,11 +10,10 @@
'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
'INC' => "-I../../lib -I../.. -I../../com_err/et $SASL_INC $OPENSSL_INC",
'EXE_FILES' => [cyradm],
-diff --git a/perl/sieve/managesieve/Makefile.PL b/perl/sieve/managesieve/Makefile.PL
-index b577f4c..a32ffb8 100644
---- a/perl/sieve/managesieve/Makefile.PL
-+++ b/perl/sieve/managesieve/Makefile.PL
-@@ -62,7 +62,7 @@ WriteMakefile(
+diff -ur cyrus-imapd-2.4.4/perl/sieve/managesieve/Makefile.PL cyrus-imapd-2.4.4.new/perl/sieve/managesieve/Makefile.PL
+--- cyrus-imapd-2.4.4/perl/sieve/managesieve/Makefile.PL 2010-11-11 23:15:33.000000000 +0100
++++ cyrus-imapd-2.4.4.new/perl/sieve/managesieve/Makefile.PL 2010-11-21 22:36:09.746290674 +0100
+@@ -62,7 +62,7 @@
'ABSTRACT' => 'Cyurs Sieve management interface',
'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
@@ -34,6 +22,3 @@
'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
);
---
-1.6.5.1
-
Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2011-02-07 19:11:53 UTC (rev 13230)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2011-02-07 22:45:02 UTC (rev 13231)
@@ -1,3 +1,17 @@
+cyrus_imapd (2.4.6,rev=2011.02.07) unstable
+
+ * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org> Mon, 07 Feb 2011 21:39:09 +0100
+
+cyrus_imapd (2.4.5,REV=2010.12.18) unstable
+
+ * New upstream version.
+ * Removed fetchnews man and doc page as nntp support is not enabled.
+ * Removed cyrus-imapd-acceptinvalidfrom.patch patch applied upstream.
+
+ -- Yann Rouillard <yann at opencsw.org> Sun, 18 Dec 2010 17:28:34 +0100
+
cyrus_imapd (2.3.16,REV=2010.11.21) unstable
* Added missing zlib dependancy.
@@ -2,3 +16,3 @@
* Moved configuration from /opt/csw/etc/cyrus to /etc/opt/csw/cyrus/.
- * Moved default cyrus directiry from /opt/csw/var/cyrus to /var/opt/csw/cyrus.
+ * Moved default cyrus directory from /opt/csw/var/cyrus to /var/opt/csw/cyrus.
* [gar] switched do dynamic prototype.
Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2011-02-07 19:11:53 UTC (rev 13230)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2011-02-07 22:45:02 UTC (rev 13231)
@@ -1,5 +1,17 @@
-cyrus_imapd\xC3_utils (2.3.16,REV=2010.11.21) unstable
+cyrus_imapd_utils (2.4.6,rev=2011.02.07) unstable
+ * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org> Mon, 07 Feb 2011 21:39:09 +0100
+
+cyrus_imapd_utils (2.4.5,REV=2010.12.18) unstable
+
+ * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org> Sun, 18 Dec 2010 17:28:34 +0100
+
+cyrus_imapd_utils (2.3.16,REV=2010.11.21) unstable
+
* Added missing zlib dependancy.
* [gar] switched do dynamic prototype.
Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2011-02-07 19:11:53 UTC (rev 13230)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2011-02-07 22:45:02 UTC (rev 13231)
@@ -1,3 +1,15 @@
+pm_cyrus (2.4.6,rev=2011.02.07) unstable
+
+ * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org> Mon, 07 Feb 2011 21:39:09 +0100
+
+pm_cyrus (2.4.5,REV=2010.12.18) unstable
+
+ * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org> Sun, 18 Dec 2010 17:28:34 +0100
+
pm_cyrus (2.3.16,REV=2010.11.21) unstable
* Added missing zlib dependancy.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list