[SVN] r762 - in /trunk/cyrus-imapd-2.2.13/debian/patches: 18-fix_strlen_return_type.dpatch 21-fix_config-parsing.dpatch 22-imapd_index_check.dpatch 24-configurable-referrals.dpatch
debian at incase.de
debian at incase.de
Fri Apr 18 19:29:34 UTC 2008
Author: sven
Date: Tue Apr 15 13:14:06 2008
New Revision: 762
URL: https://mail.incase.de/viewcvs?rev=762&root=cyrus22&view=rev
Log:
Update some of the patches to remove warnings about offsets while applying them
Modified:
trunk/cyrus-imapd-2.2.13/debian/patches/18-fix_strlen_return_type.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/21-fix_config-parsing.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/22-imapd_index_check.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/24-configurable-referrals.dpatch
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/18-fix_strlen_return_type.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/18-fix_strlen_return_type.dpatch?rev=762&root=cyrus22&r1=761&r2=762&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/18-fix_strlen_return_type.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/18-fix_strlen_return_type.dpatch Tue Apr 15 13:14:06 2008
@@ -6,9 +6,9 @@
## DP: strings.
@DPATCH@
-diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.2wtF9E/complete.dpatch/imap/imapd.c
---- complete.dpatch/imap/imapd.c 2005-11-11 16:17:00.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imap/imapd.c 2005-11-11 16:17:00.679913340 +0100
+diff -urNad cyrus-imapd-2.2.13~/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13~/imap/imapd.c 2008-04-15 13:11:16.498055004 +0200
++++ cyrus-imapd-2.2.13/imap/imapd.c 2008-04-15 13:11:16.650068029 +0200
@@ -6095,8 +6095,8 @@
memset(&tmp, 0, sizeof(struct buf));
memset(&user, 0, sizeof(struct buf));
@@ -127,9 +127,9 @@
} else {
prot_printf(imapd_out, "\"%s\"", s);
}
-diff -urNad complete.dpatch/imap/mbdump.c /tmp/dpep.2wtF9E/complete.dpatch/imap/mbdump.c
---- complete.dpatch/imap/mbdump.c 2005-11-11 16:16:59.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imap/mbdump.c 2005-11-11 16:17:00.679913340 +0100
+diff -urNad cyrus-imapd-2.2.13~/imap/mbdump.c cyrus-imapd-2.2.13/imap/mbdump.c
+--- cyrus-imapd-2.2.13~/imap/mbdump.c 2008-04-15 13:11:16.338041293 +0200
++++ cyrus-imapd-2.2.13/imap/mbdump.c 2008-04-15 13:11:16.654068370 +0200
@@ -271,8 +271,8 @@
/* send filename, size, and contents */
@@ -185,9 +185,9 @@
(!tag ? "+" : ""),
ext_fname,
len,
-diff -urNad complete.dpatch/imap/message.c /tmp/dpep.2wtF9E/complete.dpatch/imap/message.c
---- complete.dpatch/imap/message.c 2005-11-11 16:17:00.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imap/message.c 2005-11-11 16:17:00.681913145 +0100
+diff -urNad cyrus-imapd-2.2.13~/imap/message.c cyrus-imapd-2.2.13/imap/message.c
+--- cyrus-imapd-2.2.13~/imap/message.c 2008-04-15 13:11:16.546059116 +0200
++++ cyrus-imapd-2.2.13/imap/message.c 2008-04-15 13:11:16.654068370 +0200
@@ -2060,7 +2060,7 @@
if (*p || len >= 1024) {
/* Write out as literal */
@@ -197,9 +197,9 @@
message_ibuf_ensure(ibuf, strlen(s)+strlen(buf));
for (p = buf; *p; p++) *(ibuf->end)++ = *p;
for (p = s; *p; p++) *(ibuf->end)++ = *p;
-diff -urNad complete.dpatch/imap/mupdate-client.c /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate-client.c
---- complete.dpatch/imap/mupdate-client.c 2005-11-11 16:16:59.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate-client.c 2005-11-11 16:17:00.681913145 +0100
+diff -urNad cyrus-imapd-2.2.13~/imap/mupdate-client.c cyrus-imapd-2.2.13/imap/mupdate-client.c
+--- cyrus-imapd-2.2.13~/imap/mupdate-client.c 2008-04-15 13:11:15.753991248 +0200
++++ cyrus-imapd-2.2.13/imap/mupdate-client.c 2008-04-15 13:11:16.654068370 +0200
@@ -330,9 +330,11 @@
if (!handle->saslcompleted) return MUPDATE_NOAUTH;
@@ -276,9 +276,9 @@
} else {
prot_printf(handle->pout,
"X%u LIST\r\n", handle->tagn++);
-diff -urNad complete.dpatch/imap/mupdate.c /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate.c
---- complete.dpatch/imap/mupdate.c 2005-11-11 16:16:59.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate.c 2005-11-11 16:17:00.682913047 +0100
+diff -urNad cyrus-imapd-2.2.13~/imap/mupdate.c cyrus-imapd-2.2.13/imap/mupdate.c
+--- cyrus-imapd-2.2.13~/imap/mupdate.c 2008-04-15 13:11:15.753991248 +0200
++++ cyrus-imapd-2.2.13/imap/mupdate.c 2008-04-15 13:11:16.654068370 +0200
@@ -1613,20 +1613,20 @@
pthread_mutex_unlock(&mailboxes_mutex); /* UNLOCK */
@@ -334,10 +334,10 @@
break;
case SET_DELETE:
-diff -urNad complete.dpatch/imap/proxyd.c /tmp/dpep.2wtF9E/complete.dpatch/imap/proxyd.c
---- complete.dpatch/imap/proxyd.c 2005-11-11 16:17:00.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imap/proxyd.c 2005-11-11 16:17:00.685912753 +0100
-@@ -2837,7 +2837,8 @@
+diff -urNad cyrus-imapd-2.2.13~/imap/proxyd.c cyrus-imapd-2.2.13/imap/proxyd.c
+--- cyrus-imapd-2.2.13~/imap/proxyd.c 2008-04-15 13:11:16.514056374 +0200
++++ cyrus-imapd-2.2.13/imap/proxyd.c 2008-04-15 13:11:16.654068370 +0200
+@@ -2841,7 +2841,8 @@
if (!r) {
int is_active = 1;
s->context = (void*) &is_active;
@@ -347,7 +347,7 @@
if (!(r = pipe_command(s, 16384))) {
pipe_until_tag(s, tag, 0);
}
-@@ -2913,8 +2914,8 @@
+@@ -2917,8 +2918,8 @@
return;
}
@@ -358,7 +358,7 @@
switch (pipe_including_tag(backend_current, tag, 0)) {
case PROXY_OK:
proc_register("proxyd", proxyd_clienthost, proxyd_userid, mailboxname);
-@@ -3144,8 +3145,9 @@
+@@ -3148,8 +3149,9 @@
r == 0 ? "[TRYCREATE] " : "", error_message(r));
} else if (s == backend_current) {
/* this is the easy case */
@@ -370,7 +370,7 @@
pipe_including_tag(backend_current, tag, 0);
} else {
char mytag[128];
-@@ -3306,7 +3308,8 @@
+@@ -3310,7 +3312,8 @@
}
/* start the append */
@@ -380,7 +380,7 @@
prot_printf(backend_current->out, "%s %s %s (Rfc822.peek)\r\n",
mytag, usinguid ? "Uid Fetch" : "Fetch", sequence);
for (/* each FETCH response */;;) {
-@@ -3551,8 +3554,8 @@
+@@ -3555,8 +3558,8 @@
if (!r) {
/* ok, send the create to that server */
@@ -391,7 +391,7 @@
res = pipe_including_tag(s, tag, 0);
tag = "*"; /* can't send another tagged response */
-@@ -3592,8 +3595,8 @@
+@@ -3596,8 +3599,8 @@
}
if (!r) {
@@ -402,7 +402,7 @@
res = pipe_including_tag(s, tag, 0);
tag = "*"; /* can't send another tagged response */
-@@ -3694,17 +3697,17 @@
+@@ -3698,17 +3701,17 @@
/* Cross Server */
/* <tag> XFER <name> <dest server> <dest partition> */
prot_printf(s->out,
@@ -427,7 +427,7 @@
}
res = pipe_including_tag(s, tag, 0);
-@@ -3720,9 +3723,9 @@
+@@ -3724,9 +3727,9 @@
/* do MUPDATE create operations for new mailbox */
}
@@ -440,7 +440,7 @@
res = pipe_including_tag(s, tag, 0);
tag = "*"; /* can't send another tagged response */
-@@ -3757,8 +3760,8 @@
+@@ -3761,8 +3764,8 @@
if (backend_inbox) {
prot_printf(backend_inbox->out,
@@ -451,7 +451,7 @@
pipe_lsub(backend_inbox, tag, 0, "MAILBOX");
} else { /* user doesn't have an INBOX */
/* noop */
-@@ -3827,9 +3830,9 @@
+@@ -3831,9 +3834,9 @@
if (backend_inbox) {
prot_printf(backend_inbox->out,
@@ -464,7 +464,7 @@
pipe_lsub(backend_inbox, tag, 0, (listopts & LIST_LSUB) ? "LSUB" : "LIST");
} else { /* user doesn't have an INBOX */
/* noop */
-@@ -3918,14 +3921,14 @@
+@@ -3922,14 +3925,14 @@
if (namespace) {
prot_printf(backend_inbox->out,
@@ -484,7 +484,7 @@
}
pipe_including_tag(backend_inbox, tag, 0);
} else {
-@@ -4157,15 +4160,15 @@
+@@ -4161,15 +4164,15 @@
} else if (!r) {
if (rights) {
prot_printf(s->out,
@@ -507,8 +507,8 @@
}
res = pipe_including_tag(s, tag, 0);
tag = "*"; /* can't send another tagged response */
-@@ -4265,8 +4268,8 @@
- if (!r) s = proxyd_findserver(server);
+@@ -4269,8 +4272,8 @@
+ s = proxyd_findserver(server);
if (s) {
- prot_printf(s->out, "%s Getquotaroot {%d+}\r\n%s\r\n",
@@ -518,7 +518,7 @@
pipe_including_tag(s, tag, 0);
} else {
r = IMAP_SERVER_UNAVAILABLE;
-@@ -4492,8 +4495,8 @@
+@@ -4495,8 +4498,8 @@
if (!r) s = proxyd_findserver(server);
if (!r && !s) r = IMAP_SERVER_UNAVAILABLE;
if (!r) {
@@ -529,7 +529,7 @@
if (!pipe_command(s, 65536)) {
pipe_until_tag(s, tag, 0);
}
-@@ -4633,7 +4636,7 @@
+@@ -4636,7 +4639,7 @@
/* if it's too long, literal it */
if (*p || len >= 1024) {
@@ -538,7 +538,7 @@
} else {
prot_printf(proxyd_out, "\"%s\"", s);
}
-@@ -4661,7 +4664,7 @@
+@@ -4664,7 +4667,7 @@
/* if it's too long, literal it */
if (*p || len >= 1024) {
@@ -547,9 +547,9 @@
} else {
prot_printf(proxyd_out, "\"%s\"", s);
}
-diff -urNad complete.dpatch/imtest/imtest.c /tmp/dpep.2wtF9E/complete.dpatch/imtest/imtest.c
---- complete.dpatch/imtest/imtest.c 2005-11-11 16:17:00.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/imtest/imtest.c 2005-11-11 17:01:17.683492575 +0100
+diff -urNad cyrus-imapd-2.2.13~/imtest/imtest.c cyrus-imapd-2.2.13/imtest/imtest.c
+--- cyrus-imapd-2.2.13~/imtest/imtest.c 2008-04-15 13:11:16.518056717 +0200
++++ cyrus-imapd-2.2.13/imtest/imtest.c 2008-04-15 13:11:16.654068370 +0200
@@ -624,14 +624,14 @@
return (ret);
@@ -569,7 +569,7 @@
argi, ret, (unsigned int) ret);
tls_dump(argp, (int) ret);
}
-@@ -1771,7 +1771,8 @@
+@@ -1778,7 +1778,8 @@
{
int lup;
@@ -579,10 +579,10 @@
/* do normal header foo */
prot_printf(pout,HEADERS);
-diff -urNad complete.dpatch/master/master.c /tmp/dpep.2wtF9E/complete.dpatch/master/master.c
---- complete.dpatch/master/master.c 2005-11-11 16:17:00.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/master/master.c 2005-11-11 16:17:00.688912460 +0100
-@@ -1888,7 +1888,7 @@
+diff -urNad cyrus-imapd-2.2.13~/master/master.c cyrus-imapd-2.2.13/master/master.c
+--- cyrus-imapd-2.2.13~/master/master.c 2008-04-15 13:11:16.534058088 +0200
++++ cyrus-imapd-2.2.13/master/master.c 2008-04-15 13:11:16.658068714 +0200
+@@ -1883,7 +1883,7 @@
}
/* Write PID */
@@ -591,9 +591,9 @@
if(lseek(pidfd, 0, SEEK_SET) == -1 ||
ftruncate(pidfd, 0) == -1 ||
write(pidfd, buf, strlen(buf)) == -1) {
-diff -urNad complete.dpatch/timsieved/actions.c /tmp/dpep.2wtF9E/complete.dpatch/timsieved/actions.c
---- complete.dpatch/timsieved/actions.c 2005-11-11 16:16:59.000000000 +0100
-+++ /tmp/dpep.2wtF9E/complete.dpatch/timsieved/actions.c 2005-11-11 16:17:00.688912460 +0100
+diff -urNad cyrus-imapd-2.2.13~/timsieved/actions.c cyrus-imapd-2.2.13/timsieved/actions.c
+--- cyrus-imapd-2.2.13~/timsieved/actions.c 2008-04-15 13:11:15.757991591 +0200
++++ cyrus-imapd-2.2.13/timsieved/actions.c 2008-04-15 13:11:16.658068714 +0200
@@ -364,7 +364,8 @@
if (result != TIMSIEVE_OK) {
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/21-fix_config-parsing.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/21-fix_config-parsing.dpatch?rev=762&root=cyrus22&r1=761&r2=
3D762&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/21-fix_config-parsing.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/21-fix_config-parsing.dpatch Tue Apr 15 13:14:06 2008
@@ -5,9 +5,9 @@
## DP: Fix parsing of master.conf
@DPATCH@
-diff -urNad complete.dpatch/master/masterconf.c /tmp/dpep.CfovCR/complete.dpatch/master/masterconf.c
---- complete.dpatch/master/masterconf.c 2005-11-11 15:25:37.000000000 +0100
-+++ /tmp/dpep.CfovCR/complete.dpatch/master/masterconf.c 2005-11-11 15:27:02.084797577 +0100
+diff -urNad cyrus-imapd-2.2.13~/master/masterconf.c cyrus-imapd-2.2.13/master/masterconf.c
+--- cyrus-imapd-2.2.13~/master/masterconf.c 2008-04-15 13:11:50.700985663 +0200
++++ cyrus-imapd-2.2.13/master/masterconf.c 2008-04-15 13:11:50.852998693 +0200
@@ -150,8 +150,13 @@
const char *val = masterconf_getstring(e, key, NULL);
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/22-imapd_index_check.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/22-imapd_index_check.dpatch?rev=762&root=cyrus22&r1=761&r2=3D762&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/22-imapd_index_check.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/22-imapd_index_check.dpatch Tue Apr 15 13:14:06 2008
@@ -5,10 +5,10 @@
## DP: Fix usage of index_check()
@DPATCH@
-diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.SYrYMP/complete.dpatch/imap/imapd.c
---- complete.dpatch/imap/imapd.c 2005-11-11 16:01:19.000000000 +0100
-+++ /tmp/dpep.SYrYMP/complete.dpatch/imap/imapd.c 2005-11-11 16:01:37.190206572 +0100
-@@ -3175,8 +3175,8 @@
+diff -urNad cyrus-imapd-2.2.13~/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13~/imap/imapd.c 2008-04-15 13:12:21.487623592 +0200
++++ cyrus-imapd-2.2.13/imap/imapd.c 2008-04-15 13:12:21.703642098 +0200
+@@ -3125,8 +3125,8 @@
if (usinguid) {
fetchitems |= FETCH_UID;
@@ -18,7 +18,7 @@
fetchargs.fetchitems = fetchitems;
r = index_fetch(imapd_mailbox, sequence, usinguid, &fetchargs,
-@@ -3191,6 +3191,9 @@
+@@ -3141,6 +3141,9 @@
} else if (fetchedsomething || usinguid) {
prot_printf(imapd_out, "%s OK %s (%s sec)\r\n", tag,
error_message(IMAP_OK_COMPLETED), mytime);
@@ -28,7 +28,7 @@
} else {
/* normal FETCH, nothing came back */
prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag,
-@@ -3309,7 +3312,8 @@
+@@ -3259,7 +3262,8 @@
index_fetch(imapd_mailbox, msgno, 0, &fetchargs, &fetchedsomething);
@@ -38,7 +38,7 @@
if (fetchedsomething) {
prot_printf(imapd_out, "%s OK %s\r\n", tag,
-@@ -3441,7 +3445,9 @@
+@@ -3391,7 +3395,9 @@
r = index_store(imapd_mailbox, sequence, usinguid, &storeargs,
flag, nflags);
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/24-configurable-referrals.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/24-configurable-referrals.dpatch?rev=762&root=cyrus22&r1=761&r2=762&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/24-configurable-referrals.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/24-configurable-referrals.dpatch Tue Apr 15 13:14:06 2008
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad cyrus-imapd-2.2.13~/imap/proxyd.c cyrus-imapd-2.2.13/imap/proxyd.c
---- cyrus-imapd-2.2.13~/imap/proxyd.c 2007-06-22 17:16:23.000000000 +0100
-+++ cyrus-imapd-2.2.13/imap/proxyd.c 2007-06-22 17:16:52.000000000 +0100
+--- cyrus-imapd-2.2.13~/imap/proxyd.c 2008-04-15 13:12:51.542198785 +0200
++++ cyrus-imapd-2.2.13/imap/proxyd.c 2008-04-15 13:12:51.670209745 +0200
@@ -1161,7 +1161,7 @@
/* Cleanup Globals */
@@ -17,7 +17,7 @@
supports_referrals = 0;
proxyd_userisadmin = 0;
proxyd_starttls_done = 0;
-@@ -2769,6 +2769,10 @@
+@@ -2776,6 +2776,10 @@
prot_printf(proxyd_out, "* CAPABILITY ");
prot_printf(proxyd_out, CAPABILITY_STRING);
@@ -29,8 +29,8 @@
prot_printf(proxyd_out, " IDLE");
}
diff -urNad cyrus-imapd-2.2.13~/imap/version.h cyrus-imapd-2.2.13/imap/version.h
---- cyrus-imapd-2.2.13~/imap/version.h 2007-06-22 17:04:30.000000000 +0100
-+++ cyrus-imapd-2.2.13/imap/version.h 2007-06-22 17:16:52.000000000 +0100
+--- cyrus-imapd-2.2.13~/imap/version.h 2008-04-15 13:12:50.766132285 +0200
++++ cyrus-imapd-2.2.13/imap/version.h 2008-04-15 13:12:51.670209745 +0200
@@ -55,7 +55,7 @@
/* CAPABILITIES are now defined here, not including sasl ones */
@@ -41,9 +41,9 @@
"CHILDREN MULTIAPPEND BINARY " \
"SORT THREAD=ORDEREDSUBJECT THREAD=REFERENCES " \
diff -urNad cyrus-imapd-2.2.13~/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
---- cyrus-imapd-2.2.13~/lib/imapoptions 2007-06-22 17:16:22.000000000 +0100
-+++ cyrus-imapd-2.2.13/lib/imapoptions 2007-06-22 17:16:52.000000000 +0100
-@@ -653,6 +653,10 @@
+--- cyrus-imapd-2.2.13~/lib/imapoptions 2008-04-15 13:12:51.570201186 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions 2008-04-15 13:12:51.670209745 +0200
+@@ -668,6 +668,10 @@
connections that these referrals would cause, thus resulting in a higher
authentication load on the respective backend server. */
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list