From 6d306669b5e524e5cbb751074c43364a8439c1ef Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 16 May 2023 11:44:21 +0530 Subject: [PATCH] sys-apps/man-db: Sync with Gentoo It's from Gentoo commit 99dc89c1d75aafe8a20ef7372b901b569b874688. --- .../portage-stable/sys-apps/man-db/Manifest | 3 +- .../man-db-2.9.3-darwin-libdb-intl.patch | 30 --- ...-db-2.10.1.ebuild => man-db-2.11.2.ebuild} | 31 +-- .../sys-apps/man-db/man-db-2.9.4-r1.ebuild | 201 ------------------ .../sys-apps/man-db/man-db-9999.ebuild | 31 +-- .../sys-apps/man-db/metadata.xml | 17 +- 6 files changed, 43 insertions(+), 270 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch rename sdk_container/src/third_party/portage-stable/sys-apps/man-db/{man-db-2.10.1.ebuild => man-db-2.11.2.ebuild} (85%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.9.4-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/man-db/Manifest index b705601b6d..9e27345894 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/man-db/Manifest @@ -1,2 +1 @@ -DIST man-db-2.10.1.tar.xz 1890536 BLAKE2B b052a7006e1d47dfe7b82f82b6e6e47500ca1c8fa20716af7d3d4193ebde0b109f13f4ed3148c5e4bbc76f34d457ec71bf93ed88f9ab0f5da5b5e1c9066e6d70 SHA512 25a3c4e3d7b171faf0771885a7a7d502c4af801881777231c79d7ee9768c2e48e44afbf5603af13f5ac63e6981cfdb8e36ba8a33d5f926d8122635cf45fcff7a -DIST man-db-2.9.4.tar.xz 1909020 BLAKE2B 43427e851f0e661ca1cee55211dd7636f4ffde067c75de7715f525029b22c205728f8e86ac49abff60e47a4a4c9e1fbd78e2c87e70bd37778b88594a3897275f SHA512 169f091dd0a1d0dbd1583366f8257afb8f57e030d0f7d4213c14ce0b1fc5debf8b9cf2731de503830cb2826b3a22b3cff7da993d44ec18557935bd293529133c +DIST man-db-2.11.2.tar.xz 1953276 BLAKE2B 80ac565cdb69736c0f922b9cbfddcae753d176329781deaf9434d87d7718f9b6ce0b6d4642a03f22a04c7f042dda7f8986b5bce0038f0748461ca55d66964ccc SHA512 edb71cce7249c7b7f2f524e92f682047a77ed9ae8856763dfc8e18e239444651ff4c505e697f5a8b1be3b85678e714fbb1a520defe72a4eb685bc2cecc0e4391 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch b/sdk_container/src/third_party/portage-stable/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch deleted file mode 100644 index 71cbb1c20d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://gitlab.com/cjwatson/man-db/-/merge_requests/3 - -libdb: link against libintl - -necessary since gettext is used for translations - -Signed-off-by: Fabian Groffen - ---- a/libdb/Makefile.am -+++ b/libdb/Makefile.am -@@ -43,7 +43,7 @@ - db_xdbm.h \ - mydbm.h - --libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) -+libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) $(LIBINTL) - - libmandb_la_LDFLAGS = \ - -avoid-version -release $(VERSION) -rpath $(pkglibdir) -no-undefined ---- a/libdb/Makefile.in -+++ b/libdb/Makefile.in -@@ -1541,7 +1541,7 @@ - db_xdbm.h \ - mydbm.h - --libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) -+libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) $(LIBINTL) - libmandb_la_LDFLAGS = \ - -avoid-version -release $(VERSION) -rpath $(pkglibdir) -no-undefined - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.10.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.11.2.ebuild similarity index 85% rename from sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.10.1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.11.2.ebuild index 1098629151..3372a639ca 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.10.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.11.2.ebuild @@ -1,30 +1,29 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd prefix tmpfiles -DESCRIPTION="A man replacement that utilizes berkdb instead of flat files" -HOMEPAGE="https://gitlab.com/cjwatson/man-db https://www.nongnu.org/man-db/" +DESCRIPTION="A man replacement that utilizes dbm instead of flat files" +HOMEPAGE="https://gitlab.com/man-db/man-db https://www.nongnu.org/man-db/" if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 - EGIT_REPO_URI="https://gitlab.com/cjwatson/man-db.git" + EGIT_REPO_URI="https://gitlab.com/man-db/man-db" else # TODO: Change tarballs to gitlab too...? SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3" SLOT="0" -IUSE="berkdb +manpager nls +seccomp selinux static-libs zlib" +IUSE="+manpager nls +seccomp selinux static-libs zlib" -CDEPEND="!sys-apps/man +CDEPEND=" >=dev-libs/libpipeline-1.5.0 sys-apps/groff - !berkdb? ( sys-libs/gdbm:= ) - berkdb? ( sys-libs/db:= ) + sys-libs/gdbm:= seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib )" DEPEND="${CDEPEND}" @@ -62,7 +61,7 @@ src_unpack() { src_prepare() { default - if [[ "${PV}" == *9999 ]] ; then + if [[ ${PV} == *9999 ]] ; then local bootstrap_opts=( --gnulib-srcdir=../gnulib --no-bootstrap-sync @@ -117,7 +116,7 @@ src_configure() { $(use_enable static-libs static) $(use_with seccomp libseccomp) - --with-db=$(usex berkdb db gdbm) + --with-db=gdbm ) case ${CHOST} in @@ -132,9 +131,11 @@ src_configure() { econf "${myeconfargs[@]}" # Disable color output from groff so that the manpager can add it. bug #184604 - sed -i \ - -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ - src/man_db.conf || die + if use manpager; then + sed -i \ + -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ + src/man_db.conf || die + fi cat > 15man-db <<-EOF || die SANDBOX_PREDICT="/var/cache/man" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.9.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.9.4-r1.ebuild deleted file mode 100644 index 4dd59206d9..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.9.4-r1.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd prefix tmpfiles - -DESCRIPTION="A man replacement that utilizes berkdb instead of flat files" -HOMEPAGE="http://www.nongnu.org/man-db/" -if [[ "${PV}" = 9999* ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git" -else - SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib" - -CDEPEND=" - !sys-apps/man - >=dev-libs/libpipeline-1.5.0 - sys-apps/groff - gdbm? ( sys-libs/gdbm:= ) - !gdbm? ( berkdb? ( sys-libs/db:= ) ) - !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) - seccomp? ( sys-libs/libseccomp ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${CDEPEND}" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig - nls? ( - >=app-text/po4a-0.45 - sys-devel/gettext - virtual/libiconv - virtual/libintl - ) -" -RDEPEND=" - ${CDEPEND} - acct-group/man - acct-user/man - selinux? ( sec-policy/selinux-mandb ) -" -PDEPEND="manpager? ( app-text/manpager )" - -PATCHES=( - "${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch - "${FILESDIR}"/man-db-2.9.3-darwin-libdb-intl.patch -) - -pkg_setup() { - if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150 - ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings" - fi -} - -src_unpack() { - if [[ "${PV}" == *9999 ]] ; then - git-r3_src_unpack - - # We need to mess with gnulib :-/ - EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \ - EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \ - git-r3_src_unpack - else - default - fi -} - -src_prepare() { - default - if [[ "${PV}" == *9999 ]] ; then - local bootstrap_opts=( - --gnulib-srcdir=../gnulib - --no-bootstrap-sync - --copy - --no-git - ) - AUTORECONF="/bin/true" \ - LIBTOOLIZE="/bin/true" \ - sh ./bootstrap "${bootstrap_opts[@]}" || die - - eautoreconf - fi - - hprefixify src/man_db.conf.in - if use prefix ; then - { - echo "#" - echo "# Added settings for Gentoo Prefix" - [[ ${CHOST} == *-darwin* ]] && \ - echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man" - echo "MANDATORY_MANPATH /usr/share/man" - } >> src/man_db.conf.in - fi -} - -src_configure() { - # set sections we want to search by default - local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o" - sections+=" 1x 2x 3x 4x 5x 6x 7x 8x" - case ${CHOST} in - *-solaris*) - # Solaris tends to use sections named after the pkgs that - # owns them, in particular for libc functions we want those - # sections - local s - for s in $(cd /usr/share/man/ && echo man*) ; do - s=${s#man} - [[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}" - done - ;; - esac - - export ac_cv_lib_z_gzopen=$(usex zlib) - local myeconfargs=( - --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --disable-setuid #662438 - --enable-cache-owner=man - --with-sections="${sections}" - $(use_enable nls) - $(use_enable static-libs static) - $(use_with seccomp libseccomp) - --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) - ) - case ${CHOST} in - *-solaris*|*-darwin*) - myeconfargs+=( - $(use_with nls libiconv-prefix ${EPREFIX}/usr) - $(use_with nls libintl-prefix ${EPREFIX}/usr) - ) - ;; - esac - econf "${myeconfargs[@]}" - - # Disable color output from groff so that the manpager can add it. #184604 - sed -i \ - -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ - src/man_db.conf || die - - cat > 15man-db <<-EOF || die - SANDBOX_PREDICT="/var/cache/man" - EOF -} - -src_install() { - default - dodoc docs/{HACKING,TODO} - find "${ED}" -type f -name "*.la" -delete || die - - exeinto /etc/cron.daily - newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884 - - insinto /etc/sandbox.d - doins 15man-db -} - -pkg_preinst() { - local cachedir="${EROOT}/var/cache/man" - # If the system was already exploited, and the attacker is hiding in the - # cachedir of the old man-db, let's wipe them out. - # see bug #602588 comment 18 - local _replacing_version= - local _setgid_vuln=0 - for _replacing_version in ${REPLACING_VERSIONS}; do - if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then - debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!" - else - _setgid_vuln=1 - debug-print "Applying cleanup for security bug #602588" - fi - done - [[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}" - - # Fall back to recreating the cachedir - if [[ ! -d ${cachedir} ]] ; then - mkdir -p "${cachedir}" || die - chown man:man "${cachedir}" || die - fi - - # Update the whatis cache - if [[ -f ${cachedir}/whatis ]] ; then - einfo "Cleaning ${cachedir} from sys-apps/man" - find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete - fi -} - -pkg_postinst() { - tmpfiles_process man-db.conf - - if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then - einfo "Rebuilding man-db from scratch with new database format!" - su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-9999.ebuild index 1098629151..6f9fc4d8d5 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-9999.ebuild @@ -1,30 +1,29 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd prefix tmpfiles -DESCRIPTION="A man replacement that utilizes berkdb instead of flat files" -HOMEPAGE="https://gitlab.com/cjwatson/man-db https://www.nongnu.org/man-db/" +DESCRIPTION="A man replacement that utilizes dbm instead of flat files" +HOMEPAGE="https://gitlab.com/man-db/man-db https://www.nongnu.org/man-db/" if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 - EGIT_REPO_URI="https://gitlab.com/cjwatson/man-db.git" + EGIT_REPO_URI="https://gitlab.com/man-db/man-db" else # TODO: Change tarballs to gitlab too...? SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3" SLOT="0" -IUSE="berkdb +manpager nls +seccomp selinux static-libs zlib" +IUSE="+manpager nls +seccomp selinux static-libs zlib" -CDEPEND="!sys-apps/man +CDEPEND=" >=dev-libs/libpipeline-1.5.0 sys-apps/groff - !berkdb? ( sys-libs/gdbm:= ) - berkdb? ( sys-libs/db:= ) + sys-libs/gdbm:= seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib )" DEPEND="${CDEPEND}" @@ -62,7 +61,7 @@ src_unpack() { src_prepare() { default - if [[ "${PV}" == *9999 ]] ; then + if [[ ${PV} == *9999 ]] ; then local bootstrap_opts=( --gnulib-srcdir=../gnulib --no-bootstrap-sync @@ -117,7 +116,7 @@ src_configure() { $(use_enable static-libs static) $(use_with seccomp libseccomp) - --with-db=$(usex berkdb db gdbm) + --with-db=gdbm ) case ${CHOST} in @@ -132,9 +131,11 @@ src_configure() { econf "${myeconfargs[@]}" # Disable color output from groff so that the manpager can add it. bug #184604 - sed -i \ - -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ - src/man_db.conf || die + if use manpager; then + sed -i \ + -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ + src/man_db.conf || die + fi cat > 15man-db <<-EOF || die SANDBOX_PREDICT="/var/cache/man" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/man-db/metadata.xml index e840f33805..81a473b51d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/man-db/metadata.xml @@ -1,11 +1,14 @@ - - base-system@gentoo.org - Gentoo Base System - - - Enable manpager wrapper for colorizing output - + + base-system@gentoo.org + Gentoo Base System + + + Enable manpager wrapper for colorizing output + + + man-db/man-db +