rpms/cups/devel cups-res_init.patch,1.2,1.3 cups.spec,1.467,1.468

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3739

Modified Files:
	cups.spec 
Added Files:
	cups-res_init.patch 
Log Message:
* Mon Mar 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.12
- If cups-polld gets EAI_AGAIN when looking up a hostname,
  re-initialise the resolver (bug #490943).


cups-res_init.patch:

Index: cups-res_init.patch
===================================================================
RCS file: cups-res_init.patch
diff -N cups-res_init.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ cups-res_init.patch	23 Mar 2009 18:04:54 -0000	1.3
@@ -0,0 +1,12 @@
+diff -up cups-1.4b2-svn8404/cups/http-addrlist.c.res_init cups-1.4b2-svn8404/cups/http-addrlist.c
+--- cups-1.4b2-svn8404/cups/http-addrlist.c.res_init	2009-03-23 17:41:03.000000000 +0000
++++ cups-1.4b2-svn8404/cups/http-addrlist.c	2009-03-23 17:41:26.000000000 +0000
+@@ -373,7 +373,7 @@ httpAddrGetList(const char *hostname,	/*
+ 
+       freeaddrinfo(results);
+     }
+-    else if (error == EAI_FAIL)
++    else if (error == EAI_FAIL || error == EAI_AGAIN)
+       cg->need_res_init = 1;
+ 
+ #else


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- cups.spec	11 Mar 2009 12:07:51 -0000	1.467
+++ cups.spec	23 Mar 2009 18:04:54 -0000	1.468
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.11%{?dist}
+Release: 0.%{pre}.12%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -46,6 +46,7 @@
 Patch20: cups-logrotate.patch
 Patch21: cups-usb-paperout.patch
 Patch22: cups-build.patch
+Patch23: cups-res_init.patch
 Patch26: cups-avahi.patch
 Patch27: cups-missing-devices.patch
 Patch100: cups-lspp.patch
@@ -187,6 +188,7 @@
 %patch20 -p1 -b .logrotate
 %patch21 -p1 -b .usb-paperout
 %patch22 -p1 -b .build
+%patch23 -p1 -b .res_init
 %patch26 -p1 -b .avahi
 %patch27 -p1 -b .missing-devices
 
@@ -470,6 +472,10 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Mon Mar 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.12
+- If cups-polld gets EAI_AGAIN when looking up a hostname,
+  re-initialise the resolver (bug #490943).
+
 * Wed Mar 11 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.11
 - Bumped cupsddk n-v-r for obsoletes/provides, as cupsddk was rebuilt.