From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- sys-apps/man-db/Manifest | 4 +- sys-apps/man-db/man-db-2.9.2.ebuild | 157 ++++++++++++++++++++++++++++++++++++ sys-apps/man-db/man-db-9999.ebuild | 2 +- 3 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 sys-apps/man-db/man-db-2.9.2.ebuild (limited to 'sys-apps/man-db') diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest index 7027705fa1a9..722946c3c0c0 100644 --- a/sys-apps/man-db/Manifest +++ b/sys-apps/man-db/Manifest @@ -1,7 +1,9 @@ AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054 DIST man-db-2.8.7.tar.xz 1839012 BLAKE2B 19b438b1083cfd838421f29ed053fe85686929bc9f2105fe399ea99622f138bca2c8888a17cddb9223362db2d5f9c4bb3669865ecf749fe845ea8e4223027f67 SHA512 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9 DIST man-db-2.9.1.tar.xz 1875456 BLAKE2B 42d7d5f49bf19e031bde18dd60cbf18a7656e8756f2cc5d3789cab6ea82283115ed0303ae2f7f7ffd3e32310302b7b70b4e39704bd5c2a08ab60a38905d8c448 SHA512 ae2d1e9f293795c63f5a9a1a765478a9a59cbe5fe6f759647be5057c1ae53f90baee8d5467921f3d0102300f2111a5026eeb25f78401bcb16ce45ad790634977 +DIST man-db-2.9.2.tar.xz 1885484 BLAKE2B 46778ebdecffcdefedd062e3f6a01a54054b57aa9636450dd148f62184b9bb919deb72e3b57b2fc75670fc2d8d274417f00994f7030fee913d572637e080b4c1 SHA512 47b63c074cf61c15f82230cc35a0062ab6ded8c3229475c6667a47ca518346d0555616c5b07bb01515b31bd80cbdc9870cd05ffff35097d013252401c6927002 EBUILD man-db-2.8.7.ebuild 3458 BLAKE2B f3096c090cfe4f5d6926389d0e3e1d8d417c7cdfd0cee59d9d4182d9c1a602b8a2a4c57fd3b92e110e8a1e9c6c4922160fda8f24bf54fca20797defa6443af42 SHA512 3b38dfae452716e3a68e1ae6dd5c74ba92ab130e25c8bd77d9e5802e3cda8dedbf5c7e7af8613e0e62c9f337b0ddb2c1a6fd69058967d3ed774c639897278f9d EBUILD man-db-2.9.1.ebuild 4015 BLAKE2B 6ad75623c176a62cf26afb94bd84ea3a214a949bdf534e58e7e9ccbf11bf56159e02d48e3999549fd2f1f2e0240b954298717d6bfe29523e6e7cd2382b20234b SHA512 773c65cdda7fd8275266b05450cae51996652689ce26e3095e5eee97990dcce39412e784a3a0104b43218ab3d411d78bc70cbed9d8602852decc9c06f96d6074 -EBUILD man-db-9999.ebuild 4015 BLAKE2B 6ad75623c176a62cf26afb94bd84ea3a214a949bdf534e58e7e9ccbf11bf56159e02d48e3999549fd2f1f2e0240b954298717d6bfe29523e6e7cd2382b20234b SHA512 773c65cdda7fd8275266b05450cae51996652689ce26e3095e5eee97990dcce39412e784a3a0104b43218ab3d411d78bc70cbed9d8602852decc9c06f96d6074 +EBUILD man-db-2.9.2.ebuild 4023 BLAKE2B ff89a69281aadbff8dda8687cb1466cd0b6216f705f946c5e44b4ea296e2460517dd12b6e1891bb56cbca2eff7ce252cd5314a9c5df1d4ca675a92e88241beee SHA512 f79e6ac596356ab4d8ed48d1c77a7ac7d5237fdc3893b6698a5df5e8d783684fff6a666228512dbec620e2ec783472c5211c924bd9d93398ed0825460e1028a4 +EBUILD man-db-9999.ebuild 4023 BLAKE2B ff89a69281aadbff8dda8687cb1466cd0b6216f705f946c5e44b4ea296e2460517dd12b6e1891bb56cbca2eff7ce252cd5314a9c5df1d4ca675a92e88241beee SHA512 f79e6ac596356ab4d8ed48d1c77a7ac7d5237fdc3893b6698a5df5e8d783684fff6a666228512dbec620e2ec783472c5211c924bd9d93398ed0825460e1028a4 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79 diff --git a/sys-apps/man-db/man-db-2.9.2.ebuild b/sys-apps/man-db/man-db-2.9.2.ebuild new file mode 100644 index 000000000000..8ad0f47c8564 --- /dev/null +++ b/sys-apps/man-db/man-db-2.9.2.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2020 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 ~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}" -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() { + 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 92546556c66b..8ad0f47c8564 100644 --- a/sys-apps/man-db/man-db-9999.ebuild +++ b/sys-apps/man-db/man-db-9999.ebuild @@ -110,7 +110,7 @@ src_configure() { src_install() { default dodoc docs/{HACKING,TODO} - find "${ED}" -name "*.la" -delete || die + find "${ED}" -type f -name "*.la" -delete || die exeinto /etc/cron.daily newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884 -- cgit v1.2.3