[SVN] r328 - in /trunk/cyrus-imapd-2.2: ./ debian/patches/ doc/
imap/
installsieve/ lib/ master/ notifyd/ perl/ perl/sieve/ perl/sieve/lib/
sieve/ timsieved/
debian at incase.de
debian at incase.de
Fri Mar 31 18:24:01 UTC 2006
Author: sven
Date: Fri Mar 31 20:24:00 2006
New Revision: 328
URL: https://mail.incase.de/viewcvs?rev=328&root=cyrus22&view=rev
Log:
Revert previous checkin, it accidentally checked in various patched files where it shouldn't have
Modified:
trunk/cyrus-imapd-2.2/Makefile.in
trunk/cyrus-imapd-2.2/debian/patches/05-fix_programnames.dpatch
trunk/cyrus-imapd-2.2/doc/faq.html
trunk/cyrus-imapd-2.2/doc/install-virtdomains.html
trunk/cyrus-imapd-2.2/imap/Makefile.in
trunk/cyrus-imapd-2.2/installsieve/Makefile.in
trunk/cyrus-imapd-2.2/lib/Makefile.in
trunk/cyrus-imapd-2.2/lib/imapoptions
trunk/cyrus-imapd-2.2/master/Makefile.in
trunk/cyrus-imapd-2.2/notifyd/Makefile.in
trunk/cyrus-imapd-2.2/perl/Makefile.in
trunk/cyrus-imapd-2.2/perl/sieve/Makefile.in
trunk/cyrus-imapd-2.2/perl/sieve/lib/Makefile.in
trunk/cyrus-imapd-2.2/sieve/Makefile.in
trunk/cyrus-imapd-2.2/timsieved/Makefile.in
Modified: trunk/cyrus-imapd-2.2/Makefile.in
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/Makefile.in?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/Makefile.in (original)
+++ trunk/cyrus-imapd-2.2/Makefile.in Fri Mar 31 20:24:00 2006
@@ -41,7 +41,7 @@
#
SUBDIRS = man @PRE_SUBDIRS@ lib @SIEVE_SUBDIRS@ @SERVER_SUBDIRS@ \
- imtest perl @SNMP_SUBDIRS@ @EXTRA_SUBDIRS@
+ imtest @SNMP_SUBDIRS@ @EXTRA_SUBDIRS@
DISTSUBDIRS = doc
srcdir = @srcdir@
Modified: trunk/cyrus-imapd-2.2/debian/patches/05-fix_programnames.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/debian/patches/05-fix_programnames.dpatch?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/debian/patches/05-fix_programnames.dpatch (original)
+++ trunk/cyrus-imapd-2.2/debian/patches/05-fix_programnames.dpatch Fri Mar 31 20:24:00 2006
@@ -6,9 +6,9 @@
## DP: program sources
@DPATCH@
-diff -urNad cyrus-imapd-2.2/imap/deliver.c /tmp/dpep.WZm2bv/cyrus-imapd-2.2/imap/deliver.c
---- cyrus-imapd-2.2/imap/deliver.c 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/imap/deliver.c 2006-03-31 20:20:08.908742802 +0200
+diff -urNad complete.dpatch/imap/deliver.c /tmp/dpep.8HKnp3/complete.dpatch/imap/deliver.c
+--- complete.dpatch/imap/deliver.c 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/imap/deliver.c 2005-11-11 15:34:00.393958651 +0100
@@ -99,7 +99,7 @@
static void usage()
{
@@ -18,21 +18,21 @@
" [-a auth] [-r return_path] [-l] [-D]\r\n");
fprintf(stderr, "421 4.3.0 %s\n", CYRUS_VERSION);
exit(EC_USAGE);
-diff -urNad cyrus-imapd-2.2/imap/quota.c /tmp/dpep.WZm2bv/cyrus-imapd-2.2/imap/quota.c
---- cyrus-imapd-2.2/imap/quota.c 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/imap/quota.c 2006-03-31 20:20:40.611649974 +0200
-@@ -208,7 +208,7 @@
+diff -urNad complete.dpatch/imap/quota.c /tmp/dpep.8HKnp3/complete.dpatch/imap/quota.c
+--- complete.dpatch/imap/quota.c 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/imap/quota.c 2005-11-11 15:34:00.393958651 +0100
+@@ -196,7 +196,7 @@
+
void usage(void)
{
- fprintf(stderr,
-- "usage: quota [-C <alt_config>] [-d <domain>] [-f] [prefix]...\n");
-+ "usage: cyrquota [-C <alt_config>] [-d <domain>] [-f] [prefix]...\n");
+- fprintf(stderr, "usage: quota [-C <alt_config>] [-d <domain>] [-f] [prefix]...\n");
++ fprintf(stderr, "usage: cyrquota [-C <alt_config>] [-d <domain>] [-f] [prefix]...\n");
exit(EC_USAGE);
}
-diff -urNad cyrus-imapd-2.2/imap/reconstruct.c /tmp/dpep.WZm2bv/cyrus-imapd-2.2/imap/reconstruct.c
---- cyrus-imapd-2.2/imap/reconstruct.c 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/imap/reconstruct.c 2006-03-31 20:20:08.909742704 +0200
+diff -urNad complete.dpatch/imap/reconstruct.c /tmp/dpep.8HKnp3/complete.dpatch/imap/reconstruct.c
+--- complete.dpatch/imap/reconstruct.c 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/imap/reconstruct.c 2005-11-11 15:34:00.394958554 +0100
@@ -345,8 +345,8 @@
void usage(void)
{
@@ -44,54 +44,54 @@
exit(EC_USAGE);
}
-diff -urNad cyrus-imapd-2.2/man/chk_cyrus.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/chk_cyrus.8
---- cyrus-imapd-2.2/man/chk_cyrus.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/chk_cyrus.8 2006-03-31 20:20:08.909742704 +0200
+diff -urNad complete.dpatch/man/chk_cyrus.8 /tmp/dpep.8HKnp3/complete.dpatch/man/chk_cyrus.8
+--- complete.dpatch/man/chk_cyrus.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/chk_cyrus.8 2005-11-11 15:34:00.394958554 +0100
@@ -83,4 +83,4 @@
.B /etc/imapd.conf
.SH SEE ALSO
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.2/man/ctl_cyrusdb.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/ctl_cyrusdb.8
---- cyrus-imapd-2.2/man/ctl_cyrusdb.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/ctl_cyrusdb.8 2006-03-31 20:20:08.909742704 +0200
+diff -urNad complete.dpatch/man/ctl_cyrusdb.8 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_cyrusdb.8
+--- complete.dpatch/man/ctl_cyrusdb.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_cyrusdb.8 2005-11-11 15:34:00.394958554 +0100
@@ -94,4 +94,4 @@
.B /etc/imapd.conf
.SH SEE ALSO
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.2/man/ctl_deliver.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/ctl_deliver.8
---- cyrus-imapd-2.2/man/ctl_deliver.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/ctl_deliver.8 2006-03-31 20:20:08.910742607 +0200
+diff -urNad complete.dpatch/man/ctl_deliver.8 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_deliver.8
+--- complete.dpatch/man/ctl_deliver.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_deliver.8 2005-11-11 15:34:00.395958456 +0100
@@ -78,4 +78,4 @@
.B /etc/imapd.conf
.SH SEE ALSO
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.2/man/ctl_mboxlist.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/ctl_mboxlist.8
---- cyrus-imapd-2.2/man/ctl_mboxlist.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/ctl_mboxlist.8 2006-03-31 20:20:08.910742607 +0200
+diff -urNad complete.dpatch/man/ctl_mboxlist.8 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_mboxlist.8
+--- complete.dpatch/man/ctl_mboxlist.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_mboxlist.8 2005-11-11 15:34:00.395958456 +0100
@@ -138,4 +138,4 @@
.B /etc/imapd.conf
.SH SEE ALSO
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.2/man/cyr_expire.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/cyr_expire.8
---- cyrus-imapd-2.2/man/cyr_expire.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/cyr_expire.8 2006-03-31 20:20:08.910742607 +0200
+diff -urNad complete.dpatch/man/cyr_expire.8 /tmp/dpep.8HKnp3/complete.dpatch/man/cyr_expire.8
+--- complete.dpatch/man/cyr_expire.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/cyr_expire.8 2005-11-11 15:34:00.395958456 +0100
@@ -90,4 +90,4 @@
.B /etc/imapd.conf
.SH SEE ALSO
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.2/man/cyrus.conf.5 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/cyrus.conf.5
---- cyrus-imapd-2.2/man/cyrus.conf.5 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/cyrus.conf.5 2006-03-31 20:20:08.911742509 +0200
+diff -urNad complete.dpatch/man/cyrus.conf.5 /tmp/dpep.8HKnp3/complete.dpatch/man/cyrus.conf.5
+--- complete.dpatch/man/cyrus.conf.5 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/cyrus.conf.5 2005-11-11 15:34:00.396958358 +0100
@@ -44,9 +44,9 @@
cyrus.conf \- Cyrus configuration file
.SH DESCRIPTION
@@ -144,9 +144,9 @@
+\fBcyrmaster(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 -urNad cyrus-imapd-2.2/man/deliver.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/deliver.8
---- cyrus-imapd-2.2/man/deliver.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/deliver.8 2006-03-31 20:20:08.911742509 +0200
+diff -urNad complete.dpatch/man/deliver.8 /tmp/dpep.8HKnp3/complete.dpatch/man/deliver.8
+--- complete.dpatch/man/deliver.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/deliver.8 2005-11-11 15:34:00.396958358 +0100
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH DELIVER 8 "Project Cyrus" CMU
@@ -184,9 +184,9 @@
either rejects messages with 8-bit-set characters in the headers or
changes these characters to `X'.
This is because such characters can't be interpreted since the
-diff -urNad cyrus-imapd-2.2/man/fud.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/fud.8
---- cyrus-imapd-2.2/man/fud.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/fud.8 2006-03-31 20:20:08.911742509 +0200
+diff -urNad complete.dpatch/man/fud.8 /tmp/dpep.8HKnp3/complete.dpatch/man/fud.8
+--- complete.dpatch/man/fud.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/fud.8 2005-11-11 15:34:00.396958358 +0100
@@ -61,7 +61,7 @@
]
.SH DESCRIPTION
@@ -196,9 +196,9 @@
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 -urNad cyrus-imapd-2.2/man/idled.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/idled.8
---- cyrus-imapd-2.2/man/idled.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/idled.8 2006-03-31 20:20:08.912742412 +0200
+diff -urNad complete.dpatch/man/idled.8 /tmp/dpep.8HKnp3/complete.dpatch/man/idled.8
+--- complete.dpatch/man/idled.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/idled.8 2005-11-11 15:34:00.397958261 +0100
@@ -56,7 +56,7 @@
to report the changes to the client.
.I Idled
@@ -214,9 +214,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.2/man/imapd.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/imapd.8
---- cyrus-imapd-2.2/man/imapd.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/imapd.8 2006-03-31 20:20:08.912742412 +0200
+diff -urNad complete.dpatch/man/imapd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/imapd.8
+--- complete.dpatch/man/imapd.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/imapd.8 2005-11-11 15:34:00.397958261 +0100
@@ -72,7 +72,7 @@
is an IMAP4rev1 server.
It accepts commands on its standard input and responds on its standard output.
@@ -232,9 +232,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.2/man/lmtpd.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/lmtpd.8
---- cyrus-imapd-2.2/man/lmtpd.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/lmtpd.8 2006-03-31 20:20:08.912742412 +0200
+diff -urNad complete.dpatch/man/lmtpd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/lmtpd.8
+--- complete.dpatch/man/lmtpd.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/lmtpd.8 2005-11-11 15:34:00.397958261 +0100
@@ -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.
@@ -250,9 +250,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.2/man/master.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/master.8
---- cyrus-imapd-2.2/man/master.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/master.8 2006-03-31 20:20:08.913742314 +0200
+diff -urNad complete.dpatch/man/master.8 /tmp/dpep.8HKnp3/complete.dpatch/man/master.8
+--- complete.dpatch/man/master.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/master.8 2005-11-11 15:34:00.398958163 +0100
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH MASTER 8 "Project Cyrus" CMU
@@ -341,9 +341,9 @@
.SH SEE ALSO
.PP
\fBcyrus.conf(5)\fR, \fBimapd.conf(5)\fR, \fBimapd(8)\fR,
-diff -urNad cyrus-imapd-2.2/man/nntpd.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/nntpd.8
---- cyrus-imapd-2.2/man/nntpd.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/nntpd.8 2006-03-31 20:20:08.913742314 +0200
+diff -urNad complete.dpatch/man/nntpd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/nntpd.8
+--- complete.dpatch/man/nntpd.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/nntpd.8 2005-11-11 15:34:00.398958163 +0100
@@ -74,7 +74,7 @@
is a NNTP server.
It accepts commands on its standard input and responds on its standard output.
@@ -359,9 +359,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.2/man/notifyd.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/notifyd.8
---- cyrus-imapd-2.2/man/notifyd.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/notifyd.8 2006-03-31 20:20:08.913742314 +0200
+diff -urNad complete.dpatch/man/notifyd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/notifyd.8
+--- complete.dpatch/man/notifyd.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/notifyd.8 2005-11-11 15:34:00.398958163 +0100
@@ -62,7 +62,7 @@
]
.SH DESCRIPTION
@@ -377,9 +377,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBmaster(8)\fR, \fBlmtpd(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBcyrmaster(8)\fR, \fBlmtpd(8)\fR
-diff -urNad cyrus-imapd-2.2/man/pop3d.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/pop3d.8
---- cyrus-imapd-2.2/man/pop3d.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/pop3d.8 2006-03-31 20:20:08.914742217 +0200
+diff -urNad complete.dpatch/man/pop3d.8 /tmp/dpep.8HKnp3/complete.dpatch/man/pop3d.8
+--- complete.dpatch/man/pop3d.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/pop3d.8 2005-11-11 15:34:00.399958065 +0100
@@ -71,7 +71,7 @@
is a POP3 server.
It accepts commands on its standard input and responds on its standard output.
@@ -395,9 +395,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.2/man/quota.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/quota.8
---- cyrus-imapd-2.2/man/quota.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/quota.8 2006-03-31 20:20:08.914742217 +0200
+diff -urNad complete.dpatch/man/quota.8 /tmp/dpep.8HKnp3/complete.dpatch/man/quota.8
+--- complete.dpatch/man/quota.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/quota.8 2005-11-11 15:34:00.399958065 +0100
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH QUOTA 8 "Project Cyrus" CMU
@@ -449,9 +449,9 @@
reads its configuration options out of the
.IR imapd.conf (5)
file unless specified otherwise by \fB-C\fR.
-diff -urNad cyrus-imapd-2.2/man/reconstruct.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/reconstruct.8
---- cyrus-imapd-2.2/man/reconstruct.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/reconstruct.8 2006-03-31 20:20:08.914742217 +0200
+diff -urNad complete.dpatch/man/reconstruct.8 /tmp/dpep.8HKnp3/complete.dpatch/man/reconstruct.8
+--- complete.dpatch/man/reconstruct.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/reconstruct.8 2005-11-11 15:34:00.399958065 +0100
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH RECONSTRUCT 8 "Project Cyrus" CMU
@@ -526,9 +526,9 @@
with the
.I \-f
switch in order to fix the quota root files.
-diff -urNad cyrus-imapd-2.2/man/smmapd.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/smmapd.8
---- cyrus-imapd-2.2/man/smmapd.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/smmapd.8 2006-03-31 20:20:08.915742119 +0200
+diff -urNad complete.dpatch/man/smmapd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/smmapd.8
+--- complete.dpatch/man/smmapd.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/smmapd.8 2005-11-11 15:34:00.400957968 +0100
@@ -67,7 +67,7 @@
It accepts commands on its standard input and responds on its standard
output.
@@ -538,9 +538,9 @@
with those descriptors attached to a remote client connection.
.PP
.B SMMAPD
-diff -urNad cyrus-imapd-2.2/man/timsieved.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/timsieved.8
---- cyrus-imapd-2.2/man/timsieved.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/timsieved.8 2006-03-31 20:20:08.915742119 +0200
+diff -urNad complete.dpatch/man/timsieved.8 /tmp/dpep.8HKnp3/complete.dpatch/man/timsieved.8
+--- complete.dpatch/man/timsieved.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/timsieved.8 2005-11-11 15:34:00.400957968 +0100
@@ -53,7 +53,7 @@
is a server that allows users to remotly manage their sieve scripts kept on the server.
It accepts commands on its standard input and responds on its standard output.
@@ -556,18 +556,18 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.2/man/tls_prune.8 /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/tls_prune.8
---- cyrus-imapd-2.2/man/tls_prune.8 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/man/tls_prune.8 2006-03-31 20:20:08.915742119 +0200
+diff -urNad complete.dpatch/man/tls_prune.8 /tmp/dpep.8HKnp3/complete.dpatch/man/tls_prune.8
+--- complete.dpatch/man/tls_prune.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/man/tls_prune.8 2005-11-11 15:34:00.400957968 +0100
@@ -67,4 +67,4 @@
.B /etc/imapd.conf
.SH SEE ALSO
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.2/sieve/md5.c /tmp/dpep.WZm2bv/cyrus-imapd-2.2/sieve/md5.c
---- cyrus-imapd-2.2/sieve/md5.c 2006-03-31 20:16:41.000000000 +0200
-+++ /tmp/dpep.WZm2bv/cyrus-imapd-2.2/sieve/md5.c 2006-03-31 20:20:08.916742022 +0200
+diff -urNad complete.dpatch/sieve/md5.c /tmp/dpep.8HKnp3/complete.dpatch/sieve/md5.c
+--- complete.dpatch/sieve/md5.c 2000-01-05 05:51:51.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/sieve/md5.c 2005-11-11 15:34:48.633248090 +0100
@@ -31,7 +31,7 @@
#include "md5global.h"
Modified: trunk/cyrus-imapd-2.2/doc/faq.html
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/doc/faq.html?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/doc/faq.html (original)
+++ trunk/cyrus-imapd-2.2/doc/faq.html Fri Mar 31 20:24:00 2006
@@ -111,7 +111,7 @@
</pre>
<p>Make sure that <tt>saslauthd</tt> is running and that the cyrus
-user can access the unix domain socket (defaults to <tt>/var/run/saslauthd/mux</tt>).
+user can access the unix domain socket (defaults to <tt>/var/run/mux</tt>).
</dd>
Modified: trunk/cyrus-imapd-2.2/doc/install-virtdomains.html
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/doc/install-virtdomains.html?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/doc/install-virtdomains.html (original)
+++ trunk/cyrus-imapd-2.2/doc/install-virtdomains.html Fri Mar 31 20:24:00 2006
@@ -99,10 +99,6 @@
to the <tt>defaultdomain</tt>. See <a href=#admins>Administrators</a>
below for further discussion.
-<p><b>Note:</b> Users in the <tt>defaultdomain</tt> must <i>not</i>
-log in using the <tt>user at domain</tt> cross-realm login syntax. The
-<tt>user at domain</tt> type specification only works for them in LMTP.
-
<p>Here is a sample <tt>imapd.conf</tt> with a minimal set of configuration
options.</p>
Modified: trunk/cyrus-imapd-2.2/imap/Makefile.in
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/imap/Makefile.in?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/imap/Makefile.in (original)
+++ trunk/cyrus-imapd-2.2/imap/Makefile.in Fri Mar 31 20:24:00 2006
@@ -72,7 +72,7 @@
LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-CFLAGS = @CFLAGS@ @WARNERROR@
+CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
SHELL = /bin/sh
Modified: trunk/cyrus-imapd-2.2/installsieve/Makefile.in
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/installsieve/Makefile.in?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/installsieve/Makefile.in (original)
+++ trunk/cyrus-imapd-2.2/installsieve/Makefile.in Fri Mar 31 20:24:00 2006
@@ -48,7 +48,7 @@
DEFS = @DEFS@
CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
-CFLAGS = @CFLAGS@ @WARNERROR@
+CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
INSTALL = @INSTALL@
Modified: trunk/cyrus-imapd-2.2/lib/Makefile.in
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/lib/Makefile.in?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/lib/Makefile.in (original)
+++ trunk/cyrus-imapd-2.2/lib/Makefile.in Fri Mar 31 20:24:00 2006
@@ -62,7 +62,7 @@
LIBS = @LIBS@
MAKEDEPEND_CFLAGS = @CFLAGS@
-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ @WARNERROR@ -fPIC
+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
LDFLAGS = @LDFLAGS@
SHELL = /bin/sh
Modified: trunk/cyrus-imapd-2.2/lib/imapoptions
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/lib/imapoptions?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/lib/imapoptions (original)
+++ trunk/cyrus-imapd-2.2/lib/imapoptions Fri Mar 31 20:24:00 2006
@@ -187,11 +187,7 @@
mailbox that does not have a parent mailbox. */
{ "defaultdomain", NULL, STRING }
-/* The default domain for virtual domain support. Note that this domain
- is stripped from the email-address transmitted using LMTP, but it
- is not stripped from usernames at login-time. For imapd/pop3d,
- "user" and "user at defaultdomain" specify two different users.
- Please check install-virtdomains.html for details. */
+/* The default domain for virtual domain support */
{ "defaultpartition", "default", STRING }
/* The partition name used by default for new mailboxes. */
@@ -444,10 +440,7 @@
/* The list of remote realms whose users may authenticate using cross-realm
authentication identifiers. Seperate each realm name by a space. (A
cross-realm identity is considered any identity returned by SASL
- with an "@" in it.) Note that to support multiple virtual domains
- on the same interface/IP, you need to list them all as loginreals.
- If you don't list them here, your users probably won't be able to
- log in. */
+ with an "@" in it.). */
{ "loginuseacl", 0, SWITCH }
/* If enabled, any authentication identity which has \fBa\fR rights on a
Modified: trunk/cyrus-imapd-2.2/master/Makefile.in
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/master/Makefile.in?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/master/Makefile.in (original)
+++ trunk/cyrus-imapd-2.2/master/Makefile.in Fri Mar 31 20:24:00 2006
@@ -57,7 +57,7 @@
CPPFLAGS = -I.. -I$(srcdir)/../lib -I$(srcdir)/../imap @CPPFLAGS@ @COM_ERR_CPPFLAGS@
DEPLIBS = @DEPLIBS@
-CFLAGS = @CFLAGS@ @WARNERROR@
+CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
Modified: trunk/cyrus-imapd-2.2/notifyd/Makefile.in
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/notifyd/Makefile.in?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/notifyd/Makefile.in (original)
+++ trunk/cyrus-imapd-2.2/notifyd/Makefile.in Fri Mar 31 20:24:00 2006
@@ -54,7 +54,7 @@
DEFS = @DEFS@ @LOCALDEFS@
CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-CFLAGS = @CFLAGS@ @WARNERROR@
+CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
prefix = @prefix@
Modified: trunk/cyrus-imapd-2.2/perl/Makefile.in
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/perl/Makefile.in?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/perl/Makefile.in (original)
+++ trunk/cyrus-imapd-2.2/perl/Makefile.in Fri Mar 31 20:24:00 2006
@@ -82,9 +82,9 @@
BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
- $(PERL) Makefile.PL INSTALLDIRS=vendor; \
+ $(PERL) Makefile.PL PREFIX=$(prefix); \
fi; \
- $(MAKE) $(MFLAGS) LD_RUN_PATH= DESTDIR=$(DESTDIR) all) || exit 1; \
+ $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
done
install::
Modified: trunk/cyrus-imapd-2.2/perl/sieve/Makefile.in
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/perl/sieve/Makefile.in?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/perl/sieve/Makefile.in (original)
+++ trunk/cyrus-imapd-2.2/perl/sieve/Makefile.in Fri Mar 31 20:24:00 2006
@@ -84,9 +84,9 @@
BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
- $(PERL) Makefile.PL INSTALLDIRS=vendor; \
+ $(PERL) Makefile.PL PREFIX=$(prefix); \
fi; \
- $(MAKE) $(MFLAGS) LD_RUN_PATH= DESTDIR=$(DESTDIR) all) || exit 1; \
+ $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
done
install::
Modified: trunk/cyrus-imapd-2.2/perl/sieve/lib/Makefile.in
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/perl/sieve/lib/Makefile.in?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/perl/sieve/lib/Makefile.in (original)
+++ trunk/cyrus-imapd-2.2/perl/sieve/lib/Makefile.in Fri Mar 31 20:24:00 2006
@@ -57,7 +57,7 @@
DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
MAKEDEPEND_CFLAGS = @CFLAGS@
-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ -fPIC
+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
LDFLAGS = @LDFLAGS@
SHELL = /bin/sh
Modified: trunk/cyrus-imapd-2.2/sieve/Makefile.in
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/sieve/Makefile.in?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/sieve/Makefile.in (original)
+++ trunk/cyrus-imapd-2.2/sieve/Makefile.in Fri Mar 31 20:24:00 2006
@@ -40,7 +40,7 @@
DEFS = @DEFS@
CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
MAKEDEPEND_CFLAGS = @CFLAGS@
-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ -fPIC
+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
LDFLAGS = @LDFLAGS@
MAKEDEPEND = @MAKEDEPEND@
@@ -51,7 +51,6 @@
LIBS = libsieve.a $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
DEPLIBS=../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-BINARIES = sievec sieved
BUILT_SOURCES = addr.c addr.h addr-lex.c \
sieve.c sieve.h sieve-lex.c \
sieve_err.h sieve_err.c
@@ -115,7 +114,7 @@
$(COMPILE_ET) $(srcdir)/sieve_err.et
clean:
- rm -f test *~ *.o *.a Makefile.bak makedepend.log $(BINARIES)
+ rm -f test *~ *.o *.a Makefile.bak makedepend.log
distclean: clean
rm -f Makefile
Modified: trunk/cyrus-imapd-2.2/timsieved/Makefile.in
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/timsieved/Makefile.in?rev=328&root=cyrus22&r1=327&r2=328&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/timsieved/Makefile.in (original)
+++ trunk/cyrus-imapd-2.2/timsieved/Makefile.in Fri Mar 31 20:24:00 2006
@@ -54,7 +54,7 @@
DEFS = @DEFS@ @LOCALDEFS@
CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-CFLAGS = @CFLAGS@ @WARNERROR@
+CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
prefix = @prefix@
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list