rpms/cups/F-11 cups-EAI_AGAIN.patch, 1.1, 1.2 cups-res_init.patch, 1.3, 1.4 cups.spec, 1.571, 1.572

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups-EAI_AGAIN.patch cups-res_init.patch cups.spec 
Log Message:
* Wed Mar 31 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.2-29
- Another BrowsePoll fix: handle EAI_NODATA as well (bug #567353).


cups-EAI_AGAIN.patch:
 http-addr.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: cups-EAI_AGAIN.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-EAI_AGAIN.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-EAI_AGAIN.patch	23 Feb 2010 11:10:45 -0000	1.1
+++ cups-EAI_AGAIN.patch	31 Mar 2010 16:08:26 -0000	1.2
@@ -6,7 +6,7 @@ diff -up cups-1.4.2/cups/http-addr.c.EAI
      if (error)
      {
 -      if (error == EAI_FAIL)
-+      if (error == EAI_FAIL || error == EAI_AGAIN)
++      if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA)
          cg->need_res_init = 1;
  
        return (httpAddrString(addr, name, namelen));

cups-res_init.patch:
 http-addrlist.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: cups-res_init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-res_init.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cups-res_init.patch	23 Mar 2009 18:04:54 -0000	1.3
+++ cups-res_init.patch	31 Mar 2010 16:08:27 -0000	1.4
@@ -6,7 +6,7 @@ diff -up cups-1.4b2-svn8404/cups/http-ad
        freeaddrinfo(results);
      }
 -    else if (error == EAI_FAIL)
-+    else if (error == EAI_FAIL || error == EAI_AGAIN)
++    else if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA)
        cg->need_res_init = 1;
  
  #else


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -p -r1.571 -r1.572
--- cups.spec	30 Mar 2010 16:53:17 -0000	1.571
+++ cups.spec	31 Mar 2010 16:08:27 -0000	1.572
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 28%{?dist}
+Release: 29%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -557,6 +557,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Mar 31 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.2-29
+- Another BrowsePoll fix: handle EAI_NODATA as well (bug #567353).
+
 * Tue Mar 30 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.2-28
 - Fixed lpstat to adhere to -o option (bug #577901, STR #3541).