[Pkg-cups-devel] r855 - in cupsys/trunk: . debian debian/patches

[Martin Pitt]

Author: mpitt
Date: Sat Sep  6 12:10:48 2008
New Revision: 855

Log:
cupsaccept.dpatch: Rewrite to be consistent with current upstream code,
and send it upstream.

Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list
   cupsys/trunk/debian/patches/cupsaccept.dpatch

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Sat Sep  6 12:10:48 2008
@@ -13,8 +13,10 @@
     actually complete. (Closes: #489246)
   * debian/control: Bump Standards-Version (no actual changes necessary).
   * Remove classes_crash.dpatch, it has been fixed upstream a while ago.
+  * cupsaccept.dpatch: Rewrite to be consistent with current upstream code,
+    and send it upstream.
 
- -- Martin Pitt <mpitt at debian.org>  Sat, 06 Sep 2008 13:52:44 +0200
+ -- Martin Pitt <mpitt at debian.org>  Sat, 06 Sep 2008 14:01:35 +0200
 
 cups (1.3.8-7) experimental; urgency=low
 

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Sat Sep  6 12:10:48 2008
@@ -16,6 +16,7 @@
 # no answer yet, po4a might not be appropriate
 manpage-translations.dpatch
 quiesce-bonjour-warning.dpatch
+cupsaccept.dpatch
 
 # patches which should go upstream
 device_uri.dpatch
@@ -24,7 +25,6 @@
 # Debian patches
 quiesce_ipp_logging.dpatch
 default_log_warn.dpatch
-cupsaccept.dpatch
 confdirperms.dpatch
 
 # Ubuntu patches

Modified: cupsys/trunk/debian/patches/cupsaccept.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/cupsaccept.dpatch	(original)
+++ cupsys/trunk/debian/patches/cupsaccept.dpatch	Sat Sep  6 12:10:48 2008
@@ -1,20 +1,23 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 19_cupsaccept.dpatch by Kenshi Muto <kmuto at debian.org>
+## cupsaccept.dpatch by Martin Pitt <mpitt at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Allow to invoke accept command as cupsaccept/cupsreject, too, for less
+## DP: namespace clobbering and consistency with disable/enable.
+## DP: (http://www.cups.org/str.php?L2936)
 
 @DPATCH@
-diff -urNad cups-1.1.99.b1.r4748~/systemv/accept.c cups-1.1.99.b1.r4748/systemv/accept.c
---- cups-1.1.99.b1.r4748~/systemv/accept.c	2005-02-18 02:18:11.000000000 +0000
-+++ cups-1.1.99.b1.r4748/systemv/accept.c	2005-10-05 12:14:39.401595086 +0000
-@@ -67,6 +67,9 @@
-   else
-     command = argv[0];
+diff -urNad trunk~/systemv/accept.c trunk/systemv/accept.c
+--- trunk~/systemv/accept.c	2008-09-06 13:51:16.000000000 +0200
++++ trunk/systemv/accept.c	2008-09-06 13:56:08.000000000 +0200
+@@ -62,9 +62,9 @@
  
-+  if (strncmp(command, "cups", 4) == 0)
-+    command += 4;
-+
    cancel = 0;
  
-   if (strcmp(command, "accept") == 0)
+-  if (!strcmp(command, "accept"))
++  if (!strcmp(command, "cupsaccept") || !strcmp(command, "accept"))
+     op = CUPS_ACCEPT_JOBS;
+-  else if (!strcmp(command, "reject"))
++  else if (!strcmp(command, "cupsreject") || !strcmp(command, "reject"))
+     op = CUPS_REJECT_JOBS;
+   else if (!strcmp(command, "cupsdisable") || !strcmp(command, "disable"))
+     op = IPP_PAUSE_PRINTER;