diff options
| -rw-r--r-- | security/gnutls/distinfo | 3 | ||||
| -rw-r--r-- | security/gnutls/patches/patch-gl_stdio.in.h | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo index d115adc501d..49adb64572c 100644 --- a/security/gnutls/distinfo +++ b/security/gnutls/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.87 2012/07/24 18:34:06 drochner Exp $ +$NetBSD: distinfo,v 1.88 2012/08/02 09:37:32 jperkin Exp $ SHA1 (gnutls-3.0.21.tar.xz) = 3a64b3b2587803c9e53d54ee9a44bff2b2780a38 RMD160 (gnutls-3.0.21.tar.xz) = 570ac40632b7ba50183118d556ae42a8e685baad Size (gnutls-3.0.21.tar.xz) = 4664124 bytes SHA1 (patch-ae) = 71fbbeb43ac1689fca6fec7f8348d8534c1dc38a +SHA1 (patch-gl_stdio.in.h) = b5802da2cccddd6fab73bd39c49f7d62bef58464 SHA1 (patch-lib_nettle_egd.c) = b7e9769e8c620519c43ca7b7481a558e9d389c68 diff --git a/security/gnutls/patches/patch-gl_stdio.in.h b/security/gnutls/patches/patch-gl_stdio.in.h new file mode 100644 index 00000000000..c155ed4c8f0 --- /dev/null +++ b/security/gnutls/patches/patch-gl_stdio.in.h @@ -0,0 +1,22 @@ +$NetBSD: patch-gl_stdio.in.h,v 1.1 2012/08/02 09:37:32 jperkin 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 @@ + # 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. */ +@@ -706,6 +707,7 @@ + #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@ |