| 1 |
commit: 59d4f75abd7dc6b691a95b5447133922ff09ea3f |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 6 15:10:21 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 6 15:11:41 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d4f75a |
| 7 |
|
| 8 |
sys-apps/man-db: Synced live ebuild. |
| 9 |
|
| 10 |
Attempt to fix root privilege escalation. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/662438 |
| 13 |
Bug: https://bugs.gentoo.org/666404 |
| 14 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
| 15 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 16 |
|
| 17 |
sys-apps/man-db/man-db-9999.ebuild | 17 ++++++++--------- |
| 18 |
1 file changed, 8 insertions(+), 9 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild |
| 21 |
index 670cbc0de53..c6db5d3398e 100644 |
| 22 |
--- a/sys-apps/man-db/man-db-9999.ebuild |
| 23 |
+++ b/sys-apps/man-db/man-db-9999.ebuild |
| 24 |
@@ -1,9 +1,9 @@ |
| 25 |
-# Copyright 1999-2018 Gentoo Foundation |
| 26 |
+# Copyright 1999-2019 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=6 |
| 30 |
|
| 31 |
-inherit ltprune user versionator |
| 32 |
+inherit user eapi7-ver |
| 33 |
|
| 34 |
DESCRIPTION="a man replacement that utilizes berkdb instead of flat files" |
| 35 |
HOMEPAGE="http://www.nongnu.org/man-db/" |
| 36 |
@@ -17,7 +17,7 @@ fi |
| 37 |
|
| 38 |
LICENSE="GPL-3" |
| 39 |
SLOT="0" |
| 40 |
-IUSE="berkdb +gdbm +manpager nls seccomp selinux static-libs zlib" |
| 41 |
+IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib" |
| 42 |
|
| 43 |
CDEPEND=" |
| 44 |
!sys-apps/man |
| 45 |
@@ -57,9 +57,8 @@ pkg_setup() { |
| 46 |
src_configure() { |
| 47 |
export ac_cv_lib_z_gzopen=$(usex zlib) |
| 48 |
local myeconfargs=( |
| 49 |
- --docdir='$(datarootdir)'/doc/${PF} |
| 50 |
--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d |
| 51 |
- --enable-setuid |
| 52 |
+ --disable-setuid #662438 |
| 53 |
--enable-cache-owner=man |
| 54 |
--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" |
| 55 |
$(use_enable nls) |
| 56 |
@@ -78,10 +77,10 @@ src_configure() { |
| 57 |
src_install() { |
| 58 |
default |
| 59 |
dodoc docs/{HACKING,TODO} |
| 60 |
- prune_libtool_files |
| 61 |
+ find "${ED}" -name "*.la" -delete || die |
| 62 |
|
| 63 |
exeinto /etc/cron.daily |
| 64 |
- newexe "${FILESDIR}"/man-db.cron man-db #289884 |
| 65 |
+ newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884 |
| 66 |
} |
| 67 |
|
| 68 |
pkg_preinst() { |
| 69 |
@@ -115,8 +114,8 @@ pkg_preinst() { |
| 70 |
} |
| 71 |
|
| 72 |
pkg_postinst() { |
| 73 |
- if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then |
| 74 |
+ if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then |
| 75 |
einfo "Rebuilding man-db from scratch with new database format!" |
| 76 |
- mandb --quiet --create |
| 77 |
+ su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null |
| 78 |
fi |
| 79 |
} |
Archives