diff options
| author | Britney Fransen <brfransen@gmail.com> | 2016-01-23 16:13:38 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2016-01-23 16:13:38 (GMT) |
| commit | e2df288ce539e205c31b45b0570e03abeaf4b6e4 (patch) | |
| tree | 2cfcc2d18ebd322cf4c1e874fe60a86a87f3c1b1 /abs/extra/cups/cups-no-gcrypt.patch | |
| parent | 19e92e88ccb220ad8f5277322036c5aa6a5e8bf7 (diff) | |
| download | linhes_pkgbuild-e2df288ce539e205c31b45b0570e03abeaf4b6e4.zip linhes_pkgbuild-e2df288ce539e205c31b45b0570e03abeaf4b6e4.tar.gz linhes_pkgbuild-e2df288ce539e205c31b45b0570e03abeaf4b6e4.tar.bz2 | |
cups: update to 2.1.2
Diffstat (limited to 'abs/extra/cups/cups-no-gcrypt.patch')
| -rw-r--r-- | abs/extra/cups/cups-no-gcrypt.patch | 41 |
1 files changed, 6 insertions, 35 deletions
diff --git a/abs/extra/cups/cups-no-gcrypt.patch b/abs/extra/cups/cups-no-gcrypt.patch index 4eaff67..0cd64b1 100644 --- a/abs/extra/cups/cups-no-gcrypt.patch +++ b/abs/extra/cups/cups-no-gcrypt.patch @@ -1,40 +1,11 @@ -diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4 ---- cups-1.5.0.orig//config-scripts/cups-ssl.m4 2011-01-11 08:05:58.000000000 +0100 -+++ cups-1.5.0/config-scripts/cups-ssl.m4 2011-08-02 10:44:26.011047900 +0200 -@@ -96,7 +96,6 @@ +diff -up cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry cups-2.0rc1/config-scripts/cups-ssl.m4 +--- cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry 2014-09-12 15:41:23.324760213 +0200 ++++ cups-2.0rc1/config-scripts/cups-ssl.m4 2014-09-12 15:43:13.124203363 +0200 +@@ -60,7 +60,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) + AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config) +- AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config) if $PKGCONFIG --exists gnutls; then have_ssl=1 SSLLIBS=`$PKGCONFIG --libs gnutls` -@@ -108,18 +107,6 @@ - AC_DEFINE(HAVE_GNUTLS) - fi - -- 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 - - dnl Check for the OpenSSL library last... ---- cups-1.5.0.orig//cups/http-private.h 2011-01-22 01:07:22.000000000 +0100 -+++ cups-1.5.0/cups/http-private.h 2011-08-02 10:42:43.341604107 +0200 -@@ -93,7 +93,6 @@ - # 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> |