rpms/cups/FC-5 cups-str1670.patch,NONE,1.1 cups.spec,1.168,1.169

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32024

Modified Files:
	cups.spec 
Added Files:
	cups-str1670.patch 
Log Message:
* Thu May 18 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.0-1.2
- Fix for 'browsing stops on reload', STR #1670 (bug #191217).


cups-str1670.patch:
 dirsvc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE cups-str1670.patch ---
--- cups-1.2.x/scheduler/dirsvc.c.str1670	2006-05-18 13:48:42.000000000 +0100
+++ cups-1.2.x/scheduler/dirsvc.c	2006-05-18 13:49:45.000000000 +0100
@@ -2596,7 +2596,8 @@
       cupsdLogMessage(CUPSD_LOG_DEBUG2,
                       "cupsdSendBrowseList: (%d bytes) %s", bytes, packet);
 
-      if (sendto(BrowseSocket, packet, bytes, 0,
+      if (BrowseSocket != -1 &&
+	  sendto(BrowseSocket, packet, bytes, 0,
 		 (struct sockaddr *)&(b->to),
 		 sizeof(struct sockaddr_in)) <= 0)
       {


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- cups.spec	8 May 2006 21:59:51 -0000	1.168
+++ cups.spec	18 May 2006 17:05:40 -0000	1.169
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.0
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -42,6 +42,7 @@
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
 Patch41: cups-relro.patch
+Patch42: cups-str1670.patch
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -136,6 +137,7 @@
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
 %patch41 -p1 -b .relro
+%patch42 -p1 -b .str1670
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
 autoconf
@@ -389,6 +391,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu May 18 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.0-1.2
+- Fix for 'browsing stops on reload', STR #1670 (bug #191217).
+
 * Mon May  8 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.0-1.1
 - 1.2.0.
 - No longer need link patch.