[cups/f16: 4/4] Merge branch 'f15' into f16

Tim Waugh twaugh at fedoraproject.org
Tue Jan 17 13:30:52 UTC 2012 

commit 9e0aa17df26c51cad35790c5df436eae97319873
Merge: e4da718 6017b9c
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Jan 17 12:54:39 2012 +0000

    Merge branch 'f15' into f16

 cups-str4004.patch |   13 +++++++++++++
 cups-str4005.patch |   25 +++++++++++++++++++++++++
 cups.spec          |   18 +++++++++++++++++-
 3 files changed, 55 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index 36bb09e,b201e4c..0c6781b
--- a/cups.spec
+++ b/cups.spec
@@@ -12,8 -12,8 +12,8 @@@
  
  Summary: Common Unix Printing System
  Name: cups
 -Version: 1.4.8
 -Release: 8%{?dist}
 +Version: 1.5.0
- Release: 25%{?dist}
++Release: 26%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -44,36 -48,42 +44,38 @@@ 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
 -Patch37: cups-str3947.patch
 -Patch38: cups-str4004.patch
 -Patch39: cups-str4005.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
 +Patch24: cups-str3947.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
 +Patch38: cups-str3921.patch
 +Patch39: cups-ps-command-filter.patch
++Patch40: cups-str4004.patch
++Patch41: cups-str4005.patch
  
  Patch100: cups-lspp.patch
  
@@@ -282,29 -309,15 +284,37 @@@ 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
 +
 +# Work around PPDs cache handling issue (bug #742989).
 +%patch38 -p1 -b .str3921
 +
 +# Set the correct PostScript command filter for e.g. foomatic queues
 +# (STR #3973).
 +%patch39 -p1 -b .ps-command-filter
 +
++# Don't accept Device URIs of '\0' from SNMP devices
++# (bug #770646, STR #4004).
++%patch40 -p1 -b .str4004
++
++# Replace newline characters with spaces in reported Device IDs
++# (bug #782129, STR #4005).
++%patch41 -p1 -b .str4005
+ 
  %if %lspp
  # LSPP support.
  %patch100 -p1 -b .lspp
@@@ -643,96 -646,26 +653,102 @@@ 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
 -* Tue Jan 17 2012 Tim Waugh <twaugh at redhat.com> 1:1.4.8-8
++* Tue Jan 17 2012 Tim Waugh <twaugh at redhat.com> 1:1.5.0-26
+ - Replace newline characters with spaces in reported Device IDs
+   (bug #782129, STR #4005).
+ - Don't accept Device URIs of '\0' from SNMP devices
+   (bug #770646, STR #4004).
+ 
 -* Wed Dec 21 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-7
 +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5.0-25
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
 +* Wed Dec 21 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-24
  - Fixed textonly filter to work with single copies (bug #738412).
  
 -* Fri Dec  9 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-6
 +* Fri Dec  9 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-23
  - Detangle cups-serverbin-compat.patch from cups-lspp.patch.
 +- Bind to datagram socket as well in systemd cups.socket unit file, to
 +  prevent that port being stolen by another service (bug #760070).
 +
 +* Fri Nov 11 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-22
 +- Fixed trigger (bug #748841).
 +
 +* Wed Nov  9 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-21
 +- Set correct systemd service default on upgrade, once updates are
 +  applied (bug #748841).
 +
 +* Fri Nov  4 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-20
 +- Set the correct PostScript command filter for e.g. foomatic queues
 +  (STR #3973).
 +
 +* Mon Oct 31 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-19
 +- Set correct systemd service default on upgrade (bug #748841).
 +
 +* Wed Oct 19 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-18
 +- Make sure to guard against retrying the Avahi connection whilst
 +  already doing so (Ubuntu #877967).
 +
 +* Tue Oct 18 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-17
 +- Use libsystemd-daemon instead of bundling sd-daemon.c.
 +
 +* Tue Oct 11 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-16
 +- Use upstream fix for driverd issue (bug #742989).
 +- Array handling fixes for DNSSDPrinters.
 +- Array handling fixes for Avahi poll implementation.
 +- Increase client blocking timeout from 30s to 70s (bug #744715).
 +- Set BindIPv6Only=ipv6-only in systemd socket unit file as better fix
 +  for bug #737230.
 +
 +* Fri Oct  7 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-15
 +- Fixed Timeouts array comparison function (Ubuntu #860691).
 +
 +* Wed Oct  5 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-14
 +- Handle "localhost" resolving to 127.0.0.1 on IPv6-addressed systems
 +  (bug #737230).
 +
 +* Tue Oct  4 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-13
 +- Work around PPDs cache handling issue (bug #742989).
  
 -* Wed Sep 28 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-5
 +* Tue Oct  4 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-12
 +- More fixes for systemd socket activation:
 +  - relax permissions check for domain socket in libcups.
 +  - initialise addrlen before calling getsockname().
 +
 +* Mon Oct 03 2011 Richard Hughes <rhughes at redhat.com> 1:1.5.0-11
 +- Updated colord patch with fixes to DeleteDevice.
 +- Resolves https://bugzilla.redhat.com/show_bug.cgi?id=741697
 +
 +* Wed Sep 28 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-10
  - Fixed string manipulation in the dbus notifier (STR #3947, bug #741833).
  
 -* Wed Sep 14 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-4
 +* Thu Sep 22 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-9
 +- Fixed systemd socket activation support (bug #738709, bug #738710).
 +
 +* Wed Sep 14 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-8
  - Prevent libcups crash in cups-get-classes patch (bug #736698).
  
 -* Fri Aug 19 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.8-3
 +* Thu Sep  1 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-7
 +- Use PathExistsGlob instead of DirectoryNotEmpty in cups.path
 +  (bug #734435).
 +
 +* Fri Aug 19 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-6
  - Tighten explicit libs sub-package requirement so that it includes
    the correct architecture as well (bug #731421 comment #8).

More information about the scm-commits mailing list