From 61cb603b67ffc0bf3aff47a54cb8f420ebc35820 Mon Sep 17 00:00:00 2001 From: khorben Date: Fri, 5 Dec 2014 12:25:42 +0000 Subject: [PATCH] Packaged gnutls 3.2.19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Version 3.2.19 (released 2014-10-13) ** libgnutls: Fixes in the transparent import of PKCS #11 certificates. Reported by Joseph Peruski. ** libgnutls: Fixed issue with unexpected non-fatal errors resetting the handshake's hash buffer, in applications using the heartbeat extension or DTLS. Reported by Joeri de Ruiter. ** libgnutls: fix issue in DTLS retransmission when session tickets were in use; reported by Manuel Pégourié-Gonnard. ** libgnutls: Prevent abort() in library if getrusage() fails. Try to detect instead which of RUSAGE_THREAD and RUSAGE_SELF would work. ** guile: new 'set-session-server-name!' procedure; see the manual for details. ** API and ABI modifications: No changes since last version. --- security/gnutls/Makefile | 6 +++--- security/gnutls/distinfo | 18 ++++++++--------- security/gnutls/patches/patch-gl_stdio.in.h | 10 +++++----- security/gnutls/patches/patch-lib_Makefile.in | 8 ++++---- .../gnutls/patches/patch-lib_nettle_rnd.c | 20 +++++++++---------- .../gnutls/patches/patch-tests_Makefile.in | 6 +++--- .../patch-tests_openpgp-certs_Makefile.in | 6 +++--- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 8bdc0a43860cd..14e63968ccc72 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.149 2014/10/10 11:40:15 adam Exp $ +# $NetBSD: Makefile,v 1.150 2014/12/05 12:25:42 khorben Exp $ -DISTNAME= gnutls-3.2.18 +DISTNAME= gnutls-3.2.19 CATEGORIES= security devel MASTER_SITES= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/ EXTRACT_SUFX= .tar.xz @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1 USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake perl pkg-config +USE_TOOLS+= gmake gsed perl pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-p11-kit # this library duplicates (and conflicts with) openssl diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo index 110fd80be1414..806b27f97333b 100644 --- a/security/gnutls/distinfo +++ b/security/gnutls/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.108 2014/10/10 11:40:15 adam Exp $ +$NetBSD: distinfo,v 1.109 2014/12/05 12:25:42 khorben Exp $ -SHA1 (gnutls-3.2.18.tar.xz) = 3351c72658c974ad5e61ffde98caef0ae7e184e3 -RMD160 (gnutls-3.2.18.tar.xz) = 6d005a71443261b39cd862f3cf0e54afb80ce6ed -Size (gnutls-3.2.18.tar.xz) = 5154476 bytes +SHA1 (gnutls-3.2.19.tar.xz) = 1dfbbfa2bcf0a62a1dbbc63825b6fc2cc8e13c80 +RMD160 (gnutls-3.2.19.tar.xz) = 9b6010acd2f9c9ec58d09a76b2895dc64c6974ea +Size (gnutls-3.2.19.tar.xz) = 5160012 bytes SHA1 (patch-ae) = b6402cc4a03f1b32792191518ed0c5596eb91c07 -SHA1 (patch-gl_stdio.in.h) = b5802da2cccddd6fab73bd39c49f7d62bef58464 -SHA1 (patch-lib_Makefile.in) = d395121b1b640aed76aff8033106c978e7ec4ce7 -SHA1 (patch-lib_nettle_rnd.c) = e3a35d2b492cbb719c178c90fa87861dfa828ce7 +SHA1 (patch-gl_stdio.in.h) = cad0685b77a1abb74ac578695ceb5c1c74479a87 +SHA1 (patch-lib_Makefile.in) = a75aa7bf9d493fae93b02d0ffdc82f538cc85737 +SHA1 (patch-lib_nettle_rnd.c) = 8e27ae5b7aacc791b71fa767edac9ba9ef67c7e3 SHA1 (patch-src_libopts_autoopts_options.h) = 60be5b43f23ba5978759c1e245781da7f9125071 SHA1 (patch-src_libopts_compat_compat.h) = 2e0a1be460917b2d7a8f6bdac698dad405143013 SHA1 (patch-src_libopts_makeshell.c) = c94e717027d078a081acd10eaec51a44dc4d42e1 SHA1 (patch-src_libopts_proto.h) = 9749cc4bd080e1a8d800bde181143acb9c340ec8 -SHA1 (patch-tests_Makefile.in) = 43e3f23665f2ccc71413e830e7f6f1c8850a518a -SHA1 (patch-tests_openpgp-certs_Makefile.in) = 6eda841bb9a33215865d751707c67f253b4e04cf +SHA1 (patch-tests_Makefile.in) = 0c2e37c632686301855cf6d0ed09583e797ae4e3 +SHA1 (patch-tests_openpgp-certs_Makefile.in) = 8d3a7e7e4fb063465e0fbdfae22a7bf579529b0c diff --git a/security/gnutls/patches/patch-gl_stdio.in.h b/security/gnutls/patches/patch-gl_stdio.in.h index c155ed4c8f04e..b89d2261379a6 100644 --- a/security/gnutls/patches/patch-gl_stdio.in.h +++ b/security/gnutls/patches/patch-gl_stdio.in.h @@ -1,10 +1,10 @@ -$NetBSD: patch-gl_stdio.in.h,v 1.1 2012/08/02 09:37:32 jperkin Exp $ +$NetBSD: patch-gl_stdio.in.h,v 1.2 2014/12/05 12:25:42 khorben Exp $ Avoid conflict between gets() and std::gets() ---- gl/stdio.in.h.orig Thu Aug 2 09:29:29 2012 -+++ gl/stdio.in.h Thu Aug 2 09:30:17 2012 -@@ -699,6 +699,7 @@ +--- gl/stdio.in.h.orig 2014-04-18 17:03:19.000000000 +0000 ++++ gl/stdio.in.h +@@ -714,6 +714,7 @@ _GL_WARN_ON_USE (getline, "getline is un # endif #endif @@ -12,7 +12,7 @@ Avoid conflict between gets() and std::gets() /* It is very rare that the developer ever has full control of stdin, so any use of gets warrants an unconditional warning; besides, C11 removed it. */ -@@ -706,6 +707,7 @@ +@@ -721,6 +722,7 @@ _GL_WARN_ON_USE (getline, "getline is un #if HAVE_RAW_DECL_GETS _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); #endif diff --git a/security/gnutls/patches/patch-lib_Makefile.in b/security/gnutls/patches/patch-lib_Makefile.in index 158edfc512e2d..236f21399194d 100644 --- a/security/gnutls/patches/patch-lib_Makefile.in +++ b/security/gnutls/patches/patch-lib_Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-lib_Makefile.in,v 1.5 2014/02/10 12:01:20 tron Exp $ +$NetBSD: patch-lib_Makefile.in,v 1.6 2014/12/05 12:25:42 khorben Exp $ Correct path to locale files. ---- lib/Makefile.in.orig 2013-11-23 10:09:55.000000000 +0000 +--- lib/Makefile.in.orig 2014-10-13 03:56:59.000000000 +0000 +++ lib/Makefile.in -@@ -362,7 +362,7 @@ am_libgnutls_la_OBJECTS = $(am__objects_ +@@ -367,7 +367,7 @@ am_libgnutls_la_OBJECTS = $(am__objects_ libgnutls_la_OBJECTS = $(am_libgnutls_la_OBJECTS) libgnutls_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -13,7 +13,7 @@ Correct path to locale files. @ENABLE_CXX_TRUE@libgnutlsxx_la_DEPENDENCIES = libgnutls.la am__libgnutlsxx_la_SOURCES_DIST = gnutlsxx.cpp @ENABLE_CXX_TRUE@am_libgnutlsxx_la_OBJECTS = \ -@@ -1445,7 +1445,7 @@ infodir = @infodir@ +@@ -1454,7 +1454,7 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ diff --git a/security/gnutls/patches/patch-lib_nettle_rnd.c b/security/gnutls/patches/patch-lib_nettle_rnd.c index 3e30deb2f623b..eff48234c978d 100644 --- a/security/gnutls/patches/patch-lib_nettle_rnd.c +++ b/security/gnutls/patches/patch-lib_nettle_rnd.c @@ -1,20 +1,20 @@ -$NetBSD: patch-lib_nettle_rnd.c,v 1.2 2014/02/14 17:24:27 drochner Exp $ +$NetBSD: patch-lib_nettle_rnd.c,v 1.3 2014/12/05 12:25:42 khorben Exp $ http://lists.gnupg.org/pipermail/gnutls-devel/2013-November/006588.html ---- lib/nettle/rnd.c.orig 2014-01-27 18:27:10.000000000 +0000 +--- lib/nettle/rnd.c.orig 2014-10-11 17:43:54.000000000 +0000 +++ lib/nettle/rnd.c -@@ -97,8 +97,7 @@ static void _rnd_get_event(struct event_ - # else - if (getrusage(RUSAGE_SELF, &e->rusage) < 0) { - # endif -- _gnutls_debug_log("getrusage failed: %s\n", +@@ -104,8 +104,7 @@ static void _rnd_get_event(struct event_ + #ifdef HAVE_GETRUSAGE + if (rusage_arg != -1) { + if (getrusage(rusage_arg, &e->rusage) < 0) { +- _gnutls_debug_log("getrusage failed: %s\n", - strerror(errno)); -+ _gnutls_debug_log("getrusage failed\n"); - abort(); ++ _gnutls_debug_log("getrusage failed\n"); + } } #endif -@@ -263,8 +262,7 @@ static int do_device_source_urandom(int +@@ -270,8 +269,7 @@ static int do_device_source_urandom(int if (res <= 0) { if (res < 0) { _gnutls_debug_log diff --git a/security/gnutls/patches/patch-tests_Makefile.in b/security/gnutls/patches/patch-tests_Makefile.in index a6c29809c0cff..7efffb9448bc4 100644 --- a/security/gnutls/patches/patch-tests_Makefile.in +++ b/security/gnutls/patches/patch-tests_Makefile.in @@ -1,11 +1,11 @@ -$NetBSD: patch-tests_Makefile.in,v 1.1 2014/01/16 10:14:09 wiz Exp $ +$NetBSD: patch-tests_Makefile.in,v 1.2 2014/12/05 12:25:42 khorben Exp $ Disable dsa test. Hangs on NetBSD-6.99.28/amd64 in gnutls-3.8.2.1. Please retest during updates. ---- tests/Makefile.in.orig 2013-12-20 18:30:47.000000000 +0000 +--- tests/Makefile.in.orig 2014-10-13 03:57:02.000000000 +0000 +++ tests/Makefile.in -@@ -2063,7 +2063,7 @@ top_build_prefix = @top_build_prefix@ +@@ -2066,7 +2066,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . rsa-md5-collision pkcs1-padding pkcs8-decode pkcs12-decode \ diff --git a/security/gnutls/patches/patch-tests_openpgp-certs_Makefile.in b/security/gnutls/patches/patch-tests_openpgp-certs_Makefile.in index 3081a7270afc1..17742ff6e41c9 100644 --- a/security/gnutls/patches/patch-tests_openpgp-certs_Makefile.in +++ b/security/gnutls/patches/patch-tests_openpgp-certs_Makefile.in @@ -1,11 +1,11 @@ -$NetBSD: patch-tests_openpgp-certs_Makefile.in,v 1.1 2014/01/16 10:14:09 wiz Exp $ +$NetBSD: patch-tests_openpgp-certs_Makefile.in,v 1.2 2014/12/05 12:25:42 khorben Exp $ Disable testcerts test. Hangs on NetBSD-6.99.28/amd64 with gnutls-3.8.2.1. Please retest during updates. ---- tests/openpgp-certs/Makefile.in.orig 2014-01-16 09:45:13.000000000 +0000 +--- tests/openpgp-certs/Makefile.in.orig 2014-10-13 03:57:03.000000000 +0000 +++ tests/openpgp-certs/Makefile.in -@@ -1417,7 +1417,7 @@ dist_check_SCRIPTS = testselfsigs testce +@@ -1423,7 +1423,7 @@ dist_check_SCRIPTS = testselfsigs testce # The selftest is disabled until we can make it work under Wine and # under Debian buildds (problem with 127.0.0.2?).