gnutls: cleaner fix, obsolete patch

[coypu <coypu%sdf.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Wed Mar 23 23:57:30 2016 +0200
Changeset:	42f66db67895080abf078d3fcc818c2effe36b16

Modified Files:
	gnutls/distinfo
	gnutls/patches/patch-tests_dtls_dtls-stress.c
Added Files:
	gnutls/patches/patch-tests_openpgp-certs_testcerts
Removed Files:
	gnutls/patches/patch-lib_nettle_rnd-common.c

Log Message:
gnutls: cleaner fix, obsolete patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=42f66db67895080abf078d3fcc818c2effe36b16

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnutls/distinfo                                    |  3 +--
 gnutls/patches/patch-lib_nettle_rnd-common.c       | 26 ----------------------
 gnutls/patches/patch-tests_dtls_dtls-stress.c      | 20 ++++++-----------
 gnutls/patches/patch-tests_openpgp-certs_testcerts | 16 +++++++++++++
 4 files changed, 24 insertions(+), 41 deletions(-)

diffs:
diff --git a/gnutls/distinfo b/gnutls/distinfo
index ea6cf19..4e96514 100644
--- a/gnutls/distinfo
+++ b/gnutls/distinfo
@@ -6,13 +6,12 @@ SHA512 (gnutls-3.4.10.tar.xz) = e5cd60240ebbcac9d8f7c28fdbf023a499e3c58a352a43c2
 Size (gnutls-3.4.10.tar.xz) = 6645892 bytes
 SHA1 (patch-ae) = 5e020483ac14ef6ccc45a53e351242ab16c860f1
 SHA1 (patch-lib_Makefile.in) = 490f155fe30f63c9ecf82c4c4db7fd8c96ddad78
-SHA1 (patch-lib_nettle_rnd-common.c) = e0feb509e0c37791560280d9eb36785edea51a25
 SHA1 (patch-src_libopts_autoopts_options.h) = 9202c55314fe8764ac82c95bbfabfa1b031e9ba4
 SHA1 (patch-src_libopts_compat_compat.h) = 240fbfc0ba20af35e0634ba873fe9e34bfbcc921
 SHA1 (patch-src_libopts_libopts.c) = ce5e7681def882e95ed5ab770564d1f999b97039
 SHA1 (patch-src_libopts_makeshell.c) = e5b7d66caaec45e12ae5490d515fc9fc75de3d92
 SHA1 (patch-src_libopts_proto.h) = 78f845bdcbac8de74953a3cee0b77fa9c5b05386
 SHA1 (patch-tests_dsa_testdsa) = 89d0fa935b14a4d4335a693090d149babce18340
-SHA1 (patch-tests_dtls_dtls-stress.c) = 49157822d8f4928d98a757157f13c913dcbed730
+SHA1 (patch-tests_dtls_dtls-stress.c) = da8305d2557c37a0d2bfd7688e8b153717636b29
 SHA1 (patch-tests_openpgp-certs_testcerts) = cbf28fcc944133e2e40b754ca6d68f7a96789917
 SHA1 (patch-tests_utils.h) = 74e138fc7f13bc2e38341da0f73c73a686faa9f7
diff --git a/gnutls/patches/patch-lib_nettle_rnd-common.c b/gnutls/patches/patch-lib_nettle_rnd-common.c
deleted file mode 100644
index b1c4ce1..0000000
--- a/gnutls/patches/patch-lib_nettle_rnd-common.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-lib_nettle_rnd-common.c,v 1.1 2015/06/01 21:50:22 spz Exp $
-
-https://gitlab.com/gnutls/gnutls/issues/81
-
---- lib/nettle/rnd-common.c.orig	2015-03-23 07:19:23.000000000 +0000
-+++ lib/nettle/rnd-common.c
-@@ -61,8 +61,7 @@ void _rnd_get_event(struct event_st *e)
- 
- #ifdef HAVE_GETRUSAGE
- 	if (getrusage(ARG_RUSAGE, &e->rusage) < 0) {
--		_gnutls_debug_log("getrusage failed: %s\n",
--			  strerror(errno));
-+		_gnutls_debug_log("getrusage failed\n");
- 	}
- #endif
- 
-@@ -153,8 +152,7 @@ static int _rnd_get_system_entropy_urand
- 		if (res <= 0) {
- 			if (res < 0) {
- 				_gnutls_debug_log
--					("Failed to read /dev/urandom: %s\n",
--					 strerror(errno));
-+					("Failed to read /dev/urandom\n");
- 			} else {
- 				_gnutls_debug_log
- 					("Failed to read /dev/urandom: end of file\n");
diff --git a/gnutls/patches/patch-tests_dtls_dtls-stress.c b/gnutls/patches/patch-tests_dtls_dtls-stress.c
index 416f409..ecea9e8 100644
--- a/gnutls/patches/patch-tests_dtls_dtls-stress.c
+++ b/gnutls/patches/patch-tests_dtls_dtls-stress.c
@@ -1,19 +1,13 @@
 $NetBSD$
 
-Running 'make test':
-undefined reference to `rpl_strerror'
-
-https://gitlab.com/gnutls/gnutls/issues/81
-
 --- tests/dtls/dtls-stress.c.orig	2015-01-19 17:38:09.000000000 +0000
 +++ tests/dtls/dtls-stress.c
-@@ -346,8 +346,7 @@ static void _process_error_or_timeout(in
+@@ -98,6 +98,8 @@
+ #include <time.h>
+ #include <sys/wait.h>
  
- static void rperror(const char *name)
- {
--	fprintf(stdout, "%i %s| %s: %s\n", run_id, role_name, name,
--		strerror(errno));
-+	fprintf(stdout, "%i %s| %s\n", run_id, role_name, name);
- }
++#undef strerror
++
+ #if _POSIX_TIMERS && (_POSIX_TIMERS - 200112L) >= 0
  
- // }}}
+ // {{{ types
diff --git a/gnutls/patches/patch-tests_openpgp-certs_testcerts b/gnutls/patches/patch-tests_openpgp-certs_testcerts
new file mode 100644
index 0000000..affc409
--- /dev/null
+++ b/gnutls/patches/patch-tests_openpgp-certs_testcerts
@@ -0,0 +1,16 @@
+$NetBSD$
+
+This is needed because of the use of RANDOM (possibly more)
+in common.sh
+
+--- tests/openpgp-certs/testcerts.orig	2015-11-09 22:07:04.000000000 +0000
++++ tests/openpgp-certs/testcerts
+@@ -32,7 +32,7 @@ if test "${WINDIR}" != ""; then
+ 	exit 77
+ fi 
+ 
+-. "${srcdir}/../scripts/common.sh"
++bash "${srcdir}/../scripts/common.sh"
+ 
+ PORT="${PORT:-$RPORT}"
+