disable the openssl compatibility library -- no pkg I know of needs

it, and it only has a potential to conflict with the real openssl
(bad things will happen if a program links or dlopen()s both)
bump PKGREVISION
(the bug fixed in the added patches is already fixed upstream, will
be in the next release)

5 files changed, 35 insertions, 5 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index ba5aa1d0573..45ad5eb3c18 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2009/07/18 10:32:32 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2009/07/22 16:50:07 drochner Exp $
 
 DISTNAME=	gnutls-2.8.1
+PKGREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	ftp://ftp.gnutls.org/pub/gnutls/ \
 		ftp://ftp.gnupg.org/gcrypt/gnutls/ \
@@ -23,6 +24,9 @@ GNU_CONFIGURE=		yes
 TEST_TARGET=		check
 INFO_FILES=		yes
 
+# this library duplicates (and conflicts with) openssl
+CONFIGURE_ARGS+=	--disable-openssl-compatibility
+
 PKGCONFIG_OVERRIDE=	lib/gnutls.pc.in
 PKGCONFIG_OVERRIDE+=	libextra/gnutls-extra.pc.in
 
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 743c41af0d2..c2f0457f269 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2009/06/14 18:13:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.36 2009/07/22 16:50:07 drochner Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
@@ -11,7 +11,6 @@ include/gnutls/extra.h
 include/gnutls/gnutls.h
 include/gnutls/gnutlsxx.h
 include/gnutls/openpgp.h
-include/gnutls/openssl.h
 include/gnutls/pkcs12.h
 include/gnutls/x509.h
 info/gnutls-certificate-user-use-case.png
@@ -28,7 +27,6 @@ info/gnutls-pgp.png
 info/gnutls-x509.png
 info/gnutls.info
 lib/libgnutls-extra.la
-lib/libgnutls-openssl.la
 lib/libgnutls.la
 lib/libgnutlsxx.la
 lib/pkgconfig/gnutls-extra.pc
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 3a19669caa1..daba33c147b 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2009/07/18 10:32:32 wiz Exp $
+$NetBSD: distinfo,v 1.59 2009/07/22 16:50:07 drochner Exp $
 
 SHA1 (gnutls-2.8.1.tar.bz2) = b5fd364848709393d05def7e926caddd27169525
 RMD160 (gnutls-2.8.1.tar.bz2) = 3b0d7a80a60dfc3222357d2c83a7ec32bd2c8e33
@@ -8,3 +8,5 @@ SHA1 (patch-ae) = f505476ce0477dc547e8698d205d6ba26fe85f48
 SHA1 (patch-af) = bd4701640dfef5bfdce87d620befd93098b0dff3
 SHA1 (patch-ai) = 2c5c181ec6de9622cac66c2d5fe2cc8f3f89fbe8
 SHA1 (patch-aj) = 55187c2a07d67f789678b1a404c6b119b311fc82
+SHA1 (patch-ak) = ba01d607e6fad2108aed0ba2ef4a7c1168b42048
+SHA1 (patch-al) = 5b2e6bab1bc91b6e508915b984dcfa4e6030a8a6
diff --git a/security/gnutls/patches/patch-ak b/security/gnutls/patches/patch-ak
new file mode 100644
index 00000000000..55e9d6e9a28
--- /dev/null
+++ b/security/gnutls/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2009/07/22 16:50:07 drochner Exp $
+
+--- configure.orig	2009-06-17 20:42:30.000000000 +0200
++++ configure
+@@ -8587,7 +8587,7 @@ $as_echo "#define GNUTLS_POINTER_TO_INT_
+ $as_echo_n "checking whether to disable OpenSSL compatibility layer... " >&6; }
+   # Check whether --enable-openssl-compatibility was given.
+ if test "${enable_openssl_compatibility+set}" = set; then
+-  enableval=$enable_openssl_compatibility; enable_openssl=$withval
++  enableval=$enable_openssl_compatibility; enable_openssl=$enableval
+ else
+   enable_openssl=yes
+ fi
diff --git a/security/gnutls/patches/patch-al b/security/gnutls/patches/patch-al
new file mode 100644
index 00000000000..490289a133b
--- /dev/null
+++ b/security/gnutls/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2009/07/22 16:50:07 drochner Exp $
+
+--- libextra/configure.orig	2009-06-17 20:47:38.000000000 +0200
++++ libextra/configure
+@@ -12996,7 +12996,7 @@ $as_echo "#define GNUTLS_POINTER_TO_INT_
+ $as_echo_n "checking whether to disable OpenSSL compatibility layer... " >&6; }
+   # Check whether --enable-openssl-compatibility was given.
+ if test "${enable_openssl_compatibility+set}" = set; then
+-  enableval=$enable_openssl_compatibility; enable_openssl=$withval
++  enableval=$enable_openssl_compatibility; enable_openssl=$enableval
+ else
+   enable_openssl=yes
+ fi