rpms/cups/FC-6 cups-driverd-timeout.patch, NONE, 1.1 cups.spec, 1.298, 1.299

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-driverd-timeout.patch 
Log Message:
* Wed Nov 22 2006 Tim Waugh <twaugh at redhat.com>
- Increased PPD timeout in copy_model() (bug #216065).
- Resolves: rhbz#216065


cups-driverd-timeout.patch:
 ipp.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cups-driverd-timeout.patch ---
--- cups-1.2.7/scheduler/ipp.c.driverd-timeout	2006-11-22 10:41:28.000000000 +0000
+++ cups-1.2.7/scheduler/ipp.c	2006-11-22 10:45:55.000000000 +0000
@@ -4175,7 +4175,7 @@
   close(temppipe[1]);
 
  /*
-  * Wait up to 30 seconds for the PPD file to be copied...
+  * Wait up to 70 seconds for the PPD file to be copied...
   */
 
   total = 0;
@@ -4196,7 +4196,7 @@
     FD_SET(temppipe[0], input);
     FD_SET(CGIPipes[0], input);
 
-    timeout.tv_sec  = 30;
+    timeout.tv_sec  = 70;
     timeout.tv_usec = 0;
 
     if ((i = select(maxfd, input, NULL, NULL, &timeout)) < 0)


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- cups.spec	21 Nov 2006 13:29:19 -0000	1.298
+++ cups.spec	22 Nov 2006 10:47:20 -0000	1.299
@@ -44,6 +44,7 @@
 Patch18: cups-directed-broadcast.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
+Patch21: cups-driverd-timeout.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -146,6 +147,7 @@
 %patch18 -p1 -b .directed-broadcast
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
+%patch21 -p1 -b .driverd-timeout
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -428,6 +430,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Nov 22 2006 Tim Waugh <twaugh at redhat.com>
+- Increased PPD timeout in copy_model() (bug #216065).
+
 * Tue Nov 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.7-1.2
 - Run the serial backend as root (bug #212577).