diff options
| author | tonnerre <tonnerre> | 2008-09-27 23:11:36 +0000 |
|---|---|---|
| committer | tonnerre <tonnerre> | 2008-09-27 23:11:36 +0000 |
| commit | df6055568237d88e3a88d53ae87e1ec154c6e55c (patch) | |
| tree | 2d3a8677dbbca268e708edbc8781382f22546561 /security | |
| parent | 05bffd113bf280cd4439d88bc1af5b725663d42a (diff) | |
| download | pkgsrc-df6055568237d88e3a88d53ae87e1ec154c6e55c.tar.gz | |
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 (limited to 'security')
| -rw-r--r-- | security/gnutls/Makefile | 3 | ||||
| -rw-r--r-- | security/gnutls/distinfo | 4 | ||||
| -rw-r--r-- | security/gnutls/patches/patch-ac | 13 | ||||
| -rw-r--r-- | security/gnutls/patches/patch-ad | 17 |
4 files changed, 35 insertions, 2 deletions
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 54dd0c2b58a..826655832d6 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -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 --git a/security/gnutls/distinfo b/security/gnutls/distinfo index 8b1d1e851c5..3d3a28f078d 100644 --- a/security/gnutls/distinfo +++ b/security/gnutls/distinfo @@ -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 --git a/security/gnutls/patches/patch-ac b/security/gnutls/patches/patch-ac new file mode 100644 index 00000000000..b72caebd8cd --- /dev/null +++ b/security/gnutls/patches/patch-ac @@ -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 --git a/security/gnutls/patches/patch-ad b/security/gnutls/patches/patch-ad new file mode 100644 index 00000000000..69fc367090f --- /dev/null +++ b/security/gnutls/patches/patch-ad @@ -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_ */ |