rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't link against libgcrypt needlessly.

Browse Source
This commit is contained in:
Tim Waugh 2013-06-24 12:19:37 +01:00
parent 225ab5986f
commit 5b0d059f40
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cups-no-gcry.patch Normal file
View File

@ -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>

8
cups.spec
View File

@ -14,7 +14,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.7 Version: 1.7
Release: 0.8.%{prever}%{?dist} Release: 0.9.%{prever}%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -63,6 +63,7 @@ Patch29: cups-enum-all.patch
Patch30: cups-stringpool-setprinterattr.patch Patch30: cups-stringpool-setprinterattr.patch
Patch31: cups-dymo-deviceid.patch Patch31: cups-dymo-deviceid.patch
Patch32: cups-freebind.patch Patch32: cups-freebind.patch
Patch33: cups-no-gcry.patch
Patch100: cups-lspp.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 %patch31 -p1 -b .dymo-deviceid
# Use IP_FREEBIND socket option when binding listening sockets (bug #970809). # Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
%patch32 -p1 -b .freebind %patch32 -p1 -b .freebind
# Don't link against libgcrypt needlessly.
%patch33 -p1 -b .no-gcry
%if %lspp %if %lspp
# LSPP support. # LSPP support.
@ -629,6 +632,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %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 * 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 - Remove scriptlet for migrating to a systemd unit from a SysV initscript