From e55677116b7b6c9b9fa1c77b6cbc122ceffe21bd Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Sun, 15 Jan 2023 13:20:54 +0800 Subject: man-db: upgrade 2.11.1 -> 2.11.2 Changelog: ========= Fixes: ------ * Fix compile and test failures when 'troff' is not 'groff'. * Fix segfault in typical uses of 'man' when 'nroff' is not installed. * Fix crash in 'mandb' when processing stray cats. Improvements: ------------- * Check for stray cats even if no manual pages in a given manpath were changed. (From OE-Core rev: f6ddfaac9e4957abfe9f1c8d336b4fd7b52a80f5) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-extended/man-db/man-db_2.11.1.bb | 70 --------------------------- meta/recipes-extended/man-db/man-db_2.11.2.bb | 70 +++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-extended/man-db/man-db_2.11.1.bb create mode 100644 meta/recipes-extended/man-db/man-db_2.11.2.bb diff --git a/meta/recipes-extended/man-db/man-db_2.11.1.bb b/meta/recipes-extended/man-db/man-db_2.11.1.bb deleted file mode 100644 index 2d539c4a5b..0000000000 --- a/meta/recipes-extended/man-db/man-db_2.11.1.bb +++ /dev/null @@ -1,70 +0,0 @@ -SUMMARY = "An implementation of the standard Unix documentation system accessed using the man command" -HOMEPAGE = "http://man-db.nongnu.org/" -DESCRIPTION = "man-db is an implementation of the standard Unix documentation system accessed using the man command. It uses a Berkeley DB database in place of the traditional flat-text whatis databases." -LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later & GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ - file://docs/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://docs/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ - " - -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 \ - file://man_db.conf-avoid-multilib-install-file-conflict.patch" -SRC_URI[sha256sum] = "2eabaa5251349847de9c9e43c634d986cbcc6f87642d1d9cb8608ec18487b6cc" - -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[bzip2] = "--with-bzip2=bzip2,ac_cv_prog_have_bzip2='',bzip2" -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" -PACKAGECONFIG[zstd] = "--with-zstd=zstd,ac_cv_prog_have_zstd='',zstd" -PACKAGECONFIG[xz] = "--with-xz=xz,ac_cv_prog_have_xz='',xz" - -do_install() { - autotools_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 - 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" - -RDEPENDS:${PN} += "groff" -RRECOMMENDS:${PN} += "less" -RPROVIDES:${PN} += " man" - -def compress_pkg(d): - if bb.utils.contains("INHERIT", "compress_doc", True, False, d): - compress = d.getVar("DOC_COMPRESS") - if compress == "gz": - return "gzip" - elif compress == "bz2": - return "bzip2" - elif compress == "xz": - return "xz" - return "" - -RDEPENDS:${PN} += "${@compress_pkg(d)}" - -SYSTEMD_SERVICE:${PN} = "man-db.timer man-db.service" -SYSTEMD_AUTO_ENABLE ?= "disable" diff --git a/meta/recipes-extended/man-db/man-db_2.11.2.bb b/meta/recipes-extended/man-db/man-db_2.11.2.bb new file mode 100644 index 0000000000..ca0cb1a0e1 --- /dev/null +++ b/meta/recipes-extended/man-db/man-db_2.11.2.bb @@ -0,0 +1,70 @@ +SUMMARY = "An implementation of the standard Unix documentation system accessed using the man command" +HOMEPAGE = "http://man-db.nongnu.org/" +DESCRIPTION = "man-db is an implementation of the standard Unix documentation system accessed using the man command. It uses a Berkeley DB database in place of the traditional flat-text whatis databases." +LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later & GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ + file://docs/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://docs/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + " + +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 \ + file://man_db.conf-avoid-multilib-install-file-conflict.patch" +SRC_URI[sha256sum] = "cffa1ee4e974be78646c46508e6dd2f37e7c589aaab2938cc1064f058fef9f8d" + +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[bzip2] = "--with-bzip2=bzip2,ac_cv_prog_have_bzip2='',bzip2" +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" +PACKAGECONFIG[zstd] = "--with-zstd=zstd,ac_cv_prog_have_zstd='',zstd" +PACKAGECONFIG[xz] = "--with-xz=xz,ac_cv_prog_have_xz='',xz" + +do_install() { + autotools_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 + 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" + +RDEPENDS:${PN} += "groff" +RRECOMMENDS:${PN} += "less" +RPROVIDES:${PN} += " man" + +def compress_pkg(d): + if bb.utils.contains("INHERIT", "compress_doc", True, False, d): + compress = d.getVar("DOC_COMPRESS") + if compress == "gz": + return "gzip" + elif compress == "bz2": + return "bzip2" + elif compress == "xz": + return "xz" + return "" + +RDEPENDS:${PN} += "${@compress_pkg(d)}" + +SYSTEMD_SERVICE:${PN} = "man-db.timer man-db.service" +SYSTEMD_AUTO_ENABLE ?= "disable" -- cgit v1.2.3-54-g00ecf