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

[Tim Waugh]

commit 2529e37d00e9451b4d4a6febf42572dd9c833f1a
Merge: 0fed0db 07b68ee
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Jul 22 15:00:43 2013 +0100

    Merge branch 'f19'

 cups-build.patch |   12 ++++++++++++
 cups.spec        |   17 +++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)
---
diff --cc cups-build.patch
index 0000000,0000000..fba6196
new file mode 100644
--- /dev/null
+++ b/cups-build.patch
@@@ -1,0 -1,0 +1,12 @@@
++diff -up cups-1.7rc1/cups/http.c.build cups-1.7rc1/cups/http.c
++--- cups-1.7rc1/cups/http.c.build	2013-07-22 14:51:18.673065709 +0100
+++++ cups-1.7rc1/cups/http.c	2013-07-22 14:51:19.781070570 +0100
++@@ -5247,7 +5247,7 @@ http_setup_ssl(http_t *http)		/* I - Con
++     if (!message)
++       message = _("Unable to establish a secure connection to host.");
++ 
++-    _cupsSetError(IPP_PKI_ERROR, message, 1);
+++    _cupsSetError(IPP_STATUS_ERROR_CUPS_PKI, message, 1);
++ 
++     return (-1);
++   }
diff --cc cups.spec
index f704dec,05f521e..a3b74f6
--- 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: 3%{?dist}
 +Version: 1.7
- Release: 0.19.%{prever}%{?dist}
++Release: 0.20.%{prever}%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Url: http://www.cups.org/
@@@ -61,12 -58,11 +61,13 @@@ 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
 +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
  
  Patch100: cups-lspp.patch
  
@@@ -241,18 -240,14 +242,20 @@@ 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
  
  %if %lspp
  # LSPP support.
@@@ -629,11 -634,11 +630,15 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
 -* 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.
+ 
 -* Thu Jul 18 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-2
 +* Mon Jul 22 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.19.rc1
 +- Fixed avahi-no-threaded patch (was missing part of cupsd.h). Thanks
 +  to Joseph Wang for spotting it.
 +
 +* Thu Jul 18 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.18.rc1
  - Fixed downoad URL to point to the actual source, not a download
    page.