gentoo auto-resync : 09:01:2023 - 12:18:20

5 files changed, 211 insertions, 2 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f20e06c0fdfc..dcd4d6c9406f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 7ed1680edffb..71b25471d4fe 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.10.2.tar.xz 1902840 BLAKE2B 8d1748503cdf66a613d7544a27b42df9436bdf4e07ccb130d2fa62343488d2c4ab791238c348236a253abddb564db9d1bb851249da9911737ff822d822819599 SHA512 5ad7a7b601aadf4d2d7cc068881fffe3d91dc85fcf4c17e66fbe6e2b04bb1c46f5ba5d4bc7f6ab3f39e00065be39061b101d3064c12b1e89f0fee61c088611bf
 DIST man-db-2.11.1.tar.xz 1948788 BLAKE2B 60c3895a6326222e0a3f40902caa18991b5f767018ccb60f844c3a329e50fdda3db96b1c80b5337f4a5f129bdf0e7084cca7b216473328e4d2606cf811a88dab SHA512 249d65d01d83feac2503bfc1fba6d018ea0f7485c1112f1bfb4849ef7fbc3c1a50b97ab0844a7792d83bb1084a89abb4fa309ce1bc2bdf1183fe35b9e4f06263
+DIST man-db-2.11.2.tar.xz 1953276 BLAKE2B 80ac565cdb69736c0f922b9cbfddcae753d176329781deaf9434d87d7718f9b6ce0b6d4642a03f22a04c7f042dda7f8986b5bce0038f0748461ca55d66964ccc SHA512 edb71cce7249c7b7f2f524e92f682047a77ed9ae8856763dfc8e18e239444651ff4c505e697f5a8b1be3b85678e714fbb1a520defe72a4eb685bc2cecc0e4391
 EBUILD man-db-2.10.2-r1.ebuild 5128 BLAKE2B 532d907a06f95b28f8b6705fe58d9d62797ae5ac2633b25981cae36ed16678e44a7026c19d7449244b7fcbdc5187d08a898753af1c7c2c3d2e718ab4c450032b SHA512 a80d67860f7ebc8b029fb5b83adbbef32ab1714102351cee8c2605228e00caf87627dfc08e129d255c80f04a232e0b30eeaee196bb7da969c3cad1021153751d
 EBUILD man-db-2.11.1.ebuild 5118 BLAKE2B 6ecaf35f62b4bae1939956384c57fc00792db0aa84d9b5945c9ea67f2f8cb799e1182df47248c1a66fe80e48c99df9c56c89c25ea73b8f73e2af86536acfd4ca SHA512 6adb3bc7adf22ea2f6ab51bf823be5834b88b2f15bd2d4293d078ef06942fa69c5757903f7ce71df234d68f89c39ef5c36f3cbeeb0221f7a36bbb6a689938e35
+EBUILD man-db-2.11.2.ebuild 5126 BLAKE2B da72f88d63c6d90b2fea06f29d996729eb4b2c4540e799c5ef2041a26ce04d4a8aabf153ed8048e41646df2f74cf7d66a874db7856fe3f0ca00ea95578624d5f SHA512 18b1b0575b398ac2eafb6ce38b527f55dc25a2834e2f20ea628b26e74d1613a15906775aab7c0de8f8abdafcb645af214e8d9a96cf7b51af191353e99f509ff9
 EBUILD man-db-9999.ebuild 5126 BLAKE2B d9cdcdd39ed3a813330092d43d1e6c2431669e9b083dde0f1efd99481c8364c4cd7cb01a52b25aeec518a93926a82693a19ed58cf51338c2f74e09347210fb64 SHA512 99a2c0aa6fcb1426887fe320c6dc6368b80b9a0fbe45ca320c831ea27f42dca2abd96b1421b86696bddef90d122225bd6bc97d7372d144fe4cc009d02469d041
 MISC metadata.xml 428 BLAKE2B 6d0c1067a27f4ba0467b268fefcab6a208d3367592284349e15eb2ed967f29e9505eb786bbd0236b1fb41d58c2788d8f5e61ce34b97cc7a5702ff3dbe32a1f36 SHA512 2542a4c5c15ad471d143fb713617d6868e9dba49ef14840f44ae3c9d05e74041a845b3a820c4dfb9a819a72eae763f9f8883e933e4012318043baada11fc85b4
diff --git a/sys-apps/man-db/man-db-2.11.2.ebuild b/sys-apps/man-db/man-db-2.11.2.ebuild
new file mode 100644
index 000000000000..2296d5b327b3
--- /dev/null
+++ b/sys-apps/man-db/man-db-2.11.2.ebuild
@@ -0,0 +1,203 @@
+# 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index ce67073cdea1..a8511f9a6f93 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -10,5 +10,5 @@ DIST sysvinit-3.05.tar.xz.sig 833 BLAKE2B 520be5b28b02a67703eb027515d4c290532bde
 DIST sysvinit-3.06.tar.xz 252508 BLAKE2B 7fd2ba4bc0c8a15ddd7af2aaa1044e3bc8885a5e18a0a9c58c63897d0965d7430a9b529af4953618a9042cf13cca8a74a92ab02062c5de18d13fdf68328c11e7 SHA512 dc56ce12f18f7ecde6c9828e72dd8ab7afccd0f88ad4438d6a5b356a30b21e9ba9c796a4b2520a20a0c384f058be6bdb7b9b0df9786bbf65a80dff97c2be733b
 DIST sysvinit-3.06.tar.xz.sig 833 BLAKE2B 18a0af9a58ea10b1858a7d47867685e30749e335c0a88c6603fc78620d05579ff8fa1f6ccf9605140577793e4068dff50605d89b3e73e9d75b1f56c398fb5f7c SHA512 05101d4753daae73d67f1213c62b8be96c78418ce9a16f86cd23539ad124caecb8042de348aca4d752da8eb1a6b7f1bc1524489a4f0662db510c58e26ae8554c
 EBUILD sysvinit-3.05.ebuild 5306 BLAKE2B b4e6a3e983add3f0ec16c5ad95454f8a709dc6972008b3ad5de92e3e9b0dc2976b170e4986895dab69fc1ef7014c0810d15ecdc9591c6e333490be485a4696ef SHA512 bce906a7487840595464f866f18d8e1b694e304c2b262e6406ec15b7fc898a90a520bdf4755bdcee0954f7689d7463b595965a19b5a57a11d1d41dedba27b78a
-EBUILD sysvinit-3.06.ebuild 5271 BLAKE2B 681d692290c4c490f5ebf51ba299f8d6af38926c7db6605e26ae370b986a3e3211886a6a7951f6fd571f73a3879bc05002c2f720a984653ea69c03fcc2e20448 SHA512 81487018c11a7e94f9417c80a01bf932cc6ba9d5018c7c9927499f74ab206ec77b0b2e745a2c0e430aeeff60dea409e1147f3ecf5dfb8bf601ae63617b6675b8
+EBUILD sysvinit-3.06-r1.ebuild 5519 BLAKE2B 76377aa375d9c979bde662b6c7b951b12368f600968e4242e5840a77b6c2675f64782d13de992b75db4a2a9188392dd00a3aa6d515037984510378f17e6a3dad SHA512 98cfedb5f36256223f57824229c3946ff1bfa55970feaab082cef7a6bf468ff15ccc80bb79671d5802993e51b4da6bea25b1baf1ff6f95e3a3630f6fccfe30ff
 MISC metadata.xml 506 BLAKE2B ea180981d7eafbe8356b6d187c7c1c12afc7ef91d94f7992489ad54f459c924b009bfe7c7888bf1934b356091489285dbda9eee39ab14f318528e0738da6474c SHA512 b5451236ce138c372e32c1f5e4bc25fca9acb05063720d6b452e81b19a7661058b791f6fc95a9f585244ba44ff307d07f6be49aadf1dbb461492575e2af80a89
diff --git a/sys-apps/sysvinit/sysvinit-3.06.ebuild b/sys-apps/sysvinit/sysvinit-3.06-r1.ebuild
index b0a02ff6c995..f34dafcfe0d4 100644
--- a/sys-apps/sysvinit/sysvinit-3.06.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.06-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -51,9 +51,13 @@ PATCHES=(
 src_prepare() {
 	default
 
+	# We already enforce F_S=2 as a minimum in our toolchain, and
+	# allow 3. Also, SSP doesn't always make sense for some platforms
+	# e.g. HPPA. It's default-on in our toolchain where it works.
 	sed -i \
 		-e '/^CPPFLAGS =$/d' \
 		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
+		-e '/^override CFLAGS +=/s/ -D_FORTIFY_SOURCE=2//' \
 		src/Makefile || die
 
 	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux