rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- The web interface prevented conflicting options from being adjusted (bug

Browse Source 
#533426, STR #3439).
This commit is contained in:
Tim Waugh 2009-12-04 15:51:35 +00:00
parent 195eda7ef5
commit 4b35ccb4b3
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cups-str3439.patch Normal file
View File

@ -0,0 +1,12 @@
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...

8
cups.spec
View File

@ -9,7 +9,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.2 Version: 1.4.2
Release: 12%{?dist} Release: 13%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -60,6 +60,7 @@ Patch34: cups-str3418.patch
Patch35: cups-CVE-2009-3553.patch Patch35: cups-CVE-2009-3553.patch
Patch36: cups-str3422.patch Patch36: cups-str3422.patch
Patch37: cups-str3413.patch Patch37: cups-str3413.patch
Patch38: cups-str3439.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -230,6 +231,7 @@ module.
%patch35 -p1 -b .CVE-2009-3553 %patch35 -p1 -b .CVE-2009-3553
%patch36 -p1 -b .str3422 %patch36 -p1 -b .str3422
%patch37 -p1 -b .str3413 %patch37 -p1 -b .str3413
%patch38 -p1 -b .str3439
%if %lspp %if %lspp
%patch100 -p1 -b .lspp %patch100 -p1 -b .lspp
@ -522,6 +524,10 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Fri Dec 4 2009 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-13
- The web interface prevented conflicting options from being adjusted
(bug #533426, STR #3439).
* Thu Dec 3 2009 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-12 * Thu Dec 3 2009 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-12
- Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413). - Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).