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

[Martin Pitt]

Author: mpitt
Date: Thu Jun 12 17:47:44 2008
New Revision: 786

Log:
* Add HostNameLookups_values.dpatch: Make possible values of HostNameLookups
  consistent to manpage and to other options in cupsd.conf. (Closes: #379014)

Added:
   cupsys/trunk/debian/patches/HostNameLookups_values.dpatch   (contents, props changed)
Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Thu Jun 12 17:47:44 2008
@@ -5,8 +5,10 @@
     without a value. (Closes: #250848)
   * Add glibc2.8_build.dpatch: Fix building with glibc 2.8.
   * debian/patches/00list: Sort patches by upstream status.
+  * Add HostNameLookups_values.dpatch: Make possible values of HostNameLookups
+    consistent to manpage and to other options in cupsd.conf. (Closes: #379014)
 
- -- Martin Pitt <mpitt at debian.org>  Thu, 12 Jun 2008 19:13:39 +0200
+ -- Martin Pitt <mpitt at debian.org>  Thu, 12 Jun 2008 19:36:53 +0200
 
 cups (1.3.7-7) unstable; urgency=low
 

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Thu Jun 12 17:47:44 2008
@@ -11,6 +11,7 @@
 glibc2.8_build.dpatch
 pidfile.dpatch
 ppd-poll-with-client-conf.dpatch
+HostNameLookups_values.dpatch
 
 # Debian patches
 removecvstag.dpatch

Added: cupsys/trunk/debian/patches/HostNameLookups_values.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/HostNameLookups_values.dpatch	Thu Jun 12 17:47:44 2008
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## HostNameLookups_values.dpatch by Martin Pitt <mpitt at debian.org>
+##
+## DP: Fix possible values of HostNameLookups to comply to manpage and to be
+## DP: consistent with other options. (Debian #379014, STR #2861)
+
+ at DPATCH@
+diff -urNad trunk~/scheduler/conf.c trunk/scheduler/conf.c
+--- trunk~/scheduler/conf.c	2008-06-12 17:32:30.000000000 +0000
++++ trunk/scheduler/conf.c	2008-06-12 17:34:06.000000000 +0000
+@@ -2884,9 +2884,11 @@
+       * Do hostname lookups?
+       */
+ 
+-      if (!strcasecmp(value, "off"))
++      if (!strcasecmp(value, "off") || !strcasecmp(value, "no") ||
++               !strcasecmp(value, "false"))
+         HostNameLookups = 0;
+-      else if (!strcasecmp(value, "on"))
++      else if (!strcasecmp(value, "on") || !strcasecmp(value, "yes") ||
++               !strcasecmp(value, "true"))
+         HostNameLookups = 1;
+       else if (!strcasecmp(value, "double"))
+         HostNameLookups = 2;