Import of pkgsrc-2015Q1

security/gnutls/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.144 2014/03/04 09:34:19 adam Exp $
+# $NetBSD: Makefile,v 1.152 2015/02/11 11:25:57 adam Exp $
 
-DISTNAME=	gnutls-3.2.12
+DISTNAME=	gnutls-3.2.21
 CATEGORIES=	security devel
 MASTER_SITES=	ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/
 EXTRACT_SUFX=	.tar.xz
@@ -10,12 +10,10 @@ HOMEPAGE=	http://www.gnutls.org/
 COMMENT=	GNU Transport Layer Security library
 LICENSE=	gnu-gpl-v3 AND gnu-lgpl-v2.1
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 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

security/gnutls/distinfo

@@ -1,13 +1,16 @@
-$NetBSD: distinfo,v 1.105 2014/03/04 09:34:19 adam Exp $
+$NetBSD: distinfo,v 1.112 2015/02/11 11:25:57 adam Exp $
 
-SHA1 (gnutls-3.2.12.tar.xz) = bf14fdd897d572091b51a71070ed91332a0376a4
-RMD160 (gnutls-3.2.12.tar.xz) = c64e96f40fd36d6edac83484fe90c4ede562b1ea
-Size (gnutls-3.2.12.tar.xz) = 5136220 bytes
+SHA1 (gnutls-3.2.21.tar.xz) = fa12e643ad21bcaf450d534f262c813d75843966
+RMD160 (gnutls-3.2.21.tar.xz) = 8d3b7817dcd28d3c4f1e3ad0d014ab7891daa7f9
+Size (gnutls-3.2.21.tar.xz) = 5162040 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) = bbce9bbb61d2be625585f6c8ed5bda95f3a80344
+SHA1 (patch-lib_system.h) = fb67be62f1e889a665a65ab151ced24fa1ab3e2e
 SHA1 (patch-src_libopts_autoopts_options.h) = 60be5b43f23ba5978759c1e245781da7f9125071
 SHA1 (patch-src_libopts_compat_compat.h) = 2e0a1be460917b2d7a8f6bdac698dad405143013
-SHA1 (patch-tests_Makefile.in) = 43e3f23665f2ccc71413e830e7f6f1c8850a518a
-SHA1 (patch-tests_openpgp-certs_Makefile.in) = 6eda841bb9a33215865d751707c67f253b4e04cf
+SHA1 (patch-src_libopts_makeshell.c) = c94e717027d078a081acd10eaec51a44dc4d42e1
+SHA1 (patch-src_libopts_proto.h) = 9749cc4bd080e1a8d800bde181143acb9c340ec8
+SHA1 (patch-tests_Makefile.in) = 0c2e37c632686301855cf6d0ed09583e797ae4e3
+SHA1 (patch-tests_openpgp-certs_Makefile.in) = 8d3a7e7e4fb063465e0fbdfae22a7bf579529b0c

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

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@

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.4 2014/12/05 12:43:24 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-14 19:06:59.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
+@@ -101,8 +101,7 @@ static void _rnd_get_event(struct event_
+ 
+ #ifdef HAVE_GETRUSAGE
+ 	if (getrusage(ARG_RUSAGE, &e->rusage) < 0) {
 -		_gnutls_debug_log("getrusage failed: %s\n",
--				  strerror(errno));
+-			  strerror(errno));
 +		_gnutls_debug_log("getrusage failed\n");
- 		abort();
  	}
  #endif
-@@ -263,8 +262,7 @@ static int do_device_source_urandom(int 
+ 
+@@ -266,8 +265,7 @@ static int do_device_source_urandom(int 
  			if (res <= 0) {
  				if (res < 0) {
  					_gnutls_debug_log

security/gnutls/patches/patch-lib_system.h

@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_system.h,v 1.1 2014/12/31 16:05:07 rumko Exp $
+
+At least on FreeBSD, arpa/inet.h does not contain IPV6
+related structs.
+
+See https://savannah.gnu.org/support/?108713
+
+--- lib/system.h.orig	2014-12-30 11:12:37.607361021 +0000
++++ lib/system.h
+@@ -98,7 +98,12 @@ int _gnutls_ucs2_to_utf8(const void *dat
+ int gnutls_system_global_init(void);
+ void gnutls_system_global_deinit(void);
+ 
++#if defined(HAVE_NETINET_IN_H)
++#include <netinet/in.h>
++#else
+ #include <arpa/inet.h>
++#endif
++
+ #ifdef _WIN32
+ # define inet_aton _gnutls_inet_aton
+ int inet_aton(const char *cp, struct in_addr *inp);

security/gnutls/patches/patch-src_libopts_makeshell.c

@@ -0,0 +1,33 @@
+$NetBSD: patch-src_libopts_makeshell.c,v 1.1 2014/08/30 12:45:11 adam Exp $
+
+Avoid stdnoreturn.h.
+
+--- src/libopts/makeshell.c.orig	2014-08-30 12:24:30.000000000 +0000
++++ src/libopts/makeshell.c
+@@ -68,7 +68,7 @@ static void
+ open_out(char const * fname, char const * pname);
+ /* = = = END-STATIC-FORWARD = = = */
+ 
+-LOCAL noreturn void
++LOCAL void
+ option_exits(int exit_code)
+ {
+     if (print_exit)
+@@ -76,7 +76,7 @@ option_exits(int exit_code)
+     exit(exit_code);
+ }
+ 
+-LOCAL noreturn void
++LOCAL void
+ ao_bug(char const * msg)
+ {
+     fprintf(stderr, zao_bug_msg, msg);
+@@ -90,7 +90,7 @@ fserr_warn(char const * prog, char const
+             op, fname);
+ }
+ 
+-LOCAL noreturn void
++LOCAL void
+ fserr_exit(char const * prog, char const * op, char const * fname)
+ {
+     fserr_warn(prog, op, fname);

security/gnutls/patches/patch-src_libopts_proto.h

@@ -0,0 +1,26 @@
+$NetBSD: patch-src_libopts_proto.h,v 1.1 2014/08/30 12:45:11 adam Exp $
+
+Avoid stdnoreturn.h.
+
+--- src/libopts/proto.h.orig	2014-08-30 12:30:03.000000000 +0000
++++ src/libopts/proto.h
+@@ -98,16 +98,16 @@ load_opt_line(tOptions * opts, tOptState
+ /*
+  *  Extracted from makeshell.c
+  */
+-static noreturn void
++static void
+ option_exits(int exit_code);
+ 
+-static noreturn void
++static void
+ ao_bug(char const * msg);
+ 
+ static void
+ fserr_warn(char const * prog, char const * op, char const * fname);
+ 
+-static noreturn void
++static void
+ fserr_exit(char const * prog, char const * op, char const * fname);
+ 
+ /*

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 \

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?).