[SVN] r260 - in trunk/cyrus-imapd-2.2.12/debian/patches: 00-6662-upstream-off-by-one_in_imap_spool.dpatch 00list 23-upstream-off-by-one_in_imap_spool.dpatch

[debian at incase.de]

Author: sven
Date: Sat Jan 14 22:09:43 2006
New Revision: 260

URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=260
Log:
Revert to status at r255
Added:
    trunk/cyrus-imapd-2.2.12/debian/patches/23-upstream-off-by-one_in_imap_spool.dpatch   (with props)
Removed:
    trunk/cyrus-imapd-2.2.12/debian/patches/00-6662-upstream-off-by-one_in_imap_spool.dpatch
Modified:
    trunk/cyrus-imapd-2.2.12/debian/patches/00list

Modified: trunk/cyrus-imapd-2.2.12/debian/patches/00list
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/patches/00list?view=diff&rev=260&p1=trunk/cyrus-imapd-2.2.12/debian/patches/00list&r1=259&p2=trunk/cyrus-imapd-2.2.12/debian/patches/00list&r2=260
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/00list Sat Jan 14 22:09:43 2006
@@ -1,4 +1,3 @@
-00-6662-upstream-off-by-one_in_imap_spool.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch
 03-fix_docs.dpatch
@@ -21,6 +20,7 @@
 20-drac_auth.dpatch
 21-fix_config-parsing.dpatch
 22-imapd_index_check.dpatch
+23-upstream-off-by-one_in_imap_spool.dpatch
 25-update_install-sh.dpatch
 30-update_perlcalling.sh.dpatch
 35-masssievec_remove_unused_variable.dpatch

Added: trunk/cyrus-imapd-2.2.12/debian/patches/23-upstream-off-by-one_in_imap_spool.dpatch
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/patches/23-upstream-off-by-one_in_imap_spool.dpatch?view=auto&rev=260
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/23-upstream-off-by-one_in_imap_spool.dpatch (added)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/23-upstream-off-by-one_in_imap_spool.dpatch Sat Jan 14 22:09:43 2006
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 23-fix_off_by_one_in_imap_spool.dpatch by Benjamin Seidenberg <astronut at dlgeek.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: upstream patchset 6662:
+## DP: imap/spool.c:1.7->1.8: don't catch our own NULL (off by one error)
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/imap/spool.c /tmp/dpep.6hM1jL/cyrus-imapd-2.2.12/imap/spool.c
+--- cyrus-imapd-2.2.12/imap/spool.c	2006-01-14 19:38:31.145806511 +0100
++++ /tmp/dpep.6hM1jL/cyrus-imapd-2.2.12/imap/spool.c	2006-01-14 19:38:32.087713589 +0100
+@@ -452,7 +452,7 @@
+ 	    p[1] = '\n';
+ 	    p[2] = '\0';
+ 	}
+-	else if (p[0] != '\n' && (strlen(buf) < sizeof(buf)-2)) {
++	else if (p[0] != '\n' && (strlen(buf) < sizeof(buf)-3)) {
+ 	    /* line contained a \0 not at the end */
+ 	    r = IMAP_MESSAGE_CONTAINSNULL;
+ 	    continue;

Propchange: trunk/cyrus-imapd-2.2.12/debian/patches/23-upstream-off-by-one_in_imap_spool.dpatch
------------------------------------------------------------------------------
    svn:executable = *