fixed double free or corruption issue
resolves: #739207
  require groff-base instead of groff
rebuilt for gdbm-1.9.1-1
This commit is contained in:
Peter Schiffer 2011-10-06 15:55:05 +02:00
parent e6de314161
commit b09802dbfc
2 changed files with 24 additions and 2 deletions

View File

@ -0,0 +1,12 @@
diff -up trunk/src/filenames.c.double-free trunk/src/filenames.c
--- trunk/src/filenames.c.double-free 2011-01-10 21:02:05.000000000 +0100
+++ trunk/src/filenames.c 2011-10-04 16:49:42.146071708 +0200
@@ -85,6 +85,8 @@ char *filename_info (const char *file, s
char *slash = strrchr (manpage, '/');
char *base_name;
+ memset (info, 0, sizeof (struct mandata));
+
#ifdef COMP_SRC
struct compression *comp;
#endif

View File

@ -3,7 +3,7 @@
Summary: Tools for searching and reading man pages Summary: Tools for searching and reading man pages
Name: man-db Name: man-db
Version: 2.6.0.2 Version: 2.6.0.2
Release: 2%{?dist} Release: 3%{?dist}
# project man-db GPLv2+ # project man-db GPLv2+
# Gnulib part GPLv3+ # Gnulib part GPLv3+
License: GPLv2+ and GPLv3+ License: GPLv2+ and GPLv3+
@ -14,12 +14,14 @@ Source1: man-db.crondaily
Source2: man-db.sysconfig Source2: man-db.sysconfig
# Resolves: #655385 - use old format of nroff output # Resolves: #655385 - use old format of nroff output
Patch1: man-db-2.5.9-sgr.patch Patch1: man-db-2.5.9-sgr.patch
# Resolves: #702904 - double free or corruption
Patch2: man-db-2.6.0.2-double-free.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: man < 2.0 Obsoletes: man < 2.0
Provides: man-pages-reader = %{version} Provides: man-pages-reader = %{version}
Provides: man = %{version} Provides: man = %{version}
BuildRequires: less BuildRequires: less
Requires: less, coreutils, grep, groff, gzip, crontabs Requires: less, coreutils, grep, groff-base, gzip, crontabs
BuildRequires: gdbm-devel, groff, gettext, zlib-devel BuildRequires: gdbm-devel, groff, gettext, zlib-devel
BuildRequires: libpipeline-devel BuildRequires: libpipeline-devel
@ -34,6 +36,7 @@ manual pages.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .sgr %patch1 -p1 -b .sgr
%patch2 -p1 -b .double-free
%build %build
%configure\ %configure\
@ -116,6 +119,13 @@ rm -rf $RPM_BUILD_ROOT
%lang(ja) %{_datadir}/man/ja/man*/* %lang(ja) %{_datadir}/man/ja/man*/*
%changelog %changelog
* Wed Oct 05 2011 Peter Schiffer <pschiffe@redhat.com> - 2.6.0.2-3
- resolves: #702904
fixed double free or corruption issue
- resolves: #739207
require groff-base instead of groff
- rebuilt for gdbm-1.9.1-1
* Sun May 29 2011 Ville Skyttä <ville.skytta@iki.fi> - 2.6.0.2-2 * Sun May 29 2011 Ville Skyttä <ville.skytta@iki.fi> - 2.6.0.2-2
- Own the %%{_libdir}/man-db dir. - Own the %%{_libdir}/man-db dir.