Maintenance update to gnutls-2.12.5.

This commit is contained in:
ajacoutot 2011-05-17 19:08:08 +00:00
parent 117a42bba5
commit b5d6ad6a2e
4 changed files with 11 additions and 27 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.36 2011/05/04 15:48:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.37 2011/05/17 19:08:08 ajacoutot Exp $
COMMENT= GNU Transport Layer Security library
DISTNAME= gnutls-2.12.3
DISTNAME= gnutls-2.12.5
CATEGORIES= security
SHARED_LIBS += gnutls 17.0 # 44.10

View File

@ -1,5 +1,5 @@
MD5 (gnutls-2.12.3.tar.bz2) = BLcrAitCsQ3xLLuuBR4tVQ==
RMD160 (gnutls-2.12.3.tar.bz2) = 9AWpcd8eN3Pya4VAKLEXJ7KBYrY=
SHA1 (gnutls-2.12.3.tar.bz2) = F5m96ms3PjErBV+nyvBu/+y5wDM=
SHA256 (gnutls-2.12.3.tar.bz2) = n7PboQ0/psKBfNRyYLTDkCbGkSj7OfxQJvF5s2clOdM=
SIZE (gnutls-2.12.3.tar.bz2) = 7021290
MD5 (gnutls-2.12.5.tar.bz2) = LQvVrhFTQHT8142m6jhOZA==
RMD160 (gnutls-2.12.5.tar.bz2) = 0qqDg4De4i1y3+Fq6bCy5sYOCGI=
SHA1 (gnutls-2.12.5.tar.bz2) = 3UXU+3w2XRiAO56v74OLMQyJnWc=
SHA256 (gnutls-2.12.5.tar.bz2) = vyY4gPMnrDSlYdjma1pynL4z7qVnKL/tNAb/KJhEi2A=
SIZE (gnutls-2.12.5.tar.bz2) = 7150708

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-lib_gnutls_pc_in,v 1.1 2011/04/15 16:09:39 ajacoutot Exp $
$OpenBSD: patch-lib_gnutls_pc_in,v 1.2 2011/05/17 19:08:08 ajacoutot Exp $
-pthread is needed to link with gnutls.
--- lib/gnutls.pc.in.orig Thu Apr 14 17:44:51 2011
+++ lib/gnutls.pc.in Thu Apr 14 17:45:19 2011
--- lib/gnutls.pc.in.orig Sat Apr 23 17:00:07 2011
+++ lib/gnutls.pc.in Tue May 17 20:54:01 2011
@@ -19,7 +19,7 @@ Name: GnuTLS
Description: Transport Security Layer implementation for the GNU system
URL: http://www.gnu.org/software/gnutls/
Version: @VERSION@
-Libs: -L${libdir} -lgnutls
+Libs: -L${libdir} -lgnutls -pthread
Libs.private: @LTLIBPAKCHOIS@ @LTLIBGCRYPT@ @NETTLE_LIBS@
Libs.private: @LTLIBGCRYPT@ @NETTLE_LIBS@
@GNUTLS_REQUIRES_PRIVATE@
-Cflags: -I${includedir}
+Cflags: -I${includedir} -pthread

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_common_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
MIN is already defined in sys/param.h.
--- src/common.c.orig Wed May 4 17:34:54 2011
+++ src/common.c Wed May 4 17:35:27 2011
@@ -41,6 +41,9 @@
#include <gnutls/pkcs11.h>
#define SU(x) (x!=NULL?x:"Unknown")
+#ifdef MIN
+#undef MIN
+#endif
#define MIN(x,y) ((x)<(y))?(x):(y)
int print_cert;