From 5b0d059f40a992fa255fd6a8cbb17bc640bf1f55 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Jun 24 2013 11:19:37 +0000
Subject: Don't link against libgcrypt needlessly.


---

diff --git a/cups-no-gcry.patch b/cups-no-gcry.patch
new file mode 100644
index 0000000..a329ab5
--- /dev/null
+++ b/cups-no-gcry.patch
@@ -0,0 +1,37 @@
+diff -up cups-1.7b1/config-scripts/cups-ssl.m4.no-gcry cups-1.7b1/config-scripts/cups-ssl.m4
+--- cups-1.7b1/config-scripts/cups-ssl.m4.no-gcry	2013-06-24 12:14:44.514018538 +0100
++++ cups-1.7b1/config-scripts/cups-ssl.m4	2013-06-24 12:15:35.805243614 +0100
+@@ -66,7 +66,6 @@ if test x$enable_ssl != xno; then
+     dnl Then look for GNU TLS...
+     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
+     	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
+-    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
+ 	if $PKGCONFIG --exists gnutls; then
+ 	    have_ssl=1
+ 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
+@@ -84,14 +83,6 @@ if test x$enable_ssl != xno; then
+ 	if test $have_ssl = 1; then
+ 	    CUPS_SERVERCERT="ssl/server.crt"
+ 	    CUPS_SERVERKEY="ssl/server.key"
+-
+-            if $PKGCONFIG --exists gcrypt; then
+-	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
+-	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
+-	    elif test "x$LIBGCRYPTCONFIG" != x; then
+-	        SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
+-	        SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
+-	    fi
+ 	fi
+     fi
+ 
+diff -up cups-1.7b1/cups/http-private.h.no-gcry cups-1.7b1/cups/http-private.h
+--- cups-1.7b1/cups/http-private.h.no-gcry	2013-06-24 12:15:57.833339957 +0100
++++ cups-1.7b1/cups/http-private.h	2013-06-24 12:16:06.175376393 +0100
+@@ -80,7 +80,6 @@ typedef int socklen_t;
+ #  elif defined HAVE_GNUTLS
+ #    include <gnutls/gnutls.h>
+ #    include <gnutls/x509.h>
+-#    include <gcrypt.h>
+ #  elif defined(HAVE_CDSASSL)
+ #    include <CoreFoundation/CoreFoundation.h>
+ #    include <Security/Security.h>
diff --git a/cups.spec b/cups.spec
index 44571bb..1e57c90 100644
--- a/cups.spec
+++ b/cups.spec
@@ -14,7 +14,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 1.7
-Release: 0.8.%{prever}%{?dist}
+Release: 0.9.%{prever}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cups.org/
@@ -63,6 +63,7 @@ Patch29: cups-enum-all.patch
 Patch30: cups-stringpool-setprinterattr.patch
 Patch31: cups-dymo-deviceid.patch
 Patch32: cups-freebind.patch
+Patch33: cups-no-gcry.patch
 
 Patch100: cups-lspp.patch
 
@@ -241,6 +242,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch31 -p1 -b .dymo-deviceid
 # 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
 
 %if %lspp
 # LSPP support.
@@ -629,6 +632,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Mon Jun 24 2013 Tim Waugh <twaugh@redhat.com> 1:1.7-0.9.b1
+- Don't link against libgcrypt needlessly.
+
 * Thu Jun 20 2013 Jiri Popelka <jpopelka@redhat.com> - 1:1.7-0.8.b1
 - Remove scriptlet for migrating to a systemd unit from a SysV initscript