[csw-devel] SF.net SVN: gar:[16831] csw/mgar/pkg/cyrus_imapd/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Thu Jan 19 22:07:24 CET 2012
Revision: 16831
http://gar.svn.sourceforge.net/gar/?rev=16831&view=rev
Author: guengel
Date: 2012-01-19 21:07:24 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
cyrus_imapd/trunk: Move manpages in 8 to 1m.
Modified Paths:
--------------
csw/mgar/pkg/cyrus_imapd/trunk/Makefile
csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW
csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW
Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2012-01-19 20:56:09 UTC (rev 16830)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2012-01-19 21:07:24 UTC (rev 16831)
@@ -18,14 +18,14 @@
DESCRIPTION = Pop and Imap server from the Cyrus mail system
define BLURB
- The Cyrus IMAP server is generally intended to be run on sealed systems,
- where normal users are not permitted to log in. The mailbox database is
- stored in parts of the filesystem that are private to Cyrus. All user
- access to mail is through the IMAP, POP3, or KPOP protocols. The private
- mailbox database design gives the server large advantages in efficiency,
- scalability, and administratability. Multiple concurrent read/write
- connections to the same mailbox are permitted. The server supports access
- control lists on mailboxes and storage quotas on mailbox hierarchies,
+ The Cyrus IMAP server is generally intended to be run on sealed systems,
+ where normal users are not permitted to log in. The mailbox database is
+ stored in parts of the filesystem that are private to Cyrus. All user
+ access to mail is through the IMAP, POP3, or KPOP protocols. The private
+ mailbox database design gives the server large advantages in efficiency,
+ scalability, and administratability. Multiple concurrent read/write
+ connections to the same mailbox are permitted. The server supports access
+ control lists on mailboxes and storage quotas on mailbox hierarchies,
multiple SASL mechanisms, and the Sieve mail filtering language.
endef
@@ -105,9 +105,6 @@
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
-
# it's just the path to the dtd file
CHECKPKG_OVERRIDES_CSWcyrusimapd += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswcyrus.xml
@@ -160,17 +157,17 @@
# 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-2.4.4-autocreate-0.10-0.patch cyrus-imapd-2.4.4-autosieve-0.6.0.patch
-
+#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
+# invalid From headers
# This avoids "Invalid Message header" error messages
#PATCHFILES += cyrus-imapd-acceptinvalidfrom.patch
# This patch makes cyrus more tolerant with mails containing
# contains bare newlines
-PATCHFILES += cyrus-imapd-2.3.7-nobarenewlinescheck.patch
+PATCHFILES += cyrus-imapd-2.3.7-nobarenewlinescheck.patch
# the default value for allowplaintext changed since 2.3.9
# we restore the previous default value to avoid upgrade problem
@@ -206,16 +203,16 @@
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-cyrus-prefix=$(prefix)
-CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus
-CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/cyrus
+CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus
+CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/cyrus
CONFIGURE_ARGS += --with-bdb=db-4.7
-CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb47/lib
-CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb47/include
+CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb47/lib
+CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb47/include
CONFIGURE_ARGS += --with-openssl=$(prefix)
CONFIGURE_ARGS += --with-sasl=$(prefix)
-CONFIGURE_ARGS += --with-perl=$(prefix)/bin/perl
-CONFIGURE_ARGS += --enable-idled
-CONFIGURE_ARGS += --enable-murder
+CONFIGURE_ARGS += --with-perl=$(prefix)/bin/perl
+CONFIGURE_ARGS += --enable-idled
+CONFIGURE_ARGS += --enable-murder
CONFIGURE_ARGS += --enable-replication
CONFIGURE_ARGS += --with-snmp=$(prefix)
CONFIGURE_ARGS += --with-libwrap=$(prefix)
@@ -229,7 +226,7 @@
# in the correct path
INSTALL_ARGS = INSTALLDIRS=vendor
-TEST_SCRIPTS =
+TEST_SCRIPTS =
CYRUS_DAEMONS = fud idled imapd lmtpd lmtpproxyd mupdate notifyd pop3d pop3proxyd proxyd sieved smmapd timsieved
@@ -245,13 +242,11 @@
find $(WORKSRC)/doc/ -type f -exec perl -pi -e 's/(cyrus-)?master/cyrus-master/g' '{}' ';'
find $(WORKSRC)/man/ -type f -exec perl -pi -e 's/(cyrus-)?master/cyrus-master/g' '{}' ';'
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 {} \;
-
@$(MAKECOOKIE)
-post-build:
+post-build-modulated:
# we change /etc reference to /opt/csw/etc in doc and scripts,
# except the sasldb2 path
( cd $(WORKSRC); \
@@ -267,20 +262,18 @@
mkdir -p $(PKGROOT)/$(prefix)/share/doc/cyrus_imapd
@$(MAKECOOKIE)
-post-merge: install-tools cyrus-rename install-docs libexec-in-sbin install-cyrus-directory install-additional-files fix2build
+post-merge: install-tools cyrus-rename install-docs libexec-in-sbin install-cyrus-directory install-additional-files fix2build move-man8
-# Let's install the 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
-
# configuration and init file installation
ginstall -D "$(WORKDIR_FIRSTMOD)/cswcyrus" "$(PKGROOT)/etc/opt/csw/init.d/cswcyrus"
ginstall -D "$(WORKDIR_FIRSTMOD)/cswcyrus.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswcyrus.xml"
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)
@@ -293,9 +286,8 @@
[ -L $$E ] || ( mv -f $$E ../../sbin/$$E && ln -sf ../../sbin/$$E ); \
done )
@$(MAKECOOKIE)
-
-# let's create the directory structure where mails
+# 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 \
@@ -303,29 +295,24 @@
mkdir -p "$(PKGROOT)/$(localstatedir)/cyrus/$$D"; \
done
@$(MAKECOOKIE)
-
-
# 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" -delete
# and CVS directories
gfind $(PKGROOT) -depth -type d -name "CVS" -exec rm -rf '{}' ';'
# and orig files
- gfind $(PKGROOT) -name "*.orig" -delete
-
+ gfind $(PKGROOT) -name "*.orig" -delete
# 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
+ #gfind /home/yann/mgar/cyrus_imapd/trunk -name "*.orig" -delete
- gfind /home/yann/mgar/cyrus_imapd/trunk -name "*.orig" -delete
-
# we rename some tools with too generic names
cyrus-rename:
# I don't think renaming mkimap is clever, the online documentation
@@ -356,7 +343,6 @@
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 scripts to use opencsw perl and paths
perl -pi -e 's/exec\s+perl/exec \/opt\/csw\/bin\/perl/g' $(PKGROOT)$(sbindir)/* $(PKGROOT)$(bindir)/*
( for FILE in translatesieve undohash arbitronsort; do \
@@ -364,3 +350,20 @@
done )
gsed -i -e 's,/usr/local/etc/,/etc/opt/csw/,' $(PKGROOT)$(libdir)/perl/csw/Cyrus/IMAP/Shell.pm
@$(MAKECOOKIE)
+
+# The manpages in 8 are moved to 1m, since cyrus' imapd(8) clashes
+# with courier's. In the future, this might be solved using
+# alternatives. See also
+# http://lists.opencsw.org/pipermail/maintainers/2012-January/015940.html
+move-man8:
+ [ -d $(PKGROOT)$(mandir)/man8 ] && mv $(PKGROOT)$(mandir)/man8 $(PKGROOT)$(mandir)/man1m
+ if [ -d $(PKGROOT)$(mandir)/man1m ] ; then \
+ for f in $(PKGROOT)$(mandir)/man1m/*.8 ; do \
+ f_no_ext="`echo $$f | sed 's/\.8//'`" ; \
+ gsed 's/^\(\.TH.*\)8\(.*\)/\11M\2/' $${f} > $${f_no_ext}.1m ; \
+ rm $${f} ; \
+ done ; \
+ fi
+# fix references in man pages
+ find $(PKGROOT)$(mandir) -type f -exec gsed -i 's/(8)/(1m)/g' \{\} \;
+# @$(MAKECOOKIE)
\ No newline at end of file
Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2012-01-19 20:56:09 UTC (rev 16830)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2012-01-19 21:07:24 UTC (rev 16831)
@@ -1,3 +1,11 @@
+cyrus_imapd (2.4.10,REV=2012.01.19)
+
+ * Manpages in section 8 have been moved to 1m due to collision with
+ courier's manpages. See also
+ http://lists.opencsw.org/pipermail/maintainers/2012-January/015940.html
+
+ -- Rafael Ostertag <raos at opencsw.org> Thu, 19 Jan 2012 21:31:22 +0100
+
cyrus_imapd (2.4.10,rev=2011.07.20) unstable
* New upstream version.
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 2012-01-19 20:56:09 UTC (rev 16830)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2012-01-19 21:07:24 UTC (rev 16831)
@@ -1,3 +1,11 @@
+cyrus_imapd (2.4.10,REV=2012.01.19)
+
+ * Manpages in section 8 have been moved to 1m due to collision with
+ courier's manpages. See also
+ http://lists.opencsw.org/pipermail/maintainers/2012-January/015940.html
+
+ -- Rafael Ostertag <raos at opencsw.org> Thu, 19 Jan 2012 21:31:22 +0100
+
cyrus_imapd_utils (2.4.10,rev=2011.07.20) unstable
* New upstream version.
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