pkg/39640: gnutls exports strverscmp(), breaking various builds

[tonnerre%NetBSD.org@localhost]

>Number:         39640
>Category:       pkg
>Synopsis:       gnutls exports strverscmp(), breaking various builds
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Sep 27 23:05:00 +0000 2008
>Originator:     Tonnerre Lombard
>Release:        NetBSD 4.0_wrstuden_fixsa_t1
>Organization:
The NetBSD Foundation
>Environment:
System: NetBSD planck.pas-un-geek-en-tant-que-tel.ch 4.0_wrstuden_fixsa_t1 
NetBSD 4.0_wrstuden_fixsa_t1 (GENERIC) #0: Thu Jun 19 18:34:41 CEST 2008 
tonnerre%planck.pas-un-geek-en-tant-que-tel.ch@localhost:/usr/fixsasrc/sys/arch/amd64/compile/obj/GENERIC
 amd64
Architecture: x86_64
Machine: amd64
>Description:
        Trying to link against libgnutls/libcurl/... and trying to use
        strverscmp at the same time can lead to various funny problems.
        The reason for this is that libgnutls exports strverscmp().
>How-To-Repeat:
        $ nm -a /usr/pkg/lib/libgnutls.so.26.4.5 | grep strverscmp
        0000000000055280 T strverscmp
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/gnutls/Makefile,v
retrieving revision 1.71
diff -u -u -r1.71 Makefile
--- Makefile    30 Jul 2008 17:17:21 -0000      1.71
+++ Makefile    27 Sep 2008 23:01:13 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.71 2008/07/30 17:17:21 kefren Exp $
 
 DISTNAME=      gnutls-2.4.1
+PKGREVISION=   1
 CATEGORIES=    security devel
 MASTER_SITES=  http://josefsson.org/gnutls/releases/ \
                ftp://ftp.gnutls.org/pub/gnutls/ \
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/gnutls/distinfo,v
retrieving revision 1.45
diff -u -u -r1.45 distinfo
--- distinfo    30 Jul 2008 17:17:21 -0000      1.45
+++ distinfo    27 Sep 2008 23:01:13 -0000
@@ -5,5 +5,7 @@
 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
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ac    27 Sep 2008 23:01:13 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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;
Index: patches/patch-ad
===================================================================
RCS file: patches/patch-ad
diff -N patches/patch-ad
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ad    27 Sep 2008 23:01:13 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- 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_ */