From c8a77dfe4d3d307c1d5dd2650b7297447d8b609d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 12 Jan 2019 16:58:08 +0000 Subject: gentoo resync : 12.01.2019 --- sys-apps/man-db/Manifest | 7 +- sys-apps/man-db/files/man-db.cron-r1 | 11 ++++ sys-apps/man-db/man-db-2.8.3.ebuild | 122 ----------------------------------- sys-apps/man-db/man-db-2.8.5.ebuild | 122 +++++++++++++++++++++++++++++++++++ sys-apps/man-db/man-db-9999.ebuild | 18 +++--- 5 files changed, 146 insertions(+), 134 deletions(-) create mode 100644 sys-apps/man-db/files/man-db.cron-r1 delete mode 100644 sys-apps/man-db/man-db-2.8.3.ebuild create mode 100644 sys-apps/man-db/man-db-2.8.5.ebuild (limited to 'sys-apps/man-db') diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest index c4b5dad52731..f189849e903c 100644 --- a/sys-apps/man-db/Manifest +++ b/sys-apps/man-db/Manifest @@ -1,10 +1,11 @@ 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.3.tar.xz 1624280 BLAKE2B 6158608a5a6ecd361391a17642a4bbc9275a8a3105a39d6f6c3971aceb275cfb16670c51dfa8f1d7fc0136fc1b5e96e39c88e8c1d91e9a47d7a1351d16623a93 SHA512 35d5dda7a2bda94978d10770d24d4c78b3c62c71a68cfeb400df61b0df289ed17aa8aa223d4ae3ffa094d76df8d9172b878230fd7b0397ce7728b9c8ac0b1745 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 EBUILD man-db-2.7.6.1-r2.ebuild 3162 BLAKE2B 5aefa5d09e68cc46d639cd09d55d8347046b9fab1b148d40e11a996cfbf94fcc43b8fc386941b3a157a2ac13dda2c6b4f8eafea75433af10560d86ee6f1270c7 SHA512 b42c3a488d2424c24a12f5eaeda2c15efeb18cf9b3c55230238e686712d78f127f9c9e2668dc0da84569cac1d532e19088cc78936d94146a981b776f82934fe9 -EBUILD man-db-2.8.3.ebuild 3378 BLAKE2B a101e51efdb07ed48674a0632ea445a56ba582779c0ed6c9755d8c05b2afee4b6df47b8572e670234af65a5c69a5c90788b4ca45f4d7ceba476694f5a0ede904 SHA512 b0785b4f12403bdd5993f40417582a343b1b64bb332699c8476bd347153b646fc997e753ce56b80cb798fc44049fa183c4c985d2d3c24c4687d8c7fbb7a96f75 EBUILD man-db-2.8.4.ebuild 3433 BLAKE2B 3768e283d9d5f4d3f5527923cd0d3863433682a6d80e0b255324d4636419f0bf76b9b139a82f27f4c766696eac69ae915e3c891b3ae4d61142fb7bc44e2b11e7 SHA512 40848f7193559a635d8a340ca54db9739a8ffe43b6a3edbe602c17ec9d132843c3a7cbf82fca4e6bc96f832314e0fd2b7294644cfa430c76e4aae0c0620b022e -EBUILD man-db-9999.ebuild 3378 BLAKE2B a101e51efdb07ed48674a0632ea445a56ba582779c0ed6c9755d8c05b2afee4b6df47b8572e670234af65a5c69a5c90788b4ca45f4d7ceba476694f5a0ede904 SHA512 b0785b4f12403bdd5993f40417582a343b1b64bb332699c8476bd347153b646fc997e753ce56b80cb798fc44049fa183c4c985d2d3c24c4687d8c7fbb7a96f75 +EBUILD man-db-2.8.5.ebuild 3445 BLAKE2B 330717193448fa99450f980c4ddce711d59a18dce8c06e98f01687e83eb0925024b31180f66af134e04fe4ba113cefdc89a9924f7c03b0bf0e15ce3ed452e2dd SHA512 63f9b781f4c0364a10434182d060d310ea76f8d628a0fde7f104a1853ead041bda9668ea4dda8f12091dcfa7ec4043d5b2ed671c20953f1015ab5b0c8e51d33c +EBUILD man-db-9999.ebuild 3445 BLAKE2B 330717193448fa99450f980c4ddce711d59a18dce8c06e98f01687e83eb0925024b31180f66af134e04fe4ba113cefdc89a9924f7c03b0bf0e15ce3ed452e2dd SHA512 63f9b781f4c0364a10434182d060d310ea76f8d628a0fde7f104a1853ead041bda9668ea4dda8f12091dcfa7ec4043d5b2ed671c20953f1015ab5b0c8e51d33c MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79 diff --git a/sys-apps/man-db/files/man-db.cron-r1 b/sys-apps/man-db/files/man-db.cron-r1 new file mode 100644 index 000000000000..7f7932360cb8 --- /dev/null +++ b/sys-apps/man-db/files/man-db.cron-r1 @@ -0,0 +1,11 @@ +#!/bin/sh + +# Use same perms/settings as the ebuild. +cachedir="/var/cache/man" +if [ ! -d "${cachedir}" ]; then + mkdir -p "${cachedir}" + chown man:man "${cachedir}" + chmod 0755 "${cachedir}" +fi + +exec su man -s /bin/sh -c 'nice mandb --quiet' 2>/dev/null diff --git a/sys-apps/man-db/man-db-2.8.3.ebuild b/sys-apps/man-db/man-db-2.8.3.ebuild deleted file mode 100644 index 670cbc0de539..000000000000 --- a/sys-apps/man-db/man-db-2.8.3.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit ltprune user versionator - -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 - 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 ~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 - berkdb? ( sys-libs/db:= ) - gdbm? ( sys-libs/gdbm:= ) - !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) - seccomp? ( sys-libs/libseccomp ) - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${CDEPEND} - app-arch/xz-utils - virtual/pkgconfig - nls? ( - >=app-text/po4a-0.45 - sys-devel/gettext - ) -" -RDEPEND=" - ${CDEPEND} - 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 -} - -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 - --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 -} - -src_install() { - default - dodoc docs/{HACKING,TODO} - prune_libtool_files - - exeinto /etc/cron.daily - newexe "${FILESDIR}"/man-db.cron man-db #289884 -} - -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 version_is_at_least '2.7.6.1-r2' "${_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 [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then - einfo "Rebuilding man-db from scratch with new database format!" - mandb --quiet --create - fi -} diff --git a/sys-apps/man-db/man-db-2.8.5.ebuild b/sys-apps/man-db/man-db-2.8.5.ebuild new file mode 100644 index 000000000000..fc34d010327e --- /dev/null +++ b/sys-apps/man-db/man-db-2.8.5.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit user eapi7-ver 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 + 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 ~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 + berkdb? ( sys-libs/db:= ) + gdbm? ( sys-libs/gdbm:= ) + !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) + seccomp? ( sys-libs/libseccomp ) + zlib? ( sys-libs/zlib ) +" +DEPEND=" + ${CDEPEND} + app-arch/xz-utils + virtual/pkgconfig + nls? ( + >=app-text/po4a-0.45 + sys-devel/gettext + ) +" +RDEPEND=" + ${CDEPEND} + 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 +} + +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 +} + +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 +} + +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 version_is_at_least '2.7.6.1-r2' "${_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 670cbc0de539..fc34d010327e 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-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit ltprune user versionator +inherit user eapi7-ver 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 @@ -57,9 +57,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) @@ -78,10 +78,10 @@ src_configure() { 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 } pkg_preinst() { @@ -115,8 +115,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 } -- cgit v1.2.3