[cups/f16: 3/3] Merge branch 'f15' into f16
Tim Waugh
twaugh at fedoraproject.org
Fri Aug 19 11:38:35 UTC 2011
commit 39d5c4b04dce981eb3b2570fcea63d3075603854
Merge: 654962e 4b8b8d3
Author: Tim Waugh <twaugh at redhat.com>
Date: Fri Aug 19 11:38:12 2011 +0100
Merge branch 'f15' into f16
cups-CVE-2011-2896.patch | 33 +++++++++++++++++++++++++++++++++
cups.spec | 9 ++++++++-
2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index 2665579,a400a2d..2572145
--- a/cups.spec
+++ b/cups.spec
@@@ -12,8 -12,8 +12,8 @@@
Summary: Common Unix Printing System
Name: cups
-Version: 1.4.8
-Release: 2%{?dist}
+Version: 1.5.0
- Release: 4%{?dist}
++Release: 5%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -44,32 -48,39 +44,33 @@@ Patch8: cups-direct-usb.patc
Patch9: cups-lpr-help.patch
Patch10: cups-peercred.patch
Patch11: cups-pid.patch
-Patch12: cups-page-label.patch
-Patch13: cups-eggcups.patch
-Patch14: cups-getpass.patch
-Patch15: cups-driverd-timeout.patch
-Patch16: cups-strict-ppd-line-length.patch
-Patch17: cups-logrotate.patch
-Patch18: cups-usb-paperout.patch
-Patch19: cups-build.patch
-Patch20: cups-res_init.patch
-Patch21: cups-filter-debug.patch
-Patch22: cups-uri-compat.patch
-Patch23: cups-cups-get-classes.patch
-Patch24: cups-str3382.patch
-Patch25: cups-force-gnutls.patch
-Patch26: cups-serialize-gnutls.patch
-Patch27: cups-0755.patch
-Patch28: cups-snmp-quirks.patch
-Patch29: cups-hp-deviceid-oid.patch
-Patch30: cups-dnssd-deviceid.patch
-Patch31: cups-ricoh-deviceid-oid.patch
-Patch32: cups-texttops-rotate-page.patch
-Patch33: cups-usb-parallel.patch
-Patch34: cups-str3535.patch
-Patch35: cups-polld-busy-loop.patch
-Patch36: cups-CVE-2011-2896.patch
-
-Patch40: cups-avahi-1-config.patch
-Patch41: cups-avahi-2-backend.patch
-Patch42: cups-avahi-3-timeouts.patch
-Patch43: cups-avahi-4-poll.patch
-Patch44: cups-avahi-5-services.patch
-
-Patch45: cups-icc.patch
+Patch12: cups-eggcups.patch
+Patch13: cups-getpass.patch
+Patch14: cups-driverd-timeout.patch
+Patch15: cups-strict-ppd-line-length.patch
+Patch16: cups-logrotate.patch
+Patch17: cups-usb-paperout.patch
+Patch18: cups-build.patch
+Patch19: cups-res_init.patch
+Patch20: cups-filter-debug.patch
+Patch21: cups-uri-compat.patch
+Patch22: cups-cups-get-classes.patch
+Patch23: cups-str3382.patch
+Patch25: cups-0755.patch
+Patch26: cups-snmp-quirks.patch
+Patch27: cups-hp-deviceid-oid.patch
+Patch28: cups-dnssd-deviceid.patch
+Patch29: cups-ricoh-deviceid-oid.patch
+
+Patch30: cups-avahi-1-config.patch
+Patch31: cups-avahi-2-backend.patch
+Patch32: cups-avahi-3-timeouts.patch
+Patch33: cups-avahi-4-poll.patch
+Patch34: cups-avahi-5-services.patch
+
+Patch35: cups-icc.patch
+Patch36: cups-systemd-socket.patch
++Patch37: cups-CVE-2011-2896.patch
Patch100: cups-lspp.patch
@@@ -276,19 -298,15 +277,22 @@@ Sends IPP requests to the specified UR
# Avahi support:
# - discovery in the dnssd backend
# - service announcement in the scheduler
-%patch40 -p1 -b .avahi-1-config
-%patch41 -p1 -b .avahi-2-backend
-%patch42 -p1 -b .avahi-3-timeouts
-%patch43 -p1 -b .avahi-4-poll
-%patch44 -p1 -b .avahi-5-services
+%patch30 -p1 -b .avahi-1-config
+%patch31 -p1 -b .avahi-2-backend
+%patch32 -p1 -b .avahi-3-timeouts
+%patch33 -p1 -b .avahi-4-poll
+%patch34 -p1 -b .avahi-5-services
# ICC colord support.
-%patch45 -p1 -b .icc
+%patch35 -p1 -b .icc
+
+# Add support for systemd socket activation (patch from Lennart
+# Poettering).
+%patch36 -p1 -b .systemd-socket
+
++# Avoid GIF reader loop (CVE-2011-2896, STR #3914, bug #727800).
++%patch37 -p1 -b .CVE-2011-2896
+
%if %lspp
# LSPP support.
%patch100 -p1 -b .lspp
@@@ -618,42 -635,26 +622,45 @@@ rm -rf $RPM_BUILD_ROO
%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini
%{php_extdir}/phpcups.so
+%files ipptool
+%defattr(-,root,root)
+%{_bindir}/ipptool
+%dir %{_datadir}/cups/ipptool
+%{_datadir}/cups/ipptool/create-printer-subscription.test
+%{_datadir}/cups/ipptool/get-completed-jobs.test
+%{_datadir}/cups/ipptool/get-jobs.test
+%{_datadir}/cups/ipptool/ipp-1.1.test
+%{_datadir}/cups/ipptool/ipp-2.0.test
+%{_datadir}/cups/ipptool/ipp-2.1.test
+%{_datadir}/cups/ipptool/testfile.jpg
+%{_datadir}/cups/ipptool/testfile.pdf
+%{_datadir}/cups/ipptool/testfile.ps
+%{_datadir}/cups/ipptool/testfile.txt
+%{_mandir}/man1/ipptool.1.gz
+
%changelog
-* Fri Aug 19 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-2
++* Fri Aug 19 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-5
+ - Avoid GIF reader loop (CVE-2011-2896, STR #3914, bug #727800).
+
-* Tue Jul 26 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.8-1
-- 1.4.8
+* Wed Aug 17 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-4
+- Enable systemd units by default (bug #731421).
-* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-9
-- Don't delete job data files when restarted (STR #3880).
+* Mon Aug 8 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-3
+- Updated avahi support to register sub-types.
-* Fri Jul 15 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-8
-- Ship an rpm macro for where to put driver executables.
+* Fri Aug 5 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-2
+- Ported avahi support from 1.4.
+
+* Tue Jul 26 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.5.0-1
+- 1.5.0
-* Wed Jul 13 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-7
-- Avoid busy loop in cups-polld (bug #720921).
+* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.16.rc1
+- Don't delete job data files when restarted (STR #3880).
-* Thu Jul 7 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.7-6
-- Fix SNMP supply level crasher (STR #3875, bug #719057).
+* Fri Jul 15 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.15.rc1
+- Ship an rpm macro for where to put driver executables.
-* Thu Jul 7 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-5
+* Thu Jul 7 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.14.rc1
- Undo last change which had no effect. We already remove the .SILENT
target from the Makefile as part of the build.
More information about the scm-commits
mailing list