[cups/f12/master] Force the use of gnutls despite thread-safety concerns (bug #607159).

[Tim Waugh]

commit b2a234f5b23e437d98df439555f95d1dc2e63ada
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Sep 15 15:57:45 2010 +0100

    Force the use of gnutls despite thread-safety concerns (bug #607159).

 cups-force-gnutls.patch |   89 +++++++++++++++++++++++++++++++++++++++++++++++
 cups.spec               |    4 ++
 2 files changed, 93 insertions(+), 0 deletions(-)
---
diff --git a/cups-force-gnutls.patch b/cups-force-gnutls.patch
new file mode 100644
index 0000000..85adaa8
--- /dev/null
+++ b/cups-force-gnutls.patch
@@ -0,0 +1,89 @@
+diff -up cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls cups-1.4.4/config-scripts/cups-ssl.m4
+--- cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls	2010-09-15 16:49:22.343502552 +0100
++++ cups-1.4.4/config-scripts/cups-ssl.m4	2010-09-15 16:49:42.347502595 +0100
+@@ -65,23 +65,21 @@ if test x$enable_ssl != xno; then
+ 	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.])
+-	    else
+-	        have_ssl=1
+-	        SSLLIBS=`$PKGCONFIG --libs gnutls`
+-	        SSLFLAGS=`$PKGCONFIG --cflags gnutls`
+-	        AC_DEFINE(HAVE_SSL)
+-	        AC_DEFINE(HAVE_GNUTLS)
+ 	    fi
++	    have_ssl=1
++	    SSLLIBS=`$PKGCONFIG --libs gnutls`
++	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
++	    AC_DEFINE(HAVE_SSL)
++	    AC_DEFINE(HAVE_GNUTLS)
+ 	elif test "x$LIBGNUTLSCONFIG" != x; then
+ 	    if test "x$have_pthread" = xyes; then
+ 		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
+-	    else
+-	        have_ssl=1
+-	        SSLLIBS=`$LIBGNUTLSCONFIG --libs`
+-	        SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
+-	        AC_DEFINE(HAVE_SSL)
+-	        AC_DEFINE(HAVE_GNUTLS)
+ 	    fi
++	    have_ssl=1
++	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
++	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
++	    AC_DEFINE(HAVE_SSL)
++	    AC_DEFINE(HAVE_GNUTLS)
+ 	fi
+ 
+ 	if test $have_ssl = 1; then
+diff -up cups-1.4.4/configure.force-gnutls cups-1.4.4/configure
+--- cups-1.4.4/configure.force-gnutls	2010-06-17 19:25:47.000000000 +0100
++++ cups-1.4.4/configure	2010-09-15 16:50:01.689503165 +0100
+@@ -17542,36 +17542,34 @@ fi
+ 	    if test "x$have_pthread" = xyes; then
+ 		{ echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5
+ echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;}
+-	    else
+-	        have_ssl=1
+-	        SSLLIBS=`$PKGCONFIG --libs gnutls`
+-	        SSLFLAGS=`$PKGCONFIG --cflags gnutls`
+-	        cat >>confdefs.h <<\_ACEOF
++	    fi
++	    have_ssl=1
++	    SSLLIBS=`$PKGCONFIG --libs gnutls`
++	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
++	    cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SSL 1
+ _ACEOF
+ 
+-	        cat >>confdefs.h <<\_ACEOF
++	    cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GNUTLS 1
+ _ACEOF
+ 
+-	    fi
+ 	elif test "x$LIBGNUTLSCONFIG" != x; then
+ 	    if test "x$have_pthread" = xyes; then
+ 		{ echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5
+ echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;}
+-	    else
+-	        have_ssl=1
+-	        SSLLIBS=`$LIBGNUTLSCONFIG --libs`
+-	        SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
+-	        cat >>confdefs.h <<\_ACEOF
++	    fi
++	    have_ssl=1
++	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
++	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
++	    cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SSL 1
+ _ACEOF
+ 
+-	        cat >>confdefs.h <<\_ACEOF
++	    cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GNUTLS 1
+ _ACEOF
+ 
+-	    fi
+ 	fi
+ 
+ 	if test $have_ssl = 1; then
diff --git a/cups.spec b/cups.spec
index 39ad9dd..304ee31 100644
--- a/cups.spec
+++ b/cups.spec
@@ -59,6 +59,7 @@ Patch22: cups-uri-compat.patch
 Patch23: cups-cups-get-classes.patch
 Patch24: cups-avahi.patch
 Patch25: cups-str3382.patch
+Patch26: cups-force-gnutls.patch
 Patch29: cups-0755.patch
 Patch30: cups-EAI_AGAIN.patch
 Patch31: cups-hostnamelookups.patch
@@ -253,6 +254,8 @@ module.
 %patch24 -p1 -b .avahi
 # Fix temporary filename creation.
 %patch25 -p1 -b .str3382
+# Force the use of gnutls despite thread-safety concerns (bug #607159).
+%patch26 -p1 -b .force-gnutls
 # Use mode 0755 for binaries and libraries where appropriate.
 %patch29 -p1 -b .0755
 # Re-initialise the resolver on failure in httpAddrLookup().
@@ -580,6 +583,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Sep 15 2010 Tim Waugh <twaugh at redhat.com>
 - Build with --enable-threads again (bug #607159).
+- Force the use of gnutls despite thread-safety concerns (bug #607159).
 
 * Wed Sep 15 2010 Tim Waugh <twaugh at redhat.com>
 - Fixed serverbin-compat patch to avoid misleading "filter not