From 5ab4d52f0ba19db08e17c5bebc65044e153d52b9eb996ed7c94b84dcc149a532 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 18 Aug 2022 11:45:21 +0000 Subject: [PATCH 1/3] . OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=141 --- man.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/man.spec b/man.spec index 79bba76..f12f12b 100644 --- a/man.spec +++ b/man.spec @@ -166,7 +166,6 @@ find -name 'Makefile.*' | xargs \ --with-systemdtmpfilesdir=no \ --with-systemdsystemunitdir=no \ %endif - --enable-dups \ --enable-cache-owner=man \ --with-device=utf8 \ --with-zio \ @@ -174,15 +173,15 @@ find -name 'Makefile.*' | xargs \ --disable-rpath \ --disable-automatic-create \ --enable-automatic-update \ + --enable-mandirs=GNU \ --disable-cats \ --enable-threads=posix \ --enable-mb-groff \ --with-db=gdbm \ --enable-nls \ --with-config-file=%{_sysconfdir}/manpath.config \ - --without-included-gettext \ --with-sections="${SEC}" -%make_build nls=all +%make_build nls=all LOCALE_FR_UTF8=fr_FR.UTF-8 # Fix coding for man in $(find man/ -type f -a -name '*.[0-9]'); do pp="$(head -n 1 $man)" @@ -215,7 +214,7 @@ fi export MKDIR_P="mkdir -p" %endif rm -rf %{buildroot}%{_localstatedir}/cache/man -%make_install nls=all +%make_install nls=all LOCALE_FR_UTF8=fr_FR.UTF-8 find %{buildroot} -type f -name "*.la" -delete -print # Move manual mkdir -p %{buildroot}%{_docdir} From 629c0a4c7235c9e4340cc4484c52a6186ec0ead7676d5ff5c3f03bb6ba7c48e7 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 23 Aug 2022 06:05:39 +0000 Subject: [PATCH 2/3] Accepting request 998716 from home:dirkmueller:Factory - update to 2.10.2: * Regenerating man-db's build system now explicitly requires Automake >= 1.14. (This was already the case since at least man-db 2.10.0, but was previously undocumented.) * Make `man -H` sleep for a few seconds after starting the browser, since it may background itself before loading files (Dr. Werner Fink). * If an override directory is configured using `--with-override-dir`, it is now applied more consistently when building the manpath, and whether a page was found in an override directory is considered when sorting candidates for display (Mihail Konev). * Make the man-db manual build reproducible. * Add some hardening options to the `systemd` service. * `configure` now has a `--with-snapdir` option, for use on systems where `snapd` is configured to use a directory other than `/snap`. * Fix occasional `mandb-symlink-target-timestamp` test failure. * Fix inadvertent reliance on a GCC extension that caused build failures with Clang. * Fix building without `iconv`. - drop man-db-2.7.1-firefox.dif (upstream) OBS-URL: https://build.opensuse.org/request/show/998716 OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=142 --- man-db-2.10.0.tar.xz | 3 - man-db-2.10.0.tar.xz.asc | 16 ----- man-db-2.10.2.tar.xz | 3 + man-db-2.10.2.tar.xz.asc | 16 +++++ man-db-2.7.1-firefox.dif | 17 ----- man-db-2.7.1-zio.dif | 34 +++++---- man-db-2.9.4-no-chown.patch | 9 +-- man-db-2.9.4.patch | 136 ++++++++++++++++++++---------------- man.changes | 23 ++++++ man.keyring | 47 ------------- man.spec | 6 +- 11 files changed, 144 insertions(+), 166 deletions(-) delete mode 100644 man-db-2.10.0.tar.xz delete mode 100644 man-db-2.10.0.tar.xz.asc create mode 100644 man-db-2.10.2.tar.xz create mode 100644 man-db-2.10.2.tar.xz.asc delete mode 100644 man-db-2.7.1-firefox.dif diff --git a/man-db-2.10.0.tar.xz b/man-db-2.10.0.tar.xz deleted file mode 100644 index 4eca938..0000000 --- a/man-db-2.10.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a8629022f7117dc7fc6473c6fdb14913b24b106059bb056abee87dbd6070c79 -size 1888196 diff --git a/man-db-2.10.0.tar.xz.asc b/man-db-2.10.0.tar.xz.asc deleted file mode 100644 index 9cfa02f..0000000 --- a/man-db-2.10.0.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEErApP8SYRtvzPAcEROTWH2X2GUAsFAmH9QJ4ACgkQOTWH2X2G -UAuKBQ/8CfdjtSaWWhtEde7f56MeuIU8W8wkl2E0g2DM+I7UUMhs3DUmD5crC9ah -sLPcSzRr60wv9nLwG7SJSxsMAaUjAa2R78UCweRM4ikxoaBAWkKSSzxAjxeP8o0H -5m/vWepcUHij5MuXvXVBrYa4NGRhdfJo6BXrFDZl4qCFF06UiVZqTg35JvX2zWil -ZayQwlkN5h7ZPuNNmzTiQ8obB+f3n/GOXQ4SE4GKoImhgEvj++Moyo6PiR5CB1G4 -RaR62VoRuL4rmQS2dHMVRk7oD8VU3rg7cNpUh1QOOnyKOM0T7cjgIurXU2Z/pZ0x -op7VCOmllOprfBJVREs7cQmfQL7CDUGTzfmFMc+MEFW6LM6tl6Wr/6+tKYpLAiH/ -s2ylyOUVCxZay5eXEIcWnSpDxPWPRIQURdqbanobJ5Eo0gP1O23cycOeypqILTPF -t3tCAwiWbj/Je4te6paFPJ3rFYRv3xFBVr3ltaahDAj+LTbA5pYkTpPFwSqYkO3D -EJYYvjOzX6+rdwJuLCe2Ytgy9fdT5p1o7Cm4KusUWfnHKCMNJ+1/So02LayfHMKN -wPQmjXhPVMsXKvt88a9wfK8KVLRVw+hhGURKQMrf3f/hbYwBU8zUxNWxq8NagpER -S9FudI2n5glV3KHawJyK0mlfdK34qMra26cC8ekL3OyJBuXJHVA= -=rJ2k ------END PGP SIGNATURE----- diff --git a/man-db-2.10.2.tar.xz b/man-db-2.10.2.tar.xz new file mode 100644 index 0000000..1b55813 --- /dev/null +++ b/man-db-2.10.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee97954d492a13731903c9d0727b9b01e5089edbd695f0cdb58d405a5af5514d +size 1902840 diff --git a/man-db-2.10.2.tar.xz.asc b/man-db-2.10.2.tar.xz.asc new file mode 100644 index 0000000..79f5d61 --- /dev/null +++ b/man-db-2.10.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEErApP8SYRtvzPAcEROTWH2X2GUAsFAmIzgxkACgkQOTWH2X2G +UAtY+xAAlW5Mfz1D5CFnZm6/+mN2zoXVx4+BqdujPWzmlxS+sPY2HuxtkZ8kMBai +n5VuxmbEzc+CyJsHqs2ZpDA2ccGjsbTZSFqztnfvxrAQAwkD8NALms9xZoXJD6sf +8K0zXvB6utEbOpDnAW1o2psho0kh5iF2P91G//Ay/XbPsgzYn4B6dGNgrScYWF24 +3DfsGP/8sDYgSrMzFjyOHnpGhSLzWdNgjP0xN2/ZOuIQDWVZZO/7h7AJwdGbuj+t +KgfZwVc5p1IaPd7ORd8JDQmA8lSuwfh04blkt078MdBTIikKgpc8tkrjGnVpmgP2 +EsPC5XbC0c5c8THRgP4YFt0vfVfdvBwyuyCnd83pP8QzJTzRykBQ/s/ce7fzZ2dE +aeKR7ehqj7UC7F+YNp37xLRe4hqGedufu8YwzdEZ/d3aVP4U0iLTES/VwmjqBJGG +Dsyis/YLYD3W5hGgKzKPcNVzDjt22zvlYhcrWf+OKQF361RnZPm6BT7PwJ81XV2A +Sh8YBvRMv+K87iXKHyvLAL3d8tk1Mw7b8NRg0SQLO9jg/BV2L8Vx2u5yfY3WptCJ +jgL4EMVE8Pa2DMO4sU/7yaiU7GBR0QXiPpo5uWETlAXWNIHxCfwui7L9uH2JqwKc +zUVEbOAxg/0x2ghMYZpxftyZ7yorrbZvprrXcha+gELvJ1LRBqA= +=yX77 +-----END PGP SIGNATURE----- diff --git a/man-db-2.7.1-firefox.dif b/man-db-2.7.1-firefox.dif deleted file mode 100644 index 9d171c4..0000000 --- a/man-db-2.7.1-firefox.dif +++ /dev/null @@ -1,17 +0,0 @@ ---- - src/man.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- src/man.c -+++ src/man.c 2018-11-23 13:08:52.119497206 +0000 -@@ -2020,7 +2020,9 @@ static void format_display (pipeline *de - error (CHILD_FAIL, 0, - "no browser configured, so cannot show " - "HTML output"); -- } -+ } else if (!disp_status) -+ sleep (5); /* firefox runs into background to fast */ -+ - free (browser_list); - if (remove_directory (htmldir, 0) == -1) - error (0, errno, _("can't remove directory %s"), diff --git a/man-db-2.7.1-zio.dif b/man-db-2.7.1-zio.dif index da26b8e..ea17183 100644 --- a/man-db-2.7.1-zio.dif +++ b/man-db-2.7.1-zio.dif @@ -4,9 +4,11 @@ src/decompress.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 124 insertions(+), 1 deletion(-) ---- config.h.in -+++ config.h.in 2022-08-18 06:45:49.997898305 +0000 -@@ -1003,6 +1003,9 @@ +Index: config.h.in +=================================================================== +--- config.h.in.orig ++++ config.h.in +@@ -1009,6 +1009,9 @@ /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_LIBZ @@ -16,8 +18,10 @@ /* Define to 1 if the bcrypt library is guaranteed to be present. */ #undef HAVE_LIB_BCRYPT ---- configure.ac -+++ configure.ac 2022-08-18 06:45:49.997898305 +0000 +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac @@ -35,6 +35,18 @@ MAN_ARG_DEVICE MAN_ARG_DB MAN_ARG_CONFIG_FILE @@ -37,7 +41,7 @@ MAN_ARG_AUTOMATIC_CREATE MAN_ARG_AUTOMATIC_UPDATE MAN_ARG_CATS -@@ -388,6 +400,46 @@ AC_DEFINE_UNQUOTED([PROG_UNXZ], ["$unxz" +@@ -400,6 +412,46 @@ AC_DEFINE_UNQUOTED([PROG_UNXZ], ["$unxz" AC_DEFINE_UNQUOTED([PROG_UNLZIP], ["$unlzip"], [Program to use as unlzip.]) AC_DEFINE_UNQUOTED([PROG_UNZSTD], ["$unzstd"], [Program to use as unzstd.]) MAN_COMPRESS_LIB([z], [gzopen]) @@ -84,8 +88,10 @@ dnl To add more decompressors just follow the scheme above. # Check for various header files and associated libraries. ---- src/decompress.c -+++ src/decompress.c 2022-08-18 06:54:42.008671417 +0000 +Index: src/decompress.c +=================================================================== +--- src/decompress.c.orig ++++ src/decompress.c @@ -38,12 +38,17 @@ # include "zlib.h" #endif /* HAVE_LIBZ */ @@ -104,8 +110,8 @@ #include "manconfig.h" #include "comp_src.h" #include "pipeline.h" -@@ -183,6 +188,33 @@ static decompress *decompress_try_zlib ( - +@@ -186,6 +191,33 @@ static decompress *decompress_try_zlib ( + #define OPEN_FLAGS_UNUSED MAYBE_UNUSED #endif /* HAVE_LIBZ */ +#ifdef HAVE_ZIO @@ -137,8 +143,8 @@ + extern man_sandbox *sandbox; - decompress *decompress_open (const char *filename, int flags) -@@ -199,6 +231,38 @@ decompress *decompress_open (const char + decompress *decompress_open (const char *filename, int flags OPEN_FLAGS_UNUSED) +@@ -202,6 +234,38 @@ decompress *decompress_open (const char if (stat (filename, &st) < 0 || S_ISDIR (st.st_mode)) return NULL; @@ -177,7 +183,7 @@ #ifdef HAVE_LIBZ filename_len = strlen (filename); if (filename_len > 3 && STREQ (filename + filename_len - 3, ".gz")) { -@@ -216,7 +280,11 @@ decompress *decompress_open (const char +@@ -219,7 +283,11 @@ decompress *decompress_open (const char } #endif /* HAVE_LIBZ */ @@ -189,7 +195,7 @@ if (ext) { ++ext; -@@ -309,7 +377,7 @@ void decompress_inprocess_replace (decom +@@ -312,7 +380,7 @@ void decompress_inprocess_replace (decom void decompress_start (decompress *d) { diff --git a/man-db-2.9.4-no-chown.patch b/man-db-2.9.4-no-chown.patch index 67968fb..2cfe815 100644 --- a/man-db-2.9.4-no-chown.patch +++ b/man-db-2.9.4-no-chown.patch @@ -1,7 +1,8 @@ -diff -Nur man-db-2.9.4/src/Makefile.am new/src/Makefile.am ---- man-db-2.9.4/src/Makefile.am 2020-01-01 16:11:59.000000000 +0100 -+++ new/src/Makefile.am 2021-05-31 23:36:22.062144466 +0200 -@@ -211,16 +211,7 @@ +Index: man-db-2.10.2/src/Makefile.am +=================================================================== +--- man-db-2.10.2.orig/src/Makefile.am ++++ man-db-2.10.2/src/Makefile.am +@@ -210,16 +210,7 @@ apropos$(EXEEXT): whatis$(EXEEXT) all-am: apropos$(EXEEXT) install-exec-hook: diff --git a/man-db-2.9.4.patch b/man-db-2.9.4.patch index b0d678d..f6e1805 100644 --- a/man-db-2.9.4.patch +++ b/man-db-2.9.4.patch @@ -13,10 +13,11 @@ src/ult_src.c | 9 +++- 12 files changed, 242 insertions(+), 79 deletions(-) -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -289,6 +289,14 @@ fi +Index: man-db-2.10.2/configure.ac +=================================================================== +--- man-db-2.10.2.orig/configure.ac ++++ man-db-2.10.2/configure.ac +@@ -301,6 +301,14 @@ fi MAN_CHECK_PROGS([eqn], [EQN], [use EQN to preprocess equations], [eqn geqn]) AC_DEFINE_UNQUOTED([PROG_EQN], ["$eqn"], [Program to use as eqn.]) @@ -31,7 +32,7 @@ diff --git a/configure.ac b/configure.ac MAN_CHECK_PROGS([neqn], [NEQN], [use NEQN to preprocess equations for character devices], [neqn gneqn]) # If we fail to find an neqn, use eqn and try to force it to output for an # ascii device. As this is only relevant for equations (?), not using latin1 -@@ -339,9 +347,15 @@ then +@@ -351,9 +359,15 @@ then compress_ext="gz" fi MAN_CHECK_PROGS([compress], [COMPRESS], [use COMPRESS as UNIX compression utility], [compress]) @@ -49,9 +50,10 @@ diff --git a/configure.ac b/configure.ac if test -z "$gzip" then compressor="$compress -c" -diff --git a/include/comp_src.h b/include/comp_src.h ---- a/include/comp_src.h -+++ b/include/comp_src.h +Index: man-db-2.10.2/include/comp_src.h +=================================================================== +--- man-db-2.10.2.orig/include/comp_src.h ++++ man-db-2.10.2/include/comp_src.h @@ -51,7 +51,7 @@ struct compression comp_list[] = { #endif /* HAVE_GZIP */ @@ -61,10 +63,11 @@ diff --git a/include/comp_src.h b/include/comp_src.h {PROG_UNCOMPRESS, "Z", NULL}, /* Else if we have gzip, incorporate the following */ #elif defined (HAVE_GZIP) -diff --git a/lib/security.c b/lib/security.c ---- a/lib/security.c -+++ b/lib/security.c -@@ -82,6 +82,11 @@ static void gripe_set_euid (void) +Index: man-db-2.10.2/lib/security.c +=================================================================== +--- man-db-2.10.2.orig/lib/security.c ++++ man-db-2.10.2/lib/security.c +@@ -80,6 +80,11 @@ static void gripe_set_euid (void) fatal (errno, _("can't set effective uid")); } @@ -76,7 +79,7 @@ diff --git a/lib/security.c b/lib/security.c #endif /* MAN_OWNER */ void init_security (void) -@@ -168,6 +173,31 @@ void regain_effective_privs (void) +@@ -166,6 +171,31 @@ void regain_effective_privs (void) uid = euid; gid = egid; } @@ -108,9 +111,10 @@ diff --git a/lib/security.c b/lib/security.c #endif /* MAN_OWNER */ } -diff --git a/mk_catdirs b/mk_catdirs ---- a/mk_catdirs -+++ b/mk_catdirs +Index: man-db-2.10.2/mk_catdirs +=================================================================== +--- /dev/null ++++ man-db-2.10.2/mk_catdirs @@ -0,0 +1,30 @@ +#!/bin/sh + @@ -142,9 +146,10 @@ diff --git a/mk_catdirs b/mk_catdirs +cd ${OLDPWD} + +test "$(id -u)" -ne 0 || chown man:man -R ${CACHE} -diff --git a/src/check_mandirs.c b/src/check_mandirs.c ---- a/src/check_mandirs.c -+++ b/src/check_mandirs.c +Index: man-db-2.10.2/src/check_mandirs.c +=================================================================== +--- man-db-2.10.2.orig/src/check_mandirs.c ++++ man-db-2.10.2/src/check_mandirs.c @@ -417,7 +417,7 @@ void chown_if_possible (const char *path #endif /* MAN_OWNER */ @@ -230,9 +235,10 @@ diff --git a/src/check_mandirs.c b/src/check_mandirs.c content = MYDBM_FETCH (dbf, key); if (!MYDBM_DPTR (content)) { nextkey = MYDBM_NEXTKEY (dbf, key); -diff --git a/src/lexgrog.l b/src/lexgrog.l ---- a/src/lexgrog.l -+++ b/src/lexgrog.l +Index: man-db-2.10.2/src/lexgrog.l +=================================================================== +--- man-db-2.10.2.orig/src/lexgrog.l ++++ man-db-2.10.2/src/lexgrog.l @@ -69,7 +69,7 @@ #include "manconv.h" #include "manconv_client.h" @@ -368,9 +374,10 @@ diff --git a/src/lexgrog.l b/src/lexgrog.l {next}{blank_eol}+[-\\]-{blank}* | {next}{blank_eol}*[-\\]-{blank}+ | {bol}\.Nd{blank}* { -diff --git a/src/man.c b/src/man.c ---- a/src/man.c -+++ b/src/man.c +Index: man-db-2.10.2/src/man.c +=================================================================== +--- man-db-2.10.2.orig/src/man.c ++++ man-db-2.10.2/src/man.c @@ -56,6 +56,7 @@ #include #include @@ -412,7 +419,7 @@ diff --git a/src/man.c b/src/man.c # ifdef TROFF_IS_GROFF static bool ditroff; -@@ -614,36 +622,6 @@ static void gripe_no_name (const char *s +@@ -617,36 +625,6 @@ static void gripe_no_name (const char *s exit (FAIL); } @@ -449,7 +456,7 @@ diff --git a/src/man.c b/src/man.c #if defined(TROFF_IS_GROFF) || defined(HEIRLOOM_NROFF) static int get_roff_line_length (void) { -@@ -1533,6 +1511,18 @@ static void setenv_less (pipecmd *cmd, c +@@ -1536,6 +1514,18 @@ static void setenv_less (pipecmd *cmd, c free (less_opts); } @@ -468,7 +475,7 @@ diff --git a/src/man.c b/src/man.c static void add_output_iconv (pipeline *p, const char *source, const char *target) { -@@ -1663,6 +1653,8 @@ static pipeline *make_display_command (c +@@ -1666,6 +1656,8 @@ static pipeline *make_display_command (c if (pager_cmd) { setenv_less (pager_cmd, title); @@ -477,7 +484,7 @@ diff --git a/src/man.c b/src/man.c pipeline_command (p, pager_cmd); } pipeline_ignore_signals (p, 1); -@@ -1673,7 +1665,7 @@ static pipeline *make_display_command (c +@@ -1676,7 +1668,7 @@ static pipeline *make_display_command (c return p; } @@ -486,7 +493,7 @@ diff --git a/src/man.c b/src/man.c /* return a (malloced) temporary name in cat_file's directory */ static char *tmp_cat_filename (const char *cat_file) { -@@ -1701,7 +1693,6 @@ static char *tmp_cat_filename (const cha +@@ -1704,7 +1696,6 @@ static char *tmp_cat_filename (const cha return name; } @@ -494,7 +501,7 @@ diff --git a/src/man.c b/src/man.c /* If delete unlink tmp_cat, else commit tmp_cat to cat_file. Return non-zero on error. */ -@@ -1774,6 +1765,7 @@ static int commit_tmp_cat (const char *c +@@ -1777,6 +1768,7 @@ static int commit_tmp_cat (const char *c return status; } @@ -502,7 +509,7 @@ diff --git a/src/man.c b/src/man.c /* TODO: This should all be refactored after work on the decompression * library is complete. -@@ -1810,7 +1802,6 @@ static void cleanup_unlink (void *arg) +@@ -1813,7 +1805,6 @@ static void cleanup_unlink (void *arg) } #ifdef MAN_CATS @@ -510,7 +517,7 @@ diff --git a/src/man.c b/src/man.c /* Return pipeline to write formatted manual page to for saving as cat file. */ static pipeline *open_cat_stream (const char *cat_file, const char *encoding) { -@@ -2036,6 +2027,7 @@ static void format_display (decompress * +@@ -2039,6 +2030,7 @@ static void format_display (decompress * regain_effective_privs (); } @@ -518,7 +525,7 @@ diff --git a/src/man.c b/src/man.c /* "Display" a page in catman mode, which amounts to saving it. */ /* TODO: merge with format_display_and_save? */ static void display_catman (const char *cat_file, decompress *d, -@@ -2081,6 +2073,7 @@ static void display_catman (const char * +@@ -2084,6 +2076,7 @@ static void display_catman (const char * pop_cleanup (cleanup_unlink, tmpcat); free (tmpcat); } @@ -526,7 +533,7 @@ diff --git a/src/man.c b/src/man.c static void disable_hyphenation (void *data MAYBE_UNUSED) { -@@ -2283,7 +2276,7 @@ static int display (const char *dir, con +@@ -2286,7 +2279,7 @@ static int display (const char *dir, con format_cmd = NULL; decomp_errno = errno; } @@ -535,7 +542,7 @@ diff --git a/src/man.c b/src/man.c /* Get modification time, for commit_tmp_cat(). */ if (man_file && *man_file) { struct stat stb; -@@ -2293,7 +2286,7 @@ static int display (const char *dir, con +@@ -2296,7 +2289,7 @@ static int display (const char *dir, con } else man_modtime = get_stat_mtime (&stb); } @@ -544,7 +551,7 @@ diff --git a/src/man.c b/src/man.c display_to_stdout = troff; #ifdef TROFF_IS_GROFF if (htmlout || gxditview) -@@ -2434,6 +2427,7 @@ static int display (const char *dir, con +@@ -2437,6 +2430,7 @@ static int display (const char *dir, con } if (printed) putchar ('\n'); @@ -552,7 +559,7 @@ diff --git a/src/man.c b/src/man.c } else if (catman) { if (format) { if (!save_cat) -@@ -2446,6 +2440,7 @@ static int display (const char *dir, con +@@ -2449,6 +2443,7 @@ static int display (const char *dir, con format_cmd, formatted_encoding); } @@ -560,7 +567,7 @@ diff --git a/src/man.c b/src/man.c } else if (format) { /* no cat or out of date */ pipeline *disp_cmd; -@@ -3347,7 +3342,7 @@ static int display_database_check (struc +@@ -3390,7 +3385,7 @@ static int display_database_check (struc #ifdef MAN_DB_UPDATES if (!exists && !skip) { debug ("dbdelete_wrapper (%s, %p, %s)\n", @@ -569,7 +576,7 @@ diff --git a/src/man.c b/src/man.c dbdelete_wrapper (candp->req_name, candp->source, candp->path); } #endif /* MAN_DB_UPDATES */ -@@ -3946,17 +3941,20 @@ static int local_man_loop (const char *a +@@ -3989,17 +3984,20 @@ static int local_man_loop (const char *a /* Check that the file exists and isn't e.g. a directory */ if (stat (argv, &st)) { error (0, errno, "%s", argv); @@ -590,7 +597,7 @@ diff --git a/src/man.c b/src/man.c return NOT_FOUND; } -@@ -4019,6 +4017,11 @@ executable_out: +@@ -4062,6 +4060,11 @@ executable_out: argv_abs = xstrdup (argv); } lang = lang_dir (argv_abs); @@ -602,7 +609,7 @@ diff --git a/src/man.c b/src/man.c free (argv_abs); if (!display (NULL, argv, NULL, argv_base, NULL)) { if (local_mf) -@@ -4274,7 +4277,16 @@ int main (int argc, char *argv[]) +@@ -4317,7 +4320,16 @@ int main (int argc, char *argv[]) umask (022); init_locale (); @@ -620,7 +627,7 @@ diff --git a/src/man.c b/src/man.c /* Use LANGUAGE only when LC_MESSAGES locale category is * neither "C" nor "POSIX". */ if (internal_locale && strcmp (internal_locale, "C") && -@@ -4319,7 +4331,16 @@ int main (int argc, char *argv[]) +@@ -4362,7 +4374,16 @@ int main (int argc, char *argv[]) if (external) do_extern (argc, argv); @@ -637,9 +644,10 @@ diff --git a/src/man.c b/src/man.c /* close this locale and reinitialise if a new locale was issued as an argument or in $MANOPT */ -diff --git a/src/man_db.conf.in b/src/man_db.conf.in ---- a/src/man_db.conf.in -+++ b/src/man_db.conf.in +Index: man-db-2.10.2/src/man_db.conf.in +=================================================================== +--- man-db-2.10.2.orig/src/man_db.conf.in ++++ man-db-2.10.2/src/man_db.conf.in @@ -20,6 +20,14 @@ MANDATORY_MANPATH /usr/man MANDATORY_MANPATH /usr/share/man @@ -675,12 +683,13 @@ diff --git a/src/man_db.conf.in b/src/man_db.conf.in -MANDB_MAP /opt/man /var/cache/man/opt +MANDB_MAP /opt/man /var/cache/man/oldopt +MANDB_MAP /opt/share/man /var/cache/man/opt - MANDB_MAP /snap/man /var/cache/man/snap + MANDB_MAP @snapdir@/man /var/cache/man/snap # #--------------------------------------------------------- -diff --git a/src/mandb.c b/src/mandb.c ---- a/src/mandb.c -+++ b/src/mandb.c +Index: man-db-2.10.2/src/mandb.c +=================================================================== +--- man-db-2.10.2.orig/src/mandb.c ++++ man-db-2.10.2/src/mandb.c @@ -207,6 +207,8 @@ struct dbpaths { #ifdef MAN_OWNER extern uid_t ruid; @@ -734,9 +743,10 @@ diff --git a/src/mandb.c b/src/mandb.c #endif /* MAN_OWNER */ read_config_file (user); -diff --git a/src/manp.c b/src/manp.c ---- a/src/manp.c -+++ b/src/manp.c +Index: man-db-2.10.2/src/manp.c +=================================================================== +--- man-db-2.10.2.orig/src/manp.c ++++ man-db-2.10.2/src/manp.c @@ -906,7 +906,7 @@ static char *def_path (enum config_flag /* If we have complete config file failure... */ @@ -746,9 +756,10 @@ diff --git a/src/manp.c b/src/manp.c return manpath; } -diff --git a/src/straycats.c b/src/straycats.c ---- a/src/straycats.c -+++ b/src/straycats.c +Index: man-db-2.10.2/src/straycats.c +=================================================================== +--- man-db-2.10.2.orig/src/straycats.c ++++ man-db-2.10.2/src/straycats.c @@ -38,6 +38,7 @@ #include #include @@ -757,9 +768,10 @@ diff --git a/src/straycats.c b/src/straycats.c #include #include "canonicalize.h" -diff --git a/src/ult_src.c b/src/ult_src.c ---- a/src/ult_src.c -+++ b/src/ult_src.c +Index: man-db-2.10.2/src/ult_src.c +=================================================================== +--- man-db-2.10.2.orig/src/ult_src.c ++++ man-db-2.10.2/src/ult_src.c @@ -342,10 +342,15 @@ const char *ult_src (const char *name, c } decompress_start (decomp); @@ -778,8 +790,10 @@ diff --git a/src/ult_src.c b/src/ult_src.c include = test_for_include (buffer); if (include) { ---- a/src/tests/get-mtime.c -+++ b/src/tests/get-mtime.c 2022-08-18 10:24:04.881594094 +0000 +Index: man-db-2.10.2/src/tests/get-mtime.c +=================================================================== +--- man-db-2.10.2.orig/src/tests/get-mtime.c ++++ man-db-2.10.2/src/tests/get-mtime.c @@ -69,7 +69,7 @@ int main (int argc, char **argv) if (lstat (path, &st) < 0) fatal (errno, "can't lstat %s", path); diff --git a/man.changes b/man.changes index cc46194..7e4ee2f 100644 --- a/man.changes +++ b/man.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Mon Aug 22 21:17:21 UTC 2022 - Dirk Müller + +- update to 2.10.2: + * Regenerating man-db's build system now explicitly requires Automake >= + 1.14. (This was already the case since at least man-db 2.10.0, but was + previously undocumented.) + * Make `man -H` sleep for a few seconds after starting the browser, since + it may background itself before loading files (Dr. Werner Fink). + * If an override directory is configured using `--with-override-dir`, it is + now applied more consistently when building the manpath, and whether a + page was found in an override directory is considered when sorting + candidates for display (Mihail Konev). + * Make the man-db manual build reproducible. + * Add some hardening options to the `systemd` service. + * `configure` now has a `--with-snapdir` option, for use on systems where + `snapd` is configured to use a directory other than `/snap`. + * Fix occasional `mandb-symlink-target-timestamp` test failure. + * Fix inadvertent reliance on a GCC extension that caused build failures + with Clang. + * Fix building without `iconv`. +- drop man-db-2.7.1-firefox.dif (upstream) + ------------------------------------------------------------------- Thu Aug 18 10:25:21 UTC 2022 - Dr. Werner Fink diff --git a/man.keyring b/man.keyring index 9815e88..2ecf2b0 100644 --- a/man.keyring +++ b/man.keyring @@ -1,4 +1,3 @@ -GPG keys of Colin Watson -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Colin Watson -- Debian developer @@ -647,49 +646,3 @@ BPNliXslGY+D93gG5KncAE+qJ54/rac8AMyLEbcw0yn9dRrgzGdPPECXt17h+kfT 3VAe =JloC -----END PGP PUBLIC KEY BLOCK----- - -GPG keys of Giuseppe Sacco ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.1 (GNU/Linux) - -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 -=SLog ------END PGP PUBLIC KEY BLOCK----- - diff --git a/man.spec b/man.spec index f12f12b..08d1d10 100644 --- a/man.spec +++ b/man.spec @@ -26,7 +26,7 @@ %global optflags %{optflags} %{**} %bcond_without sdtimer Name: man -Version: 2.10.0 +Version: 2.10.2 Release: 0 Summary: A Program for Displaying man Pages License: GPL-2.0-or-later @@ -34,7 +34,7 @@ Group: System/Base URL: https://savannah.nongnu.org/projects/man-db Source0: https://download.savannah.gnu.org/releases/man-db/man-db-%{version}.tar.xz Source1: https://download.savannah.gnu.org/releases/man-db/man-db-%{version}.tar.xz.asc -Source2: https://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=man-db&download=1#/%{name}.keyring +Source2: https://savannah.nongnu.org/people/viewgpg.php?user_id=10653#/%{name}.keyring Source3: sysconfig.cron-man Source4: cron.daily.do_mandb Source5: wrapper.c @@ -43,7 +43,6 @@ Source7: man-db-create.service Source8: manpath.csh Source9: manpath.sh Patch0: man-db-2.3.19deb4.0-groff.dif -Patch2: man-db-2.7.1-firefox.dif Patch3: man-db-2.6.3-chinese.dif # PATCH-FEATURE-OPENSUSE man-db-2.7.1-zio.dif -- Allow using libzio for decompression Patch4: man-db-2.7.1-zio.dif @@ -99,7 +98,6 @@ printer (using groff). %prep %setup -q -n man-db-%{version} %patch0 -b .groff -%patch2 -b .firefox %patch3 -b .chinese %patch4 -b .zio %patch5 -b .listall From 80e04584f125f1c10f9ec49d1dcd11b7ebfbdaa95962a6b704ee4b5b90938519 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 23 Aug 2022 06:15:10 +0000 Subject: [PATCH 3/3] Minor changes OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=143 --- man-db-2.6.3-chinese.dif | 10 +++++----- man-db-2.6.3-listall.dif | 4 ++-- man-db-2.9.4-alternitive.dif | 2 +- man-db-2.9.4.patch | 13 ------------- man.changes | 7 +++++++ 5 files changed, 15 insertions(+), 21 deletions(-) diff --git a/man-db-2.6.3-chinese.dif b/man-db-2.6.3-chinese.dif index 58a396f..566be77 100644 --- a/man-db-2.6.3-chinese.dif +++ b/man-db-2.6.3-chinese.dif @@ -4,7 +4,7 @@ --- lib/encodings.c +++ lib/encodings.c 2016-12-15 14:07:01.072034899 +0000 -@@ -228,6 +228,7 @@ static struct charset_entry charset_tabl +@@ -227,6 +227,7 @@ static struct charset_entry charset_tabl { "EUC-CN", "nippon" }, { "EUC-JP", "nippon" }, { "EUC-TW", "nippon" }, @@ -12,7 +12,7 @@ { "GBK", "nippon" }, # else /* !MULTIBYTE_GROFF */ /* If we have a smarter version of groff, this is better dealt with -@@ -315,6 +316,7 @@ static struct less_charset_entry less_ch +@@ -314,6 +315,7 @@ static struct less_charset_entry less_ch #ifdef MULTIBYTE_GROFF { "CP1251", "windows", NULL }, @@ -20,7 +20,7 @@ { "EUC-JP", "iso8859", "japanese-ujis" }, { "KOI8-R", "koi8-r", NULL }, /* close enough? */ -@@ -453,6 +455,13 @@ char *get_page_encoding (const char *lan +@@ -452,6 +454,13 @@ char *get_page_encoding (const char *lan * roff encoding = ISO-8859-15 * output encoding = ISO-8859-15 * ISO-8859-15 -> groff -Tascii8 -> ISO-8859-15 -> iconv -> UTF-8 @@ -34,7 +34,7 @@ */ const char *get_source_encoding (const char *lang) { -@@ -620,7 +629,7 @@ static int compatible_encodings (const c +@@ -619,7 +628,7 @@ static int compatible_encodings (const c */ if ((STREQ (input, "BIG5") || STREQ (input, "BIG5HKSCS") || STREQ (input, "EUC-JP") || @@ -43,7 +43,7 @@ STREQ (input, "EUC-KR") || STREQ (input, "EUC-TW")) && STREQ (output, "UTF-8")) -@@ -724,7 +733,7 @@ const char *get_roff_encoding (const cha +@@ -723,7 +732,7 @@ const char *get_roff_encoding (const cha STRNEQ (ctype, "zh_HK", 5) || STRNEQ (ctype, "zh_SG", 5) || STRNEQ (ctype, "zh_TW", 5)) diff --git a/man-db-2.6.3-listall.dif b/man-db-2.6.3-listall.dif index 7eda19e..7042874 100644 --- a/man-db-2.6.3-listall.dif +++ b/man-db-2.6.3-listall.dif @@ -22,7 +22,7 @@ .B %man% --- src/man.c +++ src/man.c 2022-08-17 13:10:07.436205495 +0000 -@@ -3572,12 +3572,141 @@ static int locate_page (const char *manp +@@ -3615,12 +3615,141 @@ static int locate_page (const char *manp return found; } @@ -164,7 +164,7 @@ global_manpath = is_global_mandir (candp->path); if (!global_manpath) drop_effective_privs (); -@@ -3599,9 +3728,56 @@ static int display_pages (struct candida +@@ -3642,9 +3771,56 @@ static int display_pages (struct candida regain_effective_privs (); if (found && !findall) diff --git a/man-db-2.9.4-alternitive.dif b/man-db-2.9.4-alternitive.dif index 8856a46..ba3498a 100644 --- a/man-db-2.9.4-alternitive.dif +++ b/man-db-2.9.4-alternitive.dif @@ -12,7 +12,7 @@ #include "argp.h" #include "attribute.h" -@@ -4080,9 +4081,25 @@ static void locate_page_in_manpath (cons +@@ -4123,9 +4124,25 @@ static void locate_page_in_manpath (cons { char *mp; diff --git a/man-db-2.9.4.patch b/man-db-2.9.4.patch index f6e1805..b764aea 100644 --- a/man-db-2.9.4.patch +++ b/man-db-2.9.4.patch @@ -790,16 +790,3 @@ Index: man-db-2.10.2/src/ult_src.c include = test_for_include (buffer); if (include) { -Index: man-db-2.10.2/src/tests/get-mtime.c -=================================================================== ---- man-db-2.10.2.orig/src/tests/get-mtime.c -+++ man-db-2.10.2/src/tests/get-mtime.c -@@ -69,7 +69,7 @@ int main (int argc, char **argv) - if (lstat (path, &st) < 0) - fatal (errno, "can't lstat %s", path); - ts = get_stat_mtime (&st); -- printf ("%ld.%09ld\n", (long) ts.tv_sec, ts.tv_nsec); -+ printf ("%ld.%0.09ld\n", (long) ts.tv_sec, ts.tv_nsec); - - exit (OK); - } diff --git a/man.changes b/man.changes index 7e4ee2f..3a59888 100644 --- a/man.changes +++ b/man.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 23 06:13:49 UTC 2022 - Dr. Werner Fink + +- Corrrect some offsets of patch hunks +- Remove change in get-mtime.c as mandb-symlink-target-timestamp + now catch the random format changes + ------------------------------------------------------------------- Mon Aug 22 21:17:21 UTC 2022 - Dirk Müller