rpms/cups/F-12 cups-str3439.patch,NONE,1.1 cups.spec,1.545,1.546

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str3439.patch 
Log Message:
* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12
- The web interface prevented conflicting options from being adjusted
  (bug #533426, STR #3439).


cups-str3439.patch:
 admin.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3439.patch ---
diff -up cups-1.4.2/cgi-bin/admin.c.str3439 cups-1.4.2/cgi-bin/admin.c
--- cups-1.4.2/cgi-bin/admin.c.str3439	2009-12-04 15:48:21.181907084 +0000
+++ cups-1.4.2/cgi-bin/admin.c	2009-12-04 15:48:21.199906005 +0000
@@ -3327,7 +3327,7 @@ do_set_options(http_t *http,		/* I - HTT
       }
   }
 
-  if (!have_options || ppdConflicts(ppd))
+  if (!have_options)
   {
    /*
     * Show the options to the user...


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.545
retrieving revision 1.546
diff -u -p -r1.545 -r1.546
--- cups.spec	3 Dec 2009 10:06:20 -0000	1.545
+++ cups.spec	4 Dec 2009 15:49:09 -0000	1.546
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -62,6 +62,7 @@ Patch34: cups-str3418.patch
 Patch35: cups-CVE-2009-3553.patch
 Patch36: cups-str3422.patch
 Patch37: cups-str3413.patch
+Patch38: cups-conflicts.patch
 
 Patch100: cups-lspp.patch
 
@@ -232,6 +233,7 @@ module. 
 %patch35 -p1 -b .CVE-2009-3553
 %patch36 -p1 -b .str3422
 %patch37 -p1 -b .str3413
+%patch38 -p1 -b .str3439
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -532,6 +534,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12
+- The web interface prevented conflicting options from being adjusted
+  (bug #533426, STR #3439).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-11
 - Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).