gentoo resync : 06.04.2022

4 files changed, 194 insertions, 11 deletions

diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index b06c5cb8d3e5..ceabf294d03e 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -8,7 +8,10 @@ AUX sysvinit-2.99-shutdown-h.patch 2684 BLAKE2B 57c27b8646a0b47f66eb103450e645fa
 DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd
 DIST sysvinit-3.00.tar.xz 127072 BLAKE2B d1c4e509d7c13cf0fb9da290f875e7c0ab0666d843d75d4dd6885112248a859dd077bdf9cc926c4af58473da99a5229bb879c7094afd648d5ebe72597a3ba6a7 SHA512 ba834ac6c48528304373018bfb05dcdd3573d8081dd7dc95a44808804404d77ee4832fedb3f34e67d87f22f201f9526c54910a51c6ed2a42ac55b756843cd825
 DIST sysvinit-3.01.tar.xz 126616 BLAKE2B b991c6d2a09b02003cc587379b148f8ca3817c27fcaf81f184f679cfd5325e0b551484bba47bb554a34c7eeba60538f4943de49b1d59bd4bef73d7d086fefdb2 SHA512 66da3830aa32b70f0beea994213145a550e5b5d58a5b54afb17109243d5efface6aba8c296b76dbfb22ce6f86c9c58f237ff71ee04ec7d5b316ad412bf7acbcf
+DIST sysvinit-3.02.tar.xz 219560 BLAKE2B c68505aab9e257fa3fb4153b4d2a51a7a8ac0137f0ee21174c168b1a1e4f12ea6be53679c484e2ea31904a37cd94fb5d913a9885da6c618acdae566b70bb7fae SHA512 44a43e2faff3a0d3410447ffc9b8b7c66eae1a5cba54c2c4d8518d3b2e5accecc68a280c87dbf6d18f943ae466c3c1e09bc633009207cbd777d371effda30831
+DIST sysvinit-3.02.tar.xz.sig 833 BLAKE2B 07f86211d2ded8afea22df246140cb44ec4a949c2450b1cc9d996b4b582da7767726648595c5f1cf584c31c0c59c4b0915a22cc254fed56bd42ac155b544cbfc SHA512 9b8a2b3e480041ead8bd2b16551fb00e387d823ad196cf60f6938eda5accf33e944b7b530d47bc0bdd90de6766cf8d44050c0c3d95b18c8b76d412d0a6c3121a
 EBUILD sysvinit-2.99-r1.ebuild 3849 BLAKE2B 144846be10f656a54d362593b1bfda4b5a50b4ae7d871243a703b3fc3cab51ec947c01726e4e72288f21da4159e2690d16da97635f187acede8f2e285a4b8b31 SHA512 4a39ebf78b0b738e88197af58b7c1cdad66361805e022c48c51705e5357ade36f0681821da6e64a43aaf186b00d8df218a2ea40bb6eb517e50a51c2bfc475788
 EBUILD sysvinit-3.00-r1.ebuild 3857 BLAKE2B 791e9a2c798e5194338bfa2b7339d8badfcbeaa1548fd9beffcd968cf36ba68b29d6a9087818d3fdfa90c725567d71757ff50029d460c8862e8487fbd4e0cb3c SHA512 ea6f4fd2491b49b9351b767feb14aeb696452277b80ab0244e6c2831f7ae7f29dd5164825a378e251d640ef6798f547865dd359eda032757531ce92359a352af
-EBUILD sysvinit-3.01.ebuild 3857 BLAKE2B 791e9a2c798e5194338bfa2b7339d8badfcbeaa1548fd9beffcd968cf36ba68b29d6a9087818d3fdfa90c725567d71757ff50029d460c8862e8487fbd4e0cb3c SHA512 ea6f4fd2491b49b9351b767feb14aeb696452277b80ab0244e6c2831f7ae7f29dd5164825a378e251d640ef6798f547865dd359eda032757531ce92359a352af
-MISC metadata.xml 359 BLAKE2B c5bd566a590dd04ca51751f4985840a143515fb8f7d3d21e1ad7f35b042ce578dae87e8d86a6338f7346cb50012991ccc77abfe73cbf2a4195f8d3dda04708d5 SHA512 9eec819463d81e55845eb293c5bc822748dc28bb420cfe498077d2dec6947e4762a743ddaadba34576f10275e9176347ba98711b059c429b4125258718e8290b
+EBUILD sysvinit-3.01.ebuild 3851 BLAKE2B 336d2d2c0f6842348e77245e45520f81cd8a47c800c2b67f78bc022e2ddf19ca773ba4607328c341457898ac637799925fd2fae0f01781c95f97bd31b18568b6 SHA512 db6ae417491bbc015efd56f9413b15768ebe7df077f1c44d8169775bbf80d22c83088bc8c7d279b68406dfaa4dafb6aa1d13b8a80c8c1baccd5ba9b6df98a55f
+EBUILD sysvinit-3.02-r3.ebuild 4899 BLAKE2B 0be96f4b4648501f7d2a9b401a897bf12decb39309719d46e1647f80f7a60b2722ca962eb17978c6ee26a70b8dbc2a0325c2a4ec93a0968b02ae2714f8aa4f6d SHA512 93810f84e111c18fd1a7fcbe097d13f5049c373b6595ce698d7e3e6e1a3cbb62f3042a32e71ec70ea700aa4a8bbd3acacb56ed24d2cf8147652ea7a6a60847a4
+MISC metadata.xml 449 BLAKE2B e8c38e3a241f77fb4de63d170e24bcc8d1f8a9ada912fb5870d150874412c2a60a5c3a59ef662bc81f929fb4c36db393667c49c8c75346c3212b81b129edd5d5 SHA512 d5ae5c9606c89a9b73982983d68353bf0605a9c98e7272e762c5a62188b75a071675b61bac5894761a33babcb874949acb76292cda6a6b1fb4abdf725e2e847b
diff --git a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml
index 244cfb040246..f085bc59b51f 100644
--- a/sys-apps/sysvinit/metadata.xml
+++ b/sys-apps/sysvinit/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>williamh@gentoo.org</email>
-	<name>William Hubbs</name>
-</maintainer>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">slicer69/sysvinit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/sysvinit/sysvinit-3.01.ebuild b/sys-apps/sysvinit/sysvinit-3.01.ebuild
index 2b6267d776db..bb9bb332d574 100644
--- a/sys-apps/sysvinit/sysvinit-3.01.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.01.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="selinux ibm static"
 
 CDEPEND="
diff --git a/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild b/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild
new file mode 100644
index 000000000000..a1c99e551867
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="de es fr pl"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sysvinit.asc
+inherit toolchain-funcs flag-o-matic plocale verify-sig
+
+DESCRIPTION="/sbin/init - parent of all processes"
+HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
+SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
+SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
+S="${WORKDIR}/${P/_*}"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} != *beta* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+IUSE="selinux ibm nls static"
+
+COMMON_DEPEND="
+	selinux? (
+		>=sys-libs/libselinux-1.28
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers"
+# Old OpenRC blocker is for bug #587424
+# Keep for longer than usual given it's cheap and avoid user inconvenience
+RDEPEND="${COMMON_DEPEND}
+	!<app-i18n/man-pages-l10n-4.12.1-r2
+	!<sys-apps/openrc-0.13
+	selinux? ( sec-policy/selinux-shutdown )"
+# po4a is for man page translations
+BDEPEND="nls? ( app-text/po4a )
+	verify-sig? ( sec-keys/openpgp-keys-sysvinit )"
+
+PATCHES=(
+	# bug #80220
+	"${FILESDIR}/${PN}-2.86-kexec.patch"
+	# bug #158615
+	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CPPFLAGS =$/d' \
+		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
+		src/Makefile || die
+
+	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
+		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
+		src/Makefile || die
+
+	# pidof has moved to >=procps-3.3.9
+	sed -i -r \
+		-e '/\/bin\/pidof/d' \
+		-e '/^MAN8/s:\<pidof.8\>::g' \
+		src/Makefile || die
+
+	# logsave is already in e2fsprogs
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
+		-e '/^MAN8/s:\<logsave.8\>::g' \
+		src/Makefile || die
+
+	# Mung inittab for specific architectures
+	cd "${WORKDIR}" || die
+	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
+	local insert=()
+	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
+	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
+	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
+	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
+	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
+	if use ibm ; then
+		insert+=(
+			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
+			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
+		)
+	fi
+	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
+	if use x86 || use amd64 ; then
+		sed -i \
+			-e '/ttyS[01]/s:9600:115200:' \
+			inittab
+	fi
+
+	if [[ ${#insert[@]} -gt 0 ]] ; then
+		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
+	fi
+
+	delete_unused_locale() {
+		local locale=${1}
+
+		einfo "Deleting non-requested man page translations for locale=${locale}"
+		rm "${S}"/man/po/${locale}.po || die
+
+		sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
+	}
+
+	plocale_for_each_disabled_locale delete_unused_locale
+}
+
+src_compile() {
+	tc-export CC
+
+	append-lfs-flags
+
+	# bug #381311
+	export DISTRO=
+	export VERSION="${PV}"
+
+	use static && append-ldflags -static
+	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
+
+	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+		cd man/po || die
+		po4a po4a.cfg || die
+	fi
+}
+
+src_install() {
+	emake -C src install ROOT="${D}"
+	dodoc README doc/*
+
+	insinto /etc
+	doins "${WORKDIR}"/inittab
+
+	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
+	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
+
+	into /
+	dosbin "${FILESDIR}"/halt.sh
+
+	keepdir /etc/inittab.d
+
+	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+		install_locale_man_pages() {
+			doman -i18n=${1} man/po/${1}/*
+		}
+
+		plocale_for_each_locale install_locale_man_pages
+	fi
+
+	# Dead symlink
+	find "${ED}" -xtype l -delete || die
+
+	find "${ED}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	# Reload init to fix unmounting problems of / on next reboot.
+	# This is really needed, as without the new version of init cause init
+	# not to quit properly on reboot, and causes a fsck of / on next reboot.
+	if [[ -z ${ROOT} ]] ; then
+		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
+			ln -s /dev/initctl /run/initctl \
+				|| ewarn "Failed to set /run/initctl symlink!"
+		fi
+		# Do not return an error if this fails
+		/sbin/telinit U &>/dev/null
+	fi
+
+	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
+	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
+
+	# Required for new bootlogd service
+	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
+		touch "${EROOT}/var/log/boot"
+	fi
+}