2 files changed, 7 insertions, 49 deletions

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
deleted file mode 100644
index 57ecd48b1f..0000000000
--- a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-
-There is a clang bug [1] unearthed here, so help clang by re-arranging
-code without changing the logic, until its fixed in clang
-
-[1] https://github.com/llvm/llvm-project/issues/53692
-
-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 195d35d..6870989 100644
---- a/src/man.c
-+++ b/src/man.c
-@@ -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 */
--
-+       char *s;
-        /* Please keep these keys in the same order as in options above. */
-        switch (key) {
-                case 'C':
-@@ -411,7 +411,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
-                case OPT_WARNINGS:
- #ifdef NROFF_WARNINGS
-                        {
--                               char *s = xstrdup
-+                               s = xstrdup
-                                        (arg ? arg : default_roff_warnings);
-                                const char *warning;
- 
diff --git a/meta/recipes-extended/man-db/man-db_2.12.1.bb b/meta/recipes-extended/man-db/man-db_2.13.1.bb
index 27b47a7f47..f044a47f7d 100644
--- a/meta/recipes-extended/man-db/man-db_2.12.1.bb
+++ b/meta/recipes-extended/man-db/man-db_2.13.1.bb
@@ -9,23 +9,23 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
 
 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] = "ddee249daeb78cf92bab794ccd069cc8b575992265ea20e239e887156e880265"
+           "
+SRC_URI[sha256sum] = "8afebb6f7eb6bb8542929458841f5c7e6f240e30c86358c1fbcefbea076c87d9"
 
 DEPENDS = "libpipeline gdbm groff-native base-passwd"
 RDEPENDS:${PN} += "base-passwd"
 PACKAGE_WRITE_DEPS += "base-passwd"
 
-# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr'
-USE_NLS:libc-musl = "no"
-
 inherit gettext pkgconfig autotools systemd
 
 EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_system_unitdir}"
 EXTRA_AUTORECONF += "-I ${S}/gl/m4"
 
+PACKAGECONFIG ??= ""
+
 PACKAGECONFIG[bzip2] = "--with-bzip2=bzip2,ac_cv_prog_have_bzip2='',bzip2"
+# util-linux col is deprecated and only builds for glibc
+PACKAGECONFIG[col] = "--with-col=col,--with-col=,,util-linux-col"
 PACKAGECONFIG[gzip] = "--with-gzip=gzip,ac_cv_prog_have_gzip='',gzip"
 PACKAGECONFIG[lzip] = "--with-lzip=lzip,ac_cv_prog_have_lzip='',lzip"
 PACKAGECONFIG[lzma] = "--with-lzma=lzma,ac_cv_prog_have_lzma='',xz"
@@ -37,14 +37,10 @@ do_install() {
 
         if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
                 install -d ${D}/etc/default/volatiles
-                install -m 0644 ${WORKDIR}/99_mandb ${D}/etc/default/volatiles
+                install -m 0644 ${UNPACKDIR}/99_mandb ${D}/etc/default/volatiles
         fi
 }
 
-do_install:append:libc-musl() {
-        rm -f ${D}${libdir}/charset.alias
-}
-
 FILES:${PN} += "${prefix}/lib/tmpfiles.d"
 
 FILES:${PN}-dev += "${libdir}/man-db/libman.so ${libdir}/${BPN}/libmandb.so"