[Pkg-cups-devel] r384 - in cupsys/branches/cups-1.2/debian: . patches

[Kenshi Muto]

Author: kmuto
Date: Sun Sep 24 10:29:45 2006
New Revision: 384

Added:
   cupsys/branches/cups-1.2/debian/patches/65_detect_http_shutdown.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list

Log:
1.2.4-1. apply 65_detect_http_shutdown (#377640)

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Sun Sep 24 10:29:45 2006
@@ -1,11 +1,21 @@
-cupsys (1.2.3-2) UNRELEASED; urgency=low
+cupsys (1.2.4-1) unstable; urgency=medium
 
+  * New upstream release
+    - The web interface change settings and edit configuration
+      file buttons would truncate the cupsd.conf file (STR #1976,
+      closes: #377640)
+      Because this bug seems critical, we upload this fixed version
+      as urgency=medium.
   [ Martin Pitt ]
   * debian/patches/56_dirsvc.dpatch: Update patch so that a patch/unpatch
     cycle restores the source properly instead of breaking dirsvc.c in two
     different places.
 
- -- Kenshi Muto <kmuto at debian.org>  Mon, 18 Sep 2006 10:14:35 +0200
+  [ Kenshi Muto ]
+  * debian/patches/65_detect_http_shutdown.dpatch: avoid that
+    gnome-cups-manager eats CPU 100%. (closes: #377640)
+
+ -- Kenshi Muto <kmuto at debian.org>  Sun, 24 Sep 2006 09:54:44 +0000
 
 cupsys (1.2.3-1) unstable; urgency=medium
 

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Sun Sep 24 10:29:45 2006
@@ -28,3 +28,4 @@
 #61_job_c_strangeloop.dpatch
 62_classes_crash.dpatch
 #64_driverfolder.dpatch
+65_detect_http_shutdown.dpatch

Added: cupsys/branches/cups-1.2/debian/patches/65_detect_http_shutdown.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/65_detect_http_shutdown.dpatch	Sun Sep 24 10:29:45 2006
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 65_detect_http_shutdown.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.4~/cups/ipp.c cupsys-1.2.4/cups/ipp.c
+--- cupsys-1.2.4~/cups/ipp.c	2006-06-02 15:15:23.000000000 +0000
++++ cupsys-1.2.4/cups/ipp.c	2006-09-24 10:19:16.000000000 +0000
+@@ -1054,7 +1054,7 @@
+           if ((n = (*cb)(src, buffer, 8)) < 8)
+ 	  {
+ 	    DEBUG_printf(("ippReadIO: Unable to read header (%d bytes read)!\n", n));
+-	    return (n == 0 ? IPP_IDLE : IPP_ERROR);
++	    return (IPP_ERROR);
+ 	  }
+ 
+ 	 /*