Author: sven
Date: Thu Sep 3 11:33:26 2009
New Revision: 792
URL: https://mail.incase.de/viewcvs?rev=792&root=cyrus22&view=rev
Log:
Add upstream patch to fix sieve buffer overflow bug
Added:
trunk/cyrus-imapd-2.2.13/debian/patches/0024-upstream-fix-sieve.dpatch
(with props)
Modified:
trunk/cyrus-imapd-2.2.13/debian/patches/00list
Added: trunk/cyrus-imapd-2.2.13/debian/patches/0024-upstream-fix-sieve.dpatch
URL:
https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0024-upstream-fix-sieve.dpatch?rev=792&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0024-upstream-fix-sieve.dpatch
(added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0024-upstream-fix-sieve.dpatch Thu
Sep 3 11:33:26 2009
@@ -1,0 +1,79 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0024-upstream-fix-sieve.dpatch by Sven Mueller <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream patch fixing a buffer overflow bug in sieve
+
+...@dpatch@
+diff -urNad cyrus-imapd-2.2.13~/sieve/script.c
cyrus-imapd-2.2.13/sieve/script.c
+--- cyrus-imapd-2.2.13~/sieve/script.c 2009-09-03 10:51:31.000000000 +0200
++++ cyrus-imapd-2.2.13/sieve/script.c 2009-09-03 11:16:34.831047555 +0200
+@@ -546,7 +546,7 @@
+ ret |= keep_ret;
+ if (keep_ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Kept\n");
+ else {
+ implicit_keep = 0; /* don't try an implicit keep again */
+@@ -599,7 +599,7 @@
+
+ if (ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Rejected with: %s\n", a->u.rej.msg);
+
+ break;
+@@ -615,7 +615,7 @@
+
+ if (ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Filed into: %s\n",a->u.fil.mailbox);
+ break;
+ case ACTION_KEEP:
+@@ -629,7 +629,7 @@
+ &errmsg);
+ if (ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Kept\n");
+ break;
+ case ACTION_REDIRECT:
+@@ -643,7 +643,7 @@
+ &errmsg);
+ if (ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Redirected to %s\n", a->u.red.addr);
+ break;
+ case ACTION_DISCARD:
+@@ -655,7 +655,7 @@
+ &errmsg);
+ if (ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Discarded\n");
+ break;
+
+@@ -689,12 +689,12 @@
+
+ if (ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Sent vacation reply\n");
+
+ } else if (ret == SIEVE_DONE) {
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Vacation reply suppressed\n");
+
+ ret = SIEVE_OK;
Propchange:
trunk/cyrus-imapd-2.2.13/debian/patches/0024-upstream-fix-sieve.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL:
https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/00list?rev=792&root=cyrus22&r1=791&r2=792&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Thu Sep 3 11:33:26 2009
@@ -22,6 +22,7 @@
0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
0022-upstream-dont-send-empty-literal-response.dpatch
0023-sort-illegal-dates-first.dpatch
+0024-upstream-fix-sieve.dpatch
0090-fix-casts.dpatch
01-fix_Makefile.in.dpatch
02-add_mkinstalldirs.dpatch
_______________________________________________
Pkg-Cyrus-imapd-Debian-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-cyrus-imapd-debian-devel
