gentoo auto-resync : 16:11:2022 - 00:53:49

4 files changed, 210 insertions, 5 deletions

diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index d580d1603e76..41a96dd75ce2 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.0.tar.xz 1923260 BLAKE2B a95e6b5fb78d14a85199eb6c6177c057a3993fcc24afab83f1090cca6b3b107717ccb3de94460f55e293198f33e768605417fc0e4c98294b009e3461bd797f1d SHA512 0790dd6109e537f7dffb29258efd929d79274150755cab6bb8d6f239ad32df3a2006e00f61988808dc280fd3c1493a969e75cb8c4aab653f805bae8b73d9c910
+DIST man-db-2.11.1.tar.xz 1948788 BLAKE2B 60c3895a6326222e0a3f40902caa18991b5f767018ccb60f844c3a329e50fdda3db96b1c80b5337f4a5f129bdf0e7084cca7b216473328e4d2606cf811a88dab SHA512 249d65d01d83feac2503bfc1fba6d018ea0f7485c1112f1bfb4849ef7fbc3c1a50b97ab0844a7792d83bb1084a89abb4fa309ce1bc2bdf1183fe35b9e4f06263
 EBUILD man-db-2.10.2-r1.ebuild 5128 BLAKE2B 532d907a06f95b28f8b6705fe58d9d62797ae5ac2633b25981cae36ed16678e44a7026c19d7449244b7fcbdc5187d08a898753af1c7c2c3d2e718ab4c450032b SHA512 a80d67860f7ebc8b029fb5b83adbbef32ab1714102351cee8c2605228e00caf87627dfc08e129d255c80f04a232e0b30eeaee196bb7da969c3cad1021153751d
 EBUILD man-db-2.11.0.ebuild 5134 BLAKE2B 7f74b9f76ded199ca53810805bb293c0f67e9ad6a6e4a6baab206e5349ba1f724b4a6324cc71806654eb7e939f545c3ff8f9cccbe1ff771d5468841d8d7a1bbd SHA512 ed1b2ec0c66fc547b11789292a66d0822d00bfe6d7f60cde2a231a066e5f5fae877b9ffd6fd96818e32cf899a3a42259275ff23544c884b5b4f7aad4660421c2
-EBUILD man-db-9999.ebuild 5134 BLAKE2B 7f74b9f76ded199ca53810805bb293c0f67e9ad6a6e4a6baab206e5349ba1f724b4a6324cc71806654eb7e939f545c3ff8f9cccbe1ff771d5468841d8d7a1bbd SHA512 ed1b2ec0c66fc547b11789292a66d0822d00bfe6d7f60cde2a231a066e5f5fae877b9ffd6fd96818e32cf899a3a42259275ff23544c884b5b4f7aad4660421c2
-MISC metadata.xml 430 BLAKE2B d4221530699e16ed249eb5bcc439753af22cb7f502cbb9508ddfa572b80bfc11b474b362384922f2395df532491bc85453c38281fc4331807a22796cc53eaf0c SHA512 d70aa91bc631163eac4b04e699a56c583ea41cde9092ae8858079b1d326a8cc60fd24a5ab5b6bb565168e7b5dd5a21722074e76ba9f9e4102d0a9d5e7852c541
+EBUILD man-db-2.11.1.ebuild 5126 BLAKE2B d9cdcdd39ed3a813330092d43d1e6c2431669e9b083dde0f1efd99481c8364c4cd7cb01a52b25aeec518a93926a82693a19ed58cf51338c2f74e09347210fb64 SHA512 99a2c0aa6fcb1426887fe320c6dc6368b80b9a0fbe45ca320c831ea27f42dca2abd96b1421b86696bddef90d122225bd6bc97d7372d144fe4cc009d02469d041
+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.1.ebuild b/sys-apps/man-db/man-db-2.11.1.ebuild
new file mode 100644
index 000000000000..656aff6f15d3
--- /dev/null
+++ b/sys-apps/man-db/man-db-2.11.1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2022 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/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index 4fa6a76276ee..656aff6f15d3 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit systemd prefix tmpfiles
 
 DESCRIPTION="A man replacement that utilizes dbm instead of flat files"
-HOMEPAGE="https://gitlab.com/cjwatson/man-db https://www.nongnu.org/man-db/"
+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/cjwatson/man-db.git"
+	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"
diff --git a/sys-apps/man-db/metadata.xml b/sys-apps/man-db/metadata.xml
index d4f059661dd4..81a473b51d21 100644
--- a/sys-apps/man-db/metadata.xml
+++ b/sys-apps/man-db/metadata.xml
@@ -9,6 +9,6 @@
 		<flag name="manpager">Enable manpager wrapper for colorizing output</flag>
 	</use>
 	<upstream>
-		<remote-id type="gitlab">cjwatson/man-db</remote-id>
+		<remote-id type="gitlab">man-db/man-db</remote-id>
 	</upstream>
 </pkgmetadata>