rpms/cups/FC-4 cups-slow.patch,NONE,1.1 cups.spec,1.105,1.106

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-slow.patch 
Log Message:
* Thu Jan 26 2006 Tim Waugh <twaugh at redhat.com> 1:1.1.23-15.4
- Make DeletePrinterFromClass faster (bug #160620).


cups-slow.patch:
 classes.c |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

--- NEW FILE cups-slow.patch ---
--- cups-1.1.23/scheduler/classes.c.slow	2005-06-16 09:30:40.000000000 +0100
+++ cups-1.1.23/scheduler/classes.c	2005-06-16 09:36:10.000000000 +0100
@@ -158,29 +158,29 @@
 
     c->num_printers --;
     if (i < c->num_printers)
-      memcpy(c->printers + i, c->printers + i + 1,
-             (c->num_printers - i) * sizeof(printer_t *));
-  }
+      memmove(c->printers + i, c->printers + i + 1,
+              (c->num_printers - i) * sizeof(printer_t *));
 
- /*
-  * Recompute the printer type mask as needed...
-  */
+   /*
+    * Recompute the printer type mask as needed...
+    */
 
-  if (c->num_printers > 0)
-  {
-    type    = c->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT);
-    c->type = ~CUPS_PRINTER_REMOTE;
+    if (c->num_printers > 0)
+    {
+      type    = c->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT);
+      c->type = ~CUPS_PRINTER_REMOTE;
 
-    for (i = 0; i < c->num_printers; i ++)
-      c->type &= c->printers[i]->type;
+      for (i = 0; i < c->num_printers; i ++)
+        c->type &= c->printers[i]->type;
 
-    c->type |= type;
+      c->type |= type;
 
-   /*
-    * Update the IPP attributes...
-    */
+     /*
+      * Update the IPP attributes...
+      */
 
-    SetPrinterAttrs(c);
+      SetPrinterAttrs(c);
+    }
   }
 }
 


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-4/cups.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- cups.spec	4 Jan 2006 18:36:21 -0000	1.105
+++ cups.spec	26 Jan 2006 15:48:26 -0000	1.106
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.1.23
-Release: 15.3
+Release: 15.4
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2
@@ -50,7 +50,8 @@
 Patch34: cups-CAN-2005-2097.patch
 Patch35: cups-CVE-2005-3191_2_3.patch
 Patch36: cups-CVE-2005-3625,6,7.patch
-Patch37: cups-dbus.patch
+Patch37: cups-slow.patch
+Patch38: cups-dbus.patch
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -145,8 +146,9 @@
 %patch34 -p1 -b .CAN-2005-2097
 %patch35 -p1 -b .CVE-2005-3191_2_3
 %patch36 -p1 -b .CVE-2005-3625,6,7
+%patch37 -p1 -b .slow
 %if %use_dbus
-%patch37 -p1 -b .dbus
+%patch38 -p1 -b .dbus
 %endif
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
@@ -411,6 +413,9 @@
 %{_libdir}/cups/daemon/cups-lpd
 
 %changelog
+* Thu Jan 26 2006 Tim Waugh <twaugh at redhat.com> 1:1.1.23-15.4
+- Make DeletePrinterFromClass faster (bug #160620).
+
 * Wed Jan  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.1.23-15.3
 - Apply patch to fix CVE-2005-3625, CVE-2005-3626, CVE-2005-3627
   (bug #176868).