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

[Tim Waugh]

commit 2f419327075a4bc48ee3f700bf6cc77b23e6d7fd
Merge: 03e73a9 79bffad
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Aug 15 12:50:22 2013 +0100

    Merge branch 'f19'

 cups-full-relro.patch |   12 ++++++++++++
 cups.spec             |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index 98d20a5,f7a01a3..6f450b7
--- a/cups.spec
+++ b/cups.spec
@@@ -13,8 -10,8 +13,8 @@@
  Summary: CUPS printing system
  Name: cups
  Epoch: 1
 -Version: 1.6.3
 -Release: 6%{?dist}
 +Version: 1.7
- Release: 0.23.%{prever}%{?dist}
++Release: 0.24.%{prever}%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Url: http://www.cups.org/
@@@ -61,14 -58,13 +61,15 @@@ Patch27: cups-avahi-address.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
 -Patch36: cups-ipp-multifile.patch
 -Patch37: cups-full-relro.patch
 +Patch34: cups-libusb-quirks.patch
 +Patch35: cups-use-ipp1.1.patch
 +Patch36: cups-avahi-no-threaded.patch
 +Patch37: cups-gz-crc.patch
 +Patch38: cups-build.patch
 +Patch39: cups-ipp-multifile.patch
++Patch40: cups-full-relro.patch
  
  Patch100: cups-lspp.patch
  
@@@ -243,22 -242,18 +244,24 @@@ 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
 +# Fixed build.
 +%patch38 -p1 -b .build
  # Fixes for jobs with multiple files and multiple formats.
 -%patch36 -p1 -b .ipp-multifile
 +%patch39 -p1 -b .ipp-multifile
+ # Full relro (bug #996740).
 -%patch37 -p1 -b .full-relro
++%patch40 -p1 -b .full-relro
  
  %if %lspp
  # LSPP support.
@@@ -633,16 -640,16 +636,19 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
 -* Thu Aug 15 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-6
++* Thu Aug 15 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.24.rc1
+ - Build with full read-only relocations (bug #996740).
+ 
 -* Tue Aug  6 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-5
 +* Tue Aug  6 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.23.rc1
  - Fixes for jobs with multiple files and multiple formats.
  
 -* Wed Jul 24 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-4
 +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.7-0.22.rc1
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 +
 +* Wed Jul 24 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.21.rc1
  - Fixed cups-config, broken by last change (bug #987660).
  
 -* Mon Jul 22 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-3
 +* Mon Jul 22 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.20.rc1
  - Removed stale comment in spec file.
  - Link against OpenSSL instead of GnuTLS.