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

Merge branch 'f14' into f15

Browse Source
This commit is contained in:
Tim Waugh 2011-09-28 10:40:34 +01:00
commit 6b9fc43684
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cups-str3947.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up cups-1.4.8/notifier/dbus.c.str3947 cups-1.4.8/notifier/dbus.c
--- cups-1.4.8/notifier/dbus.c.str3947 2011-03-04 19:28:38.000000000 +0000
+++ cups-1.4.8/notifier/dbus.c 2011-09-28 10:37:30.443753266 +0100
@@ -4,7 +4,7 @@
* D-Bus notifier for the Common UNIX Printing System (CUPS).
*
* Copyright 2008 by Apple Inc.
- * Copyright (C) 2007 Red Hat, Inc.
+ * Copyright (C) 2011 Red Hat, Inc.
* Copyright (C) 2007 Tim Waugh <twaugh@redhat.com>
* Copyright 1997-2005 by Easy Software Products.
*
@@ -423,10 +423,11 @@ main(int argc, /* I - Number of comm
p = printer_reasons;
for (i = 0; i < attr->num_values; i++)
{
- strcpy(p, attr->values[i].string.text);
- p += strlen(p);
if (i)
*p++ = ',';
+
+ strcpy(p, attr->values[i].string.text);
+ p += strlen(p);
}
dbus_message_iter_append_string(&iter, &printer_reasons);
}

8
cups.spec
View File

@ -13,7 +13,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.8 Version: 1.4.8
Release: 4%{?dist} Release: 5%{?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
@ -73,6 +73,7 @@ Patch33: cups-usb-parallel.patch
Patch34: cups-str3535.patch Patch34: cups-str3535.patch
Patch35: cups-polld-busy-loop.patch Patch35: cups-polld-busy-loop.patch
Patch36: cups-CVE-2011-2896.patch Patch36: cups-CVE-2011-2896.patch
Patch37: cups-str3947.patch
Patch40: cups-avahi-1-config.patch Patch40: cups-avahi-1-config.patch
Patch41: cups-avahi-2-backend.patch Patch41: cups-avahi-2-backend.patch
@ -294,6 +295,8 @@ module.
%patch35 -p1 -b .polld-busy-loop %patch35 -p1 -b .polld-busy-loop
# Avoid GIF reader loop (CVE-2011-2896, STR #3914, bug #727800). # Avoid GIF reader loop (CVE-2011-2896, STR #3914, bug #727800).
%patch36 -p1 -b .CVE-2011-2896 %patch36 -p1 -b .CVE-2011-2896
# Fixed string manipulation in the dbus notifier (STR #3947, bug #741833).
%patch37 -p1 -b .str3947
# Avahi support: # Avahi support:
# - discovery in the dnssd backend # - discovery in the dnssd backend
@ -636,6 +639,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Wed Sep 28 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.8-5
- Fixed string manipulation in the dbus notifier (STR #3947, bug #741833).
* Wed Sep 14 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.8-4 * Wed Sep 14 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.8-4
- Prevent libcups crash in cups-get-classes patch (bug #736698). - Prevent libcups crash in cups-get-classes patch (bug #736698).