rpms/cups/FC-6 cups-options.patch,NONE,1.1 cups.spec,1.317,1.318

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Feb 26 18:44:48 UTC 2007


Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-options.patch 
Log Message:
* Mon Feb 26 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.8-2
- Applied fix for STR #2264 (bug #230116).
- Resolves: rhbz#230116


cups-options.patch:
 options.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-options.patch ---
--- cups-1.2.8/cups/options.c.options	2006-02-22 22:43:17.000000000 +0000
+++ cups-1.2.8/cups/options.c	2007-02-26 18:34:52.000000000 +0000
@@ -622,7 +622,7 @@
       free(option->value);
 
     if (i > 0)
-      memmove(option, option + 1, i * sizeof(cups_option_t *));
+      memmove(option, option + 1, i * sizeof(cups_option_t));
   }
 
  /*


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- cups.spec	14 Feb 2007 18:04:29 -0000	1.317
+++ cups.spec	26 Feb 2007 18:44:46 -0000	1.318
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -45,6 +45,7 @@
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
+Patch22: cups-options.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -151,6 +152,7 @@
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
+%patch22 -p1 -b .options
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -434,6 +436,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Feb 26 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.8-2
+- Applied fix for STR #2264 (bug #230116).
+
 * Wed Feb 14 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.8-1
 - 1.2.8.
 




More information about the fedora-cvs-commits mailing list