[pkgsrc/trunk]: pkgsrc/security/gnutls If strverscmp() is not present, gnutls...

[tonnerre <tonnerre%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9830e6c6975b
branches:  trunk
changeset: 547688:9830e6c6975b
user:      tonnerre <tonnerre%pkgsrc.org@localhost>
date:      Sat Sep 27 23:11:36 2008 +0000

description:
If strverscmp() is not present, gnutls shouldn't export a symbol of the
same name, breaking the builds of libraries trying to both link against
libcurl and use strverscmp(). Bump PKGREVISION.

Fixes PR 39640.

diffstat:

 security/gnutls/Makefile         |   3 ++-
 security/gnutls/distinfo         |   4 +++-
 security/gnutls/patches/patch-ac |  13 +++++++++++++
 security/gnutls/patches/patch-ad |  17 +++++++++++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)

diffs (66 lines):

diff -r 1b4b0ec9e00c -r 9830e6c6975b security/gnutls/Makefile
--- a/security/gnutls/Makefile  Sat Sep 27 22:33:20 2008 +0000
+++ b/security/gnutls/Makefile  Sat Sep 27 23:11:36 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2008/07/30 17:17:21 kefren Exp $
+# $NetBSD: Makefile,v 1.72 2008/09/27 23:11:36 tonnerre Exp $
 
 DISTNAME=      gnutls-2.4.1
+PKGREVISION=   1
 CATEGORIES=    security devel
 MASTER_SITES=  http://josefsson.org/gnutls/releases/ \
                ftp://ftp.gnutls.org/pub/gnutls/ \
diff -r 1b4b0ec9e00c -r 9830e6c6975b security/gnutls/distinfo
--- a/security/gnutls/distinfo  Sat Sep 27 22:33:20 2008 +0000
+++ b/security/gnutls/distinfo  Sat Sep 27 23:11:36 2008 +0000
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.45 2008/07/30 17:17:21 kefren Exp $
+$NetBSD: distinfo,v 1.46 2008/09/27 23:11:37 tonnerre Exp $
 
 SHA1 (gnutls-2.4.1.tar.bz2) = 7a439542e6344d5ccf11a29431a0600e7fe1c735
 RMD160 (gnutls-2.4.1.tar.bz2) = 4e21a82047add916b8ccce8aa82c36b2c9bcff90
 Size (gnutls-2.4.1.tar.bz2) = 4940118 bytes
 SHA1 (patch-aa) = b2024cb515196e64efcdbba227f05db9eb07c236
 SHA1 (patch-ab) = d30748128877d2ec5942d2b852f23a05d36102d0
+SHA1 (patch-ac) = 21f2ab373a888aadeb66d58b70e54bab4c3be7eb
+SHA1 (patch-ad) = 720d096d95a4d76aedaa13606ad4bee7872da5b0
 SHA1 (patch-ae) = f505476ce0477dc547e8698d205d6ba26fe85f48
 SHA1 (patch-af) = bd4701640dfef5bfdce87d620befd93098b0dff3
diff -r 1b4b0ec9e00c -r 9830e6c6975b security/gnutls/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnutls/patches/patch-ac  Sat Sep 27 23:11:36 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.7 2008/09/27 23:11:37 tonnerre Exp $
+
+--- lgl/strverscmp.c.orig      2008-06-19 12:00:10.000000000 +0200
++++ lgl/strverscmp.c
+@@ -58,7 +58,7 @@
+ */
+ 
+ int
+-__strverscmp (const char *s1, const char *s2)
++gnutls_strverscmp (const char *s1, const char *s2)
+ {
+   const unsigned char *p1 = (const unsigned char *) s1;
+   const unsigned char *p2 = (const unsigned char *) s2;
diff -r 1b4b0ec9e00c -r 9830e6c6975b security/gnutls/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnutls/patches/patch-ad  Sat Sep 27 23:11:36 2008 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.4 2008/09/27 23:11:37 tonnerre Exp $
+
+--- lgl/strverscmp.h.orig      2008-06-19 12:00:10.000000000 +0200
++++ lgl/strverscmp.h
+@@ -19,6 +19,12 @@
+ #ifndef STRVERSCMP_H_
+ # define STRVERSCMP_H_
+ 
++#ifdef HAVE_STRVERSCMP
+ int strverscmp (const char *, const char *);
++#else
++int gnutls_strverscmp (const char *, const char *);
++#define __strverscmp gnutls_strverscmp
++#define strverscmp gnutls_strverscmp
++#endif
+ 
+ #endif /* not STRVERSCMP_H_ */