public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/man-db/files/, sys-apps/man-db/
Date: Tue, 21 Apr 2020 07:44:30 +0000 (UTC)	[thread overview]
Message-ID: <1587454652.5f96b31dfd4738313f0ffbde83945f64c2b46ca2.polynomial-c@gentoo> (raw)

commit:     5f96b31dfd4738313f0ffbde83945f64c2b46ca2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 21 07:37:32 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 07:37:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f96b31d

sys-apps/man-db: Removed old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-apps/man-db/Manifest                 |   2 -
 sys-apps/man-db/files/man-db.cron        |  11 ---
 sys-apps/man-db/man-db-2.7.6.1-r2.ebuild | 110 ----------------------
 sys-apps/man-db/man-db-2.9.0.ebuild      | 157 -------------------------------
 4 files changed, 280 deletions(-)

diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 6e12ba7270a..071f45cf4b9 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,4 +1,2 @@
-DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
 DIST man-db-2.8.7.tar.xz 1839012 BLAKE2B 19b438b1083cfd838421f29ed053fe85686929bc9f2105fe399ea99622f138bca2c8888a17cddb9223362db2d5f9c4bb3669865ecf749fe845ea8e4223027f67 SHA512 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9
-DIST man-db-2.9.0.tar.xz 1857216 BLAKE2B b797c1bc48027346114d35f00624686daa7e139cf5836e207b482d645009b95577bc13cbad3f1b2498e8c7e8c2f530d43aa8dec96ebad6bb84e6cc77064319d1 SHA512 7deb4421c7944276c6edf974b1336ee2f6605ee470c98d374544e2fcaa32ec2afe077c5fd020fc1f74df058384a293b8ad5a92d86b1c15a949573af46ba09cda
 DIST man-db-2.9.1.tar.xz 1875456 BLAKE2B 42d7d5f49bf19e031bde18dd60cbf18a7656e8756f2cc5d3789cab6ea82283115ed0303ae2f7f7ffd3e32310302b7b70b4e39704bd5c2a08ab60a38905d8c448 SHA512 ae2d1e9f293795c63f5a9a1a765478a9a59cbe5fe6f759647be5057c1ae53f90baee8d5467921f3d0102300f2111a5026eeb25f78401bcb16ce45ad790634977

diff --git a/sys-apps/man-db/files/man-db.cron b/sys-apps/man-db/files/man-db.cron
deleted file mode 100644
index b3794f25573..00000000000
--- a/sys-apps/man-db/files/man-db.cron
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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 nice mandb --quiet

diff --git a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
deleted file mode 100644
index a4faae26809..00000000000
--- a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils ltprune user versionator
-
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib"
-
-CDEPEND=">=dev-libs/libpipeline-1.4.0
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
-	sys-apps/groff
-	zlib? ( sys-libs/zlib )
-	!sys-apps/man"
-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)
-		--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.9.0.ebuild b/sys-apps/man-db/man-db-2.9.0.ebuild
deleted file mode 100644
index 92546556c66..00000000000
--- a/sys-apps/man-db/man-db-2.9.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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}" -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
-}


             reply	other threads:[~2020-04-21  7:44 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-21  7:44 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-02-08 11:57 [gentoo-commits] repo/gentoo:master commit in: sys-apps/man-db/files/, sys-apps/man-db/ Lars Wendler
2018-02-08  7:59 Lars Wendler
2017-02-21 21:46 Robin H. Johnson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1587454652.5f96b31dfd4738313f0ffbde83945f64c2b46ca2.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox