[arch-commits] Commit in cups/trunk (PKGBUILD cups-no-gcrypt.patch)

[Jan de Groot]

    Date: Tuesday, August 2, 2011 @ 05:11:04
  Author: jgc
Revision: 134142

Add patch to drop libgcrypt dependency, GNUTLS does not use it anymore

Added:
  cups/trunk/cups-no-gcrypt.patch
Modified:
  cups/trunk/PKGBUILD

----------------------+
 PKGBUILD             |    6 +++++-
 cups-no-gcrypt.patch |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-02 08:56:57 UTC (rev 134141)
+++ PKGBUILD	2011-08-02 09:11:04 UTC (rev 134142)
@@ -4,7 +4,7 @@
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.4.7
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -13,11 +13,13 @@
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
 	cups-avahi.patch
         cups-no-export-ssllibs.patch
+        cups-no-gcrypt.patch
         cups cups.logrotate cups.pam)
 #options=('!emptydirs')
 md5sums=('1590033ab4c739b859aeb672fe849089'
          '8ebd390197501ffd709f0ee546937fd5'
          '9b8467a1e51d360096b70e2c3c081e6c'
+         'c9ede95cfc8e76571bd8156f0a573e3b'
          '9657daa21760bb0b5fa3d8b51d5e01a1'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17')
@@ -31,6 +33,8 @@
 
   # Do not export SSL libs in cups-config
   patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
+
+  patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
   
   # Rebuild configure script for --enable-avahi.
   aclocal -I config-scripts

Added: cups-no-gcrypt.patch
===================================================================
--- cups-no-gcrypt.patch	                        (rev 0)
+++ cups-no-gcrypt.patch	2011-08-02 09:11:04 UTC (rev 134142)
@@ -0,0 +1,39 @@
+diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4
+--- cups-1.4.7.orig//config-scripts/cups-ssl.m4	2011-01-11 08:05:58.000000000 +0100
++++ cups-1.4.7/config-scripts/cups-ssl.m4	2011-08-02 10:44:26.011047900 +0200
+@@ -74,7 +74,6 @@
+     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
+ 	    if test "x$have_pthread" = xyes; then
+ 		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
+@@ -96,16 +95,6 @@
+ 	        AC_DEFINE(HAVE_GNUTLS)
+ 	    fi
+ 	fi
+-
+-	if test $have_ssl = 1; then
+-            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...
+diff -ruN cups-1.4.7.orig//cups/http-private.h cups-1.4.7/cups/http-private.h
+--- cups-1.4.7.orig//cups/http-private.h	2011-01-22 01:07:22.000000000 +0100
++++ cups-1.4.7/cups/http-private.h	2011-08-02 10:42:43.341604107 +0200
+@@ -98,7 +98,6 @@
+  * The GNU TLS library is more of a "bare metal" SSL/TLS library...
+  */
+ #    include <gnutls/gnutls.h>
+-#    include <gcrypt.h>
+ 
+ typedef struct
+ {