11f6dece83
update to 2.6.2 - resolves: #657409 fixed warning when invoking col by the mandb program in cron - resolves: #829935 enabled support for man pages compressed with lzip - resolves: #821778 added virtual provides for bundled gnulib library - resolves: #824825 apropos returns correct exit code for invalid man page
87 lines
3.7 KiB
Diff
87 lines
3.7 KiB
Diff
diff -upr man-db-2.6.2.orig/gnulib/lib/stdio.in.h man-db-2.6.2/gnulib/lib/stdio.in.h
|
|
--- man-db-2.6.2.orig/gnulib/lib/stdio.in.h 2012-06-18 06:11:22.000000000 +0200
|
|
+++ man-db-2.6.2/gnulib/lib/stdio.in.h 2012-06-19 15:29:56.812604417 +0200
|
|
@@ -698,26 +698,14 @@ _GL_WARN_ON_USE (getline, "getline is un
|
|
# endif
|
|
#endif
|
|
|
|
-#if @GNULIB_GETS@
|
|
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
|
|
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
-# undef gets
|
|
-# define gets rpl_gets
|
|
-# endif
|
|
-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
|
|
-_GL_CXXALIAS_RPL (gets, char *, (char *s));
|
|
-# else
|
|
-_GL_CXXALIAS_SYS (gets, char *, (char *s));
|
|
-# undef gets
|
|
-# endif
|
|
-_GL_CXXALIASWARN (gets);
|
|
/* It is very rare that the developer ever has full control of stdin,
|
|
- so any use of gets warrants an unconditional warning. Assume it is
|
|
- always declared, since it is required by C89. */
|
|
+ so any use of gets warrants an unconditional warning; besides, C11
|
|
+ removed it. */
|
|
+#undef gets
|
|
+#if HAVE_RAW_DECL_GETS
|
|
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
|
#endif
|
|
|
|
-
|
|
#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
|
|
struct obstack;
|
|
/* Grow an obstack with formatted output. Return the number of
|
|
@@ -1053,9 +1041,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is
|
|
# endif
|
|
#endif
|
|
|
|
-/* Some people would argue that sprintf should be handled like gets
|
|
- (for example, OpenBSD issues a link warning for both functions),
|
|
- since both can cause security holes due to buffer overruns.
|
|
+/* Some people would argue that all sprintf uses should be warned about
|
|
+ (for example, OpenBSD issues a link warning for it),
|
|
+ since it can cause security holes due to buffer overruns.
|
|
However, we believe that sprintf can be used safely, and is more
|
|
efficient than snprintf in those safe cases; and as proof of our
|
|
belief, we use sprintf in several gnulib modules. So this header
|
|
diff -upr man-db-2.6.2.orig/gnulib/m4/stdio_h.m4 man-db-2.6.2/gnulib/m4/stdio_h.m4
|
|
--- man-db-2.6.2.orig/gnulib/m4/stdio_h.m4 2012-06-18 06:11:25.000000000 +0200
|
|
+++ man-db-2.6.2/gnulib/m4/stdio_h.m4 2012-06-19 15:29:56.812604417 +0200
|
|
@@ -1,4 +1,4 @@
|
|
-# stdio_h.m4 serial 40
|
|
+# stdio_h.m4 serial 41
|
|
dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
|
|
dnl This file is free software; the Free Software Foundation
|
|
dnl gives unlimited permission to copy and/or distribute it,
|
|
@@ -18,7 +18,6 @@ AC_DEFUN([gl_STDIO_H],
|
|
GNULIB_GETC=1
|
|
GNULIB_GETCHAR=1
|
|
GNULIB_FGETS=1
|
|
- GNULIB_GETS=1
|
|
GNULIB_FREAD=1
|
|
dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c"
|
|
dnl "expected source file, required through AC_LIBSOURCES, not found". It is
|
|
@@ -72,10 +71,10 @@ AC_DEFUN([gl_STDIO_H],
|
|
|
|
dnl Check for declarations of anything we want to poison if the
|
|
dnl corresponding gnulib module is not in use, and which is not
|
|
- dnl guaranteed by C89.
|
|
+ dnl guaranteed by both C89 and C11.
|
|
gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
|
|
- ]], [dprintf fpurge fseeko ftello getdelim getline pclose popen renameat
|
|
- snprintf tmpfile vdprintf vsnprintf])
|
|
+ ]], [dprintf fpurge fseeko ftello getdelim getline gets pclose popen
|
|
+ renameat snprintf tmpfile vdprintf vsnprintf])
|
|
])
|
|
|
|
AC_DEFUN([gl_STDIO_MODULE_INDICATOR],
|
|
@@ -113,7 +112,6 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS],
|
|
GNULIB_GETCHAR=0; AC_SUBST([GNULIB_GETCHAR])
|
|
GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM])
|
|
GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE])
|
|
- GNULIB_GETS=0; AC_SUBST([GNULIB_GETS])
|
|
GNULIB_OBSTACK_PRINTF=0; AC_SUBST([GNULIB_OBSTACK_PRINTF])
|
|
GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX])
|
|
GNULIB_PCLOSE=0; AC_SUBST([GNULIB_PCLOSE])
|