[csw-devel] SF.net SVN: gar:[2676] csw/mgar/pkg/cyrus_imapd/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sat Dec 20 15:18:23 CET 2008
Revision: 2676
http://gar.svn.sourceforge.net/gar/?rev=2676&view=rev
Author: chninkel
Date: 2008-12-20 14:18:23 +0000 (Sat, 20 Dec 2008)
Log Message:
-----------
cyrus_imapd: added mupdate in /etc/services
Modified Paths:
--------------
csw/mgar/pkg/cyrus_imapd/trunk/Makefile
csw/mgar/pkg/cyrus_imapd/trunk/checksums
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
csw/mgar/pkg/cyrus_imapd/trunk/files/services
Removed Paths:
-------------
csw/mgar/pkg/cyrus_imapd/trunk/files/master-rename.patch
Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2008-12-19 19:11:49 UTC (rev 2675)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2008-12-20 14:18:23 UTC (rev 2676)
@@ -1,5 +1,5 @@
GARNAME = cyrus_imapd
-GARVERSION = 2.3.11
+GARVERSION = 2.3.13
CATEGORIES = server
DESCRIPTION = Pop and Imap server from the Cyrus mail system
@@ -63,10 +63,6 @@
# contains bare newlines
PATCHFILES += cyrus-imapd-2.3.7-nobarenewlinescheck.patch
-# master is a too common name, so we rename it cyrus-master
-# this patch does a part of this job
-PATCHFILES += master-rename.patch
-
# the default value for allowplaintext changed since 2.3.9
# we restore the previous default value to avoid upgrade problem
PATCHFILES += restore_allowplaintext_default.patch
@@ -106,10 +102,14 @@
pre-patch:
cp $(WORKDIR)/install-upgrade $(WORKSRC)/doc/text
-pre-build:
+pre-configure:
# master is a too common name, so we rename it cyrus-master
cp $(WORKSRC)/man/master.8 $(WORKSRC)/man/cyrus-master.8
cp $(WORKSRC)/doc/man/master.8.html $(WORKSRC)/doc/man/cyrus-master.8.html
+ 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 {} \;
@@ -136,7 +136,7 @@
cp -r $(WORKSRC)/tools/* $(DESTDIR)$(sbindir)
ginstall -D $(DESTDIR)$(sbindir)/arbitronsort.pl $(DESTDIR)$(sbindir)/arbitronsort
- # we want perl script to use blastwave perl
+ # we want perl script to use opencsw perl
perl -pi -e 's/exec\s+perl/exec \/opt\/csw\/bin\/perl/g' $(DESTDIR)$(sbindir)/* $(DESTDIR)$(bindir)/*
( for FILE in convert-sieve.pl mupdate-loadgen.pl translatesieve undohash upgradesieve arbitronsort; do \
perl -pi -e 's/^#!\/usr\/(local\/)?bin\/perl/#!\/usr\/bin\/perl/' $(DESTDIR)$(sbindir)/$$FILE; \
Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2008-12-19 19:11:49 UTC (rev 2675)
+++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2008-12-20 14:18:23 UTC (rev 2676)
@@ -1,14 +1,14 @@
-df632eb2a89e36e6296e4abd687435ed download/cyrus-imapd-2.3.11.tar.gz
+7dc48324c3a99e210bf777ea74aae694 download/cyrus-imapd-2.3.13.tar.gz
7423d96cacb8162b7987c9983cc85171 download/CSWcyrusimapd.gspec
a22944187eb6b75e2437aa9a4c754c07 download/CSWcyrusimapd.prototype
5111a5573aa6d4878b852780aeae8a27 download/CSWcyrusimapd.preinstall
46cfc3ee1f366efdd105963422b53fc6 download/CSWcyrusimapd.depend
a55d22e88ee57fa81da2ea75c6e0e3d8 download/CSWcyrusimapd.checkinstall
-1d1b48887178a20b74c7d8ed34e4723d download/cyrus_imapd.changelog.CSW
+1218c3ab6c7d0d5ab996a309698a43c8 download/cyrus_imapd.changelog.CSW
d0b97b33e75ac75f89ee6236a2d53f05 download/README.CSW
79211aee56db01e15566ced1ba4078da download/i.services
149ac6b6d82ef9ef4bb1b314f1a1cac4 download/r.services
-d00c34fe0c54a4eb07389e2baf3af399 download/services
+6dfee20f7c02139350caf9f75199e587 download/services
9b2ae27f98333b73ff2b16ed98ee896a download/i.conf
5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf
a5326ab0d66431d057db02c5ae9c5e4a download/cswcyrus.init
@@ -22,15 +22,14 @@
d47ff67f45001cdda175616a543d7052 download/CSWcyrusimapdutils.gspec
7e99e825a1d6b134b91392beec1807f4 download/CSWcyrusimapdutils.prototype
cba5a4c4a05d4af940a323c5d7d64ca0 download/CSWcyrusimapdutils.depend
-292a334f016b2a6b7cfbc377234134c5 download/cyrus_imapd_utils.changelog.CSW
-598fc0d014664de114f85d57728605af download/pm_cyrus.changelog.CSW
+45211ad9938528d4e5e6333ac1ec1f33 download/cyrus_imapd_utils.changelog.CSW
+a700bb603514320b6d7e7959ed71618e download/pm_cyrus.changelog.CSW
9cbebaeeafa6eb3320eafa594c253bc1 download/compile_et
5375c25c8bc325a90553d0be87a64a04 download/et_c.awk
d1d86e61463a1dfefccbadedb11a8604 download/et_h.awk
14bb6e8c6d6914351f80df293982e88a download/install-upgrade
-e2f3c6e948cc73e28c5a7a8e3e53854e download/cyrus-imapd-2.3.11-autocreate-0.10-0.diff
-7177f3abd0736a14e11af4905decb6ff download/cyrus-imapd-2.3.11-autosieve-0.6.0.diff
+f1957096f173dcc9ea94d0544a07e9db download/cyrus-imapd-2.3.13-autocreate-0.10-0.diff
+cce2e7fbc847791182b8f431c59e473a download/cyrus-imapd-2.3.13-autosieve-0.6.0.diff
6127a7b62ec4679a54985f6a2d915e52 download/cyrus-imapd-acceptinvalidfrom.patch
b4c99489eacf0fb7befeef5e3098a5c1 download/cyrus-imapd-2.3.7-nobarenewlinescheck.patch
-0454ac02701faec98532669854f75724 download/master-rename.patch
dce627f9a464ae4efe8a66c8dbd358d5 download/restore_allowplaintext_default.patch
Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2008-12-19 19:11:49 UTC (rev 2675)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2008-12-20 14:18:23 UTC (rev 2676)
@@ -1,3 +1,15 @@
+cyrus_imapd (2.3.13,REV=2008.12.20) unstable
+
+ * Added mupdate service in /etc/services.
+
+ -- Yann Rouillard <yann at opencsw.org> Sat, 20 Dec 2008 15:13:33 +0100
+
+cyrus_imapd (2.3.13,REV=2008.11.30) unstable
+
+ * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org> Sun, 30 Nov 2008 20:58:22 +0100
+
cyrus_imapd (2.3.11,REV=2008.03.22) unstable
* Added missing pcre dependancy (closes: #2830).
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 2008-12-19 19:11:49 UTC (rev 2675)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2008-12-20 14:18:23 UTC (rev 2676)
@@ -1,3 +1,15 @@
+cyrus_imapd_utils (2.3.13,REV=2008.12.20) unstable
+
+ * Added mupdate service in /etc/services.
+
+ -- Yann Rouillard <yann at opencsw.org> Sat, 20 Dec 2008 15:13:33 +0100
+
+cyrus_imapd_utils (2.3.13,REV=2008.11.30) unstable
+
+ * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org> Sun, 30 Nov 2008 20:58:22 +0100
+
cyrus_imapd_utils (2.3.9,REV=2008.01.21) unstable
* New upstream version.
Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/master-rename.patch
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/master-rename.patch 2008-12-19 19:11:49 UTC (rev 2675)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/master-rename.patch 2008-12-20 14:18:23 UTC (rev 2676)
@@ -1,957 +0,0 @@
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/bugs.html cyrus-imapd-2.3.11/doc/bugs.html
---- cyrus-imapd-2.3.11.orig/doc/bugs.html 2006-11-30 12:11:16.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/bugs.html 2008-01-22 04:19:22.968333000 -0500
-@@ -33,12 +33,12 @@
- <li> during appendstage(), the message is parsed once per delivery,
- not once at the beginning.
-
--<li> <tt>master</tt> should pay attention to processes that have told
-+<li> <tt>cyrus-master</tt> should pay attention to processes that have told
- it they are listening, and make sure they don't die abnormally.
- likewise, it should be on the lookout for continually forking
- services.
-
--<li> <tt>master</tt> should probably have a babysitting service
-+<li> <tt>cyrus-master</tt> should probably have a babysitting service
- ("always keep this process running").
-
- </ul>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/faq.html cyrus-imapd-2.3.11/doc/faq.html
---- cyrus-imapd-2.3.11.orig/doc/faq.html 2006-11-30 12:11:16.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/faq.html 2008-01-22 04:19:23.008338000 -0500
-@@ -78,7 +78,7 @@
- <h2>Troubleshooting</h2>
-
- <dl compact="compact">
--<dt><b>Q:</b> I'm getting syslog'd messages from the master process
-+<dt><b>Q:</b> I'm getting syslog'd messages from the cyrus-master process
- saying processes are "signaled to death by 10". What's up?</dt>
-
- <dd>
-@@ -142,7 +142,7 @@
- <dd>
- <p><b>A:</b> Remove all <tt>imap</tt>, <tt>pop</tt>, <tt>lmtp</tt>
- and <tt>sieve</tt> lines from <tt>[x]inetd.conf</tt> and restart
--<tt>[x]inetd</tt>. Cyrus is run out of its own "master" process.</p>
-+<tt>[x]inetd</tt>. Cyrus is run out of its own "cyrus-master" process.</p>
- </dd>
-
- <dt><b>Q:</b> How do I use different SSL/TLS certificates for imap
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/install-configure.html cyrus-imapd-2.3.11/doc/install-configure.html
---- cyrus-imapd-2.3.11.orig/doc/install-configure.html 2006-11-30 12:11:16.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/install-configure.html 2008-01-22 04:19:23.038343000 -0500
-@@ -230,16 +230,16 @@
- enabling certain services, or to tune the number of preforked copies.
- Be sure not to remove the entries that are labeled required.
-
--<p><li>Arrange to start "<tt>/usr/cyrus/bin/master</tt>" as root when
-+<p><li>Arrange to start "<tt>/usr/cyrus/bin/cyrus-master</tt>" as root when
- the system starts. It will bind some ports and then give up it's root
--privileges. Until your system reboots, you can start the master
-+privileges. Until your system reboots, you can start the cyrus-master
- process by hand:
-
- <pre>
--<kbd> /usr/cyrus/bin/master &
-+<kbd> /usr/cyrus/bin/cyrus-master &
- </kbd></pre>
-
--<p><li>Monitor the progress of the master process by examining the
-+<p><li>Monitor the progress of the cyrus-master process by examining the
- <tt>imapd.log</tt> file. It should never exit by itself, but you can
- shut down the mail system by sending it a signal with <tt>kill</tt>.
- </ol>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/install-perf.html cyrus-imapd-2.3.11/doc/install-perf.html
---- cyrus-imapd-2.3.11.orig/doc/install-perf.html 2003-01-02 14:23:11.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/install-perf.html 2008-01-22 04:19:23.078346000 -0500
-@@ -81,7 +81,7 @@
- don't leave them there.</li>
-
- <li>You may want to increase the listen queue value when starting
--up the master process. For example, you may want to do this if you
-+up the cyrus-master process. For example, you may want to do this if you
- see the Listen queue drop counter increasing quickly. For example,
- under Solaris, look at the variable tcpListenDrop (from <tt>netstat
- -sP tcp</tt>).</li>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/install-upgrade.html cyrus-imapd-2.3.11/doc/install-upgrade.html
---- cyrus-imapd-2.3.11.orig/doc/install-upgrade.html 2007-12-08 14:24:25.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/install-upgrade.html 2008-01-22 04:19:23.118352000 -0500
-@@ -229,7 +229,7 @@
- <tt>allowusermoves</tt> option, which defaults to off.</li>
-
- <li>If you use <tt>ptloader</tt>, it now runs as a regular cyrus
--service. This means that you will need master to acquire and maintain
-+service. This means that you will need cyrus-master to acquire and maintain
- AFS tokens for it. You will also need to create the ptclient
- directory under your imap configdirectory, to hold the PTS cache (now
- a full-fledged cyrusdb) and UNIX socket. In <tt>cyrus.conf</tt>,
-@@ -409,7 +409,7 @@
- <tt>popd3d</tt> lines need to be removed from <tt>/etc/inetd.conf</tt>
- and inetd needs to be restarted.
-
--<li>master process configuration: You'll need to configure the master
-+<li>cyrus-master process configuration: You'll need to configure the cyrus-master
- process Cyrus process and ensure that it starts on boot. see <a
- href="install-configure.html#master">this section</a> of the
- configuration instructions.
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/chk_cyrus.8.html cyrus-imapd-2.3.11/doc/man/chk_cyrus.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/chk_cyrus.8.html 2007-12-10 10:24:05.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/chk_cyrus.8.html 2008-01-22 04:19:23.188360000 -0500
-@@ -120,7 +120,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>imapd.conf(5)</b>, <b>master(8)</b></p>
-+<p><b>imapd.conf(5)</b>, <b>cyrus-master(8)</b></p>
- </td>
- </table>
- <hr>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/ctl_cyrusdb.8.html cyrus-imapd-2.3.11/doc/man/ctl_cyrusdb.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/ctl_cyrusdb.8.html 2007-12-10 10:24:05.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/ctl_cyrusdb.8.html 2008-01-22 04:19:23.218363000 -0500
-@@ -140,7 +140,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>imapd.conf(5)</b>, <b>master(8)</b></p>
-+<p><b>imapd.conf(5)</b>, <b>cyrus-master(8)</b></p>
- </td>
- </table>
- <hr>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/ctl_deliver.8.html cyrus-imapd-2.3.11/doc/man/ctl_deliver.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/ctl_deliver.8.html 2007-12-10 10:24:05.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/ctl_deliver.8.html 2008-01-22 04:19:23.248368000 -0500
-@@ -129,7 +129,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>imapd.conf(5)</b>, <b>master(8)</b></p>
-+<p><b>imapd.conf(5)</b>, <b>cyrus-master(8)</b></p>
- </td>
- </table>
- <hr>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/ctl_mboxlist.8.html cyrus-imapd-2.3.11/doc/man/ctl_mboxlist.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/ctl_mboxlist.8.html 2007-12-10 10:24:05.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/ctl_mboxlist.8.html 2008-01-22 04:19:23.268371000 -0500
-@@ -259,7 +259,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>imapd.conf(5)</b>, <b>master(8)</b></p>
-+<p><b>imapd.conf(5)</b>, <b>cyrus-master(8)</b></p>
- </td>
- </table>
- <hr>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/cyr_expire.8.html cyrus-imapd-2.3.11/doc/man/cyr_expire.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/cyr_expire.8.html 2007-12-10 10:24:05.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/cyr_expire.8.html 2008-01-22 04:19:23.298374000 -0500
-@@ -220,7 +220,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>imapd.conf(5)</b>, <b>master(8)</b></p>
-+<p><b>imapd.conf(5)</b>, <b>cyrus-master(8)</b></p>
- </td>
- </table>
- <hr>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/cyrus.conf.5.html cyrus-imapd-2.3.11/doc/man/cyrus.conf.5.html
---- cyrus-imapd-2.3.11.orig/doc/man/cyrus.conf.5.html 2007-12-10 10:24:05.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/cyrus.conf.5.html 2008-01-22 04:19:23.328380000 -0500
-@@ -563,7 +563,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>master(8)</b>, <b>imapd(8)</b>, <b>pop3d(8)</b>,
-+<p><b>cyrus-master(8)</b>, <b>imapd(8)</b>, <b>pop3d(8)</b>,
- <b>lmtpd(8)</b>, <b>timsieved(8)</b>, <b>idled(8)</b>,
- <b>notifyd(8)</b>, <b>ctl_cyrusdb(8)</b>,
- <b>ctl_deliver(8)</b>, <b>tls_prune(8)</b>,
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/fud.8.html cyrus-imapd-2.3.11/doc/man/fud.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/fud.8.html 2007-12-10 10:24:05.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/fud.8.html 2008-01-22 04:19:23.368382000 -0500
-@@ -50,7 +50,7 @@
- <td width="10%"></td>
- <td width="89%">
- <p><b>FUD</b> is a long lived datagram daemon started from
--master that provides information about when a user last read
-+cyrus-master that provides information about when a user last read
- their mail, when mail last arrived in a user’s
- mailbox, and how many messages are recent for that user.</p>
- <!-- INDENTATION -->
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/idled.8.html cyrus-imapd-2.3.11/doc/man/idled.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/idled.8.html 2007-12-10 10:24:05.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/idled.8.html 2008-01-22 04:19:23.398385000 -0500
-@@ -52,7 +52,7 @@
- receives notifications of mailbox changes and signals the
- appropriate <i>imapd</i> to report the changes to the
- client. <i>Idled</i> is usually started from
--<i>master.</i></p>
-+<i>cyrus-master.</i></p>
- <!-- INDENTATION -->
- <p><i>Idled</i> reads its configuration options out of the
- <i>imapd.conf</i>(5) file unless specified otherwise by
-@@ -97,7 +97,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>imapd.conf(5)</b>, <b>master(8)</b></p>
-+<p><b>imapd.conf(5)</b>, <b>cyrus-master(8)</b></p>
- </td>
- </table>
- <hr>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/imapd.8.html cyrus-imapd-2.3.11/doc/man/imapd.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/imapd.8.html 2007-12-10 10:24:05.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/imapd.8.html 2008-01-22 04:19:23.428390000 -0500
-@@ -52,7 +52,7 @@
- <td width="89%">
- <p><i>Imapd</i> is an IMAP4rev1 server. It accepts commands
- on its standard input and responds on its standard output.
--It MUST be invoked by <i>master</i>(8) with those
-+It MUST be invoked by <i>cyrus-master</i>(8) with those
- descriptors attached to a remote client connection.</p>
- <!-- INDENTATION -->
- <p><i>Imapd</i> reads its configuration options out of the
-@@ -199,7 +199,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>imapd.conf(5)</b>, <b>master(8)</b></p>
-+<p><b>imapd.conf(5)</b>, <b>cyrus-master(8)</b></p>
- </td>
- </table>
- <hr>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/imapd.conf.5.html cyrus-imapd-2.3.11/doc/man/imapd.conf.5.html
---- cyrus-imapd-2.3.11.orig/doc/man/imapd.conf.5.html 2007-12-10 10:24:06.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/imapd.conf.5.html 2008-01-22 04:19:23.468400000 -0500
-@@ -4053,7 +4053,7 @@
- <td width="89%">
- <p><b>imapd(8)</b>, <b>pop3d(8)</b>, <b>nntpd(8)</b>,
- <b>lmtpd(8)</b>, <b>timsieved(8)</b>, <b>idled(8)</b>,
--<b>notifyd(8)</b>, <b>deliver(8)</b>, <b>master(8)</b>,
-+<b>notifyd(8)</b>, <b>deliver(8)</b>, <b>cyrus-master(8)</b>,
- <b>ciphers(1)</b></p>
- <!-- INDENTATION -->
- <p>Allowed values: <i>off</i>, <i>userid</i>, <i>on</i></p>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/lmtpd.8.html cyrus-imapd-2.3.11/doc/man/lmtpd.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/lmtpd.8.html 2007-12-10 10:24:06.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/lmtpd.8.html 2008-01-22 04:19:23.508399000 -0500
-@@ -53,7 +53,7 @@
- <p><i>Lmtpd</i> is an LMTP server used to deliver mail to
- the IMAP mailstore. It accepts commands on its standard
- input and responds on its standard output. It MUST be
--invoked by <i>master</i>(8) with those descriptors attached
-+invoked by <i>cyrus-master</i>(8) with those descriptors attached
- to a remote client connection.</p>
- <!-- INDENTATION -->
- <p><i>Lmtpd</i> reads its configuration options out of the
-@@ -164,7 +164,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>imapd.conf(5)</b>, <b>master(8)</b></p>
-+<p><b>imapd.conf(5)</b>, <b>cyrus-master(8)</b></p>
- </td>
- </table>
- <hr>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/master.8.html cyrus-imapd-2.3.11/doc/man/master.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/master.8.html 2007-12-10 10:24:06.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/master.8.html 2008-01-22 04:19:23.538404000 -0500
-@@ -4,11 +4,11 @@
- <head>
- <meta name="generator" content="groff -Thtml, see www.gnu.org">
- <meta name="Content-Style" content="text/css">
--<title>MASTER</title>
-+<title>CYRUS-MASTER</title>
- </head>
- <body>
-
--<h1 align=center>MASTER</h1>
-+<h1 align=center>CYRUS-MASTER</h1>
- <a href="#NAME">NAME</a><br>
- <a href="#SYNOPSIS">SYNOPSIS</a><br>
- <a href="#DESCRIPTION">DESCRIPTION</a><br>
-@@ -27,7 +27,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p>master − master Cyrus process</p>
-+<p>cyrus-master − master Cyrus process</p>
- </td>
- </table>
- <a name="SYNOPSIS"></a>
-@@ -38,7 +38,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>master</b> [ <b>−C</b> <i>alternate
-+<p><b>cyrus-master</b> [ <b>−C</b> <i>alternate
- imapd.conf</i> ] [ <b>−M</b> <i>alternate
- cyrus.conf</i> ] [ <b>−l</b> <i>listen queue</i> ] [
- <b>−p</b> <i>pidfile</i> ] [ <b>−P</b> <i>snmp
-@@ -55,7 +55,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><i>Master</i> is the process that controls all of the
-+<p><i>Cyrus-master</i> is the process that controls all of the
- Cyrus processes. This process is responsible for creating
- all imapd, pop3d, lmtpd and sieved child processes. This
- process also initializes the Berkeley DB code and performs
-@@ -84,9 +84,9 @@
- <tr valign="top" align="left">
- <td width="21%"></td>
- <td width="77%">
--<p>Specifies an alternate imapd.conf for use by master (note
-+<p>Specifies an alternate imapd.conf for use by cyrus-master (note
- that this will not affect any sub-processes spawned by
--master, you should specify those specifically in the
-+cyrus-master, you should specify those specifically in the
- respective entries in cyrus.conf).</p>
- </td>
- </table>
-@@ -104,7 +104,7 @@
- <tr valign="top" align="left">
- <td width="21%"></td>
- <td width="77%">
--<p>Specifies an alternate cyrus.conf for use by master.</p>
-+<p>Specifies an alternate cyrus.conf for use by cyrus-master.</p>
- </td>
- </table>
- <!-- INDENTATION -->
-@@ -241,10 +241,10 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p>Upon execution, <i>master</i> reads its configuration
-+<p>Upon execution, <i>cyrus-master</i> reads its configuration
- information out of the <i>cyrus.conf</i>(5) file.</p>
- <!-- INDENTATION -->
--<p><i>Master</i> rereads its configuration file when it
-+<p><i>Cyrus-master</i> rereads its configuration file when it
- receives a hangup signal, SIGHUP. Services and events may be
- added, deleted or modified when the configuration file is
- reread. Any active services removed from the configuration
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/nntpd.8.html cyrus-imapd-2.3.11/doc/man/nntpd.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/nntpd.8.html 2007-12-10 10:24:06.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/nntpd.8.html 2008-01-22 04:19:23.558406000 -0500
-@@ -53,7 +53,7 @@
- <td width="89%">
- <p><i>Nntpd</i> is a NNTP server. It accepts commands on its
- standard input and responds on its standard output. It MUST
--invoked by <i>master</i>(8) with those descriptors attached
-+invoked by <i>cyrus-master</i>(8) with those descriptors attached
- to a remote client connection.</p>
- <!-- INDENTATION -->
- <p><i>Nntpd</i> reads its configuration options out of the
-@@ -220,7 +220,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>imapd.conf(5)</b>, <b>master(8)</b></p>
-+<p><b>imapd.conf(5)</b>, <b>cyrus-master(8)</b></p>
- </td>
- </table>
- <hr>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/notifyd.8.html cyrus-imapd-2.3.11/doc/man/notifyd.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/notifyd.8.html 2007-12-10 10:24:06.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/notifyd.8.html 2008-01-22 04:19:23.588410000 -0500
-@@ -51,7 +51,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>Notifyd</b> is a daemon started from master(8) that
-+<p><b>Notifyd</b> is a daemon started from cyrus-master(8) that
- handles notification requests on behalf of lmtpd(8).
- <b>Notifyd</b> accepts the request and performs the
- notification using the method specified in the request.</p>
-@@ -235,7 +235,7 @@
- <td width="10%"></td>
- <td width="89%">
- <p><b>imapd.conf(5)</b>, <b>cyrus.conf</b>,
--<b>master(8)</b>, <b>lmtpd(8)</b></p>
-+<b>cyrus-master(8)</b>, <b>lmtpd(8)</b></p>
- </td>
- </table>
- <hr>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/pop3d.8.html cyrus-imapd-2.3.11/doc/man/pop3d.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/pop3d.8.html 2007-12-10 10:24:06.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/pop3d.8.html 2008-01-22 04:19:23.618414000 -0500
-@@ -53,7 +53,7 @@
- <td width="89%">
- <p><i>Pop3d</i> is a POP3 server. It accepts commands on its
- standard input and responds on its standard output. It MUST
--invoked by <i>master</i>(8) with those descriptors attached
-+invoked by <i>cyrus-master</i>(8) with those descriptors attached
- to a remote client connection.</p>
- <!-- INDENTATION -->
- <p><i>Pop3d</i> reads its configuration options out of the
-@@ -198,7 +198,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>imapd.conf(5)</b>, <b>master(8)</b></p>
-+<p><b>imapd.conf(5)</b>, <b>cyrus-master(8)</b></p>
- </td>
- </table>
- <hr>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/smmapd.8.html cyrus-imapd-2.3.11/doc/man/smmapd.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/smmapd.8.html 2007-12-10 10:24:07.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/smmapd.8.html 2008-01-22 04:19:23.648417000 -0500
-@@ -53,7 +53,7 @@
- used to verify that a Cyrus mailbox exists, that it is
- postable and it is under quota. It accepts commands on its
- standard input and responds on its standard output. It MUST
--be invoked by <i>master</i>(8) with those descriptors
-+be invoked by <i>cyrus-master</i>(8) with those descriptors
- attached to a remote client connection.</p>
- <!-- INDENTATION -->
- <p><b>SMMAPD</b> reads its configuration options out of the
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/timsieved.8.html cyrus-imapd-2.3.11/doc/man/timsieved.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/timsieved.8.html 2007-12-10 10:24:07.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/timsieved.8.html 2008-01-22 04:19:23.678421000 -0500
-@@ -52,7 +52,7 @@
- <p><i>timsieved</i> is a server that allows users to
- remotely manage their sieve scripts kept on the server. It
- accepts commands on its standard input and responds on its
--standard output. It MUST be invoked by <i>master</i>(8) with
-+standard output. It MUST be invoked by <i>cyrus-master</i>(8) with
- those descriptors attached to a remote client
- connection.</p>
- <!-- INDENTATION -->
-@@ -102,7 +102,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>imapd.conf(5)</b>, <b>master(8)</b></p>
-+<p><b>imapd.conf(5)</b>, <b>cyrus-master(8)</b></p>
- </td>
- </table>
- <hr>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/tls_prune.8.html cyrus-imapd-2.3.11/doc/man/tls_prune.8.html
---- cyrus-imapd-2.3.11.orig/doc/man/tls_prune.8.html 2007-12-10 10:24:07.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man/tls_prune.8.html 2008-01-22 04:19:23.708425000 -0500
-@@ -96,7 +96,7 @@
- <tr valign="top" align="left">
- <td width="10%"></td>
- <td width="89%">
--<p><b>imapd.conf(5)</b>, <b>master(8)</b></p>
-+<p><b>imapd.conf(5)</b>, <b>cyrus-master(8)</b></p>
- </td>
- </table>
- <hr>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man.html cyrus-imapd-2.3.11/doc/man.html
---- cyrus-imapd-2.3.11.orig/doc/man.html 2007-02-09 08:23:27.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/man.html 2008-01-22 04:19:23.158355000 -0500
-@@ -48,7 +48,7 @@
- <LI><A HREF="man/imapd.8.html"><TT>imapd</TT>(8)</A>
- <LI><A HREF="man/ipurge.8.html"><TT>ipurge</TT>(8)</A>
- <LI><A HREF="man/lmtpd.8.html"><TT>lmtpd</TT>(8)</A>
--<LI><A HREF="man/master.8.html"><TT>master</TT>(8)</A>
-+<LI><A HREF="man/cyrus-master.8.html"><TT>cyrus-master</TT>(8)</A>
- <LI><A HREF="man/mbexamine.8.html"><TT>mbexamine</TT>(8)</A>
- <LI><A HREF="man/mbpath.8.html"><TT>mbpath</TT>(8)</A>
- <LI><A HREF="man/nntpd.8.html"><TT>nntpd</TT>(8)</A>
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/bugs cyrus-imapd-2.3.11/doc/text/bugs
---- cyrus-imapd-2.3.11.orig/doc/text/bugs 2007-12-10 10:24:08.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/text/bugs 2008-01-22 04:19:23.738429000 -0500
-@@ -16,10 +16,10 @@
- threadsafe.
- * during appendstage(), the message is parsed once per delivery, not
- once at the beginning.
-- * master should pay attention to processes that have told it they are
-+ * cyrus-master should pay attention to processes that have told it they are
- listening, and make sure they don't die abnormally. likewise, it
- should be on the lookout for continually forking services.
-- * master should probably have a babysitting service ("always keep
-+ * cyrus-master should probably have a babysitting service ("always keep
- this process running").
-
- proxyd and Cyrus Murder
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/faq cyrus-imapd-2.3.11/doc/text/faq
---- cyrus-imapd-2.3.11.orig/doc/text/faq 2007-12-10 10:24:08.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/text/faq 2008-01-22 04:19:23.768433000 -0500
-@@ -52,7 +52,7 @@
-
- Troubleshooting
-
-- Q: I'm getting syslog'd messages from the master process saying
-+ Q: I'm getting syslog'd messages from the cyrus-master process saying
- processes are "signaled to death by 10". What's up?
-
-
-@@ -98,7 +98,7 @@
-
- A: Remove all imap, pop, lmtp and sieve lines from
- [x]inetd.conf and restart [x]inetd. Cyrus is run out of its own
-- "master" process.
-+ "cyrus-master" process.
- Q: How do I use different SSL/TLS certificates for imap and pop?
-
-
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/install-configure cyrus-imapd-2.3.11/doc/text/install-configure
---- cyrus-imapd-2.3.11.orig/doc/text/install-configure 2007-12-10 10:24:08.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/text/install-configure 2008-01-22 04:19:23.798438000 -0500
-@@ -160,7 +160,7 @@
- kpop, lmtp and sieve lines need to be removed from
- /etc/[x]inetd.conf and [x]inetd needs to be restarted.
-
--Configuring the Master Process
-+Configuring the Cyrus-master Process
-
- 1. Choose a configuration from the master/conf directory:
-
-@@ -186,14 +186,14 @@
- certain services, or to tune the number of preforked copies. Be
- sure not to remove the entries that are labeled required.
-
-- 2. Arrange to start "/usr/cyrus/bin/master" as root when the system
-+ 2. Arrange to start "/opt/csw/sbin/cyrus-master" as root when the system
- starts. It will bind some ports and then give up it's root
- privileges. Until your system reboots, you can start the master
- process by hand:
-
-- /usr/cyrus/bin/master &
-+ /usr/cyrus/bin/cyrus-master &
-
-- 3. Monitor the progress of the master process by examining the
-+ 3. Monitor the progress of the cyrus-master process by examining the
- imapd.log file. It should never exit by itself, but you can shut
- down the mail system by sending it a signal with kill.
-
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/install-perf cyrus-imapd-2.3.11/doc/text/install-perf
---- cyrus-imapd-2.3.11.orig/doc/text/install-perf 2007-12-10 10:24:08.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/text/install-perf 2008-01-22 04:19:23.828440000 -0500
-@@ -62,7 +62,7 @@
- /usr/lib/sasl2 and if you don't plan on using those mechanisms,
- don't leave them there.
- * You may want to increase the listen queue value when starting up
-- the master process. For example, you may want to do this if you see
-+ the cyrus-master process. For example, you may want to do this if you see
- the Listen queue drop counter increasing quickly. For example,
- under Solaris, look at the variable tcpListenDrop (from netstat -sP
- tcp).
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/install-upgrade cyrus-imapd-2.3.11/doc/text/install-upgrade
---- cyrus-imapd-2.3.11.orig/doc/text/install-upgrade 2007-12-10 10:24:08.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/text/install-upgrade 2008-01-22 04:24:50.079616000 -0500
-@@ -134,7 +134,7 @@
- * User moves via RENAME and XFER are now controlled by the
- allowusermoves option, which defaults to off.
- * If you use ptloader, it now runs as a regular cyrus service. This
-- means that you will need master to acquire and maintain AFS tokens
-+ means that you will need cyrus-master to acquire and maintain AFS tokens
- for it. You will also need to create the ptclient directory under
- your imap configdirectory, to hold the PTS cache (now a
- full-fledged cyrusdb) and UNIX socket. In cyrus.conf, ptloader
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/man cyrus-imapd-2.3.11/doc/text/man
---- cyrus-imapd-2.3.11.orig/doc/text/man 2007-12-10 10:24:08.000000000 -0500
-+++ cyrus-imapd-2.3.11/doc/text/man 2008-01-22 04:19:23.908450000 -0500
-@@ -39,7 +39,7 @@
- * imapd(8)
- * ipurge(8)
- * lmtpd(8)
-- * master(8)
-+ * cyrus-master(8)
- * mbexamine(8)
- * mbpath(8)
- * nntpd(8)
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/lib/imapoptions cyrus-imapd-2.3.11/lib/imapoptions
---- cyrus-imapd-2.3.11.orig/lib/imapoptions 2007-10-18 14:14:48.000000000 -0400
-+++ cyrus-imapd-2.3.11/lib/imapoptions 2008-01-22 04:19:23.948460000 -0500
-@@ -1045,5 +1045,5 @@
- .PP
- \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBnntpd(8)\fR, \fBlmtpd(8)\fR,
- \fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR,
--\fBdeliver(8)\fR, \fBmaster(8)\fR, \fBciphers(1)\fR
-+\fBdeliver(8)\fR, \fBcyrus-master(8)\fR, \fBciphers(1)\fR
- */
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/Makefile.in cyrus-imapd-2.3.11/man/Makefile.in
---- cyrus-imapd-2.3.11.orig/man/Makefile.in 2007-10-18 14:14:48.000000000 -0400
-+++ cyrus-imapd-2.3.11/man/Makefile.in 2008-01-22 04:19:23.998461000 -0500
-@@ -61,7 +61,7 @@
- MAN8 = $(srcdir)/arbitron.8 $(srcdir)/cyr_expire.8 $(srcdir)/deliver.8 \
- $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
- $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
-- $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 $(srcdir)/master.8 \
-+ $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 $(srcdir)/cyrus-master.8 \
- $(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.8 \
- $(srcdir)/ctl_deliver.8 $(srcdir)/ctl_cyrusdb.8 $(srcdir)/ipurge.8 \
- $(srcdir)/tls_prune.8 $(srcdir)/squatter.8 $(srcdir)/cvt_cyrusdb.8 \
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/chk_cyrus.8 cyrus-imapd-2.3.11/man/chk_cyrus.8
---- cyrus-imapd-2.3.11.orig/man/chk_cyrus.8 2006-06-19 09:05:54.000000000 -0400
-+++ cyrus-imapd-2.3.11/man/chk_cyrus.8 2008-01-22 04:19:24.028465000 -0500
-@@ -83,4 +83,4 @@
- .B /etc/imapd.conf
- .SH SEE ALSO
- .PP
--\fBimapd.conf(5)\fR, \fBmaster(8)\fR
-+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/ctl_cyrusdb.8 cyrus-imapd-2.3.11/man/ctl_cyrusdb.8
---- cyrus-imapd-2.3.11.orig/man/ctl_cyrusdb.8 2003-08-09 19:43:14.000000000 -0400
-+++ cyrus-imapd-2.3.11/man/ctl_cyrusdb.8 2008-01-22 04:19:24.068470000 -0500
-@@ -94,4 +94,4 @@
- .B /etc/imapd.conf
- .SH SEE ALSO
- .PP
--\fBimapd.conf(5)\fR, \fBmaster(8)\fR
-+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/ctl_deliver.8 cyrus-imapd-2.3.11/man/ctl_deliver.8
---- cyrus-imapd-2.3.11.orig/man/ctl_deliver.8 2003-10-22 14:50:13.000000000 -0400
-+++ cyrus-imapd-2.3.11/man/ctl_deliver.8 2008-01-22 04:19:24.098473000 -0500
-@@ -78,4 +78,4 @@
- .B /etc/imapd.conf
- .SH SEE ALSO
- .PP
--\fBimapd.conf(5)\fR, \fBmaster(8)\fR
-+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/ctl_mboxlist.8 cyrus-imapd-2.3.11/man/ctl_mboxlist.8
---- cyrus-imapd-2.3.11.orig/man/ctl_mboxlist.8 2007-10-05 14:39:48.000000000 -0400
-+++ cyrus-imapd-2.3.11/man/ctl_mboxlist.8 2008-01-22 04:19:24.138477000 -0500
-@@ -166,4 +166,4 @@
- .B /etc/imapd.conf
- .SH SEE ALSO
- .PP
--\fBimapd.conf(5)\fR, \fBmaster(8)\fR
-+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/cyr_expire.8 cyrus-imapd-2.3.11/man/cyr_expire.8
---- cyrus-imapd-2.3.11.orig/man/cyr_expire.8 2007-09-04 11:13:27.000000000 -0400
-+++ cyrus-imapd-2.3.11/man/cyr_expire.8 2008-01-22 04:19:24.178482000 -0500
-@@ -121,4 +121,4 @@
- .B /etc/imapd.conf
- .SH SEE ALSO
- .PP
--\fBimapd.conf(5)\fR, \fBmaster(8)\fR
-+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/cyrus.conf.5 cyrus-imapd-2.3.11/man/cyrus.conf.5
---- cyrus-imapd-2.3.11.orig/man/cyrus.conf.5 2007-09-24 08:48:32.000000000 -0400
-+++ cyrus-imapd-2.3.11/man/cyrus.conf.5 2008-01-22 04:19:24.218489000 -0500
-@@ -44,9 +44,9 @@
- cyrus.conf \- Cyrus configuration file
- .SH DESCRIPTION
- \fB/etc/cyrus.conf\fR
--is the configuration file for the Cyrus \fBmaster\fR process. It
-+is the configuration file for the Cyrus \fBcyrus-master\fR process. It
- defines the startup procedures, services and events to be spawned by
--\fBmaster\fR.
-+\fBcyrus-master\fR.
- .PP
- The \fB/etc/cyrus.conf\fR file consists of a series of entries divided
- into sections of the form
-@@ -177,6 +177,6 @@
- still have separate access control rules.
- .SH SEE ALSO
- .PP
--\fBmaster(8)\fR, \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR,
-+\fBcyrus-master(8)\fR, \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR,
- \fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR, \fBctl_cyrusdb(8)\fR,
- \fBctl_deliver(8)\fR, \fBtls_prune(8)\fR, \fBhosts_access(5)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/fud.8 cyrus-imapd-2.3.11/man/fud.8
---- cyrus-imapd-2.3.11.orig/man/fud.8 2003-10-22 14:50:13.000000000 -0400
-+++ cyrus-imapd-2.3.11/man/fud.8 2008-01-22 04:19:24.268494000 -0500
-@@ -61,7 +61,7 @@
- ]
- .SH DESCRIPTION
- .B FUD
--is a long lived datagram daemon started from master that provides
-+is a long lived datagram daemon started from cyrus-master that provides
- information about when a user last
- read their mail, when mail last arrived in a user's mailbox, and how
- many messages are recent for that user.
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/idled.8 cyrus-imapd-2.3.11/man/idled.8
---- cyrus-imapd-2.3.11.orig/man/idled.8 2003-08-09 19:43:14.000000000 -0400
-+++ cyrus-imapd-2.3.11/man/idled.8 2008-01-22 04:19:24.298497000 -0500
-@@ -56,7 +56,7 @@
- to report the changes to the client.
- .I Idled
- is usually started from
--.I master.
-+.I cyrus-master.
- .PP
- .I Idled
- reads its configuration options out of the
-@@ -75,4 +75,4 @@
- .B /etc/imapd.conf
- .SH SEE ALSO
- .PP
--\fBimapd.conf(5)\fR, \fBmaster(8)\fR
-+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/imapd.8 cyrus-imapd-2.3.11/man/imapd.8
---- cyrus-imapd-2.3.11.orig/man/imapd.8 2002-10-03 15:02:41.000000000 -0400
-+++ cyrus-imapd-2.3.11/man/imapd.8 2008-01-22 04:19:24.338503000 -0500
-@@ -72,7 +72,7 @@
- is an IMAP4rev1 server.
- It accepts commands on its standard input and responds on its standard output.
- It MUST be invoked by
--.IR master (8)
-+.IR cyrus-master (8)
- with those descriptors attached to a remote client connection.
- .PP
- .I Imapd
-@@ -148,4 +148,4 @@
- .B /etc/imapd.conf
- .SH SEE ALSO
- .PP
--\fBimapd.conf(5)\fR, \fBmaster(8)\fR
-+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/imapd.conf.5 cyrus-imapd-2.3.11/man/imapd.conf.5
---- cyrus-imapd-2.3.11.orig/man/imapd.conf.5 2007-12-10 10:24:04.000000000 -0500
-+++ cyrus-imapd-2.3.11/man/imapd.conf.5 2008-01-22 04:19:24.368513000 -0500
-@@ -872,7 +872,7 @@
- .PP
- \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBnntpd(8)\fR, \fBlmtpd(8)\fR,
- \fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR,
--\fBdeliver(8)\fR, \fBmaster(8)\fR, \fBciphers(1)\fR
-+\fBdeliver(8)\fR, \fBcyrus-master(8)\fR, \fBciphers(1)\fR
-
-
- Allowed values: \fIoff\fR, \fIuserid\fR, \fIon\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/lmtpd.8 cyrus-imapd-2.3.11/man/lmtpd.8
---- cyrus-imapd-2.3.11.orig/man/lmtpd.8 2002-10-03 15:02:41.000000000 -0400
-+++ cyrus-imapd-2.3.11/man/lmtpd.8 2008-01-22 04:19:24.418512000 -0500
-@@ -68,7 +68,7 @@
- is an LMTP server used to deliver mail to the IMAP mailstore.
- It accepts commands on its standard input and responds on its standard output.
- It MUST be invoked by
--.IR master (8)
-+.IR cyrus-master (8)
- with those descriptors attached to a remote client connection.
- .PP
- .I Lmtpd
-@@ -101,4 +101,4 @@
- .B /etc/imapd.conf
- .SH SEE ALSO
- .PP
--\fBimapd.conf(5)\fR, \fBmaster(8)\fR
-+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/master.8 cyrus-imapd-2.3.11/man/master.8
---- cyrus-imapd-2.3.11.orig/man/master.8 2006-11-30 12:11:23.000000000 -0500
-+++ cyrus-imapd-2.3.11/man/master.8 2008-01-22 04:19:24.448517000 -0500
-@@ -1,5 +1,5 @@
- .\" -*- nroff -*-
--.TH MASTER 8 "Project Cyrus" CMU
-+.TH CYRUS-MASTER 8 "Project Cyrus" CMU
- .\"
- .\" Copyright (c) 1996-2000 Carnegie Mellon University. All rights reserved.
- .\"
-@@ -41,9 +41,9 @@
- .\"
- .\" $Id: master.8,v 1.14 2006/11/30 17:11:23 murch Exp $
- .SH NAME
--master \- master Cyrus process
-+cyrus-master \- master Cyrus process
- .SH SYNOPSIS
--.B master
-+.B cyrus-master
- [
- .B \-C
- .I alternate imapd.conf
-@@ -79,7 +79,7 @@
- .I snmp agentx socket
- ]
- .SH DESCRIPTION
--.I Master
-+.I Cyrus-master
- is the process that controls all of the Cyrus processes. This process
- is responsible for creating all imapd, pop3d, lmtpd and sieved child
- processes. This process also initializes the Berkeley DB code and
-@@ -92,12 +92,12 @@
- .SH OPTIONS
- .TP
- .BI \-C " alternate imapd.conf"
--Specifies an alternate imapd.conf for use by master (note that this will
--not affect any sub-processes spawned by master, you should specify those
-+Specifies an alternate imapd.conf for use by cyrus-master (note that this will
-+not affect any sub-processes spawned by cyrus-master, you should specify those
- specifically in the respective entries in cyrus.conf).
- .TP
- .BI \-M " alternate cyrus.conf"
--Specifies an alternate cyrus.conf for use by master.
-+Specifies an alternate cyrus.conf for use by cyrus-master.
- .TP
- .BI \-l " listen queue backlog"
- Increase the listen queue backlog. By default, the listen queue is set
-@@ -132,12 +132,12 @@
- Requires net-snmp 5.0 or higher.
- .SH CONFIGURATION
- Upon execution,
--.I master
-+.I cyrus-master
- reads its configuration information out of the
- .IR cyrus.conf (5)
- file.
- .PP
--.I Master
-+.I Cyrus-master
- rereads its configuration file when it receives a hangup signal,
- SIGHUP. Services and events may be added, deleted or modified when the
- configuration file is reread. Any active services removed from the
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/nntpd.8 cyrus-imapd-2.3.11/man/nntpd.8
---- cyrus-imapd-2.3.11.orig/man/nntpd.8 2006-11-30 12:11:23.000000000 -0500
-+++ cyrus-imapd-2.3.11/man/nntpd.8 2008-01-22 04:19:24.488523000 -0500
-@@ -78,7 +78,7 @@
- is a NNTP server.
- It accepts commands on its standard input and responds on its standard output.
- It MUST invoked by
--.IR master (8)
-+.IR cyrus-master (8)
- with those descriptors attached to a remote client connection.
- .PP
- .I Nntpd
-@@ -153,4 +153,4 @@
- .B /etc/imapd.conf
- .SH SEE ALSO
- .PP
--\fBimapd.conf(5)\fR, \fBmaster(8)\fR
-+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/notifyd.8 cyrus-imapd-2.3.11/man/notifyd.8
---- cyrus-imapd-2.3.11.orig/man/notifyd.8 2003-08-09 19:43:14.000000000 -0400
-+++ cyrus-imapd-2.3.11/man/notifyd.8 2008-01-22 04:19:24.538528000 -0500
-@@ -62,7 +62,7 @@
- ]
- .SH DESCRIPTION
- .B Notifyd
--is a daemon started from master(8) that handles notification requests on
-+is a daemon started from cyrus-master(8) that handles notification requests on
- behalf of lmtpd(8).
- .B Notifyd
- accepts the request and performs the notification using the method
-@@ -122,4 +122,4 @@
- Cyrus Master process configuration file.
- .SH SEE ALSO
- .PP
--\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBmaster(8)\fR, \fBlmtpd(8)\fR
-+\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBcyrus-master(8)\fR, \fBlmtpd(8)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/pop3d.8 cyrus-imapd-2.3.11/man/pop3d.8
---- cyrus-imapd-2.3.11.orig/man/pop3d.8 2006-11-30 12:11:23.000000000 -0500
-+++ cyrus-imapd-2.3.11/man/pop3d.8 2008-01-22 04:19:24.568532000 -0500
-@@ -75,7 +75,7 @@
- is a POP3 server.
- It accepts commands on its standard input and responds on its standard output.
- It MUST invoked by
--.IR master (8)
-+.IR cyrus-master (8)
- with those descriptors attached to a remote client connection.
- .PP
- .I Pop3d
-@@ -132,4 +132,4 @@
- .B /etc/imapd.conf
- .SH SEE ALSO
- .PP
--\fBimapd.conf(5)\fR, \fBmaster(8)\fR
-+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/smmapd.8 cyrus-imapd-2.3.11/man/smmapd.8
---- cyrus-imapd-2.3.11.orig/man/smmapd.8 2006-11-30 12:11:23.000000000 -0500
-+++ cyrus-imapd-2.3.11/man/smmapd.8 2008-01-22 04:19:24.608537000 -0500
-@@ -67,7 +67,7 @@
- It accepts commands on its standard input and responds on its standard
- output.
- It MUST be invoked by
--.IR master (8)
-+.IR cyrus-master (8)
- with those descriptors attached to a remote client connection.
- .PP
- .B SMMAPD
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/timsieved.8 cyrus-imapd-2.3.11/man/timsieved.8
---- cyrus-imapd-2.3.11.orig/man/timsieved.8 2006-11-30 12:11:23.000000000 -0500
-+++ cyrus-imapd-2.3.11/man/timsieved.8 2008-01-22 04:19:24.638540000 -0500
-@@ -53,7 +53,7 @@
- is a server that allows users to remotely manage their sieve scripts
- kept on the server. It accepts commands on its standard input and
- responds on its standard output. It MUST be invoked by
--.IR master (8)
-+.IR cyrus-master (8)
- with those descriptors attached to a remote client connection.
- .PP
- Cyrus admins that authenticate and authorize as themselves (e.g. don't
-@@ -73,4 +73,4 @@
- .B /etc/imapd.conf
- .SH SEE ALSO
- .PP
--\fBimapd.conf(5)\fR, \fBmaster(8)\fR
-+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/tls_prune.8 cyrus-imapd-2.3.11/man/tls_prune.8
---- cyrus-imapd-2.3.11.orig/man/tls_prune.8 2003-08-09 19:43:15.000000000 -0400
-+++ cyrus-imapd-2.3.11/man/tls_prune.8 2008-01-22 04:19:24.678545000 -0500
-@@ -67,4 +67,4 @@
- .B /etc/imapd.conf
- .SH SEE ALSO
- .PP
--\fBimapd.conf(5)\fR, \fBmaster(8)\fR
-+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/master/Makefile.in cyrus-imapd-2.3.11/master/Makefile.in
---- cyrus-imapd-2.3.11.orig/master/Makefile.in 2007-09-24 08:48:32.000000000 -0400
-+++ cyrus-imapd-2.3.11/master/Makefile.in 2008-01-22 04:20:08.954063000 -0500
-@@ -71,7 +71,7 @@
-
- LOBJS=service.o service-thread.o
-
--PROGS=master
-+PROGS=cyrus-master
-
- all: $(PROGS) $(LOBJS)
-
-@@ -86,8 +86,8 @@
- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
- $<
-
--master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_ at WITH_LOCK@.o
-- $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_ at WITH_LOCK@.o $(LIBS) $(DEPLIBS)
-+cyrus-master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_ at WITH_LOCK@.o
-+ $(CC) $(LDFLAGS) -o cyrus-master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_ at WITH_LOCK@.o $(LIBS) $(DEPLIBS)
-
- clean:
- rm -f *.o *.a Makefile.bak $(PROGS)
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/master/master.c cyrus-imapd-2.3.11/master/master.c
---- cyrus-imapd-2.3.11.orig/master/master.c 2007-10-10 09:59:48.000000000 -0400
-+++ cyrus-imapd-2.3.11/master/master.c 2008-01-22 04:19:24.748554000 -0500
-@@ -1738,7 +1738,7 @@
- pid = fork();
-
- if ((pid == -1) && (errno == EAGAIN)) {
-- syslog(LOG_WARNING, "master fork failed (sleeping): %m");
-+ syslog(LOG_WARNING, "cyrus-master fork failed (sleeping): %m");
- sleep(5);
- }
- } while ((pid == -1) && (errno == EAGAIN));
-@@ -1799,7 +1799,7 @@
- /* Tell our parent that we failed. */
- write(startup_pipe[1], &exit_result, sizeof(exit_result));
-
-- fatal("cannot get exclusive lock on pidfile (is another master still running?)", EX_OSERR);
-+ fatal("cannot get exclusive lock on pidfile (is another cyrus-master still running?)", EX_OSERR);
- } else {
- int pidfd_flags = fcntl(pidfd, F_GETFD, 0);
- if (pidfd_flags != -1)
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/master/service-thread.c cyrus-imapd-2.3.11/master/service-thread.c
---- cyrus-imapd-2.3.11.orig/master/service-thread.c 2006-11-30 12:11:23.000000000 -0500
-+++ cyrus-imapd-2.3.11/master/service-thread.c 2008-01-22 04:19:24.778558000 -0500
-@@ -79,11 +79,11 @@
- void notify_master(int fd, int msg)
- {
- struct notify_message notifymsg;
-- if (verbose) syslog(LOG_DEBUG, "telling master %x", msg);
-+ if (verbose) syslog(LOG_DEBUG, "telling cyrus-master %x", msg);
- notifymsg.message = msg;
- notifymsg.service_pid = getpid();
- if (write(fd, ¬ifymsg, sizeof(notifymsg)) != sizeof(notifymsg)) {
-- syslog(LOG_ERR, "unable to tell master %x: %m", msg);
-+ syslog(LOG_ERR, "unable to tell cyrus-master %x: %m", msg);
- }
- }
-
-diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/master/service.c cyrus-imapd-2.3.11/master/service.c
---- cyrus-imapd-2.3.11.orig/master/service.c 2007-09-27 16:10:39.000000000 -0400
-+++ cyrus-imapd-2.3.11/master/service.c 2008-01-22 04:19:24.808564000 -0500
-@@ -86,11 +86,11 @@
- void notify_master(int fd, int msg)
- {
- struct notify_message notifymsg;
-- if (verbose) syslog(LOG_DEBUG, "telling master %x", msg);
-+ if (verbose) syslog(LOG_DEBUG, "telling cyrus-master %x", msg);
- notifymsg.message = msg;
- notifymsg.service_pid = getpid();
- if (write(fd, ¬ifymsg, sizeof(notifymsg)) != sizeof(notifymsg)) {
-- syslog(LOG_ERR, "unable to tell master %x: %m", msg);
-+ syslog(LOG_ERR, "unable to tell cyrus-master %x: %m", msg);
- }
- }
-
Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2008-12-19 19:11:49 UTC (rev 2675)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2008-12-20 14:18:23 UTC (rev 2676)
@@ -1,3 +1,15 @@
+pm_cyrus (2.3.13,REV=2008.12.20) unstable
+
+ * Added mupdate service in /etc/services.
+
+ -- Yann Rouillard <yann at opencsw.org> Sat, 20 Dec 2008 15:13:33 +0100
+
+pm_cyrus (2.3.13,REV=2008.11.30) unstable
+
+ * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org> Sun, 30 Nov 2008 20:58:22 +0100
+
pm_cyrus (2.3.9,REV=2008.01.21) unstable
* New upstream version.
Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/services
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/services 2008-12-19 19:11:49 UTC (rev 2675)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/services 2008-12-20 14:18:23 UTC (rev 2676)
@@ -16,6 +16,7 @@
kpop 1109/tcp # Pop with Kerberos
sieve 2000/tcp # Sieve mail filter daemon
lmtp 2003/tcp # Local Mail Transfer Protocol
+mupdate 3905/tcp
fud 4201/udp
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