rpms/cups/F-12 cups-hostnamelookups.patch, NONE, 1.1 cups.spec, 1.585, 1.586

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv741

Modified Files:
	cups.spec 
Added Files:
	cups-hostnamelookups.patch 
Log Message:
* Thu May  6 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.3-5
- Use numeric addresses for interfaces unless HostNameLookups are
  turned on (bug #583054).


cups-hostnamelookups.patch:
 network.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cups-hostnamelookups.patch ---
diff -up cups-1.4.3/scheduler/network.c.hostnamelookups cups-1.4.3/scheduler/network.c
--- cups-1.4.3/scheduler/network.c.hostnamelookups	2009-04-28 01:23:38.000000000 +0100
+++ cups-1.4.3/scheduler/network.c	2010-05-06 15:11:34.652926030 +0100
@@ -155,7 +155,7 @@ cupsdNetIFUpdate(void)
     * Try looking up the hostname for the address as needed...
     */
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
       httpAddrLookup((http_addr_t *)(addr->ifa_addr), hostname,
                      sizeof(hostname));
     else
@@ -163,7 +163,7 @@ cupsdNetIFUpdate(void)
      /*
       * Map the default server address and localhost to the server name
       * and localhost, respectively; for all other addresses, use the
-      * dotted notation...
+      * numeric address...
       */
 
       if (httpAddrLocalhost((http_addr_t *)(addr->ifa_addr)))


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -p -r1.585 -r1.586
--- cups.spec	16 Apr 2010 11:36:56 -0000	1.585
+++ cups.spec	6 May 2010 14:24:14 -0000	1.586
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -57,6 +57,7 @@ Patch30: cups-EAI_AGAIN.patch
 Patch31: cups-str3505.patch
 Patch32: cups-str3541.patch
 Patch33: cups-snmp-quirks.patch
+Patch34: cups-hostnamelookups.patch
 
 Patch100: cups-lspp.patch
 
@@ -223,6 +224,7 @@ module. 
 %patch31 -p1 -b .str3505
 %patch32 -p1 -b .str3541
 %patch33 -p1 -b .snmp-quirks
+%patch34 -p1 -b .hostnamelookups
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -526,6 +528,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu May  6 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.3-5
+- Use numeric addresses for interfaces unless HostNameLookups are
+  turned on (bug #583054).
+
 * Fri Apr 16 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.3-4
 - Fixed str3541.patch
 - Added Require: ghostscript (bug #572701)