[cups: 2/2] Merge branch 'f19'

[Tim Waugh]

commit 858f7110040a13da625eea96069c6d40808b1d7e
Merge: a9a7dcc 08200f2
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Jul 11 13:24:57 2013 +0100

    Merge branch 'f19'

 cups-gz-crc.patch |   14 ++++++++++++++
 cups.spec         |    8 +++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index 1f5f5af,8987b5c..e7ddbd2
--- a/cups.spec
+++ b/cups.spec
@@@ -13,8 -10,8 +13,8 @@@
  Summary: CUPS printing system
  Name: cups
  Epoch: 1
 -Version: 1.6.2
 -Release: 18%{?dist}
 +Version: 1.7
- Release: 0.15.%{prever}%{?dist}
++Release: 0.16.%{prever}%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Url: http://www.cups.org/
@@@ -62,11 -59,10 +62,12 @@@ Patch28: cups-17b1-va_list.patc
  Patch29: cups-enum-all.patch
  Patch30: cups-stringpool-setprinterattr.patch
  Patch31: cups-dymo-deviceid.patch
 -Patch32: cups-use-ipp1.1.patch
 +Patch32: cups-freebind.patch
  Patch33: cups-no-gcry.patch
 -Patch34: cups-avahi-no-threaded.patch
 -Patch35: cups-gz-crc.patch
 +Patch34: cups-libusb-quirks.patch
 +Patch35: cups-use-ipp1.1.patch
 +Patch36: cups-avahi-no-threaded.patch
++Patch37: cups-gz-crc.patch
  
  Patch100: cups-lspp.patch
  
@@@ -243,16 -242,14 +244,18 @@@ Sends IPP requests to the specified UR
  %patch30 -p1 -b .stringpool-setprinterattr
  # Added IEEE 1284 Device ID for a Dymo device (bug #747866).
  %patch31 -p1 -b .dymo-deviceid
 -# Default to IPP/1.1 for now (bug #977813).
 -%patch32 -p1 -b .use-ipp1.1
 +# Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
 +%patch32 -p1 -b .freebind
  # Don't link against libgcrypt needlessly.
  %patch33 -p1 -b .no-gcry
 +# Added libusb quirk for Canon PIXMA MP540 (bug #967873).
 +%patch34 -p1 -b .libusb-quirks
 +# Default to IPP/1.1 for now (bug #977813).
 +%patch35 -p1 -b .use-ipp1.1
  # Don't use D-Bus from two threads (bug #979748).
 -%patch34 -p1 -b .avahi-no-threaded
 +%patch36 -p1 -b .avahi-no-threaded
+ # Avoid sign-extending CRCs for gz decompression (bug #983486).
 -%patch35 -p1 -b .gz-crc
++%patch37 -p1 -b .gz-crc
  
  %if %lspp
  # LSPP support.
@@@ -633,55 -643,48 +636,58 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
 -* Thu Jul 11 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-18
++* Thu Jul 11 2013 Tim Waugh <twaugh at redhat.com> 1:1.7-0.16.b1
+ - Avoid sign-extending CRCs for gz decompression (bug #983486).
+ 
 -* Wed Jul 10 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-17
 +* Wed Jul 10 2013 Tim Waugh <twaugh at redhat.com> 1:1.7-0.15.b1
  - Fixed download URL.
  
 -* Wed Jul 10 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-16
 +* Wed Jul 10 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.7-0.14.b1
  - Remove pstops cost factor tweak from conf/mime.convs.in
  
 -* Mon Jul  1 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-15
 +* Mon Jul  1 2013 Tim Waugh <twaugh at redhat.com> 1:1.7-0.13.b1
  - Don't use D-Bus from two threads (bug #979748).
  
 -* Fri Jun 28 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-14
 +* Fri Jun 28 2013 Tim Waugh <twaugh at redhat.com> 1:1.7-0.12.b1
  - Fix for DNSSD name resolution.
  
 -* Wed Jun 26 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-13
 +* Wed Jun 26 2013 Tim Waugh <twaugh at redhat.com> 1:1.7-0.11.b1
 +- Default to IPP/1.1 for now (bug #977813).
 +
 +* Tue Jun 25 2013 Tim Waugh <twaugh at redhat.com> 1:1.7-0.10.b1
 +- Added libusb quirk for Canon PIXMA MP540 (bug #967873).
 +
 +* Mon Jun 24 2013 Tim Waugh <twaugh at redhat.com> 1:1.7-0.9.b1
  - Don't link against libgcrypt needlessly.
  
 -* Wed Jun 26 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-12
 -- Default to IPP/1.1 for now (bug #977813).
 +* Thu Jun 20 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.7-0.8.b1
 +- Remove scriptlet for migrating to a systemd unit from a SysV initscript
  
 -* Tue Jun 25 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-11
 -- Added usblp quirk for Canon PIXMA MP540 (bug #967873).
 +* Thu Jun 20 2013 Tim Waugh <twaugh at redhat.com> 1:1.7-0.7.b1
 +- Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
  
 -* Tue Jun 18 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-10
 +* Tue Jun 18 2013 Tim Waugh <twaugh at redhat.com> 1:1.7-0.6.b1
  - Added IEEE 1284 Device ID for a Dymo device (bug #747866).
  
 -* Thu Jun 13 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-9
 +* Thu Jun 13 2013 Tim Waugh <twaugh at redhat.com> 1:1.7-0.5.b1
  - Prevent stringpool damage leading to memory leaks (bug #974048).
  
 -* Tue Jun  4 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.2-8
 +* Tue Jun  4 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.4.b1
  - Return from cupsEnumDests() once all records have been returned.
  
 -* Thu May 23 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-7
 -- Added more USB quirks for the libusb-based backend (STR #4311)
 -
 -* Thu May 23 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-6
 +* Thu May 23 2013 Jiri Popelka <jpopelka at redhat.com>
  - don't ship Russian web templates because they're broken (#960571, STR #4310)
  
 -* Wed May 15 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-5
 +* Wed May 15 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.7-0.3.b1
  - move cups/ppdc/ to filesystem subpackage
  
 +* Mon Apr 29 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.7-0.2.b1
 +- Do not apply unary exclamation mark to va_list (bug #957737).
 +
 +* Fri Apr 19 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.7-0.1.b1
 +- 1.7b1
 +- use _tmpfilesdir macro
 +
  * Wed Apr 10 2013 Tim Waugh <twaugh at redhat.com>
  - cups-dbus-utf.patch: now that the scheduler only accepts valid UTF-8
    strings for job-name, there's no need to validate it as UTF-8 in the