From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- sys-apps/man-db/Manifest | 8 +- .../files/man-db-2.9.3-darwin-libdb-intl.patch | 2 + sys-apps/man-db/man-db-2.10.1.ebuild | 202 +++++++++++++++++++++ sys-apps/man-db/man-db-2.10.2.ebuild | 202 +++++++++++++++++++++ sys-apps/man-db/man-db-9999.ebuild | 87 ++++----- 5 files changed, 456 insertions(+), 45 deletions(-) create mode 100644 sys-apps/man-db/man-db-2.10.1.ebuild create mode 100644 sys-apps/man-db/man-db-2.10.2.ebuild (limited to 'sys-apps/man-db') diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest index 2f2f8a6cc476..83fe252df229 100644 --- a/sys-apps/man-db/Manifest +++ b/sys-apps/man-db/Manifest @@ -1,7 +1,11 @@ -AUX man-db-2.9.3-darwin-libdb-intl.patch 733 BLAKE2B 864ed2ac8a3626ad5474412ce59560100e48516ad898b974a6d9d900d4b96fd3bf36a2e292b1bafd77a7196e485e6f4aaaa053a8b9c031f29d15c2608a31e224 SHA512 5c2d493dac9f895a0d9ddd24311051de3961b554ee395143159fe661ced64253e38db6a2e6c280831e30effd5cc6316e8480466e29dea81c4b61c3e603626c89 +AUX man-db-2.9.3-darwin-libdb-intl.patch 788 BLAKE2B 509c656f45a4b1ee5af1f28704b5c7c4507fb8405708c7554842a390f31ca2453baa26cbea76461fe40886e6f886c5d9321e6b39da0603364a4a59ae6c065218 SHA512 1de97d18ebf56aca43c183fdb90e09782b79c3f55e1738e03fd478b6f14d02c1ae398cfa87ace3cc96049bf234cd4417c93fa64eccc4e957964c31c6c607c6ae AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70ee664192db05fbe74013724fcdbe112ead2d4288f90be032777a58ee41515c23d5561ab9cde495a92aa9f74ee353479ef884e3 SHA512 d8840d45c3b115f51bb9b3fc11ece2fecadfe284cd7db29cd012ed32faed990b12a9920cf11282358e5dd27df4bcf3c1a0316116ecae58917ef3c65efb1eb22b AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054 +DIST man-db-2.10.1.tar.xz 1890536 BLAKE2B b052a7006e1d47dfe7b82f82b6e6e47500ca1c8fa20716af7d3d4193ebde0b109f13f4ed3148c5e4bbc76f34d457ec71bf93ed88f9ab0f5da5b5e1c9066e6d70 SHA512 25a3c4e3d7b171faf0771885a7a7d502c4af801881777231c79d7ee9768c2e48e44afbf5603af13f5ac63e6981cfdb8e36ba8a33d5f926d8122635cf45fcff7a +DIST man-db-2.10.2.tar.xz 1902840 BLAKE2B 8d1748503cdf66a613d7544a27b42df9436bdf4e07ccb130d2fa62343488d2c4ab791238c348236a253abddb564db9d1bb851249da9911737ff822d822819599 SHA512 5ad7a7b601aadf4d2d7cc068881fffe3d91dc85fcf4c17e66fbe6e2b04bb1c46f5ba5d4bc7f6ab3f39e00065be39061b101d3064c12b1e89f0fee61c088611bf DIST man-db-2.9.4.tar.xz 1909020 BLAKE2B 43427e851f0e661ca1cee55211dd7636f4ffde067c75de7715f525029b22c205728f8e86ac49abff60e47a4a4c9e1fbd78e2c87e70bd37778b88594a3897275f SHA512 169f091dd0a1d0dbd1583366f8257afb8f57e030d0f7d4213c14ce0b1fc5debf8b9cf2731de503830cb2826b3a22b3cff7da993d44ec18557935bd293529133c +EBUILD man-db-2.10.1.ebuild 5180 BLAKE2B dcc6468224e72ca1d54d95d397483463887df70459f4beffa1a26c932f4ba15f51e25087b9f65425ffc3401ac13a021620c90d6e3af42dde2f760fb6985a4c53 SHA512 cc9fe78d2752b2b74b3e04dc5f34bb5c37aa16db9757fff938f16576e5fa3edf6734b7402b7b31ba8078920e69859443b5ceb02fe2a83920e1d7c478e3fe69e4 +EBUILD man-db-2.10.2.ebuild 5180 BLAKE2B dcc6468224e72ca1d54d95d397483463887df70459f4beffa1a26c932f4ba15f51e25087b9f65425ffc3401ac13a021620c90d6e3af42dde2f760fb6985a4c53 SHA512 cc9fe78d2752b2b74b3e04dc5f34bb5c37aa16db9757fff938f16576e5fa3edf6734b7402b7b31ba8078920e69859443b5ceb02fe2a83920e1d7c478e3fe69e4 EBUILD man-db-2.9.4-r1.ebuild 5182 BLAKE2B 1c875d760100c08c6188a0933faf7de31036df192b7b9aefed54d2d95aca3d6f736fa99ecced6e72a6b9b7a672a5c6901803fe65265edc0899d82bf0771aecaf SHA512 f9507572028a410b5e01b4fab73552c3ba3e4e944740a16cb964b8fe3d8b4a6b375134cdf77df0e44daa29cbc90584789df74a3a350cd78c3b875873501a7ad0 -EBUILD man-db-9999.ebuild 5110 BLAKE2B f073f875c6c882b5b5f387659b8862d2cf6493cccd3cf1636428ae183751a575aa059e9b8ad8eaf68fb1707f883fbc0f65f71719b6b7459bbbe20a49457761fc SHA512 7a5bda7f4b52ec037b82dbc94af31dc05309ba5d7f203efd8f0f751d3a7d02166dbd1e9c1417e523fb58c8d834aa4b9c0ed9f0a9571aa30bf94bca84223c39bf +EBUILD man-db-9999.ebuild 5180 BLAKE2B dcc6468224e72ca1d54d95d397483463887df70459f4beffa1a26c932f4ba15f51e25087b9f65425ffc3401ac13a021620c90d6e3af42dde2f760fb6985a4c53 SHA512 cc9fe78d2752b2b74b3e04dc5f34bb5c37aa16db9757fff938f16576e5fa3edf6734b7402b7b31ba8078920e69859443b5ceb02fe2a83920e1d7c478e3fe69e4 MISC metadata.xml 343 BLAKE2B bed6b94c3e46bb74275e578a901e0a2706ee2ad1c25e2401f0cb5900bb3c3e8a07a7562e9b074340ed6f4511cd906aa25172122bda3c8e931077d47a14f29db1 SHA512 7244ccbaa5e4e64f67694069f1831ec5b142974b5ca57dcc10f1da62a0c533e4084ae3bb2b51f91fe1f98b52818f3e988ecdf83a52473d87a404b92733498882 diff --git a/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch b/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch index a7df3c62fd06..71cbb1c20df6 100644 --- a/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch +++ b/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch @@ -1,3 +1,5 @@ +https://gitlab.com/cjwatson/man-db/-/merge_requests/3 + libdb: link against libintl necessary since gettext is used for translations diff --git a/sys-apps/man-db/man-db-2.10.1.ebuild b/sys-apps/man-db/man-db-2.10.1.ebuild new file mode 100644 index 000000000000..10986291516d --- /dev/null +++ b/sys-apps/man-db/man-db-2.10.1.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2022 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="https://gitlab.com/cjwatson/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" +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" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="berkdb +manpager nls +seccomp selinux static-libs zlib" + +CDEPEND="!sys-apps/man + >=dev-libs/libpipeline-1.5.0 + sys-apps/groff + !berkdb? ( sys-libs/gdbm:= ) + berkdb? ( sys-libs/db:= ) + 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 +) + +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 # bug #662438 + --enable-cache-owner=man + --with-sections="${sections}" + + $(use_enable nls) + $(use_enable static-libs static) + $(use_with seccomp libseccomp) + + --with-db=$(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. bug #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.md,TODO} + find "${ED}" -type f -name "*.la" -delete || die + + exeinto /etc/cron.daily + newexe "${FILESDIR}"/man-db.cron-r1 man-db # bug #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 [[ -n "${REPLACING_VERSIONS}" ]] ; then + local _replacing_version= + + for _replacing_version in ${REPLACING_VERSIONS} ; do + if [[ $(ver_cut 2 ${_replacing_version}) -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 + + # No need to run it again if we hit one + break + fi + done + fi +} diff --git a/sys-apps/man-db/man-db-2.10.2.ebuild b/sys-apps/man-db/man-db-2.10.2.ebuild new file mode 100644 index 000000000000..10986291516d --- /dev/null +++ b/sys-apps/man-db/man-db-2.10.2.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2022 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="https://gitlab.com/cjwatson/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" +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" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="berkdb +manpager nls +seccomp selinux static-libs zlib" + +CDEPEND="!sys-apps/man + >=dev-libs/libpipeline-1.5.0 + sys-apps/groff + !berkdb? ( sys-libs/gdbm:= ) + berkdb? ( sys-libs/db:= ) + 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 +) + +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 # bug #662438 + --enable-cache-owner=man + --with-sections="${sections}" + + $(use_enable nls) + $(use_enable static-libs static) + $(use_with seccomp libseccomp) + + --with-db=$(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. bug #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.md,TODO} + find "${ED}" -type f -name "*.la" -delete || die + + exeinto /etc/cron.daily + newexe "${FILESDIR}"/man-db.cron-r1 man-db # bug #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 [[ -n "${REPLACING_VERSIONS}" ]] ; then + local _replacing_version= + + for _replacing_version in ${REPLACING_VERSIONS} ; do + if [[ $(ver_cut 2 ${_replacing_version}) -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 + + # No need to run it again if we hit one + break + fi + done + fi +} diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild index e673f4391432..10986291516d 100644 --- a/sys-apps/man-db/man-db-9999.ebuild +++ b/sys-apps/man-db/man-db-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,64 +6,51 @@ 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 +HOMEPAGE="https://gitlab.com/cjwatson/man-db https://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" + EGIT_REPO_URI="https://gitlab.com/cjwatson/man-db.git" 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" + 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" +IUSE="berkdb +manpager nls +seccomp selinux static-libs zlib" -CDEPEND=" - !sys-apps/man +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:= ) ) + !berkdb? ( sys-libs/gdbm:= ) + berkdb? ( sys-libs/db:= ) seccomp? ( sys-libs/libseccomp ) - zlib? ( sys-libs/zlib ) -" + zlib? ( sys-libs/zlib )" DEPEND="${CDEPEND}" -BDEPEND=" - app-arch/xz-utils +BDEPEND="app-arch/xz-utils virtual/pkgconfig nls? ( >=app-text/po4a-0.45 sys-devel/gettext virtual/libiconv virtual/libintl - ) -" -RDEPEND=" - ${CDEPEND} + )" +RDEPEND="${CDEPEND} acct-group/man acct-user/man - selinux? ( sec-policy/selinux-mandb ) -" + 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 + if [[ ${PV} == *9999 ]] ; then git-r3_src_unpack - # We need to mess with gnulib :-/ + # 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 @@ -74,6 +61,7 @@ src_unpack() { src_prepare() { default + if [[ "${PV}" == *9999 ]] ; then local bootstrap_opts=( --gnulib-srcdir=../gnulib @@ -101,7 +89,7 @@ src_prepare() { } src_configure() { - # set sections we want to search by default + # 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 @@ -121,25 +109,29 @@ src_configure() { local myeconfargs=( --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --disable-setuid #662438 + --disable-setuid # bug #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)) + + --with-db=$(usex berkdb db gdbm) ) + case ${CHOST} in *-solaris*|*-darwin*) myeconfargs+=( - $(use_with nls libiconv-prefix ${EPREFIX}/usr) - $(use_with nls libintl-prefix ${EPREFIX}/usr) + $(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 + # 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 @@ -151,11 +143,11 @@ src_configure() { src_install() { default - dodoc docs/{HACKING,TODO} + dodoc docs/{HACKING.md,TODO} find "${ED}" -type f -name "*.la" -delete || die exeinto /etc/cron.daily - newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884 + newexe "${FILESDIR}"/man-db.cron-r1 man-db # bug #289884 insinto /etc/sandbox.d doins 15man-db @@ -168,8 +160,8 @@ pkg_preinst() { # 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 + 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 @@ -194,8 +186,17 @@ pkg_preinst() { 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 + if [[ -n "${REPLACING_VERSIONS}" ]] ; then + local _replacing_version= + + for _replacing_version in ${REPLACING_VERSIONS} ; do + if [[ $(ver_cut 2 ${_replacing_version}) -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 + + # No need to run it again if we hit one + break + fi + done fi } -- cgit v1.2.3