summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Gurr <tgurr@gentoo.org>2009-05-29 00:46:07 +0000
committerTimo Gurr <tgurr@gentoo.org>2009-05-29 00:46:07 +0000
commitee14fa7e718eb728b2fd982fecb96a197348b2fe (patch)
treed47c1696b83bc2c4bb641d0c97ab25594557cdb6 /net-print/cups/files
parentKeyword ~amd64. (diff)
downloadgentoo-2-ee14fa7e718eb728b2fd982fecb96a197348b2fe.tar.gz
gentoo-2-ee14fa7e718eb728b2fd982fecb96a197348b2fe.tar.bz2
gentoo-2-ee14fa7e718eb728b2fd982fecb96a197348b2fe.zip
Revision bump, fixing the detection of newer libgnutls versions, bug #253717. Thanks Daniel Black for the patch.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'net-print/cups/files')
-rw-r--r--net-print/cups/files/cups-1.3.10-str3178.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/net-print/cups/files/cups-1.3.10-str3178.patch b/net-print/cups/files/cups-1.3.10-str3178.patch
new file mode 100644
index 000000000000..5336e23c802c
--- /dev/null
+++ b/net-print/cups/files/cups-1.3.10-str3178.patch
@@ -0,0 +1,19 @@
+diff -Naur cups-1.3.10/config-scripts/cups-ssl.m4 cups-1.3.10.new/config-scripts/cups-ssl.m4
+--- cups-1.3.10/config-scripts/cups-ssl.m4 2007-07-11 23:46:42.000000000 +0200
++++ cups-1.3.10.new/config-scripts/cups-ssl.m4 2009-05-29 02:38:27.444267250 +0200
+@@ -64,11 +64,11 @@
+ fi
+
+ dnl Then look for GNU TLS...
+- if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno"; then
++ if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno" -a "x$PKGCONFIG" != x; then
+ AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
+- if test "x$LIBGNUTLSCONFIG" != x; then
+- SSLLIBS=`$LIBGNUTLSCONFIG --libs`
+- SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
++ if $PKGCONFIG --exists gnutls; then
++ SSLLIBS=`$PKGCONFIG --libs gnutls`
++ SSLFLAGS=`$PKGCONFIG --cflags gnutls`
+ ENCRYPTION_REQUIRED=" Encryption Required"
+ AC_DEFINE(HAVE_SSL)
+ AC_DEFINE(HAVE_GNUTLS)