[Pkg-Cyrus-imapd-Debian-devel] [SVN] r239 - in trunk/cyrus-imapd-2.2.12/debian: changelog patches/00-6662-upstream-off-by-one_in_imap_spool.dpatch patches/00list patches/23-fix_off_by_one_in_imap_spool.dpatch

debian at incase.de debian at incase.de
Mon Dec 12 13:56:53 UTC 2005


Author: sven
Date: Mon Dec 12 14:56:52 2005
New Revision: 239

URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=239
Log:
Renamed patch according to HMH's proposed upstream patch guidelines
Added:
    trunk/cyrus-imapd-2.2.12/debian/patches/00-6662-upstream-off-by-one_in_imap_spool.dpatch
      - copied, changed from r238, trunk/cyrus-imapd-2.2.12/debian/patches/23-fix_off_by_one_in_imap_spool.dpatch
Removed:
    trunk/cyrus-imapd-2.2.12/debian/patches/23-fix_off_by_one_in_imap_spool.dpatch
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=239&p1=trunk/cyrus-imapd-2.2.12/debian/changelog&r1=238&p2=trunk/cyrus-imapd-2.2.12/debian/changelog&r2=239
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.12/debian/changelog Mon Dec 12 14:56:52 2005
@@ -8,18 +8,18 @@
   * 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
-  * Deleted two files in /usr/lib/cyrus in the purge target of postrm so that 
+  * Deleted two files in /usr/lib/cyrus in the purge target of postrm so that
     this folder is deleted correctly
   * Changed policy version to 3.6.2
-  * Patched imap/spool.c to fix an off-by-one error for long lines catching
+  * Added upstream patchset 6662:
+    imap/sppol.c:1.7->1.8: don't catch our own NULL (off by one error)
     (Closes: #342314)
-  
 
   [ Sven Mueller ]
   * Add a build dependency for libsensors-dev to temporarily work around a bug
     in libsnmp[59]-dev (Closes: #341580)
 
- -- Benjamin Seidenberg <astronut at dlgeek.net>  Sat, 10 Dec 2005 23:13:24 -0500
+ -- Sven Mueller <debian at incase.de>  Mon, 12 Dec 2005 14:54:05 +0100
 
 cyrus22-imapd (2.2.12-1) experimental; urgency=low
 

Copied: trunk/cyrus-imapd-2.2.12/debian/patches/00-6662-upstream-off-by-one_in_imap_spool.dpatch (from r238, 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/00-6662-upstream-off-by-one_in_imap_spool.dpatch?view=diff&rev=239&p1=trunk/cyrus-imapd-2.2.12/debian/patches/23-fix_off_by_one_in_imap_spool.dpatch&r1=238&p2=trunk/cyrus-imapd-2.2.12/debian/patches/00-6662-upstream-off-by-one_in_imap_spool.dpatch&r2=239
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/23-fix_off_by_one_in_imap_spool.dpatch (original)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/00-6662-upstream-off-by-one_in_imap_spool.dpatch Mon Dec 12 14:56:52 2005
@@ -2,13 +2,14 @@
 ## 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.
+## DP: upstream patchset 6662:
+## DP: imap/spool.c:1.7->1.8: don't catch our own NULL (off by one error)
 
 @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 @@
+diff -urNad cyrus-imapd-2.2.12/imap/spool.c /tmp/dpep.E9tYMt/cyrus-imapd-2.2.12/imap/spool.c
+--- cyrus-imapd-2.2.12/imap/spool.c	2005-12-12 14:02:54.000000000 +0100
++++ /tmp/dpep.E9tYMt/cyrus-imapd-2.2.12/imap/spool.c	2005-12-12 14:08:27.908074019 +0100
+@@ -451,7 +451,7 @@
  	    p[1] = '\n';
  	    p[2] = '\0';
  	}

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=239&p1=trunk/cyrus-imapd-2.2.12/debian/patches/00list&r1=238&p2=trunk/cyrus-imapd-2.2.12/debian/patches/00list&r2=239
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/00list Mon Dec 12 14:56:52 2005
@@ -1,3 +1,4 @@
+00-6662-upstream-off-by-one_in_imap_spool.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch
 03-fix_docs.dpatch
@@ -20,7 +21,6 @@
 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



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