[pkgsrc/trunk]: pkgsrc/security/gnutls Fix more gnulib gets() vs std::gets() ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c6dfd3adb53
branches:  trunk
changeset: 652536:4c6dfd3adb53
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Jun 04 09:43:53 2015 +0000

description:
Fix more gnulib gets() vs std::gets() conflict.

diffstat:

 security/gnutls/distinfo                        |   5 +++--
 security/gnutls/patches/patch-src_gl_stdio.in.h |  22 ++++++++++++++++++++++
 security/gnutls/patches/patch-tests_Makefile.in |   4 ++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diffs (64 lines):

diff -r 8d881261ec0a -r 4c6dfd3adb53 security/gnutls/distinfo
--- a/security/gnutls/distinfo  Thu Jun 04 09:14:33 2015 +0000
+++ b/security/gnutls/distinfo  Thu Jun 04 09:43:53 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.113 2015/06/01 21:50:22 spz Exp $
+$NetBSD: distinfo,v 1.114 2015/06/04 09:43:53 jperkin Exp $
 
 SHA1 (gnutls-3.3.15.tar.xz) = d7f66b0aeaf48ff8621cc1913230635ef672f0a4
 RMD160 (gnutls-3.3.15.tar.xz) = 0c812034b3b8356c31d69074ec92382545eb808b
@@ -7,9 +7,10 @@
 SHA1 (patch-gl_stdio.in.h) = 298cc0e27087f086e9d47c67f81c8d10f6a7a8f1
 SHA1 (patch-lib_Makefile.in) = d0e292e632a91a9f19e39bd2c2d205a086ba5588
 SHA1 (patch-lib_nettle_rnd-common.c) = e0feb509e0c37791560280d9eb36785edea51a25
+SHA1 (patch-src_gl_stdio.in.h) = fbea411c3a7b71dd2daa3a5963324a2f8daad212
 SHA1 (patch-src_libopts_autoopts_options.h) = 9202c55314fe8764ac82c95bbfabfa1b031e9ba4
 SHA1 (patch-src_libopts_compat_compat.h) = 240fbfc0ba20af35e0634ba873fe9e34bfbcc921
 SHA1 (patch-src_libopts_makeshell.c) = e5b7d66caaec45e12ae5490d515fc9fc75de3d92
 SHA1 (patch-src_libopts_proto.h) = 78f845bdcbac8de74953a3cee0b77fa9c5b05386
-SHA1 (patch-tests_Makefile.in) = 5a52b56d247f999f8c16a068291c5dfb2ec80f6c
+SHA1 (patch-tests_Makefile.in) = b76dfb38f057b9094a5f46eef33b27492a79301e
 SHA1 (patch-tests_openpgp-certs_Makefile.in) = 2e7074312e67d747bd0ecfa839187f8bf33f4f09
diff -r 8d881261ec0a -r 4c6dfd3adb53 security/gnutls/patches/patch-src_gl_stdio.in.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnutls/patches/patch-src_gl_stdio.in.h   Thu Jun 04 09:43:53 2015 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_gl_stdio.in.h,v 1.1 2015/06/04 09:43:53 jperkin Exp $
+
+Avoid conflict between gets() and std::gets()
+
+--- src/gl/stdio.in.h.orig     2015-03-23 20:57:21.000000000 +0000
++++ src/gl/stdio.in.h
+@@ -714,6 +714,7 @@ _GL_WARN_ON_USE (getline, "getline is un
+ # endif
+ #endif
+ 
++#if !defined(__cplusplus)
+ /* 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.  */
+@@ -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
++#endif
+ 
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff -r 8d881261ec0a -r 4c6dfd3adb53 security/gnutls/patches/patch-tests_Makefile.in
--- a/security/gnutls/patches/patch-tests_Makefile.in   Thu Jun 04 09:14:33 2015 +0000
+++ b/security/gnutls/patches/patch-tests_Makefile.in   Thu Jun 04 09:43:53 2015 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-tests_Makefile.in,v 1.3 2015/06/01 21:50:22 spz Exp $
+$NetBSD: patch-tests_Makefile.in,v 1.4 2015/06/04 09:43:53 jperkin 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     2015-05-03 17:30:57.000000000 +0000
 +++ tests/Makefile.in
-@@ -1151,7 +1151,7 @@ TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) 
+@@ -1151,7 +1151,7 @@ TEST_LOG_COMPILE = $(TEST_LOG_COMPILER)
        $(TEST_LOG_FLAGS)
  DIST_SUBDIRS = . rsa-md5-collision pkcs1-padding pkcs8-decode \
        pkcs12-decode userid cert-tests key-tests sha2 \