diff --git a/man-db-2.5.2-fastpipe.dif b/man-db-2.5.2-fastpipe.dif new file mode 100644 index 0000000..05ba8aa --- /dev/null +++ b/man-db-2.5.2-fastpipe.dif @@ -0,0 +1,23 @@ +--- lib/pipeline.c ++++ lib/pipeline.c 2008-11-21 11:53:20.554776039 +0100 +@@ -50,6 +50,20 @@ + #include "error.h" + #include "pipeline.h" + ++#ifdef __linux__ ++# include ++# include ++# include ++# ifndef SHUT_RD ++# define SHUT_RD 0 ++# endif ++# ifndef SHUT_WR ++# define SHUT_WR 1 ++# endif ++# define pipe(v) (((socketpair(AF_UNIX,SOCK_STREAM,0,v) < 0) || \ ++ (shutdown((v)[1],SHUT_RD) < 0) || (shutdown((v)[0],SHUT_WR) < 0)) ? -1 : 0) ++#endif ++ + /* ---------------------------------------------------------------------- */ + + /* Functions to build individual commands. */ diff --git a/man-db-2.5.2.dif b/man-db-2.5.2.dif index 8e0b817..c1173b1 100644 --- a/man-db-2.5.2.dif +++ b/man-db-2.5.2.dif @@ -193,15 +193,6 @@ /* By default, man-db will store a whatis referenced manual page in favour of a stray cat page when they both share identical namespace. If you -@@ -137,7 +137,7 @@ - - #ifndef NROFF_MISSING - # ifndef NROFF --# define NROFF "@nroff@" -+# define NROFF "nroff -mandocdb" - # endif - #endif - --- intl/Makefile.in +++ intl/Makefile.in 2007-12-10 12:51:51.000000000 +0100 @@ -181,7 +181,7 @@ libgnuintl.h.msvc-shared Makefile.msvc @@ -1312,15 +1303,6 @@ # #--------------------------------------------------------- # Program definitions. These are commented out by default as the value -@@ -80,7 +211,7 @@ MANDB_MAP /opt/man /var/cache/man/opt - #DEFINE tr @tr@ '\255\267\264\327' '\055\157\047\170' - #DEFINE grep @grep@ - #DEFINE troff @troff@ --#DEFINE nroff @nroff@ -+#DEFINE nroff /usr/bin/nroff -mandocdb - #DEFINE eqn @eqn@ - #DEFINE neqn @neqn@ - #DEFINE tbl @tbl@ --- src/mandb.c +++ src/mandb.c 2008-08-12 16:59:18.688466727 +0200 @@ -185,6 +185,8 @@ static const char *xtmpfile; diff --git a/man.changes b/man.changes index 6bdbf8a..474eb47 100644 --- a/man.changes +++ b/man.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 20 18:13:38 CET 2008 - werner@suse.de + +- Skip mandocdb workaround as groff now works in UTF-8 (bnc#446710) +- Replace pipe(2) with socketpair(2) to speed up mandb (bnc#381830) + ------------------------------------------------------------------- Thu Oct 2 13:03:40 CEST 2008 - werner@suse.de diff --git a/man.spec b/man.spec index 7aaf1e9..3cabd62 100644 --- a/man.spec +++ b/man.spec @@ -31,7 +31,7 @@ BuildRequires: gettext-runtime gettext-tools BuildRequires: gettext gettext-devel %endif Version: 2.5.2 -Release: 15 +Release: 16 Summary: A Program for Displaying man Pages License: GPL v2 or later Url: https://savannah.nongnu.org/projects/man-db @@ -56,6 +56,7 @@ Patch8: man-db-2.5.1-globbing.dif Patch9: man-db-2.5.1-zio.dif Patch10: man-db-2.5.1-listall.dif Patch11: man-db-%{version}-catp.dif +Patch12: man-db-2.5.2-fastpipe.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc @@ -83,6 +84,7 @@ Authors: %patch9 -p0 -b .zio %patch10 -p0 -b .listall %patch11 -p0 -b .catp +%patch12 -p0 -b .fp %patch -p0 %build @@ -283,6 +285,9 @@ test -d var/catman/ && rm -rf var/catman/ || true %{_localstatedir}/adm/fillup-templates/sysconfig.cron-man %changelog +* Thu Nov 20 2008 werner@suse.de +- Skip mandocdb workaround as groff now works in UTF-8 (bnc#446710) +- Replace pipe(2) with socketpair(2) to speed up mandb (bnc#381830) * Thu Oct 02 2008 werner@suse.de - Fix option handling for renice in cron script (bnc#431027) * Tue Aug 12 2008 werner@suse.de @@ -572,7 +577,7 @@ test -d var/catman/ && rm -rf var/catman/ || true - Port libz patch to this version - Map UTF-8 man pages to appropiate groff command - Make it work -* Mon Jun 18 2001 bk@suse.de +* Sun Jun 17 2001 bk@suse.de - new location of tmac files is /usr/share/groff/site-tmac, needed for groff 1.17 and does not work with older versions * Thu Jun 07 2001 werner@suse.de @@ -629,10 +634,10 @@ test -d var/catman/ && rm -rf var/catman/ || true - Make mandir depending on the RPM macro %%_mandir - Make zsoemlin zlib interface functions more compatible to cookie I/O functions (type changed in new glibc 2.1 and higher) -* Fri Mar 17 2000 werner@suse.de +* Thu Mar 16 2000 werner@suse.de - Make lexgrog knowing the japanese multibyte string of section NAME - Make flex use memory aligned tables. -* Thu Mar 09 2000 werner@suse.de +* Wed Mar 08 2000 werner@suse.de - Security fix in straycats: Check if we got a temporary file! * Thu Mar 02 2000 ro@suse.de - added usr/share/man/allman @@ -647,12 +652,12 @@ test -d var/catman/ && rm -rf var/catman/ || true - patched configure.in to prefer gdbm * Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Tue Sep 07 1999 ro@suse.de +* Mon Sep 06 1999 ro@suse.de - removed (now) conflicting redeclarations from zsoelim.l * Thu Sep 02 1999 werner@suse.de - Make man.c work again - Use RPM_OPT_FLAGS -* Tue Aug 31 1999 werner@suse.de +* Mon Aug 30 1999 werner@suse.de - Few simple changes * drop privileges before chdir back into current directory * do not search for local man page if not given `-l' @@ -666,14 +671,14 @@ test -d var/catman/ && rm -rf var/catman/ || true - Add allman sub tree to fsstnd tree * Fri Jul 09 1999 ro@suse.de - fixed filelist -* Wed Jul 07 1999 werner@suse.de +* Tue Jul 06 1999 werner@suse.de - Update to debian version 2.3.10-69i * Change from /var/catman/ to /var/cache/man/ * Make /usr/share/man/ possible * Buildin NLS support - Fix some debian bugs (sig handlers!) - Add SuSE bug fixes (sig handler) and zlib feature -* Thu Jul 01 1999 werner@suse.de +* Wed Jun 30 1999 werner@suse.de - First changes for SuSE 6.2 * Use fopencookie in zsoelim if glibc 2.1 or higher to avoid any possible link attack in /tmp/ @@ -714,7 +719,7 @@ test -d var/catman/ && rm -rf var/catman/ || true - added es, fr & it. * Wed Jul 15 1998 bs@suse.de - fixed /usr/man/allman/de -* Thu Apr 23 1998 werner@suse.de +* Wed Apr 22 1998 werner@suse.de - Fix preprocessor handling: was missed since libz was used instead of gzip -dc * Thu Mar 19 1998 werner@suse.de