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

[Kenshi Muto]

Author: kmuto
Date: Sun Jun 11 12:14:52 2006
New Revision: 257

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

Log:
remove unnecessary %s in dirsvc.c (#372696, STR#1768)

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Sun Jun 11 12:14:52 2006
@@ -2,6 +2,8 @@
 
   [Kenshi Muto]
   * Apply upstream svn change r5643.
+  * Remove unnecessary %s from dirsvc.c and will solve a mysterious
+    cupsd crash. Thanks Neil. (closes: #372696)
 
  -- Kenshi Muto <kmuto at debian.org>  Sun, 11 Jun 2006 11:51:01 +0000
 

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 Jun 11 12:14:52 2006
@@ -18,3 +18,4 @@
 47_pid.dpatch
 #48_stdlib.dpatch
 55_ppd_okidata_name.dpatch
+56_dirsvc.dpatch

Added: cupsys/branches/cups-1.2/debian/patches/56_dirsvc.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/56_dirsvc.dpatch	Sun Jun 11 12:14:52 2006
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 56_dirsvc.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.1~/scheduler/dirsvc.c cupsys-1.2.1/scheduler/dirsvc.c
+--- cupsys-1.2.1~/scheduler/dirsvc.c	2006-06-11 11:41:06.000000000 +0000
++++ cupsys-1.2.1/scheduler/dirsvc.c	2006-06-11 11:50:51.000000000 +0000
+@@ -2521,7 +2521,7 @@
+ 
+ 	  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+ 	                   iface->hostname, iface->port,
+-			   (p->type & CUPS_PRINTER_CLASS) ? "/classes/%s%s" :
++			   (p->type & CUPS_PRINTER_CLASS) ? "/classes/%s" :
+ 			                                    "/printers/%s",
+ 			   p->name);
+ 	  snprintf(packet, sizeof(packet), "%x %x %s \"%s\" \"%s\" \"%s\" %s\n",