rpms/cups/F-7 cups-str2408.patch,NONE,1.1 cups.spec,1.337,1.338

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22257

Modified Files:
	cups.spec 
Added Files:
	cups-str2408.patch 
Log Message:
* Fri Jun 29 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.11-2
- Applied patch to fix group handling in PPDs (bug #186231, STR #2408).


cups-str2408.patch:

--- NEW FILE cups-str2408.patch ---
--- cups-1.2.11/cups/ppd.c.str2408	2007-04-05 00:43:50.000000000 +0100
+++ cups-1.2.11/cups/ppd.c	2007-06-29 09:36:12.000000000 +0100
@@ -1013,11 +1013,15 @@
 
       if ((option = ppdFindOption(ppd, keyword + 6)) == NULL)
       {
+        int		groupidx;	/* Index for current group */
 	ppd_group_t	*gtemp;		/* Temporary group */
 
 
         DEBUG_printf(("%s option not found for %s...\n", keyword + 6, keyword));
 
+        if (group)
+          groupidx = group - ppd->groups; /* Save index for current group */
+
 	if ((gtemp = ppd_get_group(ppd, "General", _("General"), cg,
 	                           encoding)) == NULL)
 	{
@@ -1026,6 +1030,9 @@
 	  goto error;
 	}
 
+        if (group)
+          group = ppd->groups + groupidx; /* Restore group pointer */
+
 	if ((option = ppd_get_option(gtemp, keyword + 6)) == NULL)
 	{
 	  DEBUG_printf(("Unable to get %s option!\n", keyword + 6));
@@ -1079,8 +1086,12 @@
 
 	if ((option = ppdFindOption(ppd, "PageRegion")) == NULL)
 	{
+	  int		groupidx;	/* Index to current group */
 	  ppd_group_t	*gtemp;		/* Temporary group */
 
+          if (group)
+            groupidx = group - ppd->groups; /* Save index for current group */
+
 	  if ((gtemp = ppd_get_group(ppd, "General", _("General"), cg,
 				     encoding)) == NULL)
 	  {
@@ -1089,6 +1100,9 @@
 	    goto error;
 	  }
 
+          if (group)
+            group = ppd->groups + groupidx; /* Restore group pointer */
+
 	  option = ppd_get_option(gtemp, "PageRegion");
         }
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-7/cups.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- cups.spec	27 Jun 2007 08:37:53 -0000	1.337
+++ cups.spec	29 Jun 2007 09:04:07 -0000	1.338
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.11
-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
@@ -47,6 +47,7 @@
 Patch24: cups-str2109.patch
 Patch25: cups-usb-paperout.patch
 Patch26: cups-adminutil.patch
+Patch27: cups-str2408.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -156,6 +157,7 @@
 %patch24 -p1 -b .str2109
 %patch25 -p1 -b .usb-paperout
 %patch26 -p1 -b .adminutil
+%patch27 -p1 -b .str2408
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -443,6 +445,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Jun 29 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.11-2
+- Applied patch to fix group handling in PPDs (bug #186231, STR #2408).
+
 * Wed Jun 27 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.11-1
 - Fixed permissions on classes.conf in the file manifest (bug #245748).
 - 1.2.11.