Hello community, here is the log from the commit of package man for openSUSE:Factory checked in at 2014-06-25 11:47:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-09-14 19:08:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.man.new/man.changes 2014-06-25 11:47:16.000000000 +0200 @@ -1,0 +2,66 @@ +Tue Jun 10 15:13:45 UTC 2014 - [email protected] + +- Avoid messages on deleted cache directories bewlow /var/cache/man/ + that is tag them as %ghost (bnc#882030) +- The former submit had rebased the patches + man-db-2.6.3.dif + man-db-2.6.3-security4.dif + man-db-2.6.3-firefox.dif + man-db-2.6.3-zio.dif + which now had renamed to + man-db-2.6.5.dif + man-db-2.6.5-security4.dif + man-db-2.6.5-firefox.dif + man-db-2.6.5-zio.dif + accordingly + +------------------------------------------------------------------ +Tue Apr 8 12:26:37 UTC 2014 - [email protected] + +- Update to version 2.6.6 +- Fixes since 2.6.3: + * man(1) and catman(8) now document the default section list set at + configure time. + * Build fixes for Automake 1.13. + * man-db 2.6.0 arranged to search the full manpath when expanding + .so directives in manual pages (so that ".so name.1" works as well + as ".so man1/name.1"), but this incorrectly did not take effect + for manual pages that consist only of a .so directive. This is + now fixed. +- Improvements since 2.6.3: + * The MANLESS environment variable is now treated as if it were a + default value for the -r option to man: occurrences of the text + "$MAN_PN" are expanded, and explicitly using the -r option + overrides the default. + * The (unfortunately still hardcoded) maximum length for paths to + manual page hierarchies in the configuration file is now 511 + characters rather than 49. + * MANPATH entries now undergo glob(7)-style wildcard expansion, + allowing entries such as "/opt/*/man". +- Fixes since 2.6.4: + * man's --warnings option works again on systems with versions of + groff that support it (broken in 2.6.4). + * man automatically falls back to C.UTF-8 and then en_GB.UTF-8 if + trying to find a UTF-8 locale on a system without + /usr/share/i18n/SUPPORTED. +- Fixes since 2.6.5: + * apropos's --and option now works again; it was broken by the + optimisations in 2.6.2. + * Restore compatibility with Automake 1.10. + * Improve support for translation of common elements of help + messages. + * Don't issue error messages when the database refers to a page that + no longer exists. + * Pass macro and hyphenation language tags to groff again (broken in + 2.6.5). +- Improvements since 2.6.5: + * ./configure --with-override-dir=OVERRIDE arranges to look for + manual pages in DIR/OVERRIDE before each path element DIR. +- rebase following patches: + * man-db-2.6.3.dif + * man-db-2.6.3-security4.dif + * man-db-2.6.3-firefox.dif + * man-db-2.6.3-zio.dif +- enable checks + +------------------------------------------------------------------- Old: ---- man-db-2.6.3-firefox.dif man-db-2.6.3-security4.dif man-db-2.6.3-zio.dif man-db-2.6.3.dif man-db-2.6.3.tar.xz New: ---- 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man.spec ++++++ --- /var/tmp/diff_new_pack.hF8ojV/_old 2014-06-25 11:47:19.000000000 +0200 +++ /var/tmp/diff_new_pack.hF8ojV/_new 2014-06-25 11:47:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package man # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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.3 +Version: 2.6.6 Release: 0 Summary: A Program for Displaying man Pages License: GPL-2.0+ @@ -51,14 +51,14 @@ Source3: cron.daily.clean_catman Source4: mancoding Source5: wrapper.c -Patch0: man-db-%{version}.dif +Patch0: man-db-2.6.5.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.3-security4.dif -Patch6: man-db-2.6.3-firefox.dif +Patch5: man-db-2.6.5-security4.dif +Patch6: man-db-2.6.5-firefox.dif Patch7: man-db-2.6.3-chinese.dif -Patch9: man-db-2.6.3-zio.dif +Patch9: man-db-2.6.5-zio.dif Patch10: man-db-2.6.3-listall.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc @@ -162,6 +162,12 @@ gcc $CFLAGS -I gnulib/lib/ -I include/ --include config.h --include configmake.h \ -o wrapper %{S:5} -L gnulib/lib/.libs/ -lgnu +%check +if ! make check; then + cat src/tests/test-suite.log + exit 1 +fi + %install %if %suse_version <= 1030 export MKDIR_P="mkdir -p" @@ -253,7 +259,7 @@ %doc %{_mandir}/man8/*.8.gz %dir %{_mandir}/id %defattr(-,man,man) -%{_localstatedir}/cache/man/* +%ghost %{_localstatedir}/cache/man/* %{_localstatedir}/adm/fillup-templates/sysconfig.cron-man %changelog ++++++ man-db-2.6.3-firefox.dif -> man-db-2.6.5-firefox.dif ++++++ --- /work/SRC/openSUSE:Factory/man/man-db-2.6.3-firefox.dif 2012-10-07 19:53:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.man.new/man-db-2.6.5-firefox.dif 2014-06-25 11:47:16.000000000 +0200 @@ -1,6 +1,12 @@ +--- + src/man.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git src/man.c src/man.c +index 10bcd4f..5c164ad 100644 --- src/man.c -+++ src/man.c 2012-10-01 14:34:29.003506558 +0000 -@@ -2312,21 +2312,23 @@ static void format_display (pipeline *de ++++ src/man.c +@@ -2316,22 +2316,24 @@ static void format_display (pipeline *decomp, if (!status) break; } @@ -21,6 +27,7 @@ htmldir); free (htmlfile); free (htmldir); + free (old_cwd); + if (!candidate) + error (CHILD_FAIL, 0, + "couldn't execute any browser from %s", @@ -28,3 +35,6 @@ } else #endif /* TROFF_IS_GROFF */ /* TODO: check format_cmd status too? */ +-- +1.8.4.5 + ++++++ man-db-2.6.3-security4.dif -> man-db-2.6.5-security4.dif ++++++ --- /work/SRC/openSUSE:Factory/man/man-db-2.6.3-security4.dif 2012-10-07 19:53:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.man.new/man-db-2.6.5-security4.dif 2014-06-25 11:47:16.000000000 +0200 @@ -1,5 +1,11 @@ +--- + 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 2012-10-01 14:30:11.619507260 +0000 ++++ src/mandb.c @@ -37,6 +37,7 @@ #include <errno.h> #include <sys/types.h> @@ -8,17 +14,15 @@ #include <dirent.h> #include <unistd.h> #include <signal.h> -@@ -420,11 +421,20 @@ static int mandb (const char *catpath, c +@@ -422,10 +423,19 @@ static int mandb (const char *catpath, const char *manpath) char *dbname; char *cachedir_tag; struct stat st; + int fd; dbname = mkdbname (catpath); - sprintf (pid, "%d", getpid ()); - database = appendstr (NULL, catpath, "/", pid, NULL); -- -+ + database = xasprintf ("%s/%d", catpath, getpid ()); + + /* Just for the case that catpath isn't a system catpath */ + drop_effective_privs (); + fd = open (database, O_WRONLY | O_CREAT | O_EXCL, 0644); @@ -30,7 +34,7 @@ if (!quiet) printf (_("Processing manual pages under %s...\n"), manpath); -@@ -432,6 +442,7 @@ static int mandb (const char *catpath, c +@@ -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; @@ -38,7 +42,7 @@ cachedir_tag_file = fopen (cachedir_tag, "w"); if (cachedir_tag_file) { fputs ("Signature: 8a477f597d28d172789f06886806bc55\n" -@@ -443,6 +454,7 @@ static int mandb (const char *catpath, c +@@ -444,6 +455,7 @@ static int mandb (const char *catpath, const char *manpath) cachedir_tag_file); fclose (cachedir_tag_file); } @@ -46,3 +50,6 @@ } free (cachedir_tag); +-- +1.8.4.5 + ++++++ man-db-2.6.3-zio.dif -> man-db-2.6.5-zio.dif ++++++ --- /work/SRC/openSUSE:Factory/man/man-db-2.6.3-zio.dif 2012-10-07 19:53:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.man.new/man-db-2.6.5-zio.dif 2014-06-25 11:47:16.000000000 +0200 @@ -1,6 +1,14 @@ +--- + 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 2012-10-02 09:06:48.591006953 +0000 -@@ -674,6 +674,9 @@ ++++ config.h.in +@@ -692,6 +692,9 @@ /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_LIBZ @@ -10,8 +18,10 @@ /* 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 2012-10-02 09:55:06.783914808 +0000 ++++ configure.ac @@ -98,6 +98,18 @@ AC_ARG_WITH([sections], sections="$withval" fi], @@ -31,7 +41,7 @@ AC_ARG_ENABLE([automatic-create], [AS_HELP_STRING([--enable-automatic-create], [allow man to create user databases on the fly])], [if test "$enableval" = "yes" -@@ -375,6 +387,46 @@ AC_SUBST([unlzma]) +@@ -410,6 +422,46 @@ AC_SUBST([unlzma]) AC_SUBST([unxz]) AC_SUBST([unlzip]) MAN_COMPRESS_LIB([z], [gzopen]) @@ -78,11 +88,13 @@ 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 --- lib/decompress.c -+++ lib/decompress.c 2012-10-02 09:05:43.787007258 +0000 -@@ -36,6 +36,10 @@ - # include "zlib.h" - #endif /* HAVE_LIBZ */ ++++ lib/decompress.c +@@ -38,6 +38,10 @@ + + #include "xvasprintf.h" +#ifdef HAVE_ZIO +# include "zio.h" @@ -91,7 +103,7 @@ #include "manconfig.h" #include "comp_src.h" #include "pipeline.h" -@@ -66,6 +70,32 @@ static void decompress_zlib (void *data +@@ -68,6 +72,32 @@ static void decompress_zlib (void *data ATTRIBUTE_UNUSED) #endif /* HAVE_LIBZ */ @@ -124,7 +136,7 @@ pipeline *decompress_open (const char *filename) { pipecmd *cmd; -@@ -80,6 +110,37 @@ pipeline *decompress_open (const char *f +@@ -82,6 +112,37 @@ pipeline *decompress_open (const char *filename) if (stat (filename, &st) < 0 || S_ISDIR (st.st_mode)) return NULL; @@ -162,7 +174,7 @@ #ifdef HAVE_LIBZ filename_len = strlen (filename); if (filename_len > 3 && STREQ (filename + filename_len - 3, ".gz")) { -@@ -93,7 +154,11 @@ pipeline *decompress_open (const char *f +@@ -95,7 +156,11 @@ pipeline *decompress_open (const char *filename) } #endif /* HAVE_LIBZ */ @@ -174,3 +186,6 @@ if (ext) { ++ext; +-- +1.8.4.5 + ++++++ man-db-2.6.3-firefox.dif -> man-db-2.6.5.dif ++++++ ++++ 1320 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/man/man-db-2.6.3-firefox.dif ++++ and /work/SRC/openSUSE:Factory/.man.new/man-db-2.6.5.dif ++++++ man-db-2.6.3.tar.xz -> man-db-2.6.6.tar.xz ++++++ ++++ 132817 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
