[Pkg-Cyrus-imapd-Debian-devel] [SVN] r236 - in trunk/cyrus-imapd-2.2.12/debian: changelog patches/00list patches/23-fix_off_by_one_in_imap_spool.dpatch

debian at incase.de debian at incase.de
Sun Dec 11 04:56:00 UTC 2005


Author: astronut
Date: Sun Dec 11 05:55:51 2005
New Revision: 236

URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=236
Log:
Added Fixed: to changelog to close FTBFS bug (#341580) and added patch to close off by one bug for long line checking in imap/spool.c (#342314)
Added:
    trunk/cyrus-imapd-2.2.12/debian/patches/23-fix_off_by_one_in_imap_spool.dpatch   (with props)
Modified:
    trunk/cyrus-imapd-2.2.12/debian/changelog
    trunk/cyrus-imapd-2.2.12/debian/patches/00list

Modified: trunk/cyrus-imapd-2.2.12/debian/changelog
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/changelog?view=diff&rev=236&p1=trunk/cyrus-imapd-2.2.12/debian/changelog&r1=235&p2=trunk/cyrus-imapd-2.2.12/debian/changelog&r2=236
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.12/debian/changelog Sun Dec 11 05:55:51 2005
@@ -8,12 +8,16 @@
   * Rewrote descriptions to all refer to cyrus-common-2.2
   * Changed all package names in all required files within /debian to reflect
     the new naming scheme
+  * Changed policy version to 3.6.2
+  * Patched imap/spool.c to fix an off-by-one error for long lines catching
+    (Closes: #342314)
   
+
   [ Sven Mueller ]
   * Add a build dependency for libsensors-dev to temporarily work around a bug
-    in libsnmp[59]-dev
+    in libsnmp[59]-dev (Closes: #341580)
 
- -- Sven Mueller <debian at incase.de>  Thu,  8 Dec 2005 22:59:11 +0100
+ -- Benjamin Seidenberg <astronut at dlgeek.net>  Sat, 10 Dec 2005 23:13:24 -0500
 
 cyrus22-imapd (2.2.12-1) experimental; urgency=low
 

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=236&p1=trunk/cyrus-imapd-2.2.12/debian/patches/00list&r1=235&p2=trunk/cyrus-imapd-2.2.12/debian/patches/00list&r2=236
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/00list Sun Dec 11 05:55:51 2005
@@ -20,6 +20,7 @@
 20-drac_auth.dpatch
 21-fix_config-parsing.dpatch
 22-imapd_index_check.dpatch
+23-fix_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-fix_off_by_one_in_imap_spool.dpatch
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/patches/23-fix_off_by_one_in_imap_spool.dpatch?view=auto&rev=236
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/23-fix_off_by_one_in_imap_spool.dpatch (added)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/23-fix_off_by_one_in_imap_spool.dpatch Sun Dec 11 05:55:51 2005
@@ -1,0 +1,19 @@
+#! /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: No description.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12~/imap/spool.c cyrus-imapd-2.2.12/imap/spool.c
+--- cyrus-imapd-2.2.12~/imap/spool.c	2005-12-10 23:48:31.000000000 -0500
++++ cyrus-imapd-2.2.12/imap/spool.c	2005-12-10 23:49:30.000000000 -0500
+@@ -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-fix_off_by_one_in_imap_spool.dpatch
------------------------------------------------------------------------------
    svn:executable = *



More information about the Pkg-Cyrus-imapd-Debian-devel mailing list