rpms/cups/F-11 cups-str3279.patch,NONE,1.1 cups.spec,1.504,1.505

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25023

Modified Files:
	cups.spec 
Added Files:
	cups-str3279.patch 
Log Message:
* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
- Fixed ppds.dat handling of drv files (bug #515027, STR #3279).


cups-str3279.patch:
 cups-driverd.cxx |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

--- NEW FILE cups-str3279.patch ---
diff -up cups-1.4rc1/scheduler/cups-driverd.cxx.str3279 cups-1.4rc1/scheduler/cups-driverd.cxx
--- cups-1.4rc1/scheduler/cups-driverd.cxx.str3279	2009-06-08 23:00:14.000000000 +0100
+++ cups-1.4rc1/scheduler/cups-driverd.cxx	2009-08-10 15:48:26.255839804 +0100
@@ -1493,12 +1493,16 @@ load_ppds(const char *d,		/* I - Actual 
 	ppd->record.size == dent->fileinfo.st_size &&
 	ppd->record.mtime == dent->fileinfo.st_mtime)
     {
-      do
+      /* Rewind to the beginning of this run. */
+      while ((ppd = (ppd_info_t *)cupsArrayPrev(PPDsByName)) != NULL &&
+	     !strcmp(ppd->record.filename, name))
+	;
+
+      while ((ppd = (ppd_info_t *)cupsArrayNext(PPDsByName)) != NULL &&
+	     !strcmp(ppd->record.filename, name))
       {
         ppd->found = 1;
       }
-      while ((ppd = (ppd_info_t *)cupsArrayNext(PPDsByName)) != NULL &&
-	     !strcmp(ppd->record.filename, name));
 
       continue;
     }
@@ -1929,7 +1933,7 @@ load_drv(const char  *filename,		/* I - 
   * Add a dummy entry for the file...
   */
 
-  add_ppd(filename, filename, "", "", "", "", "", "", mtime, size, 0,
+  add_ppd(name, name, "", "", "", "", "", "", mtime, size, 0,
           PPD_TYPE_DRV, "drv");
   ChangedPPD = 1;
 
@@ -1988,7 +1992,7 @@ load_drv(const char  *filename,		/* I - 
       {
         product_found = true;
 
-	add_ppd(filename, uri, "en", d->manufacturer->value, make_model,
+	add_ppd(name, uri, "en", d->manufacturer->value, make_model,
 		device_id ? device_id->value->value : "",
 		product->value->value,
 		ps_version ? ps_version->value->value : "(3010) 0",
@@ -1996,7 +2000,7 @@ load_drv(const char  *filename,		/* I - 
       }
 
     if (!product_found)
-      add_ppd(filename, uri, "en", d->manufacturer->value, make_model,
+      add_ppd(name, uri, "en", d->manufacturer->value, make_model,
 	      device_id ? device_id->value->value : "",
 	      d->model_name->value,
 	      ps_version ? ps_version->value->value : "(3010) 0",


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -p -r1.504 -r1.505
--- cups.spec	10 Aug 2009 14:13:31 -0000	1.504
+++ cups.spec	10 Aug 2009 14:50:16 -0000	1.505
@@ -65,6 +65,7 @@ Patch37: cups-avahi.patch
 Patch38: cups-str3277.patch
 Patch39: cups-str3284.patch
 Patch40: cups-str3285.patch
+Patch41: cups-str3279.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -230,6 +231,7 @@ module. 
 %patch38 -p1 -b .str3277
 %patch39 -p1 -b .str3284
 %patch40 -p1 -b .str3285
+%patch41 -p1 -b .str3279
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -525,6 +527,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
+- Fixed ppds.dat handling of drv files (bug #515027, STR #3279).
 - Fixed udev rules file to avoid DEVTYPE warning messages.
 - Fixed cupsGetNamedDest() so it does not fall back to the default
   printer when a destination has been named (bug #516439, STR #3285).