- Fixed lpstat to adhere to -o option (bug #577901, STR #3541).

This commit is contained in:
Jiří Popelka 2010-03-30 16:39:51 +00:00
parent 6484bf8fde
commit 35bec1783c
2 changed files with 24 additions and 1 deletions

17
cups-str3541.patch Normal file
View File

@ -0,0 +1,17 @@
diff -up cups-1.4.2/systemv/lpstat.c.str3541 cups-1.4.2/systemv/lpstat.c
--- cups-1.4.2/systemv/lpstat.c.str3541 2009-02-04 23:54:22.000000000 +0100
+++ cups-1.4.2/systemv/lpstat.c 2010-03-30 17:38:09.000000000 +0200
@@ -581,11 +581,11 @@ match_list(const char *list, /* I - Lis
/*
- * An empty list always matches...
+ * An empty list never matches...
*/
if (!list || !*list)
- return (1);
+ return (0);
while (*list)
{

View File

@ -8,7 +8,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.2
Release: 35%{?dist}
Release: 36%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -86,6 +86,7 @@ Patch52: cups-str3460.patch
Patch53: cups-EAI_AGAIN.patch
Patch54: cups-str3505.patch
Patch55: cups-CVE-2010-0302.patch
Patch56: cups-str3541.patch
Patch100: cups-lspp.patch
@ -333,6 +334,8 @@ module.
# Applied patch for CVE-2010-0302 (incomplete fix for CVE-2009-3553,
# bug #557775).
%patch55 -p1 -b .CVE-2010-0302
# Fix lpstat to adhere to -o option.
%patch56 -p1 -b .str3541
%if %lspp
# LSPP support.
@ -624,6 +627,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
* Tue Mar 30 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-36
- Fixed lpstat to adhere to -o option (bug #577901, STR #3541).
* Wed Mar 10 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-35
- Fixed (for the third time) patch for STR #3425 to correctly
remove job info files in /var/spool/cups (bug #571830).