commit: d597761a7254b14bad5f9d9cd7d3a1a63c6fcaf3 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sun Nov 3 16:59:36 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Nov 3 16:59:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d597761a
sys-apps/man-db: drop 2.11.2, 2.12.0 Bug: https://bugs.gentoo.org/900380 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> sys-apps/man-db/Manifest | 2 - sys-apps/man-db/man-db-2.11.2.ebuild | 203 ---------------------------------- sys-apps/man-db/man-db-2.12.0.ebuild | 206 ----------------------------------- 3 files changed, 411 deletions(-) diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest index 5a223d246b13..ca248693ee8a 100644 --- a/sys-apps/man-db/Manifest +++ b/sys-apps/man-db/Manifest @@ -1,4 +1,2 @@ -DIST man-db-2.11.2.tar.xz 1953276 BLAKE2B 80ac565cdb69736c0f922b9cbfddcae753d176329781deaf9434d87d7718f9b6ce0b6d4642a03f22a04c7f042dda7f8986b5bce0038f0748461ca55d66964ccc SHA512 edb71cce7249c7b7f2f524e92f682047a77ed9ae8856763dfc8e18e239444651ff4c505e697f5a8b1be3b85678e714fbb1a520defe72a4eb685bc2cecc0e4391 -DIST man-db-2.12.0.tar.xz 1987444 BLAKE2B a6258c1fc9cd81be5d288298660f5b9bda22d726ef98dd5c0a1998809a32391f7244be6897ee8e03483e705a426d6a59d442de3dc2e84f45500daa825ac639db SHA512 4b644a508cf10ef6d27b6325b08f8a89e0695bbc1409bf420efd27649c6851860cc472c4d86063f7b71dccd01fb158faa82afa1e2b91c9a20154acf66b0349bf DIST man-db-2.12.1.tar.xz 2041380 BLAKE2B b06c48431608cf798659d19df754d992dca8ba31842613a3326e376e80fe74d913146f45a7f3c5e70c421a2401aeabdb091de78ebb3102b9d70c194286c245a7 SHA512 0f79f4205ce116c3148dc6caf561c1b7d793aac234188ef8edd1b1f5aaaebcca32c65ef403dff65896920535077fb63ddc2e9cb293efdb6ef3037c33916aa329 DIST man-db-2.13.0.tar.xz 2071032 BLAKE2B 7ce91a7abc6d3bbd92d4707f13caacd8ab5caee0502a2b115f8aa53f4d38df05b0e03346f70584618cce6f5457113e826828a02b847bff57abd6ba6ec1b2d407 SHA512 612ce39bb1e11aa7797e8e3a26f06a7154c48a13b2d74217c2c6701e0d33fa8f77ae2b8c9ee84353e364d16918f884115f2dfbf3cd743edd4ed32b763b87f723 diff --git a/sys-apps/man-db/man-db-2.11.2.ebuild b/sys-apps/man-db/man-db-2.11.2.ebuild deleted file mode 100644 index 26e6d6874674..000000000000 --- a/sys-apps/man-db/man-db-2.11.2.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd prefix tmpfiles - -DESCRIPTION="A man replacement that utilizes dbm instead of flat files" -HOMEPAGE="https://gitlab.com/man-db/man-db https://www.nongnu.org/man-db/"; -if [[ ${PV} == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitlab.com/man-db/man-db"; -else - # TODO: Change tarballs to gitlab too...? - SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="+manpager nls +seccomp selinux static-libs zlib" - -CDEPEND=" - >=dev-libs/libpipeline-1.5.0 - sys-apps/groff - 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 - virtual/libiconv - virtual/libintl - )" -RDEPEND="${CDEPEND} - acct-group/man - acct-user/man - selinux? ( sec-policy/selinux-mandb )" -PDEPEND="manpager? ( app-text/manpager )" - -PATCHES=( - "${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch -) - -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 - - hprefixify src/man_db.conf.in - if use prefix ; then - { - echo "#" - echo "# Added settings for Gentoo Prefix" - [[ ${CHOST} == *-darwin* ]] && \ - echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man" - echo "MANDATORY_MANPATH /usr/share/man" - } >> src/man_db.conf.in - fi -} - -src_configure() { - # Set sections we want to search by default - local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o" - sections+=" 1x 2x 3x 4x 5x 6x 7x 8x" - case ${CHOST} in - *-solaris*) - # Solaris tends to use sections named after the pkgs that - # owns them, in particular for libc functions we want those - # sections - local s - for s in $(cd /usr/share/man/ && echo man*) ; do - s=${s#man} - [[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}" - done - ;; - esac - - export ac_cv_lib_z_gzopen=$(usex zlib) - local myeconfargs=( - --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --disable-setuid # bug #662438 - --enable-cache-owner=man - --with-sections="${sections}" - - $(use_enable nls) - $(use_enable static-libs static) - $(use_with seccomp libseccomp) - - --with-db=gdbm - ) - - case ${CHOST} in - *-solaris*|*-darwin*) - myeconfargs+=( - $(use_with nls libiconv-prefix "${EPREFIX}"/usr) - $(use_with nls libintl-prefix "${EPREFIX}"/usr) - ) - ;; - esac - - econf "${myeconfargs[@]}" - - # Disable color output from groff so that the manpager can add it. bug #184604 - if use manpager; then - sed -i \ - -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ - src/man_db.conf || die - fi - - cat > 15man-db <<-EOF || die - SANDBOX_PREDICT="/var/cache/man" - EOF -} - -src_install() { - default - dodoc docs/{HACKING.md,TODO} - find "${ED}" -type f -name "*.la" -delete || die - - exeinto /etc/cron.daily - newexe "${FILESDIR}"/man-db.cron-r1 man-db # bug #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() { - tmpfiles_process man-db.conf - - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - local _replacing_version= - - for _replacing_version in ${REPLACING_VERSIONS} ; do - if [[ $(ver_cut 2 ${_replacing_version}) -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 - - # No need to run it again if we hit one - break - fi - done - fi -} diff --git a/sys-apps/man-db/man-db-2.12.0.ebuild b/sys-apps/man-db/man-db-2.12.0.ebuild deleted file mode 100644 index 6450925d8d44..000000000000 --- a/sys-apps/man-db/man-db-2.12.0.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd prefix tmpfiles - -DESCRIPTION="A man replacement that utilizes dbm instead of flat files" -HOMEPAGE="https://gitlab.com/man-db/man-db https://www.nongnu.org/man-db/"; -if [[ ${PV} == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitlab.com/man-db/man-db"; -else - inherit libtool - # TODO: Change tarballs to gitlab too...? - SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="+manpager nls +seccomp selinux static-libs zlib" - -CDEPEND=" - >=dev-libs/libpipeline-1.5.0 - sys-apps/groff - 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 - virtual/libiconv - virtual/libintl - )" -RDEPEND="${CDEPEND} - acct-group/man - acct-user/man - selinux? ( sec-policy/selinux-mandb )" -PDEPEND="manpager? ( app-text/manpager )" - -PATCHES=( - "${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch -) - -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 - else - elibtoolize - fi - - hprefixify src/man_db.conf.in - if use prefix ; then - { - echo "#" - echo "# Added settings for Gentoo Prefix" - [[ ${CHOST} == *-darwin* ]] && \ - echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man" - echo "MANDATORY_MANPATH /usr/share/man" - } >> src/man_db.conf.in - fi -} - -src_configure() { - # Set sections we want to search by default - local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o" - sections+=" 1x 2x 3x 4x 5x 6x 7x 8x" - case ${CHOST} in - *-solaris*) - # Solaris tends to use sections named after the pkgs that - # owns them, in particular for libc functions we want those - # sections - local s - for s in $(cd /usr/share/man/ && echo man*) ; do - s=${s#man} - [[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}" - done - ;; - esac - - export ac_cv_lib_z_gzopen=$(usex zlib) - local myeconfargs=( - --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --disable-setuid # bug #662438 - $(use_enable !prefix cache-owner man) # bug #917024 - --with-sections="${sections}" - - $(use_enable nls) - $(use_enable static-libs static) - $(use_with seccomp libseccomp) - - --with-db=gdbm - ) - - case ${CHOST} in - *-solaris*|*-darwin*) - myeconfargs+=( - $(use_with nls libiconv-prefix "${EPREFIX}"/usr) - $(use_with nls libintl-prefix "${EPREFIX}"/usr) - ) - ;; - esac - - econf "${myeconfargs[@]}" - - # Disable color output from groff so that the manpager can add it. bug #184604 - if use manpager; then - sed -i \ - -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ - src/man_db.conf || die - fi - - cat > 15man-db <<-EOF || die - SANDBOX_PREDICT="/var/cache/man" - EOF -} - -src_install() { - default - dodoc docs/{HACKING.md,TODO} - find "${ED}" -type f -name "*.la" -delete || die - - exeinto /etc/cron.daily - newexe "${FILESDIR}"/man-db.cron-r1 man-db # bug #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() { - tmpfiles_process man-db.conf - - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - local _replacing_version= - - for _replacing_version in ${REPLACING_VERSIONS} ; do - if [[ $(ver_cut 2 ${_replacing_version}) -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 - - # No need to run it again if we hit one - break - fi - done - fi -}
