gentoo resync : 18.08.2019

4 files changed, 32 insertions, 59 deletions

diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 631764b435cd..8ecb7438f08b 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,11 +1,10 @@
-AUX man-db-2.8.4-berkdb_build_fix.patch 661 BLAKE2B 2f8950d05ef4c467089ebef3d73b9df1d1a6f1f235ce01e87830b14644d9317da0b255702d7c40507c67d65710cb13a1cb85210739f55b4b7e7ee282acceedae SHA512 c99f61ef08be2e88feb90376dfe3c4f1b028c6916c46aea92d145de304ca380d381a334bb1c0bc5828ea38c24532960cf0d449c18cd6db59a47ca3bdc3fac43b
 AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
-DIST man-db-2.8.4.tar.xz 1779488 BLAKE2B c5f9b06c4b24e046e4b8fbcf4f43015133d18d875edd79f0aad992d884e83fc28a8c3b7d82ded187293d858dfadae48eb088722c3ffc91eec64b71cdf46750be SHA512 3cc160a5a8a0a4e918f6f6546582d1e5fe9851a13c5bd8dc94e3fcbf4ec28cb3cd1524b1ae30722931c84981fa8ca9ac64c9c4d9544c2d0bea80ac9f39cb5e66
 DIST man-db-2.8.5.tar.xz 1787244 BLAKE2B b908a6fb0187d42f8d1f842063e0afdf1e052244ea727f0aaaf4d658bb8954a216c0555df5511b27246fd12c2a388c44dcfccf243449d25d6e741c5c3466d3be SHA512 8d1524c3b6459c9ac02d969149c18c198cb171bcd6acc493e863a466c01309958ee9f5ac52df4d7d27da29d35cb7c64132732f5b969181ab336500df2e6dad69
+DIST man-db-2.8.6.1.tar.xz 1829328 BLAKE2B 5dce50a4d5003a370595b3db0b1d7f01c54b53d26f011307bd91447cdeed410ea20a6720b12eae301d21c0b9674ed84b055f38f44e09d5543ce1647dff8b5bca SHA512 0c43cdddf2e07cd4a2225e098ea4cbfb2842a9bbf08bfb073058be0d66efac3a77ca0f8725564677c8f61e671f471c76f1dbba77a7601d7a63bb81350ef51bb5
 EBUILD man-db-2.7.6.1-r2.ebuild 3166 BLAKE2B 12cc1a5704569692825c9487433a604f5752caf366fcf152d5565b58b3b26a4db0e4816afdf2974cc3570142d024d07ccbe5e0a3f8f084c463b50c895f7e2f21 SHA512 95afcd9fd93c690003a3fdeb9ba1f2b794fd8d7fdc882d1d9f0658f6caf62fb0157d4e590033852f2b6f9b4634229b7256826a4799c9f37f68f8e986f12f3335
-EBUILD man-db-2.8.4.ebuild 3437 BLAKE2B b10866c070904e397994d214eca7f2f95993669b9c67e55e691bcc74aff5a536c81b3fdccfe7ea90c705d4792c53b43c966634c1a415e4f445415463d8eeba4a SHA512 64ec42d1789b187318696394a885329d30151a3d52b1065ab831a5deaf85d2c8a06e63f4c8d45b24dbe5b152965b03d520ce85e0133c609d5e8106914ee6f0e2
 EBUILD man-db-2.8.5-r1.ebuild 3556 BLAKE2B 54d767f777edaf57755569261009c4287bb73107913e736482685e30cd93f76c62f31a51f55625e72ada927134ecb8d2ead1b610db16a206a4906858188bea19 SHA512 3b1f03cad7087b28bfe60df5a5a16fe1db4a33518cc43c11a0c79b3fcb8cd10c35a98941f359d8dd35c8b8f6dc5e693eeae917baf4bc2cdf70f9ea154ac4a29b
-EBUILD man-db-9999.ebuild 3556 BLAKE2B 54d767f777edaf57755569261009c4287bb73107913e736482685e30cd93f76c62f31a51f55625e72ada927134ecb8d2ead1b610db16a206a4906858188bea19 SHA512 3b1f03cad7087b28bfe60df5a5a16fe1db4a33518cc43c11a0c79b3fcb8cd10c35a98941f359d8dd35c8b8f6dc5e693eeae917baf4bc2cdf70f9ea154ac4a29b
+EBUILD man-db-2.8.6.1.ebuild 3460 BLAKE2B 4442e511e90674a1b511fde4829b30399a79dc0b483c213e4a7de8d2e331300a5a99a7fa45ad30cd5896d6a57e7c580affc524e41cbbba28b97a2c3af3a6a55a SHA512 0907ed049803b9c04f8b454cdd6ff8f8cb235b8b531502d0ef55f5022b75af2b51189b4472ed382e161f70600dff1e62202bd499a7c7d24577378a44b21f1860
+EBUILD man-db-9999.ebuild 3460 BLAKE2B 4442e511e90674a1b511fde4829b30399a79dc0b483c213e4a7de8d2e331300a5a99a7fa45ad30cd5896d6a57e7c580affc524e41cbbba28b97a2c3af3a6a55a SHA512 0907ed049803b9c04f8b454cdd6ff8f8cb235b8b531502d0ef55f5022b75af2b51189b4472ed382e161f70600dff1e62202bd499a7c7d24577378a44b21f1860
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/files/man-db-2.8.4-berkdb_build_fix.patch b/sys-apps/man-db/files/man-db-2.8.4-berkdb_build_fix.patch
deleted file mode 100644
index 30052f268157..000000000000
--- a/sys-apps/man-db/files/man-db-2.8.4-berkdb_build_fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From dd0f554b5c1d563f9ee625c19c8745d8982e00e3 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@debian.org>
-Date: Thu, 2 Aug 2018 10:34:00 +0100
-Subject: Fix build with Berkeley DB
-
-Fixes Savannah bug #54425.
-
-* libdb/db_btree.c: Include <stdlib.h> for free.
----
- libdb/db_btree.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libdb/db_btree.c b/libdb/db_btree.c
-index fdd9b15..4469bf6 100644
---- a/libdb/db_btree.c
-+++ b/libdb/db_btree.c
-@@ -28,6 +28,7 @@
- /* below this line are routines only useful for the BTREE interface */
- #ifdef BTREE
- 
-+#include <stdlib.h>
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
--- 
-cgit v1.0-41-gc330
-
diff --git a/sys-apps/man-db/man-db-2.8.4.ebuild b/sys-apps/man-db/man-db-2.8.6.1.ebuild
index 1fc95e763ef2..4d2bfc884fe9 100644
--- a/sys-apps/man-db/man-db-2.8.4.ebuild
+++ b/sys-apps/man-db/man-db-2.8.6.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit ltprune user versionator
+inherit systemd
 
 DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
 HOMEPAGE="http://www.nongnu.org/man-db/"
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="berkdb +gdbm +manpager nls seccomp selinux static-libs zlib"
+IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
 
 CDEPEND="
 	!sys-apps/man
@@ -29,8 +29,8 @@ CDEPEND="
 	seccomp? ( sys-libs/libseccomp )
 	zlib? ( sys-libs/zlib )
 "
-DEPEND="
-	${CDEPEND}
+DEPEND="${CDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig
 	nls? (
@@ -40,17 +40,13 @@ DEPEND="
 "
 RDEPEND="
 	${CDEPEND}
+	acct-group/man
+	acct-user/man
 	selinux? ( sec-policy/selinux-mandb )
 "
 PDEPEND="manpager? ( app-text/manpager )"
 
-PATCHES=( "${FILESDIR}"/${P}-berkdb_build_fix.patch )
-
 pkg_setup() {
-	# Create user now as Makefile in src_install does setuid/chown
-	enewgroup man 15
-	enewuser man 13 -1 /usr/share/man man
-
 	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
@@ -59,9 +55,9 @@ pkg_setup() {
 src_configure() {
 	export ac_cv_lib_z_gzopen=$(usex zlib)
 	local myeconfargs=(
-		--docdir='$(datarootdir)'/doc/${PF}
 		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--enable-setuid
+		--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)
@@ -75,26 +71,33 @@ src_configure() {
 	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}
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 
 	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron man-db #289884
+	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
+
+	insinto /etc/sandbox.d
+	doins 15man-db
 }
 
 pkg_preinst() {
-	local cachedir="${EROOT}var/cache/man"
+	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 version_is_at_least '2.7.6.1-r2' "${_replacing_version}"; then
+		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
@@ -117,8 +120,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
+	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
 		einfo "Rebuilding man-db from scratch with new database format!"
-		mandb --quiet --create
+		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 0bcb6f92ce69..4d2bfc884fe9 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit user eapi7-ver systemd
+inherit systemd
 
 DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
 HOMEPAGE="http://www.nongnu.org/man-db/"
@@ -29,8 +29,8 @@ CDEPEND="
 	seccomp? ( sys-libs/libseccomp )
 	zlib? ( sys-libs/zlib )
 "
-DEPEND="
-	${CDEPEND}
+DEPEND="${CDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig
 	nls? (
@@ -40,15 +40,13 @@ DEPEND="
 "
 RDEPEND="
 	${CDEPEND}
+	acct-group/man
+	acct-user/man
 	selinux? ( sec-policy/selinux-mandb )
 "
 PDEPEND="manpager? ( app-text/manpager )"
 
 pkg_setup() {
-	# Create user now as Makefile in src_install does setuid/chown
-	enewgroup man 15
-	enewuser man 13 -1 /usr/share/man man
-
 	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
@@ -92,7 +90,7 @@ src_install() {
 }
 
 pkg_preinst() {
-	local cachedir="${EROOT}var/cache/man"
+	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