diff mbox series

[20/33] man-db: upgrade 2.12.0 -> 2.12.1

Message ID 1712646620-16608-20-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [01/33] babeltrace2: upgrade 2.0.5 -> 2.0.6 | expand

Commit Message

Mingyu Wang (Fujitsu) April 9, 2024, 7:10 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-man-Move-local-variable-declaration-to-function-scop.patch
refreshed for 2.23.1

Changelog:
=============
* Fix excessive cleanup of '/var/cache/man' by 'systemd-tmpfiles'.
* 'man' matches the display width more accurately to the configured width.
* Upgrade to Gnulib 'stable-202401'.
* Mention 'groff''s 'pdf' device in 'man(1)'.
* Speed up 'seccomp' filter slightly.
* Document how to format pages using italic rather than underlined text.
* Remove the obsolete 'chconfig' tool for converting man-db configuration
  files to the FHS.  This transition took place almost 25 years ago (at
  least in Debian), so it's not worth keeping it around now.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...ove-local-variable-declaration-to-function-scop.patch | 9 ++++-----
 .../man-db/{man-db_2.12.0.bb => man-db_2.12.1.bb}        | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename meta/recipes-extended/man-db/{man-db_2.12.0.bb => man-db_2.12.1.bb} (96%)
diff mbox series

Patch

diff --git a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch b/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch
index dc6966629c..57ecd48b1f 100644
--- a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch
+++ b/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch
@@ -1,4 +1,4 @@ 
-From 126dfefb5fddf411ad0a1316209e9c1b47abfcd2 Mon Sep 17 00:00:00 2001
+From e4125223631f0d555fc327da6d8705bcc8ee5ba5 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 9 Feb 2022 17:30:16 -0800
 Subject: [PATCH] man: Move local variable declaration to function scope
@@ -10,16 +10,15 @@  code without changing the logic, until its fixed in clang
 
 Upstream-Status: Inappropriate [Inappropriate: Clang bug]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
 ---
  src/man.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/man.c b/src/man.c
-index f16fae8..333df03 100644
+index 195d35d..6870989 100644
 --- a/src/man.c
 +++ b/src/man.c
-@@ -352,7 +352,7 @@ static void init_html_pager (void)
+@@ -379,7 +379,7 @@ static void init_html_pager (void)
  static error_t parse_opt (int key, char *arg, struct argp_state *state)
  {
  	static bool apropos, whatis; /* retain values between calls */
@@ -28,7 +27,7 @@  index f16fae8..333df03 100644
  	/* Please keep these keys in the same order as in options above. */
  	switch (key) {
  		case 'C':
-@@ -384,7 +384,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
+@@ -411,7 +411,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
  		case OPT_WARNINGS:
  #ifdef NROFF_WARNINGS
  			{
diff --git a/meta/recipes-extended/man-db/man-db_2.12.0.bb b/meta/recipes-extended/man-db/man-db_2.12.1.bb
similarity index 96%
rename from meta/recipes-extended/man-db/man-db_2.12.0.bb
rename to meta/recipes-extended/man-db/man-db_2.12.1.bb
index 19dbb41d16..27b47a7f47 100644
--- a/meta/recipes-extended/man-db/man-db_2.12.0.bb
+++ b/meta/recipes-extended/man-db/man-db_2.12.1.bb
@@ -11,7 +11,7 @@  SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
            file://99_mandb \
            file://0001-man-Move-local-variable-declaration-to-function-scop.patch \
           "
-SRC_URI[sha256sum] = "415a6284a22764ad22ff0f66710d853be7790dd451cd71436e3d25c74d996a95"
+SRC_URI[sha256sum] = "ddee249daeb78cf92bab794ccd069cc8b575992265ea20e239e887156e880265"
 
 DEPENDS = "libpipeline gdbm groff-native base-passwd"
 RDEPENDS:${PN} += "base-passwd"