From 3e0d14516f35b65f74132fd0f4e6509ad5defd4c Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Thu, 18 Oct 2012 16:52:07 +0200 Subject: [PATCH] - resolves: #858577 updated to 2.6.3 --- .gitignore | 2 +- man-db-2.6.2-gnulib.patch | 122 -------------------------------------- man-db.spec | 10 ++-- sources | 2 +- 4 files changed, 8 insertions(+), 128 deletions(-) delete mode 100644 man-db-2.6.2-gnulib.patch diff --git a/.gitignore b/.gitignore index 2999bce..9066844 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/man-db-2.6.2.tar.xz +/man-db-2.6.3.tar.xz diff --git a/man-db-2.6.2-gnulib.patch b/man-db-2.6.2-gnulib.patch deleted file mode 100644 index 7dadf9a..0000000 --- a/man-db-2.6.2-gnulib.patch +++ /dev/null @@ -1,122 +0,0 @@ -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 -- ]], [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; } diff --git a/man-db.spec b/man-db.spec index 95c7c99..2f6333b 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,8 +3,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.6.2 -Release: 5%{?dist} +Version: 2.6.3 +Release: 1%{?dist} # project man-db GPLv2+ # Gnulib part GPLv3+ License: GPLv2+ and GPLv3+ @@ -20,7 +20,6 @@ Patch1: man-db-2.5.9-sgr.patch Patch2: man-db-2.6.1-wildcards.patch Patch3: man-db-2.6.1-so-links.patch Patch4: man-db-2.6.1-locale-fallback.patch -Patch5: man-db-2.6.2-gnulib.patch Patch6: man-db-2.6.2-invalid-cache.patch Obsoletes: man < 2.0 @@ -47,7 +46,6 @@ manual pages. %patch2 -p1 -b .wildcards %patch3 -p1 -b .so-links %patch4 -p1 -b .locale-fallback -%patch5 -p1 -b .gnulib-fix %patch6 -p1 -b .invalid-cache %build @@ -122,6 +120,10 @@ install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/man-db %lang(it) %{_datadir}/man/it/man*/* %changelog +* Thu Oct 18 2012 Peter Schiffer - 2.6.3-1 +- resolves: #858577 + updated to 2.6.3 + * Tue Jul 31 2012 Peter Schiffer - 2.6.2-5 - resolves: #841431 ignore cached man pages if they don't exist anymore diff --git a/sources b/sources index 894c562..6d85f5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -647c48d46c464419185d031d04481ee5 man-db-2.6.2.tar.xz +a593a095599ae97bcacf8d038659a146 man-db-2.6.3.tar.xz