Hello community, here is the log from the commit of package man for openSUSE:Factory checked in at 2015-06-01 09:25:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/man (Old) and /work/SRC/openSUSE:Factory/.man.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "man" Changes: -------- --- /work/SRC/openSUSE:Factory/man/man.changes 2014-07-31 21:49:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.man.new/man.changes 2015-06-01 09:25:12.000000000 +0200 @@ -1,0 +2,66 @@ +Fri May 29 10:34:37 UTC 2015 - werner@suse.de + +- Own /usr/lib/tmpfiles.d if not owned by package filesystem + +------------------------------------------------------------------- +Thu May 28 12:55:34 UTC 2015 - werner@suse.de + +- Update to version 2.7.1 + For the first time since version 2.4.0, the database format has + changed slightly, so you will need to run 'mandb --create' after + installing the new version to rebuild your databases from scratch. +- Fixes + * Various portability fixes for Solaris, contributed by Peter Bray. + * man now runs correctly when its current working directory has been + deleted. (As a result of this fix, man-db now requires + libpipeline >= 1.4.0.) + * 'man -a' sends its prompts to /dev/tty rather than to stderr, and + likewise reads replies from /dev/tty rather than from stdin. + * Be more careful to avoid using or double-closing closed database + handles. Fixes test suite failures on some systems. + * Patch the fdutimens function imported from Gnulib to work around a + libc bug in GNU/Hurd. + * Fix test suite in the case where the system supports + high-precision timestamps but the file system containing the build + directory does not. + * lexgrog now filters terminal escape sequences out of cat pages + before trying to parse them. + * Tools that consider the terminal line length now prioritise the + COLUMNS environment variable above the TIOCGWINSZ ioctl. + * Manpath elements are no longer canonicalised before being inserted + into the search path; this caused the use of incorrect catpaths in + some cases. This was broken by the LANGUAGE-handling fixes in + 2.5.4. + * Remove test suite dependency on realpath(1). + * Fix a test failure when configured with --enable-undoc. + * Run the pager in man's original working directory rather than in + the manual hierarchy. (As a result of this fix, man-db now + requires libpipeline >= 1.3.0.) + * mandb only creates a cache directory tag if the catpath is + different from the manpath, since it should only be created in + directories that consist entirely of cached information. +- Improvements + * Ship a systemd tmpfiles snippet to clean up old cat files after a + week. + * The modification time of manual databases is now simply stored in + the mtime of the database files themselves, rather than using a + special row. This makes databases reproducible between + otherwise-identical installations, as long as the underlying + database has predictable behaviour. As a bonus, man-db now uses + high-precision timestamps to determine whether it needs to update + databases. + * Timestamps of manual pages are also now stored in the database + with high precision and compared accordingly. + * Files are now ordered by first physical extent before reading + them, for substantial performance improvements in operations such + as mandb and 'man -K'. + * 'man -H' shows a better error message if no browser is configured. + * zsoelim is now installed in $pkglibexecdir, to avoid clashes with + other packages. +- Rename patches + man-db-2.6.5-firefox.dif becomes man-db-2.7.1-firefox.dif + man-db-2.6.5-security4.dif becomes man-db-2.7.1-security4.dif + man-db-2.6.5-zio.dif becomes man-db-2.7.1-zio.dif + man-db-2.6.5.dif becomes man-db-2.7.1.dif + +------------------------------------------------------------------- Old: ---- man-db-2.6.5-firefox.dif man-db-2.6.5-security4.dif man-db-2.6.5-zio.dif man-db-2.6.5.dif man-db-2.6.6.tar.xz New: ---- man-db-2.7.1-firefox.dif man-db-2.7.1-security4.dif man-db-2.7.1-zio.dif man-db-2.7.1.dif man-db-2.7.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man.spec ++++++ --- /var/tmp/diff_new_pack.hm7oUb/_old 2015-06-01 09:25:13.000000000 +0200 +++ /var/tmp/diff_new_pack.hm7oUb/_new 2015-06-01 09:25:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package man # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ BuildRequires: po4a BuildRequires: xz-devel BuildRequires: zlib-devel -Version: 2.6.6 +Version: 2.7.1 Release: 0 Summary: A Program for Displaying man Pages License: GPL-2.0+ @@ -39,6 +39,7 @@ Url: https://savannah.nongnu.org/projects/man-db PreReq: coreutils fillup Provides: man_db +Requires: cronie Requires: glibc-locale %if 0%{suse_version} > 1300 Recommends: groff-full @@ -51,19 +52,20 @@ Source3: cron.daily.clean_catman Source4: mancoding Source5: wrapper.c -Patch0: man-db-2.6.5.dif +Patch0: man-db-2.7.1.dif Patch1: man-db-2.6.3-man0.dif Patch2: man-db-2.3.19deb4.0-groff.dif Patch4: man-db-2.6.3-section.dif -Patch5: man-db-2.6.5-security4.dif -Patch6: man-db-2.6.5-firefox.dif +Patch5: man-db-2.7.1-security4.dif +Patch6: man-db-2.7.1-firefox.dif Patch7: man-db-2.6.3-chinese.dif -Patch9: man-db-2.6.5-zio.dif +Patch9: man-db-2.7.1-zio.dif Patch10: man-db-2.6.3-listall.dif # PATCH-FIX-SUSE Fixes the documentation for bnc#786679 Patch11: man-MAN_POSIXLY_CORRECT-man1.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc +%global _has_tmpfiled %(rpm -q -f /usr/lib/tmpfiles.d | grep -c filesystem) %description A program for displaying man pages on the screen or sending them to a @@ -113,8 +115,12 @@ Cg g s m) SEC="${SEC[@]}" rm -f configure -%global optflags %{optflags} -funroll-loops -pipe -D_GNU_SOURCE -D_SVID_SOURCE -Wall - CFLAGS="%{optflags}" +%global optflags %{optflags} -funroll-loops -pipe -Wall + if grep -q _DEFAULT_SOURCE /usr/include/features.h ; then + CFLAGS="%{optflags} -D_DEFAULT_SOURCE" + else + CFLAGS="%{optflags} -D_GNU_SOURCE -D_SVID_SOURCE" + fi LDFLAGS= LIBS= LINGUAS= @@ -224,8 +230,12 @@ test -d var/catman/ && rm -rf var/catman/ || true %post +%{?tmpfiles_create:%tmpfiles_create %{_libexecdir}/tmpfiles.d/man-db.conf} %{fillup_only -an cron} +%posttrans +mandb --quiet --create + %files -f man-db.lang %defattr(-,root,root) %doc docs/COPYING @@ -237,23 +247,22 @@ %{_bindir}/apropos %{_bindir}/catman %{_bindir}/lexgrog -%if %suse_version > 1030 -%attr(0755,root,root) %{_bindir}/man -%attr(0755,root,root) %{_bindir}/mandb -%else -%attr(4755,root,root) %{_bindir}/man -%attr(4755,root,root) %{_bindir}/mandb -%endif +%{_bindir}/man +%{_bindir}/mandb %{_bindir}/manpath %{_bindir}/whatis -%{_bindir}/zsoelim -%dir %attr(0755,root,root) %{_prefix}/lib/man-db -%attr(0755,root,root) %{_prefix}/lib/man-db/man -%attr(0755,root,root) %{_prefix}/lib/man-db/mandb -%attr(0755,man,man) %{_prefix}/lib/man-db/manconv -%attr(0755,man,man) %{_prefix}/lib/man-db/globbing +%dir %attr(0755,root,root) %{_libexecdir}/man-db +%attr(0755,root,root) %{_libexecdir}/man-db/man +%attr(0755,root,root) %{_libexecdir}/man-db/mandb +%attr(0755,man,man) %{_libexecdir}/man-db/manconv +%attr(0755,man,man) %{_libexecdir}/man-db/globbing %{_sbindir}/accessdb %{_libdir}/libman*.so +%{_libexecdir}/man-db/zsoelim +%if 0%{?_has_tmpfiled} == 0 +%dir %{_libexecdir}/tmpfiles.d +%endif +%{_libexecdir}/tmpfiles.d/man-db.conf %dir %{_datadir}/groff/site-tmac %{_datadir}/groff/site-tmac/tmac.andb %{_datadir}/groff/site-tmac/tmac.andocdb @@ -261,7 +270,7 @@ %doc %{_mandir}/man5/*.5.gz %doc %{_mandir}/man8/*.8.gz %dir %{_mandir}/id -%defattr(-,man,man) +%defattr(-,man,root) %ghost %{_localstatedir}/cache/man/* %{_localstatedir}/adm/fillup-templates/sysconfig.cron-man ++++++ man-db-2.6.5-firefox.dif -> man-db-2.7.1-firefox.dif ++++++ --- /work/SRC/openSUSE:Factory/man/man-db-2.6.5-firefox.dif 2014-06-25 11:47:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.man.new/man-db-2.7.1-firefox.dif 2015-06-01 09:25:12.000000000 +0200 @@ -1,25 +1,30 @@ --- - src/man.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) + src/man.c | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) -diff --git src/man.c src/man.c -index 10bcd4f..5c164ad 100644 --- src/man.c -+++ src/man.c -@@ -2316,22 +2316,24 @@ static void format_display (pipeline *decomp, ++++ src/man.c 2015-05-28 10:54:07.961519305 +0000 +@@ -1847,16 +1847,6 @@ static void format_display (pipeline *de if (!status) break; } -- if (!candidate) -- error (CHILD_FAIL, 0, -- "couldn't execute any browser from %s", -- html_pager); +- if (!candidate) { +- if (html_pager && *html_pager) +- error (CHILD_FAIL, 0, +- "couldn't execute any browser from %s", +- html_pager); +- else +- error (CHILD_FAIL, 0, +- "no browser configured, so cannot show " +- "HTML output"); +- } free (browser_list); - if (chdir (old_cwd) == -1) { - error (0, errno, _("can't change to directory %s"), - old_cwd); + if (have_old_cwd && restore_cwd (&old_cwd) < 0) { + error (0, errno, +@@ -1864,11 +1854,23 @@ static void format_display (pipeline *de chdir ("/"); } + free_cwd (&old_cwd); + if (!status) + sleep(5); /* firefox runs into background to fast */ if (remove_directory (htmldir, 0) == -1) @@ -27,14 +32,16 @@ htmldir); free (htmlfile); free (htmldir); - free (old_cwd); -+ if (!candidate) -+ error (CHILD_FAIL, 0, -+ "couldn't execute any browser from %s", -+ html_pager); ++ if (!candidate) { ++ if (html_pager && *html_pager) ++ error (CHILD_FAIL, 0, ++ "couldn't execute any browser from %s", ++ html_pager); ++ else ++ error (CHILD_FAIL, 0, ++ "no browser configured, so cannot show " ++ "HTML output"); ++ } } else #endif /* TROFF_IS_GROFF */ /* TODO: check format_cmd status too? */ --- -1.8.4.5 - ++++++ man-db-2.6.5-security4.dif -> man-db-2.7.1-security4.dif ++++++ --- /work/SRC/openSUSE:Factory/man/man-db-2.6.5-security4.dif 2014-06-25 11:47:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.man.new/man-db-2.7.1-security4.dif 2015-06-01 09:25:12.000000000 +0200 @@ -1,11 +1,9 @@ --- - src/mandb.c | 12 ++++++++++++ + src/mandb.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -diff --git src/mandb.c src/mandb.c -index 86b9e97..5b8c57d 100644 --- src/mandb.c -+++ src/mandb.c ++++ src/mandb.c 2015-05-28 10:43:41.785520616 +0000 @@ -37,6 +37,7 @@ #include <errno.h> #include <sys/types.h> @@ -14,7 +12,7 @@ #include <dirent.h> #include <unistd.h> #include <signal.h> -@@ -422,10 +423,19 @@ static int mandb (const char *catpath, const char *manpath) +@@ -446,10 +447,19 @@ static int mandb (const char *catpath, c char *dbname; char *cachedir_tag; struct stat st; @@ -34,22 +32,17 @@ if (!quiet) printf (_("Processing manual pages under %s...\n"), manpath); -@@ -433,6 +443,7 @@ static int mandb (const char *catpath, const char *manpath) - if (stat (cachedir_tag, &st) == -1 && errno == ENOENT) { - FILE *cachedir_tag_file; +@@ -458,11 +468,13 @@ static int mandb (const char *catpath, c + if (stat (cachedir_tag, &st) == -1 && errno == ENOENT) { + FILE *cachedir_tag_file; -+ drop_effective_privs (); - cachedir_tag_file = fopen (cachedir_tag, "w"); - if (cachedir_tag_file) { - fputs ("Signature: 8a477f597d28d172789f06886806bc55\n" -@@ -444,6 +455,7 @@ static int mandb (const char *catpath, const char *manpath) - cachedir_tag_file); - fclose (cachedir_tag_file); ++ drop_effective_privs (); + cachedir_tag_file = fopen (cachedir_tag, "w"); + if (cachedir_tag_file) { + fputs (CACHEDIR_TAG, cachedir_tag_file); + fclose (cachedir_tag_file); + } ++ regain_effective_privs (); } -+ regain_effective_privs (); + free (cachedir_tag); } - free (cachedir_tag); - --- -1.8.4.5 - ++++++ man-db-2.6.5-zio.dif -> man-db-2.7.1-zio.dif ++++++ --- /work/SRC/openSUSE:Factory/man/man-db-2.6.5-zio.dif 2014-06-25 11:47:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.man.new/man-db-2.7.1-zio.dif 2015-06-01 09:25:12.000000000 +0200 @@ -1,14 +1,12 @@ --- - config.h.in | 3 +++ - configure.ac | 52 +++++++++++++++++++++++++++++++++++++++++++++ - lib/decompress.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + config.h.in | 3 ++ + configure.ac | 52 ++++++++++++++++++++++++++++++++++++++++++++ + lib/decompress.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+) -diff --git config.h.in config.h.in -index efa85da..9a3fcc9 100644 --- config.h.in -+++ config.h.in -@@ -692,6 +692,9 @@ ++++ config.h.in 2015-05-28 00:00:00.000000000 +0000 +@@ -737,6 +737,9 @@ /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_LIBZ @@ -18,14 +16,12 @@ /* Define to 1 if you have the <linewrap.h> header file. */ #undef HAVE_LINEWRAP_H -diff --git configure.ac configure.ac -index adde408..2daf4a3 100644 --- configure.ac -+++ configure.ac -@@ -98,6 +98,18 @@ AC_ARG_WITH([sections], - sections="$withval" - fi], - [: ${sections=1 n l 8 3 2 5 4 9 6 7}]) ++++ configure.ac 2015-05-28 11:01:35.689518526 +0000 +@@ -35,6 +35,18 @@ MAN_ARG_DEVICE + MAN_ARG_DB + MAN_ARG_CONFIG_FILE + MAN_ARG_SECTIONS +AC_ARG_WITH([zio], +[AS_HELP_STRING([--with-zio=LIBRARY], [use zlib/libbz2 wrapper library LIBRARY (libzio)])], + [if test -z "$withval" -o "$withval" = "yes" @@ -38,60 +34,58 @@ + zio=$withval + fi], + [: ${zio=no}]) - AC_ARG_ENABLE([automatic-create], - [AS_HELP_STRING([--enable-automatic-create], [allow man to create user databases on the fly])], - [if test "$enableval" = "yes" -@@ -410,6 +422,46 @@ AC_SUBST([unlzma]) + MAN_ARG_AUTOMATIC_CREATE + MAN_ARG_AUTOMATIC_UPDATE + MAN_ARG_CATS +@@ -325,6 +337,46 @@ AC_SUBST([unlzma]) AC_SUBST([unxz]) AC_SUBST([unlzip]) MAN_COMPRESS_LIB([z], [gzopen]) +dnl Check for zlib and libbz2 libraries to use this together -+dnl with SuSE's libzio to open compressed info files. ++dnl with SUSE's libzio to open compressed info files. +dnl +if test "$zio" = "no" || test -n "$zio" +then -+ AC_CHECK_HEADER(zio.h,[ -+ for lib in ${zio#lib} zio -+ do -+ AC_CHECK_LIB($lib, fzopen, [LIBS="-l$lib $LIBS"; am_cv_libzio=yes]) -+ done -+ ]) -+ if test "$am_cv_libzio" = yes; then -+ AC_DEFINE([COMP_SRC],[],[Define if you have compressors and want to support compressed cat files.]) -+ AC_DEFINE([HAVE_ZIO],[],[Define to 1 if you have libzio for opening compressed manuals]) -+ AC_CHECK_HEADER(zlib.h,[ -+ for lib in z gz -+ do -+ AC_CHECK_LIB($lib, gzopen, [LIBS="$LIBS -Wl,--no-as-needed -l$lib"; break]) -+ done -+ ]) -+ AC_CHECK_HEADER(bzlib.h,[ -+ for lib in bz2 bzip2 -+ do -+ AC_CHECK_LIB($lib, BZ2_bzopen, [LIBS="$LIBS -Wl,--no-as-needed -l$lib"; break]) -+ done -+ ]) -+ AC_CHECK_HEADER(lzmadec.h, [ -+ for lib in lzma lzmadec -+ do -+ AC_CHECK_LIB($lib, lzmadec_open, [LIBS="$LIBS -Wl,--no-as-needed -l$lib"; break]) -+ done -+ ]) -+ AC_CHECK_HEADER(lzma.h, [ -+ for lib in lzma -+ do -+ AC_CHECK_LIB($lib, lzma_easy_encoder, [LIBS="$LIBS -Wl,--no-as-needed -l$lib"; break]) -+ done -+ ]) -+ fi ++ AC_CHECK_HEADER(zio.h,[ ++ for lib in ${zio#lib} zio ++ do ++ AC_CHECK_LIB($lib, fzopen, [LIBS="-l$lib $LIBS"; am_cv_libzio=yes]) ++ done ++ ]) ++ if test "$am_cv_libzio" = yes; then ++ AC_DEFINE([COMP_SRC],[],[Define if you have compressors and want to support compressed cat files.]) ++ AC_DEFINE([HAVE_ZIO],[],[Define to 1 if you have libzio for opening compressed manuals]) ++ AC_CHECK_HEADER(zlib.h,[ ++ for lib in z gz ++ do ++ AC_CHECK_LIB($lib, gzopen, [LIBS="$LIBS -Wl,--no-as-needed -l$lib"; break]) ++ done ++ ]) ++ AC_CHECK_HEADER(bzlib.h,[ ++ for lib in bz2 bzip2 ++ do ++ AC_CHECK_LIB($lib, BZ2_bzopen, [LIBS="$LIBS -Wl,--no-as-needed -l$lib"; break]) ++ done ++ ]) ++ AC_CHECK_HEADER(lzmadec.h, [ ++ for lib in lzma lzmadec ++ do ++ AC_CHECK_LIB($lib, lzmadec_open, [LIBS="$LIBS -Wl,--no-as-needed -l$lib"; break]) ++ done ++ ]) ++ AC_CHECK_HEADER(lzma.h, [ ++ for lib in lzma ++ do ++ AC_CHECK_LIB($lib, lzma_easy_encoder, [LIBS="$LIBS -Wl,--no-as-needed -l$lib"; break]) ++ done ++ ]) ++ fi +fi dnl To add more decompressors just follow the scheme above. - # Work out which manual page hierarchy scheme might be in use. -diff --git lib/decompress.c lib/decompress.c -index a176a9d..0057e39 100644 + # Check for various header files and associated libraries. --- lib/decompress.c -+++ lib/decompress.c ++++ lib/decompress.c 2015-05-28 00:00:00.000000000 +0000 @@ -38,6 +38,10 @@ #include "xvasprintf.h" @@ -103,7 +97,7 @@ #include "manconfig.h" #include "comp_src.h" #include "pipeline.h" -@@ -68,6 +72,32 @@ static void decompress_zlib (void *data ATTRIBUTE_UNUSED) +@@ -68,6 +72,32 @@ static void decompress_zlib (void *data #endif /* HAVE_LIBZ */ @@ -136,7 +130,7 @@ pipeline *decompress_open (const char *filename) { pipecmd *cmd; -@@ -82,6 +112,37 @@ pipeline *decompress_open (const char *filename) +@@ -82,6 +112,37 @@ pipeline *decompress_open (const char *f if (stat (filename, &st) < 0 || S_ISDIR (st.st_mode)) return NULL; @@ -174,7 +168,7 @@ #ifdef HAVE_LIBZ filename_len = strlen (filename); if (filename_len > 3 && STREQ (filename + filename_len - 3, ".gz")) { -@@ -95,7 +156,11 @@ pipeline *decompress_open (const char *filename) +@@ -95,7 +156,11 @@ pipeline *decompress_open (const char *f } #endif /* HAVE_LIBZ */ @@ -186,6 +180,3 @@ if (ext) { ++ext; --- -1.8.4.5 - ++++++ man-db-2.6.5-firefox.dif -> man-db-2.7.1.dif ++++++ ++++ 1278 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/man/man-db-2.6.5-firefox.dif ++++ and /work/SRC/openSUSE:Factory/.man.new/man-db-2.7.1.dif ++++++ man-db-2.6.6.tar.xz -> man-db-2.7.1.tar.xz ++++++ ++++ 118071 lines of diff (skipped)