[SVN] r736 - in /branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian: README.Debian README.Debian.database README.exim UPGRADE.Debian control cyrus-makedirs logcheck.ignore logcheck.violations.ignore patches/13-master_process_handling.dpatch
debian at incase.de
debian at incase.de
Fri Jun 22 13:14:31 UTC 2007
Author: astronut
Date: Fri Jun 22 15:14:21 2007
New Revision: 736
URL: https://mail.incase.de/viewcvs?rev=3D736&root=3Dcyrus22&view=3Drev
Log:
Manually merge changes from 2.2 branch
Modified:
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/README.Debian
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/README.Debian.database
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/README.exim
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/UPGRADE.Debian
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/control
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/cyrus-makedirs
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/logcheck.ignore
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/logcheck.violations.ignore
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/13-master_process=
_handling.dpatch
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/README.Debian
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/=
debian/README.Debian?rev=3D736&root=3Dcyrus22&r1=3D735&r2=3D736&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/README.Debian (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/README.Debian Fri Jun 22 =
15:14:21 2007
@@ -241,7 +241,7 @@
=
o Sieveshell is really lacking on auth capabilities, and timsieved is qui=
te
strict on what auth capabilities it offers. So, pay attention to
- sasl_minimum_layer, and see bug #151925 for more details
+ sasl_minimum_layer, and see bug #151295 for more details
(http://bugs.debian.org/151925). Also, make sure you have the correct =
set
of SASL2 modules installed in in your system.
=
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/README.Debian.datab=
ase
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/=
debian/README.Debian.database?rev=3D736&root=3Dcyrus22&r1=3D735&r2=3D736&vi=
ew=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/README.Debian.database (o=
riginal)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/README.Debian.database Fr=
i Jun 22 15:14:21 2007
@@ -72,6 +72,8 @@
=
SUBS /var/lib/cyrus/...../*.sub
SEEN /var/lib/cyrus/...../*.seen
+ =
+ For Cyrus 1.x versions, these files are in /var/spool/cyrus/...../
=
SUBS contains the subscribed folders, and SEEN contains the seen state
of every mail in a folder.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/README.exim
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/=
debian/README.exim?rev=3D736&root=3Dcyrus22&r1=3D735&r2=3D736&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/README.exim (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/README.exim Fri Jun 22 15=
:14:21 2007
@@ -1,5 +1,5 @@
Setting up Cyrus IMAPd for Exim
-$Id: README.exim 5 2005-03-12 23:19:45Z sven $
+$Id: README.exim 727 2007-06-19 12:33:18Z astronut $
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=
This is very incomplete information, if you are an exim user, please send
@@ -33,10 +33,10 @@
add whichever user exim is running as to it, and use dpkg-statoverride
to make /var/run/cyrus/socket/lmtp writeable by that group.
=
- To then deliver to Cyrus, you will need to comment check_local_user in
- conf.d/router/900_exim4-config_local_user, and change the LOCAL_DELIVERY
- macro in conf.d/main/01_exim4-config_listmacrosdefs to
- LOCAL_DELIVERY=3Dcyrus_delivery.
+ To then deliver to Cyrus, you will need to comment out the check_local_=
user
+ stanza in conf.d/router/900_exim4-config_local_user (the entire file), =
and
+ change the dc_localdelivery variable in /etc/exim4/update-exim4.conf.co=
nf to =
+ 'cyrus_delivery'.
=
If you still want to deliver some messages to a mail spool then create
conf.d/router/899_exim4-config_copy_to_mbox and put this in it, changing
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/UPGRADE.Debian
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/=
debian/UPGRADE.Debian?rev=3D736&root=3Dcyrus22&r1=3D735&r2=3D736&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/UPGRADE.Debian (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/UPGRADE.Debian Fri Jun 22=
15:14:21 2007
@@ -32,8 +32,15 @@
information from cyrus v1.5 below and in more detail in
/usr/share/doc/cyrus-common-2.3/README.Debian.database. =
=
+The configuration option lmtp_overquota_perm_failure has been renamed =
+lmtp_over_quota_perm_failure. Please update your configuration accordingly.
+
Please note that the 2.1 packages in Debian use a different format =
from upstream, thus the upgrade is easier.
+
+Also, please note that The tls_[service]_* configuration options have been
+removed. Now use [servicename]_tls_*, where servicename is the service
+identifier from cyrus.conf for that particular process.
=
Upgrading sieve scripts
-----------------------
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/control
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/=
debian/control?rev=3D736&root=3Dcyrus22&r1=3D735&r2=3D736&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/control (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/control Fri Jun 22 15:14:=
21 2007
@@ -5,6 +5,8 @@
Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Sven Mueller <sve=
n at debian.org>, Benjamin Seidenberg <benjamin at debian.org>, Ond=C3=85=C2=99ej=
Sur=C3=83=C2=BD <ondrej at debian.org>
Standards-Version: 3.7.2
Build-Depends: debhelper (>=3D 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g=
-dev, libdb4.5-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>=3D 2.1.9), c=
omerr-dev, libsnmp9-dev | libsnmp5-dev, perl (>=3D 5.6.0-16), xutils, flex,=
bison, autotools-dev, po-debconf, dpatch, transfig, gs, groff, libkvm-dev =
[kfreebsd-i386], libkvm-dev [kfreebsd-amd64]
+Xs-Vcs-Browser: https://mail.incase.de/viewcvs/branches/cyrus23/?root=3Dcy=
rus22
+Xs-Vcs-Svn: https://mail.incase.de/svn/cyrus22/branches/cyrus23
=
Package: cyrus-common-2.3
Architecture: any
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/cyrus-makedirs
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/=
debian/cyrus-makedirs?rev=3D736&root=3Dcyrus22&r1=3D735&r2=3D736&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/cyrus-makedirs (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/cyrus-makedirs Fri Jun 22=
15:14:21 2007
@@ -6,7 +6,7 @@
# Copyright 2001,2002 by Henrique de Moraes Holschuh <hmh at debian.org.
# Released under the terms of the GNU General Public License (GPL) versio=
n 2
#
-# $Id: cyrus-makedirs 229 2005-12-08 23:26:29Z astronut $
+# $Id: cyrus-makedirs 725 2007-06-19 11:16:53Z astronut $
=
# See lib/util.c, dir_hash_c for Cyrus' directory hashing
# for the new hash style
@@ -76,7 +76,7 @@
} " < "$CONF" | sort | uniq | xargs`
=
# First, fix up the entire confdir subtree
-echo "Creating cyrus control directories in ${confdir}..."
+echo "Creating/updating cyrus control directories in ${confdir}..."
[ -d "$confdir" ] || mkdir -p "$confdir"
chmod 750 "$confdir"
for i in db proc socket log msg user quota; do
@@ -89,11 +89,11 @@
[ -d "$confdir/$i/$j" ] || mkdir "$confdir/$i/$j"
done
done
-chown -R cyrus:mail "$confdir"
+find "$confdir" -not -user cyrus -or -not -group mail -exec chown cyrus:ma=
il {} \;
=
# Now, create the spool partitions
for i in $partitions ; do
- echo "Creating partition spool $i..."
+ echo "Creating/updating partition spool $i..."
[ -d "$i" ] || mkdir -p "$i"
chmod 750 "$i"
[ $hashspool -eq 1 ] && {
@@ -102,7 +102,7 @@
done
}
[ -d "$i/stage." ] || mkdir "$i/stage."
- chown -R cyrus:mail "$i"
+ find "$i" -not -user cyrus -or -not -group mail -exec chown cyrus:mail {}=
\;
# and kill any squatter indexes
[ $killsquat -ne 0 ] && find "$i" -name 'cyrus.squat' -type f -exec rm -f=
"{}" \;
done
@@ -115,7 +115,7 @@
[ -d "$sievedir/$j" ] || mkdir "$sievedir/$j"
chmod 755 "$sievedir/$j"
done
- chown -R cyrus:mail "$sievedir"
+ find "$sievedir" -not -user cyrus -or -not -group mail -exec chown cyrus:=
mail {} \;
}
=
[ "x${CYRUSOPTFILESYS}" !=3D "x1" ] && exit 0
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/logcheck.ignore
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/=
debian/logcheck.ignore?rev=3D736&root=3Dcyrus22&r1=3D735&r2=3D736&view=3Ddi=
ff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/logcheck.ignore (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/logcheck.ignore Fri Jun 2=
2 15:14:21 2007
@@ -53,7 +53,7 @@
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/squatter\[[0-9]+\]: (done )?(inde=
xing|skipping) mailbox
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/notifyd\[[0-9]+\]: do_notify usin=
g method
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: IOERROR: fsta=
ting sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: siev=
e script %s doesn't exist: [/a-zA-Z^]+/defaultbc: No such file or directory
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: siev=
e script /var/spool/sieve/[/[:alnum:]^]+defaultbc doesn't exist: No such fi=
le or directory
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/sieve\[[0-9]+\]: entered bc_actio=
n_emit with filelen: [0-9]+$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: no sec=
ret in database$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/cyr_expire\[[0-9]+\]: expunged 0 =
out of 0 messages from 0 mailboxes$
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/logcheck.violations=
.ignore
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/=
debian/logcheck.violations.ignore?rev=3D736&root=3Dcyrus22&r1=3D735&r2=3D73=
6&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/logcheck.violations.ignor=
e (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/logcheck.violations.ignor=
e Fri Jun 22 15:14:21 2007
@@ -2,6 +2,7 @@
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: IOERRO=
R: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: siev=
e script %s doesn't exist: [/a-zA-Z^]+/defaultbc: No such file or directory
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0=
-9]+\]: SQUAT failed to open index file$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0=
-9]+\]: SQUAT failed$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0=
-9]+\]: DBERROR db[34]: [0-9]+ lockers$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: (START=
)?TLS( negotiation)? failed:
=
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/13-master_p=
rocess_handling.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/=
debian/patches/13-master_process_handling.dpatch?rev=3D736&root=3Dcyrus22&r=
1=3D735&r2=3D736&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/13-master_process=
_handling.dpatch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/13-master_process=
_handling.dpatch Fri Jun 22 15:14:21 2007
@@ -5,10 +5,10 @@
## DP: Fixes process (child) handling in master process
=
@DPATCH@
-diff -urNad cyrus-imapd-2.3-2.3.7~/master/master.c cyrus-imapd-2.3-2.3.7/m=
aster/master.c
---- cyrus-imapd-2.3-2.3.7~/master/master.c 2006-08-14 16:22:33.000000000 +=
0200
-+++ cyrus-imapd-2.3-2.3.7/master/master.c 2006-08-14 16:22:34.000000000 +0=
200
-@@ -165,6 +165,8 @@
+diff -urNad cyrus-imapd-2.3-2.3.8~/master/master.c cyrus-imapd-2.3-2.3.8/m=
aster/master.c
+--- cyrus-imapd-2.3-2.3.8~/master/master.c 2007-06-22 13:59:51.000000000 +=
0100
++++ cyrus-imapd-2.3-2.3.8/master/master.c 2007-06-22 13:59:51.000000000 +0=
100
+@@ -169,6 +169,8 @@
static struct centry *ctable[child_table_size];
static struct centry *cfreelist;
=
@@ -17,7 +17,7 @@
static int janitor_frequency =3D 1; /* Janitor sweeps per second */
static int janitor_position; /* Entry to begin at in next sweep */
static struct timeval janitor_mark; /* Last time janitor did a sweep */
-@@ -189,9 +191,9 @@
+@@ -193,9 +195,9 @@
int become_cyrus(void)
{
struct passwd *p;
@@ -29,7 +29,7 @@
=
if (uid) return setuid(uid);
=
-@@ -943,7 +945,7 @@
+@@ -947,7 +949,7 @@
}
}
c->service_state =3D SERVICE_STATE_DEAD;
@@ -38,7 +38,7 @@
} else {
/* weird. Are we multithreaded now? we don't know this child */
syslog(LOG_WARNING,
-@@ -952,7 +954,7 @@
+@@ -956,7 +958,7 @@
c =3D get_centry();
c->pid =3D pid;
c->service_state =3D SERVICE_STATE_DEAD;
@@ -47,7 +47,7 @@
c->si =3D SERVICE_NONE;
c->next =3D ctable[pid % child_table_size];
ctable[pid % child_table_size] =3D c;
-@@ -1107,6 +1109,36 @@
+@@ -1111,6 +1113,36 @@
}
}
=
@@ -84,7 +84,7 @@
void process_msg(const int si, struct notify_message *msg) =
{
struct centry *c;
-@@ -1421,8 +1453,9 @@
+@@ -1425,8 +1457,9 @@
snprintf(buf, sizeof(buf),
"cannot find executable for service '%s'", name);
=
@@ -96,7 +96,7 @@
}
=
Services[i].maxforkrate =3D maxforkrate;
-@@ -1435,7 +1468,7 @@
+@@ -1439,7 +1472,7 @@
Services[i].desired_workers =3D prefork;
Services[i].babysit =3D babysit;
Services[i].max_workers =3D atoi(max);
@@ -105,7 +105,7 @@
Services[i].max_workers =3D INT_MAX;
}
} else {
-@@ -1443,6 +1476,7 @@
+@@ -1447,6 +1480,7 @@
if (prefork > 1) prefork =3D 1;
Services[i].desired_workers =3D prefork;
Services[i].max_workers =3D 1;
@@ -113,7 +113,7 @@
}
free(max);
=
-@@ -1483,7 +1517,7 @@
+@@ -1487,7 +1521,7 @@
if (!strcmp(cmd,"")) {
char buf[256];
snprintf(buf, sizeof(buf),
@@ -122,7 +122,7 @@
=
if (ignore_err) {
syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
-@@ -1537,7 +1571,7 @@
+@@ -1541,7 +1575,7 @@
=
rl.rlim_cur =3D x;
rl.rlim_max =3D x;
@@ -131,7 +131,7 @@
syslog(LOG_ERR, "setrlimit: Unable to set file descriptors limit to %ld:=
%m", x);
=
#ifdef HAVE_GETRLIMIT
-@@ -1552,11 +1586,9 @@
+@@ -1556,11 +1590,9 @@
}
=
=
@@ -146,19 +146,7 @@
#else
}
#endif /* HAVE_GETRLIMIT */
-@@ -1575,7 +1607,10 @@
- =
- /* disable all services -
- they will be re-enabled if they appear in config file */
-- for (i =3D 0; i < nservices; i++) Services[i].exec =3D NULL;
-+ for (i =3D 0; i < nservices; i++) {
-+ if (Services[i].exec) free((void*)Services[i].exec);
-+ Services[i].exec =3D NULL;
-+ }
- =
- /* read services */
- masterconf_getsection("SERVICES", &add_service, (void*) 1);
-@@ -1590,13 +1625,18 @@
+@@ -1594,13 +1626,18 @@
Services[i].stat[0], Services[i].stat[1]);
=
/* Only free the service info on the primary */
@@ -178,7 +166,7 @@
=
/* send SIGHUP to all children */
for (j =3D 0 ; j < child_table_size ; j++ ) {
-@@ -1679,9 +1719,9 @@
+@@ -1683,9 +1720,9 @@
p =3D getenv("CYRUS_VERBOSE");
if (p) verbose =3D atoi(p) + 1;
#ifdef HAVE_NETSNMP
@@ -190,7 +178,7 @@
#endif
switch (opt) {
case 'C': /* alt imapd.conf file */
-@@ -1714,8 +1754,15 @@
+@@ -1718,8 +1755,15 @@
/* Janitor frequency */
janitor_frequency =3D atoi(optarg);
if(janitor_frequency < 1)
@@ -207,7 +195,7 @@
#ifdef HAVE_NETSNMP
case 'P': /* snmp AgentXPingInterval */
agentxpinginterval =3D atoi(optarg);
-@@ -2098,13 +2145,19 @@
+@@ -2102,13 +2146,19 @@
int j;
=
if (FD_ISSET(x, &rfds)) {
@@ -232,9 +220,9 @@
}
=
if (Services[i].exec &&
-diff -urNad cyrus-imapd-2.3-2.3.7~/master/master.h cyrus-imapd-2.3-2.3.7/m=
aster/master.h
---- cyrus-imapd-2.3-2.3.7~/master/master.h 2005-04-06 22:37:01.000000000 +=
0200
-+++ cyrus-imapd-2.3-2.3.7/master/master.h 2006-08-14 16:22:34.000000000 +0=
200
+diff -urNad cyrus-imapd-2.3-2.3.8~/master/master.h cyrus-imapd-2.3-2.3.8/m=
aster/master.h
+--- cyrus-imapd-2.3-2.3.8~/master/master.h 2007-06-16 15:14:17.000000000 +=
0100
++++ cyrus-imapd-2.3-2.3.8/master/master.h 2007-06-22 13:59:51.000000000 +0=
100
@@ -46,6 +46,7 @@
extern struct service *Services;
extern int allocservices;
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list