From e29fcb789e7b81c5cf36a12e9ab7bb86cd15f621 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Jun 29 2007 09:05:30 +0000
Subject: - Applied patch to fix group handling in PPDs (bug #186231, STR #2408).


---

diff --git a/cups-str2408.patch b/cups-str2408.patch
new file mode 100644
index 0000000..f737cee
--- /dev/null
+++ b/cups-str2408.patch
@@ -0,0 +1,51 @@
+--- 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");
+         }
+ 
diff --git a/cups.spec b/cups.spec
index 4373082..5940454 100644
--- a/cups.spec
+++ b/cups.spec
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -47,6 +47,7 @@ Patch22: cups-af_unix-auth.patch
 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 @@ lpd emulation.
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Jun 29 2007 Tim Waugh <twaugh@redhat.com> 1:1.2.11-3
+- Applied patch to fix group handling in PPDs (bug #186231, STR #2408).
+
 * Wed Jun 27 2007 Tim Waugh <twaugh@redhat.com> 1:1.2.11-2
 - Fixed _cupsAdminSetServerSettings() sharing/shared handling (bug #238057).