From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Nov 2019 16:06:58 +0000 Subject: gentoo resync : 03.11.2019 --- sys-apps/man-db/Manifest | 6 +- sys-apps/man-db/man-db-2.8.7.ebuild | 2 +- sys-apps/man-db/man-db-2.9.0.ebuild | 157 ++++++++++++++++++++++++++++++++++++ sys-apps/man-db/man-db-9999.ebuild | 34 +++++++- 4 files changed, 194 insertions(+), 5 deletions(-) create mode 100644 sys-apps/man-db/man-db-2.9.0.ebuild (limited to 'sys-apps/man-db') diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest index e861755026e4..987aff39e0ba 100644 --- a/sys-apps/man-db/Manifest +++ b/sys-apps/man-db/Manifest @@ -3,8 +3,10 @@ AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a7906616 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301 DIST man-db-2.8.6.1.tar.xz 1829328 BLAKE2B 5dce50a4d5003a370595b3db0b1d7f01c54b53d26f011307bd91447cdeed410ea20a6720b12eae301d21c0b9674ed84b055f38f44e09d5543ce1647dff8b5bca SHA512 0c43cdddf2e07cd4a2225e098ea4cbfb2842a9bbf08bfb073058be0d66efac3a77ca0f8725564677c8f61e671f471c76f1dbba77a7601d7a63bb81350ef51bb5 DIST man-db-2.8.7.tar.xz 1839012 BLAKE2B 19b438b1083cfd838421f29ed053fe85686929bc9f2105fe399ea99622f138bca2c8888a17cddb9223362db2d5f9c4bb3669865ecf749fe845ea8e4223027f67 SHA512 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9 +DIST man-db-2.9.0.tar.xz 1857216 BLAKE2B b797c1bc48027346114d35f00624686daa7e139cf5836e207b482d645009b95577bc13cbad3f1b2498e8c7e8c2f530d43aa8dec96ebad6bb84e6cc77064319d1 SHA512 7deb4421c7944276c6edf974b1336ee2f6605ee470c98d374544e2fcaa32ec2afe077c5fd020fc1f74df058384a293b8ad5a92d86b1c15a949573af46ba09cda EBUILD man-db-2.7.6.1-r2.ebuild 3166 BLAKE2B 12cc1a5704569692825c9487433a604f5752caf366fcf152d5565b58b3b26a4db0e4816afdf2974cc3570142d024d07ccbe5e0a3f8f084c463b50c895f7e2f21 SHA512 95afcd9fd93c690003a3fdeb9ba1f2b794fd8d7fdc882d1d9f0658f6caf62fb0157d4e590033852f2b6f9b4634229b7256826a4799c9f37f68f8e986f12f3335 EBUILD man-db-2.8.6.1.ebuild 3460 BLAKE2B 4442e511e90674a1b511fde4829b30399a79dc0b483c213e4a7de8d2e331300a5a99a7fa45ad30cd5896d6a57e7c580affc524e41cbbba28b97a2c3af3a6a55a SHA512 0907ed049803b9c04f8b454cdd6ff8f8cb235b8b531502d0ef55f5022b75af2b51189b4472ed382e161f70600dff1e62202bd499a7c7d24577378a44b21f1860 -EBUILD man-db-2.8.7.ebuild 3460 BLAKE2B 4442e511e90674a1b511fde4829b30399a79dc0b483c213e4a7de8d2e331300a5a99a7fa45ad30cd5896d6a57e7c580affc524e41cbbba28b97a2c3af3a6a55a SHA512 0907ed049803b9c04f8b454cdd6ff8f8cb235b8b531502d0ef55f5022b75af2b51189b4472ed382e161f70600dff1e62202bd499a7c7d24577378a44b21f1860 -EBUILD man-db-9999.ebuild 3460 BLAKE2B 4442e511e90674a1b511fde4829b30399a79dc0b483c213e4a7de8d2e331300a5a99a7fa45ad30cd5896d6a57e7c580affc524e41cbbba28b97a2c3af3a6a55a SHA512 0907ed049803b9c04f8b454cdd6ff8f8cb235b8b531502d0ef55f5022b75af2b51189b4472ed382e161f70600dff1e62202bd499a7c7d24577378a44b21f1860 +EBUILD man-db-2.8.7.ebuild 3471 BLAKE2B ecc2767847f36a0cfed4f71e82e2bb683f219b2efb236bf0b8135368154e37139c82ae293b8e7911aa128169fc9b620a5f1b83b76b8d3784a6e66b9dd97af6b5 SHA512 88b299762e788380d0e5ee3b59834345b6050fdd5b200a5e355fd41d1967019df67f18b1a6ec2fdf1da0ddf17cfd5509fe6cb71beb4dfad07c2a660cfba47531 +EBUILD man-db-2.9.0.ebuild 4019 BLAKE2B 51ebbcad346410f4030b19ca787b36b0d86e32e0c54e9fb74b4dc95384868775dc777a30b101e4dea9e4b1c265567a5c53fbb686aaa9857eec6c7e5b9fc5be9c SHA512 732da754f75d4773cb267b30aac7b6076134e4183fc1572e95f0299cfd01fa470bc775f18753e7259443ee84db81c4109e73a97de360de093db90ee4077536c7 +EBUILD man-db-9999.ebuild 4019 BLAKE2B 51ebbcad346410f4030b19ca787b36b0d86e32e0c54e9fb74b4dc95384868775dc777a30b101e4dea9e4b1c265567a5c53fbb686aaa9857eec6c7e5b9fc5be9c SHA512 732da754f75d4773cb267b30aac7b6076134e4183fc1572e95f0299cfd01fa470bc775f18753e7259443ee84db81c4109e73a97de360de093db90ee4077536c7 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79 diff --git a/sys-apps/man-db/man-db-2.8.7.ebuild b/sys-apps/man-db/man-db-2.8.7.ebuild index 4d2bfc884fe9..f4fbb8a7f88f 100644 --- a/sys-apps/man-db/man-db-2.8.7.ebuild +++ b/sys-apps/man-db/man-db-2.8.7.ebuild @@ -23,8 +23,8 @@ CDEPEND=" !sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff - berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) + !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) diff --git a/sys-apps/man-db/man-db-2.9.0.ebuild b/sys-apps/man-db/man-db-2.9.0.ebuild new file mode 100644 index 000000000000..dffc4b56907e --- /dev/null +++ b/sys-apps/man-db/man-db-2.9.0.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd + +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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +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 + ) +" +RDEPEND=" + ${CDEPEND} + acct-group/man + acct-user/man + selinux? ( sec-policy/selinux-mandb ) +" +PDEPEND="manpager? ( app-text/manpager )" + +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 +} + +src_configure() { + 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="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" + $(use_enable nls) + $(use_enable static-libs static) + $(use_with seccomp libseccomp) + --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) + ) + 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}" -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() { + 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/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild index 4d2bfc884fe9..dffc4b56907e 100644 --- a/sys-apps/man-db/man-db-9999.ebuild +++ b/sys-apps/man-db/man-db-9999.ebuild @@ -8,7 +8,7 @@ inherit systemd DESCRIPTION="a man replacement that utilizes berkdb instead of flat files" HOMEPAGE="http://www.nongnu.org/man-db/" if [[ "${PV}" = 9999* ]] ; then - inherit git-r3 + 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" @@ -23,8 +23,8 @@ CDEPEND=" !sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff - berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) + !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) @@ -52,6 +52,36 @@ pkg_setup() { 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 +} + src_configure() { export ac_cv_lib_z_gzopen=$(usex zlib) local myeconfargs=( -- cgit v1.2.3