From ce87928fd731a741bbf913e450834462a0361729 Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Thu, 5 Apr 2012 16:25:02 +0200 Subject: [PATCH] - resolves: #790771 update to 2.6.1 - resolves: #806086 removed hard-dependency on cron, update man db after install or update --- .gitignore | 2 +- man-db-2.6.0.2-double-free.patch | 12 ------------ man-db.crondaily | 2 +- man-db.spec | 28 +++++++++++++--------------- sources | 2 +- 5 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 man-db-2.6.0.2-double-free.patch diff --git a/.gitignore b/.gitignore index c96550d..2ce497b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/man-db-2.6.0.2.tar.gz +/man-db-2.6.1.tar.gz diff --git a/man-db-2.6.0.2-double-free.patch b/man-db-2.6.0.2-double-free.patch deleted file mode 100644 index 8d703cd..0000000 --- a/man-db-2.6.0.2-double-free.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/man-db.crondaily b/man-db.crondaily index a58aee7..efd25d6 100644 --- a/man-db.crondaily +++ b/man-db.crondaily @@ -19,7 +19,7 @@ LOCKFILE=/var/lock/man-db.lock # happen is that they will temporarily corrupt the database [ -f $LOCKFILE ] && exit 0 -trap "{ rm -f $LOCKFILE ; exit 255; }" EXIT +trap "{ rm -f $LOCKFILE ; exit 0; }" EXIT touch $LOCKFILE # create/update the mandb database mandb $OPTS diff --git a/man-db.spec b/man-db.spec index 9a9085c..35554e0 100644 --- a/man-db.spec +++ b/man-db.spec @@ -2,8 +2,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.6.0.2 -Release: 4%{?dist} +Version: 2.6.1 +Release: 1%{?dist} # project man-db GPLv2+ # Gnulib part GPLv3+ License: GPLv2+ and GPLv3+ @@ -14,14 +14,12 @@ Source1: man-db.crondaily Source2: man-db.sysconfig # Resolves: #655385 - use old format of nroff output 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) Obsoletes: man < 2.0 Provides: man-pages-reader = %{version} Provides: man = %{version} BuildRequires: less -Requires: less, coreutils, grep, groff-base, gzip, crontabs +Requires: less, coreutils, grep, groff-base, gzip BuildRequires: gdbm-devel, groff, gettext, zlib-devel BuildRequires: libpipeline-devel @@ -36,7 +34,6 @@ manual pages. %prep %setup -q %patch1 -p1 -b .sgr -%patch2 -p1 -b .double-free %build %configure\ @@ -57,13 +54,6 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/man-db/* ./ rm $RPM_BUILD_ROOT%{_bindir}/zsoelim rm $RPM_BUILD_ROOT%{_datadir}/man/man1/zsoelim.1 -# remove pages which are also in man-pages-de -rm $RPM_BUILD_ROOT%{_mandir}/de/man1/zsoelim.1 -rm $RPM_BUILD_ROOT%{_mandir}/de/man1/manpath.1 -rm $RPM_BUILD_ROOT%{_mandir}/de/man5/manpath.5 -rm $RPM_BUILD_ROOT%{_mandir}/de/man8/catman.8 -rm $RPM_BUILD_ROOT%{_mandir}/de/man8/mandb.8 - # remove libtool archives rm $RPM_BUILD_ROOT%{_libdir}/man-db/*.la @@ -82,6 +72,10 @@ install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/man-db %clean rm -rf $RPM_BUILD_ROOT +# update the man db after install or update +%post +/bin/bash %{_sysconfdir}/cron.daily/man-db.cron + %files -f %{name}.lang -f %{name}-gnulib.lang %defattr(-,root,root,-) %doc README man-db-manual.txt man-db-manual.ps docs/COPYING ChangeLog NEWS @@ -113,12 +107,16 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/accessdb.8* %{_mandir}/man8/catman.8* %{_mandir}/man8/mandb.8* -%lang(de) %{_datadir}/man/de/man*/* %lang(es) %{_datadir}/man/es/man*/* %lang(it) %{_datadir}/man/it/man*/* -%lang(ja) %{_datadir}/man/ja/man*/* %changelog +* Thu Apr 05 2012 Peter Schiffer - 2.6.1-1 +- resolves: #790771 + update to 2.6.1 +- resolves: #806086 + removed hard-dependency on cron, update man db after install or update + * Fri Jan 13 2012 Fedora Release Engineering - 2.6.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index fca4928..04fc5e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b41c96efec032d2b74ccbf2e401f93e man-db-2.6.0.2.tar.gz +79658e8695c7b9b3be1ee340d78a4692 man-db-2.6.1.tar.gz