[SVN] r331 -
/trunk/cyrus-imapd-2.2/debian/patches/18-fix_strlen_return_type.dpatch
debian at incase.de
debian at incase.de
Fri Mar 31 18:56:25 UTC 2006
Author: sven
Date: Fri Mar 31 20:56:25 2006
New Revision: 331
URL: https://mail.incase.de/viewcvs?rev=331&root=cyrus22&view=rev
Log:
Fix debian/patches/18-fix_strlen_return_type.dpatch for 2.2.13
Modified:
trunk/cyrus-imapd-2.2/debian/patches/18-fix_strlen_return_type.dpatch
Modified: trunk/cyrus-imapd-2.2/debian/patches/18-fix_strlen_return_type.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/debian/patches/18-fix_strlen_return_type.dpatch?rev=331&root=cyrus22&r1=330&r2=331&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/debian/patches/18-fix_strlen_return_type.dpatch (original)
+++ trunk/cyrus-imapd-2.2/debian/patches/18-fix_strlen_return_type.dpatch Fri Mar 31 20:56:25 2006
@@ -9,7 +9,7 @@
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
-@@ -6071,8 +6071,8 @@
+@@ -6095,8 +6095,8 @@
memset(&tmp, 0, sizeof(struct buf));
memset(&user, 0, sizeof(struct buf));
@@ -20,7 +20,7 @@
while(1) {
c = getword(pin, &tag);
-@@ -6122,9 +6122,9 @@
+@@ -6146,9 +6146,9 @@
snprintf(tagbuf, sizeof(tagbuf), "ACL%d", ++i);
@@ -33,7 +33,7 @@
if(c == '\r') {
c = prot_getc(pin);
if(c != '\n') {
-@@ -6199,11 +6199,11 @@
+@@ -6223,11 +6223,11 @@
snprintf(tag, sizeof(tag), "SACL%d", tagnum++);
@@ -48,7 +48,7 @@
while(1) {
c = getword(pin, &inbuf);
-@@ -6317,11 +6317,11 @@
+@@ -6341,11 +6341,11 @@
if(!r) {
if(topart) {
/* need to send partition as an atom */
@@ -64,7 +64,7 @@
}
r = getresult(be->in, "LC1");
if(r) syslog(LOG_ERR, "Could not move mailbox: %s, LOCALCREATE failed",
-@@ -6355,7 +6355,8 @@
+@@ -6379,7 +6379,8 @@
if(!r) {
backout_mupdate = 1;
@@ -74,7 +74,7 @@
r = dump_mailbox(NULL, mailboxname, path, acl, 0, be->in, be->out,
imapd_authstate);
-@@ -6401,8 +6402,8 @@
+@@ -6425,8 +6426,8 @@
/* 6.5) Kick remote server to correct mupdate entry */
/* Note that we don't really care if this succeeds or not */
if (mupdate_h) {
@@ -85,7 +85,7 @@
rerr = getresult(be->in, "MP1");
if(rerr) {
syslog(LOG_ERR,
-@@ -6441,8 +6442,8 @@
+@@ -6465,8 +6466,8 @@
}
if(r && backout_remotebox) {
rerr = 0;
@@ -96,7 +96,7 @@
rerr = getresult(be->in, "LD1");
if(rerr) {
syslog(LOG_ERR,
-@@ -6637,9 +6638,10 @@
+@@ -6661,9 +6662,10 @@
if(!r) {
/* note use of + to force the setting of a nonexistant
* quotaroot */
@@ -109,7 +109,7 @@
r = getresult(be->in, "Q01");
if(r) syslog(LOG_ERR,
"Could not move mailbox: %s, " \
-@@ -7183,7 +7185,7 @@
+@@ -7207,7 +7209,7 @@
/* if it's too long, literal it */
if (*p || len >= 1024) {
@@ -118,7 +118,7 @@
} else {
prot_printf(imapd_out, "\"%s\"", s);
}
-@@ -7213,7 +7215,7 @@
+@@ -7237,7 +7239,7 @@
/* if it's too long, literal it */
if (*p || len >= 1024) {
@@ -200,7 +200,7 @@
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
-@@ -331,9 +331,11 @@
+@@ -330,9 +330,11 @@
if (!handle->saslcompleted) return MUPDATE_NOAUTH;
prot_printf(handle->pout,
@@ -215,7 +215,7 @@
ret = mupdate_scarf(handle, mupdate_scarf_one, NULL, 1, &response);
if (ret) {
-@@ -356,9 +358,10 @@
+@@ -355,9 +357,10 @@
if (!handle->saslcompleted) return MUPDATE_NOAUTH;
prot_printf(handle->pout,
@@ -229,7 +229,7 @@
ret = mupdate_scarf(handle, mupdate_scarf_one, NULL, 1, &response);
if (ret) {
-@@ -381,9 +384,10 @@
+@@ -380,9 +383,10 @@
if (!handle->saslcompleted) return MUPDATE_NOAUTH;
prot_printf(handle->pout,
@@ -243,7 +243,7 @@
ret = mupdate_scarf(handle, mupdate_scarf_one, NULL, 1, &response);
if (ret) {
-@@ -406,8 +410,8 @@
+@@ -405,8 +409,8 @@
if (!handle->saslcompleted) return MUPDATE_NOAUTH;
prot_printf(handle->pout,
@@ -254,7 +254,7 @@
ret = mupdate_scarf(handle, mupdate_scarf_one, NULL, 1, &response);
if (ret) {
-@@ -475,8 +479,8 @@
+@@ -474,8 +478,8 @@
if(!handle || !mailbox || !target) return MUPDATE_BADPARAM;
prot_printf(handle->pout,
@@ -265,7 +265,7 @@
memset(&(handle->mailboxdata_buf), 0, sizeof(handle->mailboxdata_buf));
-@@ -508,8 +512,8 @@
+@@ -507,8 +511,8 @@
if(prefix) {
prot_printf(handle->pout,
@@ -279,7 +279,7 @@
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
-@@ -1589,20 +1589,20 @@
+@@ -1613,20 +1613,20 @@
pthread_mutex_unlock(&mailboxes_mutex); /* UNLOCK */
if (m && m->t == SET_ACTIVE) {
@@ -309,7 +309,7 @@
}
free_mbent(m);
-@@ -1644,17 +1644,17 @@
+@@ -1668,17 +1668,17 @@
switch (m->t) {
case SET_ACTIVE:
prot_printf(C->pout,
@@ -337,17 +337,17 @@
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
-@@ -2888,7 +2888,8 @@
- if (!s) r = IMAP_SERVER_UNAVAILABLE;
- }
+@@ -2837,7 +2837,8 @@
if (!r) {
+ int is_active = 1;
+ s->context = (void*) &is_active;
- prot_printf(s->out, "%s Append {%d+}\r\n%s ", tag, strlen(name), name);
-+ prot_printf(s->out, "%s Append {%lu+}\r\n%s ", tag,
-+ (unsigned long) strlen(name), name);
- if (!pipe_command(s, 16384)) {
++ prot_printf(s->out, "%s Append {%lu+}\r\n%s ", tag,
++ (unsigned long) strlen(name), name);
+ if (!(r = pipe_command(s, 16384))) {
pipe_until_tag(s, tag, 0);
}
-@@ -2961,8 +2962,8 @@
+@@ -2913,8 +2914,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);
-@@ -3192,8 +3193,9 @@
+@@ -3144,8 +3145,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];
-@@ -3346,7 +3348,8 @@
+@@ -3306,7 +3308,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 */;;) {
-@@ -3576,8 +3579,8 @@
+@@ -3551,8 +3554,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 */
-@@ -3617,8 +3620,8 @@
+@@ -3592,8 +3595,8 @@
}
if (!r) {
@@ -402,7 +402,7 @@
res = pipe_including_tag(s, tag, 0);
tag = "*"; /* can't send another tagged response */
-@@ -3719,17 +3722,17 @@
+@@ -3694,17 +3697,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);
-@@ -3745,9 +3748,9 @@
+@@ -3720,9 +3723,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 */
-@@ -3782,8 +3785,8 @@
+@@ -3757,8 +3760,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 */
-@@ -3852,9 +3855,9 @@
+@@ -3827,9 +3830,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 */
-@@ -3943,14 +3946,14 @@
+@@ -3918,14 +3921,14 @@
if (namespace) {
prot_printf(backend_inbox->out,
@@ -484,7 +484,7 @@
}
pipe_including_tag(backend_inbox, tag, 0);
} else {
-@@ -4182,15 +4185,15 @@
+@@ -4157,15 +4160,15 @@
} else if (!r) {
if (rights) {
prot_printf(s->out,
@@ -507,7 +507,7 @@
}
res = pipe_including_tag(s, tag, 0);
tag = "*"; /* can't send another tagged response */
-@@ -4290,8 +4293,8 @@
+@@ -4265,8 +4268,8 @@
if (!r) s = proxyd_findserver(server);
if (s) {
@@ -518,7 +518,7 @@
pipe_including_tag(s, tag, 0);
} else {
r = IMAP_SERVER_UNAVAILABLE;
-@@ -4517,8 +4520,8 @@
+@@ -4492,8 +4495,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);
}
-@@ -4658,7 +4661,7 @@
+@@ -4633,7 +4636,7 @@
/* if it's too long, literal it */
if (*p || len >= 1024) {
@@ -538,7 +538,7 @@
} else {
prot_printf(proxyd_out, "\"%s\"", s);
}
-@@ -4686,7 +4689,7 @@
+@@ -4661,7 +4664,7 @@
/* if it's too long, literal it */
if (*p || len >= 1024) {
@@ -550,7 +550,7 @@
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
-@@ -625,14 +625,14 @@
+@@ -624,14 +624,14 @@
return (ret);
if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
@@ -569,7 +569,7 @@
argi, ret, (unsigned int) ret);
tls_dump(argp, (int) ret);
}
-@@ -1769,7 +1769,8 @@
+@@ -1771,7 +1771,8 @@
{
int lup;
@@ -582,7 +582,7 @@
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
-@@ -1889,7 +1889,7 @@
+@@ -1888,7 +1888,7 @@
}
/* Write PID */
@@ -594,7 +594,7 @@
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
-@@ -353,7 +353,8 @@
+@@ -364,7 +364,8 @@
if (result != TIMSIEVE_OK) {
if (errstr && *errstr) {
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list