[packages/man-db] added virtual provides for bundled gnulib library
baggins
baggins at pld-linux.org
Tue Aug 28 12:38:11 CEST 2012
commit d7befb213758b5fff0e5c48d92e15d68273f4ccc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Aug 28 12:35:33 2012 +0200
added virtual provides for bundled gnulib library
man-db-gnulib.patch | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++
man-db.spec | 4 +-
2 files changed, 125 insertions(+), 1 deletion(-)
---
diff --git a/man-db.spec b/man-db.spec
index 85942e4..258662e 100644
--- a/man-db.spec
+++ b/man-db.spec
@@ -1,7 +1,7 @@
Summary: Tools for searching and reading man pages
Name: man-db
Version: 2.6.2
-Release: 2
+Release: 3
# project man-db GPLv2+
# Gnulib part GPLv3+
License: GPL v2+ and GPL v3+
@@ -14,6 +14,7 @@ Source2: %{name}.sysconfig
Patch0: so-include.patch
# Resolves: #655385 - use old format of nroff output
Patch1: sgr.patch
+Patch2: man-db-gnulib.patch
BuildRequires: gdbm-devel
BuildRequires: gettext
BuildRequires: groff
@@ -47,6 +48,7 @@ pages.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%configure\
diff --git a/man-db-gnulib.patch b/man-db-gnulib.patch
new file mode 100644
index 0000000..7dadf9a
--- /dev/null
+++ b/man-db-gnulib.patch
@@ -0,0 +1,122 @@
+diff -up man-db-2.6.2/gnulib/lib/stdio.in.h.gnulib-fix man-db-2.6.2/gnulib/lib/stdio.in.h
+--- man-db-2.6.2/gnulib/lib/stdio.in.h.gnulib-fix 2012-06-18 06:11:22.000000000 +0200
++++ man-db-2.6.2/gnulib/lib/stdio.in.h 2012-07-20 19:04:16.000000000 +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 -up man-db-2.6.2/gnulib/m4/stdio_h.m4.gnulib-fix man-db-2.6.2/gnulib/m4/stdio_h.m4
+--- man-db-2.6.2/gnulib/m4/stdio_h.m4.gnulib-fix 2012-06-18 06:11:25.000000000 +0200
++++ man-db-2.6.2/gnulib/m4/stdio_h.m4 2012-07-20 19:04:16.000000000 +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])
+diff -up man-db-2.6.2/configure.gnulib-fix man-db-2.6.2/configure
+--- man-db-2.6.2/configure.gnulib-fix 2012-07-20 19:04:31.000000000 +0200
++++ man-db-2.6.2/configure 2012-07-20 19:04:47.000000000 +0200
+@@ -998,7 +998,6 @@ GNULIB_PERROR
+ GNULIB_PCLOSE
+ GNULIB_OBSTACK_PRINTF_POSIX
+ GNULIB_OBSTACK_PRINTF
+-GNULIB_GETS
+ GNULIB_GETLINE
+ GNULIB_GETDELIM
+ GNULIB_GETCHAR
+@@ -19575,7 +19574,6 @@ _ACEOF
+ GNULIB_GETCHAR=0;
+ GNULIB_GETDELIM=0;
+ GNULIB_GETLINE=0;
+- GNULIB_GETS=0;
+ GNULIB_OBSTACK_PRINTF=0;
+ GNULIB_OBSTACK_PRINTF_POSIX=0;
+ GNULIB_PCLOSE=0;
+@@ -34421,7 +34419,6 @@ $as_echo "$gl_cv_next_stdio_h" >&6; }
+ GNULIB_GETC=1
+ GNULIB_GETCHAR=1
+ GNULIB_FGETS=1
+- GNULIB_GETS=1
+ GNULIB_FREAD=1
+
+
+@@ -34439,7 +34436,7 @@ $as_echo "$gl_cv_next_stdio_h" >&6; }
+
+
+
+- for gl_func in dprintf fpurge fseeko ftello getdelim getline pclose popen renameat snprintf tmpfile vdprintf vsnprintf; do
++ for gl_func in dprintf fpurge fseeko ftello getdelim getline gets pclose popen renameat snprintf tmpfile vdprintf vsnprintf; do
+ as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+ $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/man-db.git/commitdiff/d7befb213758b5fff0e5c48d92e15d68273f4ccc
More information about the pld-cvs-commit
mailing list