gentoo auto-resync : 07:04:2024 - 12:30:41

3 files changed, 217 insertions, 2 deletions

diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 8a42cf890cb8..38108426c7f0 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -2,7 +2,9 @@ AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70e
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 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
 EBUILD man-db-2.11.2.ebuild 5086 BLAKE2B 406c4420f624699316cd0fede3756738f38b84033dbb3ca884b7921729738b098db428156faa6cdca1a7a2aee4128f6e0c9107473f2965f2e83a67f2672fc118 SHA512 6f2b1b64720de1aca1c009218dabe589a4be49e649d08eeb51187750719fb42a60f3795246f4334d78d57917ef86fe349d73af499fb7aeb93229ea5b4af90601
 EBUILD man-db-2.12.0.ebuild 5114 BLAKE2B 9e11654946a22c91339940ef7fe676935f1108756e7db938757c59bdacd068010feea0d1f3213d93eb17e09a832500312aecdeed5ec5a8be6699246370d111c6 SHA512 ee12a25768839a03616abe45a648b019abf9ab5cf1d4bc73abd35d6864d0c776c090a09174bbba20d6e6f47a43b6e540130fd26535f07c49ba0c1d85e27f90d9
-EBUILD man-db-9999.ebuild 5122 BLAKE2B ae50ef37e0aad239e9dc6cbb86317553432cc9b0db20eaecc91bd3d502ad7c7f5cd48cdf7b5ddf912bbb197d67d75e9aae9e814f949b746b6d7af304264c9f43 SHA512 e462965d23575d33c9906861c4a6eb589206a564863494361811bf4a516b3fc797cc4e1b85b5a2296cd330714d8dbb3bc3e560697958e01c872f9bf59fc86518
+EBUILD man-db-2.12.1.ebuild 5205 BLAKE2B b6834b3d9024977301c33fdc2305d4d3c7dd00675b979f0b09828efb69530dfbc8f792f4eb1fe21ab86642f529bd73261ccd0fc202be9d8292083b16d4f41c0d SHA512 c923727d67834b33e90e63e04b068f4dd44fd2f0cf7e3bc3e8b26295b586ad91c5b4d6489886f4700df5e4d5c924baebf0f1c71ab618cea4dbb2702616c672b1
+EBUILD man-db-9999.ebuild 5205 BLAKE2B b6834b3d9024977301c33fdc2305d4d3c7dd00675b979f0b09828efb69530dfbc8f792f4eb1fe21ab86642f529bd73261ccd0fc202be9d8292083b16d4f41c0d SHA512 c923727d67834b33e90e63e04b068f4dd44fd2f0cf7e3bc3e8b26295b586ad91c5b4d6489886f4700df5e4d5c924baebf0f1c71ab618cea4dbb2702616c672b1
 MISC metadata.xml 493 BLAKE2B 33282cbeba0e727dbe080ce8dab8b903590f4139d346e260d950d531fadee3c9a36451b8ec37564b313c8c2fa3ce0accf41cb632db2b2f709287fae4c57bcfd5 SHA512 2ac84cdda859f02a19005ca0cc43b84160171f9080a100491cef5451d0ba3f6d38cdbfb4da35bf38b1942f14eae8ea705774820c2c7a0cd86d4bc9540c9c5490
diff --git a/sys-apps/man-db/man-db-2.12.1.ebuild b/sys-apps/man-db/man-db-2.12.1.ebuild
new file mode 100644
index 000000000000..edcfb60226c1
--- /dev/null
+++ b/sys-apps/man-db/man-db-2.12.1.ebuild
@@ -0,0 +1,208 @@
+# 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
+	# TODO: Change tarballs to gitlab too...?
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# gnulib FPs
+	unreachable MIN alignof static_assert
+)
+
+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
+		$(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
+}
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index 2805d67ac3cb..edcfb60226c1 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,6 +45,11 @@ PATCHES=(
 	"${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch
 )
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# gnulib FPs
+	unreachable MIN alignof static_assert
+)
+
 src_unpack() {
 	if [[ ${PV} == *9999 ]] ; then
 		git-r3_src_unpack