Package: cyrus-imapd-2.3
Severity: wishlist
Tags: patch
--- Please enter the report below this line. ---
I have updated the patches (see attached files)
these patches become obsolete :
* 20-fix-bdb-for-4.5.dpatch
* 72-faster-isdigit.dpatch
the 99-should also be updated but I don't know the automake or something used.
--- System information. ---
Architecture: i386
Kernel: Linux 2.6.18-5-xen-686
Debian Release: lenny/sid
500 ubuntu-doko people.ubuntu.com
500 testing security.debian.org
500 testing ftp.fr.debian.org
--- Package information. ---
Depends (Version) | Installed
=======================-+-===========
|
--- cyrus-imapd-2.3-2.3.8/debian/patches/01-fix_Makefile.in.dpatch 2007-12-03 22:17:31.000000000 +0100
+++ cyrus-imapd-2.3-2.3.10/debian/patches/01-fix_Makefile.in.dpatch 2007-12-03 22:19:10.000000000 +0100
@@ -131,23 +131,6 @@
LDFLAGS = @LDFLAGS@
MAKEDEPEND = @MAKEDEPEND@
-@@ -51,6 +51,7 @@
- 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 +116,7 @@
- $(COMPILE_ET) $(srcdir)/sieve_err.et
-
- clean:
-- rm -f test *~ *.o *.a Makefile.bak makedepend.log
-+ rm -f test *~ *.o *.a Makefile.bak makedepend.log $(BINARIES)
-
- distclean: clean
- rm -f Makefile
diff -urNad cyrus-imapd-2.3-2.3.7~/timsieved/Makefile.in cyrus-imapd-2.3-2.3.7/timsieved/Makefile.in
--- cyrus-imapd-2.3-2.3.7~/timsieved/Makefile.in 2006-06-27 17:58:43.000000000 +0200
+++ cyrus-imapd-2.3-2.3.7/timsieved/Makefile.in 2006-08-14 16:18:21.000000000 +0200
--- cyrus-imapd-2.3-2.3.8/debian/patches/13-master_process_handling.dpatch 2007-12-03 22:31:13.000000000 +0100
+++ cyrus-imapd-2.3-2.3.10/debian/patches/13-master_process_handling.dpatch 2007-12-03 22:52:49.000000000 +0100
@@ -5,9 +5,9 @@
## DP: Fixes process (child) handling in master process
@DPATCH@
-diff -urNad cyrus-imapd-2.3-2.3.8~/master/master.c cyrus-imapd-2.3-2.3.8/master/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 +0100
+diff -urNad cyrus-imapd-2.3-2.3.10~/master/master.c cyrus-imapd-2.3-2.3.10/master/master.c
+--- cyrus-imapd-2.3-2.3.10~/master/master.c 2007-06-22 13:59:51.000000000 +0100
++++ cyrus-imapd-2.3-2.3.10/master/master.c 2007-06-22 13:59:51.000000000 +0100
@@ -169,6 +169,8 @@
static struct centry *ctable[child_table_size];
static struct centry *cfreelist;
@@ -17,18 +17,6 @@
static int janitor_frequency = 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 */
-@@ -193,9 +195,9 @@
- int become_cyrus(void)
- {
- struct passwd *p;
-- int newuid, newgid;
-+ uid_t newuid, newgid;
- int result;
-- static int uid = 0;
-+ static uid_t uid = 0;
-
- if (uid) return setuid(uid);
-
@@ -947,7 +949,7 @@
}
}
@@ -220,9 +208,9 @@
}
if (Services[i].exec &&
-diff -urNad cyrus-imapd-2.3-2.3.8~/master/master.h cyrus-imapd-2.3-2.3.8/master/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 +0100
+diff -urNad cyrus-imapd-2.3-2.3.10~/master/master.h cyrus-imapd-2.3-2.3.10/master/master.h
+--- cyrus-imapd-2.3-2.3.10~/master/master.h 2007-06-16 15:14:17.000000000 +0100
++++ cyrus-imapd-2.3-2.3.10/master/master.h 2007-06-22 13:59:51.000000000 +0100
@@ -46,6 +46,7 @@
extern struct service *Services;
extern int allocservices;
@@ -231,3 +219,18 @@
/*
* Description of multiple address family support from
+diff -urNad cyrus-imapd-2.3-2.3.10~/lib/util.c cyrus-imapd-2.3-2.3.10/lib/util.c
+--- cyrus-imapd-2.3-2.3.10~/lib/util.c 2007-06-16 15:14:17.000000000 +0100
++++ cyrus-imapd-2.3-2.3.10/lib/util.c 2007-06-22 13:59:51.000000000 +0100
+@@ -366,9 +366,9 @@
+ int become_cyrus(void)
+ {
+ struct passwd *p;
+- int newuid, newgid;
++ uid_t newuid, newgid;
+ int result;
+- static int uid = 0;
++ static uid_t uid = 0;
+
+ if (uid) return setuid(uid);
+
--- cyrus-imapd-2.3-2.3.10/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch 2007-12-03 22:31:29.000000000 +0100
+++ cyrus-imapd-2.3-2.3.10-patched/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch 2007-12-03 23:03:42.000000000 +0100
@@ -5,12 +5,15 @@
## DP: fix tail syntax in xversion.h (use "tail -n 1" instead of "tail -1")
@DPATCH@
-diff -urNad complete.dpatch/imap/xversion.sh /tmp/dpep.gLdzBq/complete.dpatch/imap/xversion.sh
---- complete.dpatch/imap/xversion.sh 2003-10-22 20:03:00.000000000 +0200
-+++ /tmp/dpep.gLdzBq/complete.dpatch/imap/xversion.sh 2005-11-10 17:14:52.208238481 +0100
-@@ -22,4 +22,4 @@
+diff -urNa cyrus-imapd-2.3-2.3.10/imap/xversion.sh cyrus-imapd-2.3-2.3.10-patched/imap/xversion.sh
+--- cyrus-imapd-2.3-2.3.10/imap/xversion.sh 2007-12-03 22:55:26.000000000 +0100
++++ cyrus-imapd-2.3-2.3.10-patched/imap/xversion.sh 2007-12-03 23:00:20.000000000 +0100
+@@ -23,7 +23,7 @@
match ($0, pattern) {
printf "\"%s\"\n", substr($0, RSTART, RLENGTH)
}' pattern="$DATEPAT $TIMEPAT" | \
-- sort | tail -1 >> xversion.h
-+ sort | tail -n 1 >> xversion.h
+- sort | tail -1 >> $TMPF
++ sort | tail -n 1 >> $TMPF
+
+ if [ -f xversion.h ] && cmp -s $TMPF xversion.h
+ then
--- cyrus-imapd-2.3-2.3.8/debian/patches/65-sieveshell-enhancements.dpatch 2007-12-03 23:05:52.000000000 +0100
+++ cyrus-imapd-2.3-2.3.10/debian/patches/65-sieveshell-enhancements.dpatch 2007-12-03 23:24:01.000000000 +0100
@@ -12,8 +12,8 @@
[\&_sc_info, '[mailbox]',
'display mailbox/server metadata'],
mboxcfg =>
-- [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat] value',
-+ [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat|/<explicit annotation>] value',
+- [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value',
++ [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value',
'configure mailbox'],
mboxconfig => 'mboxcfg',
reconstruct =>
@@ -39,8 +39,8 @@
while (defined ($opt = shift(@argv))) {
last if $opt eq '--';
if ($opt =~ /^-/) {
-- die "usage: mboxconfig mailbox [comment|condstore|news2mail|expire|sieve|squat] value\n";
-+ die "usage: mboxconfig mailbox [comment|condstore|news2mail|expire|sieve|squat|/<explicit annotation>] value\n";
+- die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
++ die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
}
else {
push(@nargv, $opt);
@@ -48,22 +48,11 @@
}
push(@nargv, @argv);
if (@nargv < 2) {
-- die "usage: mboxconfig mailbox [comment|condstore|news2mail|expire|sieve|squat] value\n";
-+ die "usage: mboxconfig mailbox [comment|condstore|news2mail|expire|sieve|squat|/<explicit annotation>] value\n";
+- die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
++ die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
}
if (!$cyrref || !$$cyrref) {
die "mboxconfig: no connection to server\n";
-diff -urNad cyrus-imapd-2.3.7~/perl/sieve/lib/request.c cyrus-imapd-2.3.7/perl/sieve/lib/request.c
---- cyrus-imapd-2.3.7~/perl/sieve/lib/request.c 2003-02-13 21:15:53.000000000 +0100
-+++ cyrus-imapd-2.3.7/perl/sieve/lib/request.c 2006-08-11 12:15:13.000000000 +0200
-@@ -560,7 +560,6 @@
- char **refer_to, char **errstrp)
- {
- int res;
-- mystring_t *str=NULL;
- mystring_t *errstr=NULL;
- lexstate_t state;
- int ret = 0;
diff -urNad cyrus-imapd-2.3.7~/perl/sieve/scripts/sieveshell.pl cyrus-imapd-2.3.7/perl/sieve/scripts/sieveshell.pl
--- cyrus-imapd-2.3.7~/perl/sieve/scripts/sieveshell.pl 2006-08-11 12:15:13.000000000 +0200
+++ cyrus-imapd-2.3.7/perl/sieve/scripts/sieveshell.pl 2006-08-11 12:15:13.000000000 +0200
--- cyrus-imapd-2.3-2.3.8/debian/patches/75-update-imapd.conf-documentation.dpatch 2007-12-03 23:05:52.000000000 +0100
+++ cyrus-imapd-2.3-2.3.10/debian/patches/75-update-imapd.conf-documentation.dpatch 2007-12-03 23:35:51.000000000 +0100
@@ -24,7 +24,7 @@
@@ -122,7 +125,17 @@
enabled when absolutely necessary. */
- { "allowplaintext", 1, SWITCH }
+ { "allowplaintext", 0, SWITCH }
-/* Allow the use of cleartext passwords on the wire. */
+/* Allow the use of cleartext passwords on the wire.
+.PP
