Accepting request 1298345 from Base:System

- Update to man-db 2.13.1 (2 May 2025)
  * Update various manual page translation
  * Fix various minor formatting issues in manual pages.
  * Tolerate additional spaces in preprocessor strings.
  * Fix check for generated source files in out-of-tree builds.
  * Fix building with the `musl` C library.
  * Recognize another Ukrainian translation of the `NAME` section.
  * Increase the maximum size of the `NAME` section from 8192 to 16384 bytes.
- Port patches
  * man-db-2.6.3-listall.dif
  * man-db-2.9.4.patch

- Avoid latest gettextize as it breaks build now

OBS-URL: https://build.opensuse.org/request/show/1298345
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/man?expand=0&rev=106

man-db-2.13.0.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEErApP8SYRtvzPAcEROTWH2X2GUAsFAmbQWvEACgkQOTWH2X2G
-UAv41g/9EwS08JyC1q9NY9K/m+dbrweHuNTJOWu9PfBQNmxDD+39uWOcqzf+Wg7S
-rorbs1mHbn+6JG/7PcugGcUucSJOPLB36+DJzVXwGip13aJi8WNWqSEV2RtiPsA0
-3DJHvCEB2WcbxbumWxowgpQaWxUy+1FssSCf0ScVqWDc46V8zUWq1rmtgejEOc7m
-Eumxc4J+0mhwGx0IB+djjmde/ciqoDQ4ANqLZ7hNMg0+b3l92NRYgBspXfoBjQp9
-+wk1cimgrI1oW9gpmO/wZ4LSwsK7YvhdL+zPRjL6HADQaXlpHY7pkx0X/qhqXplo
-eUu7GlWSVF6z813g4MAZGdH03coCGLHfbqMWsRiOwKuefmMQsARPVDFAIJtOfsYz
-qo3h5pUf0PzVuzRweuA3laM6dHkVhGmewWyzXSH3MbRUlDK17I7h9gY0dtDw4GWz
-S+Ppw1Ar2xiN62G9PDtjkt4v/axNbdKaHEMUBqEuzYmBBaJeKxWkRcmXG5smvFb9
-fsuoyFxh/opd01Kp8QrU3T6iIIhzSr4SLZMFzxZ1ai8d8AzkHwfBNiQAh5Q94Gtp
-qYy/mv7jOpDt0QyyaxMO001/9uFD0Sh3w5lRN0SQCJ0T84bxYY+eVMveSg8qlZsE
-53sFdxIbqLetvcHx9L4WXlRLdJXqS+YF2wbe5Dwr+MT+1ys3YKY=
-=PUlf
------END PGP SIGNATURE-----

man-db-2.13.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8afebb6f7eb6bb8542929458841f5c7e6f240e30c86358c1fbcefbea076c87d9
+size 2110328

man-db-2.13.1.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEErApP8SYRtvzPAcEROTWH2X2GUAsFAmgUw78ACgkQOTWH2X2G
+UAvftQ/+JxYBvnxB8YqOkBer50jBy0yQiQ3MtGus8Y1PxJLr/49vwAjdD5JWZJzV
+kkxSW8/3qLow0joJtOSalwZMFDP85ykzGm45/PIo/qSJXM8gRlsan99X99ZdFMXd
+LO2YoTojNXaTtiO4wDWm20HdiVPamf/m0QQcm9+3lUDKh9dxgC44f9dNk9MgNFVC
+W747Vkt1FLEobtcnLj/8KL0wRRDywJudrOcSkchAvIUUn15OSTwL+8Bco8W5l5hg
+Qr1TVcjmmwBHyf/lgTaS2D0+qJHSyaO+roO1WuzEAImIMFAu0enxAYl8uqLADgdR
+OvCHBAm1e4nMOgnAdr4tSb6pL+nW7llgtPNWD0U24JcApFB1MX70D9o1UyIfSUzj
+z5ZNx4hpYjR3r/m9i/n4C4/dgd437u+Ka8sjDxHDJTp8WjSNqsIPOQMe6RHQx7gj
+TuUz2dG1FKsUssGcbqrC+KZh2nacmXNLFg2Tn5sjCFvmmhexGIWFbVy0cxxPtPnG
+5iNRzPidfSYRW+dbCoqOxy1JkSB9AtbGxICXjW8yPA6zRdoMgciW2R1uaBgGxp8H
+jyb8LqNIv+fuuccLKcdQC6OInF+ak/MwbuqjAxLOaXFPlFbtW6je20ydgonGcGbh
+a5Mzwnmy5NbxvthYYDMruuGZoggOALwLxrMCdVFKQk1nFfGtXNI=
+=pOVh
+-----END PGP SIGNATURE-----

man-db-2.6.3-listall.dif

@@ -1,11 +1,11 @@
 ---
  man/man1/man.man1 |    8 ++
- src/man.c         |  180 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 186 insertions(+), 2 deletions(-)
+ src/man.c         |  182 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 188 insertions(+), 2 deletions(-)
 
 --- man/man1/man.man1
-+++ man/man1/man.man1	2022-08-17 13:11:29.974677243 +0000
-@@ -1236,6 +1236,14 @@ However, some users want to see them any
++++ man/man1/man.man1	2025-04-07 09:22:13.196358321 +0000
+@@ -1237,6 +1237,14 @@ However, some users want to see them any
  .RB $ MAN_KEEP_STDERR
  is set to any non-empty value, error output will be displayed as usual.
  .TP
@@ -21,8 +21,8 @@
  On Linux,
  .B %man%
 --- src/man.c
-+++ src/man.c	2022-08-17 13:10:07.436205495 +0000
-@@ -3651,12 +3651,141 @@ static int locate_page (const char *manp
++++ src/man.c	2025-04-07 09:41:34.647095968 +0000
+@@ -3658,12 +3658,143 @@ static int locate_page (const char *manp
  	return found;
  }
  
@@ -54,6 +54,8 @@
 +		struct sigaction sa;
 +		int used = 0x2A;
 +
++		if (section)
++			break;
 +		if (findall)
 +			break;
 +		if (external)
@@ -73,7 +75,7 @@
 +
 +		fputs("Man: ", stderr);
 +		fputs(_("find all matching manual pages"), stderr);
-+		fputs(" (set MAN_POSIXLY_CORRECT to avoid this)", stderr);
++		fputs(" (export MAN_POSIXLY_CORRECT=1 to avoid this)", stderr);
 +		fputc('\n', stderr);
 +
 +		lext = NULL;
@@ -102,7 +104,7 @@
 +
 +		sigaction(SIGALRM, &sa, (struct sigaction*)0);
 +
-+		alarm(7);
++		alarm(15);
 +		len = read(STDIN_FILENO, reqsect, sizeof(reqsect)-1);
 +		alarm(0);
 +
@@ -164,7 +166,7 @@
  		global_manpath = is_global_mandir (candp->path);
  		if (!global_manpath)
  			drop_effective_privs ();
-@@ -3679,9 +3808,56 @@ static int display_pages (struct candida
+@@ -3686,9 +3817,56 @@ static int display_pages (struct candida
  			regain_effective_privs ();
  
  		if (found && !findall)

man-db-2.7.1-zio.dif

@@ -245,7 +245,7 @@
  		pipecmd_pre_exec (cmd, sandbox_load, sandbox_free, sandbox);
  		p = pipeline_new_commands (cmd, nullptr);
 +# ifdef HAVE_ZIO
-+                free (name);
++		free (name);
 +# endif
  		goto got_pipeline;
  	}

man-db-2.9.4.patch

@@ -227,7 +227,7 @@ diff --git a/src/lexgrog.l b/src/lexgrog.l
  
 -#define YY_READ_BUF_SIZE	1024
 +#define YY_READ_BUF_SIZE	YY_BUF_SIZE
- #define MAX_NAME		8192
+ #define MAX_NAME		16384
  
  /* defines the ordered list of filters detected by lexgrog */
 @@ -227,15 +227,15 @@ static const struct macro perldocs[] = {
@@ -358,7 +358,7 @@ diff --git a/src/lexgrog.l b/src/lexgrog.l
  	{bol}\.Nd{blank}*			{
 diff --git a/src/man.c b/src/man.c
 --- a/src/man.c
-+++ b/src/man.c
++++ b/src/man.c	2025-08-08 06:51:32.192263735 +0000
 @@ -56,6 +56,8 @@
  #include <termios.h>
  #include <time.h>
@@ -389,7 +389,7 @@ diff --git a/src/man.c b/src/man.c
  
  #ifdef TROFF_IS_GROFF
  static bool ditroff;
-@@ -1569,6 +1573,18 @@ static void setenv_less (pipecmd *cmd, c
+@@ -1576,6 +1585,18 @@ static void setenv_less (pipecmd *cmd, c
  	free (less_opts);
  }
  
@@ -408,7 +408,7 @@ diff --git a/src/man.c b/src/man.c
  static void add_output_iconv (pipeline *p, const char *source,
                                const char *target)
  {
-@@ -1697,6 +1713,8 @@ static pipeline *make_display_command (c
+@@ -1704,6 +1725,8 @@ static pipeline *make_display_command (c
  
  	if (pager_cmd) {
  		setenv_less (pager_cmd, title);
@@ -417,7 +417,7 @@ diff --git a/src/man.c b/src/man.c
  		pipeline_command (p, pager_cmd);
  	}
  	pipeline_ignore_signals (p, 1);
-@@ -1707,6 +1725,7 @@ static pipeline *make_display_command (c
+@@ -1714,6 +1737,7 @@ static pipeline *make_display_command (c
  	return p;
  }
  
@@ -425,7 +425,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)
  {
-@@ -1808,6 +1827,7 @@ static int commit_tmp_cat (const char *c
+@@ -1815,6 +1839,7 @@ static int commit_tmp_cat (const char *c
  
  	return status;
  }
@@ -433,7 +433,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.
-@@ -1844,7 +1864,6 @@ static void cleanup_unlink (void *arg)
+@@ -1851,7 +1876,6 @@ static void cleanup_unlink (void *arg)
  }
  
  #ifdef MAN_CATS
@@ -441,7 +441,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)
  {
-@@ -2072,6 +2091,7 @@ static void format_display (decompress *
+@@ -2079,6 +2103,7 @@ static void format_display (decompress *
  	regain_effective_privs ();
  }
  
@@ -449,7 +449,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,
-@@ -2117,6 +2137,7 @@ static void display_catman (const char *
+@@ -2124,6 +2149,7 @@ static void display_catman (const char *
  	pop_cleanup (cleanup_unlink, tmpcat);
  	free (tmpcat);
  }
@@ -457,7 +457,7 @@ diff --git a/src/man.c b/src/man.c
  
  #ifndef TROFF_IS_GROFF
  static void disable_hyphenation (void *data MAYBE_UNUSED)
-@@ -2327,7 +2348,7 @@ static int display (const char *dir, con
+@@ -2334,7 +2360,7 @@ static int display (const char *dir, con
  		format_cmd = NULL;
  		decomp_errno = errno;
  	}
@@ -466,7 +466,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;
-@@ -2337,7 +2358,7 @@ static int display (const char *dir, con
+@@ -2344,7 +2370,7 @@ static int display (const char *dir, con
  		} else
  			man_modtime = get_stat_mtime (&stb);
  	}
@@ -475,7 +475,7 @@ diff --git a/src/man.c b/src/man.c
  	display_to_stdout = troff;
  #ifdef TROFF_IS_GROFF
  	if (htmlout || gxditview)
-@@ -2474,6 +2495,7 @@ static int display (const char *dir, con
+@@ -2481,6 +2507,7 @@ static int display (const char *dir, con
  			}
  			if (printed)
  				putchar ('\n');
@@ -483,7 +483,7 @@ diff --git a/src/man.c b/src/man.c
  		} else if (catman) {
  			if (format) {
  				if (!save_cat)
-@@ -2486,6 +2508,7 @@ static int display (const char *dir, con
+@@ -2493,6 +2520,7 @@ static int display (const char *dir, con
  					                format_cmd,
  					                formatted_encoding);
  			}
@@ -491,7 +491,7 @@ diff --git a/src/man.c b/src/man.c
  		} else if (format) {
  			/* no cat or out of date */
  			pipeline *disp_cmd;
-@@ -4028,17 +4051,20 @@ static int local_man_loop (const char *a
+@@ -4037,17 +4065,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);
@@ -512,7 +512,7 @@ diff --git a/src/man.c b/src/man.c
  			return NOT_FOUND;
  		}
  
-@@ -4102,6 +4128,11 @@ executable_out:
+@@ -4111,6 +4142,11 @@ executable_out:
  					argv_abs = xstrdup (argv);
  			}
  			lang = lang_dir (argv_abs);
@@ -524,7 +524,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)
-@@ -4158,9 +4189,25 @@ static void locate_page_in_manpath (cons
+@@ -4167,9 +4203,25 @@ static void locate_page_in_manpath (cons
  {
  	char *mp;
  
@@ -553,7 +553,7 @@ diff --git a/src/man.c b/src/man.c
  }
  
  /*
-@@ -4354,7 +4401,16 @@ int main (int argc, char *argv[])
+@@ -4363,7 +4415,16 @@ int main (int argc, char *argv[])
  	umask (022);
  	init_locale ();
  
@@ -571,7 +571,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") &&
-@@ -4399,7 +4455,16 @@ int main (int argc, char *argv[])
+@@ -4408,7 +4469,16 @@ int main (int argc, char *argv[])
  	if (external)
  		do_extern (argc, argv);
  

man.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Fri Aug  8 06:58:32 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Update to man-db 2.13.1 (2 May 2025)
+  * Update various manual page translation
+  * Fix various minor formatting issues in manual pages.
+  * Tolerate additional spaces in preprocessor strings.
+  * Fix check for generated source files in out-of-tree builds.
+  * Fix building with the `musl` C library.
+  * Recognize another Ukrainian translation of the `NAME` section.
+  * Increase the maximum size of the `NAME` section from 8192 to 16384 bytes.
+- Port patches
+  * man-db-2.6.3-listall.dif
+  * man-db-2.9.4.patch
+
+-------------------------------------------------------------------
+Thu Apr 10 11:53:11 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Avoid latest gettextize as it breaks build now 
+
+-------------------------------------------------------------------
+Mon Apr  7 09:49:24 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Modify patch man-db-2.6.3-listall.dif
+  * If a section is specified do not show the list (boo#1240874)
+  * Wait 15 seconds instead of 7 instead for a choice
+  * Explicit mention `export' instead of `set' for MAN_POSIXLY_CORRECT
+
 -------------------------------------------------------------------
 Mon Nov 11 10:37:45 UTC 2024 - Dr. Werner Fink <werner@suse.de>
 

man.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package man
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
 %global optflags %{optflags} %{**}
 %bcond_without  sdtimer
 Name:           man
-Version:        2.13.0
+Version:        2.13.1
 Release:        0
 Summary:        A Program for Displaying man Pages
 License:        GPL-2.0-or-later
@@ -110,7 +110,7 @@ rm -f configure
 %build
 %global optflags %{optflags} -funroll-loops -pipe -Wall
 
-gettextize --force --copy --no-changelog
+#gettextize --copy --no-changelog
 SEC=(0 1 n l 8 3 2 5 4 9 6 7
 	 1x 3x 4x 5x 6x 8x
 	 1bind 3bind 5bind 7bind 8bind
@@ -195,7 +195,7 @@ for man in $(find man/ -type f -a -name '*.[0-9]'); do
 	esac
 done
 #
-gcc $CFLAGS -I gl/lib/ -I include/ --include config.h \
+gcc $CFLAGS -I gl/lib/ -I ./ -I include/ --include config.h \
 	-D LOCALEDIR="\"%{_datarootdir}/locale\"" \
 	-D LIBEXECDIR="\"%{_libexecdir}\"" -o wrapper %{SOURCE5} -L gl/lib/.libs/ -lgnu