5 files changed, 59 insertions, 213 deletions
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index d902a66c9e00..49606fab089b 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -4,14 +4,9 @@ AUX halt.sh 101 BLAKE2B f3b8a24b6efce0ccffeb76f401af9f9bce752a541ea646dd6d357eaa
 AUX inittab-2.98-r1 2124 BLAKE2B 57e40e8410a31ec73f581e2feb142c600e2ce687745a6135961c0f1ea31e77f1acf9b9be1cf4c1d55685802a913304056cf1f137686f14d89caa9ec973d751c2 SHA512 6ce22ba933158d1a0fc7d0eaa9536b1cdcd8baa90cddfe8b1bf7a1f7292ba7fc14b6b46968848301a2e573939b4e21ce8d64bf3a9eaeb4d038de7d113fd3b9fb
 AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de6319153cce234b0d1dc7546beecf67296f8b7d6e3eb0f633d8a4ebc83fc4cc586c4f92cdb48df1f766aa4af72b0fa0e1 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee
 AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31e507ea8331ae1e9b8b012570cdc4099a15c864f2abc92f84c44ef9dbd35dfe43c68e491d347266abaa0156536edae4c35231f17ccb SHA512 2f26201e8634b380dafdf42678cd0241a93f0e473f5c8680d4206d97dfe3510c2ceeb4cd066d1af3ae97fe411f7a5452a9586f8f5c5e65653bf9241fea1edaf0
-AUX sysvinit-3.05-fix-man-makefile.patch 780 BLAKE2B 0fc0396f41663a554484c06a96079497b4991ea44f077bc89c2249db86c47b5b5630713485fb6ef01a66e380cb5cb49af585e23eb2db762b38dca94d55d0a4d1 SHA512 b7fd436a224b67b41693aa1e0ccce5b94471473345ca72ef618c7a7abb8e5bf1866ffb27d42a1fc0d1326df275ec8f7e920be5d03dc8883c590551e1e87b873e
-DIST sysvinit-3.05.tar.xz 234416 BLAKE2B 56cd57976c34194b07512e05f21782247d2f79e51655de758ee789016fe45ec74d2b036c727e6897f6fd743edf2755715fe22ed4538d8d5f81220b0898c3c62b SHA512 15063d237e247f4eefd9c2e86c986384c1103eb2a84d834d92f00a557106a9c24f5f3530633412997692515a5404c194840fc71b4d3c94eb284ae6c776bb38a3
-DIST sysvinit-3.05.tar.xz.sig 833 BLAKE2B 520be5b28b02a67703eb027515d4c290532bdefdb319d6b74d14dbaa51538410eab9d336637c1b32cd8f27d45353b78f531ba7646157790e2563a38dbf396646 SHA512 ed7816281e81b7c568ee8e3b8a1b2eb3973751d5fc7f626bdfefbe28d0f0d67857862924dd000e12e6c12ed0382c27c1992d2d6326cc1fc3c94559f475402b33
-DIST sysvinit-3.06.tar.xz 252508 BLAKE2B 7fd2ba4bc0c8a15ddd7af2aaa1044e3bc8885a5e18a0a9c58c63897d0965d7430a9b529af4953618a9042cf13cca8a74a92ab02062c5de18d13fdf68328c11e7 SHA512 dc56ce12f18f7ecde6c9828e72dd8ab7afccd0f88ad4438d6a5b356a30b21e9ba9c796a4b2520a20a0c384f058be6bdb7b9b0df9786bbf65a80dff97c2be733b
-DIST sysvinit-3.06.tar.xz.sig 833 BLAKE2B 18a0af9a58ea10b1858a7d47867685e30749e335c0a88c6603fc78620d05579ff8fa1f6ccf9605140577793e4068dff50605d89b3e73e9d75b1f56c398fb5f7c SHA512 05101d4753daae73d67f1213c62b8be96c78418ce9a16f86cd23539ad124caecb8042de348aca4d752da8eb1a6b7f1bc1524489a4f0662db510c58e26ae8554c
+AUX sysvinit-3.07-halt.patch 2085 BLAKE2B 6cf746ff84d9d4fb499e1751d26de1bcf646c14792f0f13de2a84b8dfeeaf92d67e4e66d28ffbf06733a2fb51b2ac8df155ef37c19a3fc012ce22db22c297133 SHA512 89becb9874111679a86bdcc066ab5de6087a48961871ad25aaea3e9b129cf7131d02b7d8b3599832eded9cd5e8c7c39b520c63d54ecacdb5d6617375af8a6ebc
 DIST sysvinit-3.07.tar.xz 263352 BLAKE2B 51943290c5f41ac6eb421a3ee1529d07bc127a44306973a2f3180079a28119001ad6b44c25156986fe249dd025f5eb1929189edfb5da72ee4fa64b5fd4cd5993 SHA512 57d8365ae9ab4e3b6ab948d1ac9a4f1fe86c4e86c06ea3b12fca7f7be88ef39b5e04787fbfec9417aaf06cff0db3a90e18e6a6135e205f7eb74a5e7c897491fd
 DIST sysvinit-3.07.tar.xz.sig 833 BLAKE2B 7a05a2d44a7006f61bb41abc8ae3d5207cc4558156e5cc553cc9477f4d1366bf847013e22c382aa9112b6c4c9c33d4a5465e73ca810a041c459a927d710dfadc SHA512 50047ce638fd5af19c3894c4dfcada3e1b2e359331b18f6dbc5f526e91f250b736625877362c7741dbd83c9fee79ec8e4e7a57c4aa72102c017b23518064733a
-EBUILD sysvinit-3.05.ebuild 5306 BLAKE2B b4e6a3e983add3f0ec16c5ad95454f8a709dc6972008b3ad5de92e3e9b0dc2976b170e4986895dab69fc1ef7014c0810d15ecdc9591c6e333490be485a4696ef SHA512 bce906a7487840595464f866f18d8e1b694e304c2b262e6406ec15b7fc898a90a520bdf4755bdcee0954f7689d7463b595965a19b5a57a11d1d41dedba27b78a
-EBUILD sysvinit-3.06-r1.ebuild 5528 BLAKE2B 11e89e1c0325eec2f3b4b2f151589ad4a40ba22608731d922240dfbd2b84b6470e7562cedafbab193aa8491857ad1b6346a3ff2fbe367ed50d7fc2f6c71279e7 SHA512 96b58a3334e704e334aadbcaae230661f51417b19c3ed19976308b6d1c8dd005e4f25e534af3455690080cded639e5e9f5b72e2ed2578df327952b71a8ad055e
+EBUILD sysvinit-3.07-r1.ebuild 5590 BLAKE2B 7d5be7b57f6bd4ec377877a73c4c4a790e38c2d17efa5dce53b8a8f19e8acea0d621cddc53438b4e1d4e3df154c9c4997e5ccbfe2c6ead0c92dadb88d3056a21 SHA512 e5875c9e0acb64a29646ef0f721b65a69f778251caf8ac8f58ea6547e88bcc0c11688f79255634af1686f7de795ceeb82954105ac84719baf15bd3ba68cee4f6
 EBUILD sysvinit-3.07.ebuild 5528 BLAKE2B a1f6e53e828454b541349b5d1e26e0e38d0079da15c91c16a80d7cca9741c47809378b8cfdad3c9f4e8b7fd38e886570ebb6dff11d8fc0e6c5fbd10c50754bcf SHA512 5ce4441a90bb654aaadb69fd75f62b871c38a31584b891249fe87af7e26f69df5f812aa255a27f10615a53d29ed038fdf6a212a7ce4cb356e227c3da856ea4cc
 MISC metadata.xml 506 BLAKE2B ea180981d7eafbe8356b6d187c7c1c12afc7ef91d94f7992489ad54f459c924b009bfe7c7888bf1934b356091489285dbda9eee39ab14f318528e0738da6474c SHA512 b5451236ce138c372e32c1f5e4bc25fca9acb05063720d6b452e81b19a7661058b791f6fc95a9f585244ba44ff307d07f6be49aadf1dbb461492575e2af80a89
diff --git a/sys-apps/sysvinit/files/sysvinit-3.05-fix-man-makefile.patch b/sys-apps/sysvinit/files/sysvinit-3.05-fix-man-makefile.patch
deleted file mode 100644
index e6079baca1f5..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-3.05-fix-man-makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/slicer69/sysvinit/commit/e7622b031dac56e1836d2c6e353da4b7f8367aab
-
-From: Adam Sampson <ats@offog.org>
-Date: Sun, 21 Aug 2022 22:13:09 +0100
-Subject: [PATCH] Use the .po files to work out which manpage dirs to create.
-
-The pattern being used here didn't match anything in a tarball release.
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -214,7 +214,7 @@ install:	all
- 		fi
- 		$(INSTALL_DIR) $(ROOT)/usr/include/
- 		$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
--		for lang in  '' $(subst ../man/,,$(wildcard ../man/po/??/)); do \
-+		for lang in  '' $(patsubst ../man/po/%.po,%,$(wildcard ../man/po/??.po)); do \
- 			$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/$$lang; \
- 			$(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/$$lang; \
- 			$(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/$$lang; \
-
diff --git a/sys-apps/sysvinit/files/sysvinit-3.07-halt.patch b/sys-apps/sysvinit/files/sysvinit-3.07-halt.patch
new file mode 100644
index 000000000000..4e65a912ccde
--- /dev/null
+++ b/sys-apps/sysvinit/files/sysvinit-3.07-halt.patch
@@ -0,0 +1,53 @@
+https://github.com/slicer69/sysvinit/pull/18
+https://bugs.gentoo.org/911257
+
+From fca101c2ff428eb765958ae6e3aaa0eb1adc0fdf Mon Sep 17 00:00:00 2001
+From: Jesse <jsmith@resonatingmedia.com>
+Date: Thu, 27 Jul 2023 00:39:53 -0300
+Subject: [PATCH] Floppym provided patch which causes the halt command to call
+ "shutdown -h -H" instead of "shutdown -h" when halt is invoked without
+ parameters. This forces the shutdown command to set the INIT_HALT variable
+ and assume, unless other conditions apply, that the "halt" call really wants
+ to halt the machine and INIT_HALT should be set. In other words we assume
+ halt wants to halt unless told otherwise. Addresses downstream Gentoo bug ID
+ 911257.
+
+---
+ doc/Changelog | 11 +++++++++++
+ src/halt.c    |  4 ++--
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/doc/Changelog b/doc/Changelog
+index c00f6ef..b902756 100644
+--- a/doc/Changelog
++++ b/doc/Changelog
+@@ -1,3 +1,14 @@
++sysvinit (3.08) unreleased; urgency=low
++    * Floppym provided patch which causes the halt command
++      to call "shutdown -h -H" instead of "shutdown -h" when
++      halt is invoked without parameters. This forces the shutdown
++      command to set the INIT_HALT variable and assume, unless other
++      conditions apply, that the "halt" call really wants to halt the
++      machine and INIT_HALT should be set. In other words we
++      assume halt wants to halt unless told otherwise.
++      Addresses downstream Gentoo bug ID 911257.
++
++
+ sysvinit (3.07) released; urgency=low
+     * Fixed killall5 so that processes in the omit list are
+       not sent any signals, including SIGSTOP.
+diff --git a/src/halt.c b/src/halt.c
+index a469147..9bd3a4d 100644
+--- a/src/halt.c
++++ b/src/halt.c
+@@ -162,8 +162,8 @@ void do_shutdown(char *fl, int should_poweroff, char *tm)
+ 
+ 	args[i++] = "shutdown";
+ 	args[i++] = fl;
+-        if ( (! strcmp(fl, "-h") ) && (should_poweroff) )
+-           args[i++] = "-P";
++        if (! strcmp(fl, "-h"))
++           args[i++] = (should_poweroff ? "-P" : "-H");
+ 	if (tm) {
+ 		args[i++] = "-t";
+ 		args[i++] = tm;
diff --git a/sys-apps/sysvinit/sysvinit-3.05.ebuild b/sys-apps/sysvinit/sysvinit-3.05.ebuild
deleted file mode 100644
index c028b897abcd..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.05.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Dropped these because blank as of 3.02
-#PLOCALES="de es fi fr hu id pl"
-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"
-# https://github.com/slicer69/sysvinit/issues/12
-#SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-#SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
-SRC_URI="https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz.sig )"
-S="${WORKDIR}/${P/_*}"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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-20220413 )"
-
-PATCHES=(
-	# bug #80220
-	"${FILESDIR}/${PN}-2.86-kexec.patch"
-	# bug #158615
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
-
-	"${FILESDIR}"/${P}-fix-man-makefile.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
-		rm -rf "${S}"/man/${locale} || 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
-}
diff --git a/sys-apps/sysvinit/sysvinit-3.06-r1.ebuild b/sys-apps/sysvinit/sysvinit-3.07-r1.ebuild
index 0a7ab706c4eb..349a3b1db05e 100644
--- a/sys-apps/sysvinit/sysvinit-3.06-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.07-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${P/_*}"
 LICENSE="GPL-2"
 SLOT="0"
 if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 IUSE="selinux ibm nls static"
 
@@ -35,7 +35,7 @@ DEPEND="${COMMON_DEPEND}
 # 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
+	!<app-i18n/man-pages-l10n-4.18.1-r1
 	!<sys-apps/openrc-0.13
 	selinux? ( sec-policy/selinux-shutdown )"
 # po4a is for man page translations
@@ -47,6 +47,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.86-kexec.patch"
 	# bug #158615
 	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
+	# bug 911257
+	"${FILESDIR}/sysvinit-3.07-halt.patch"
 )
 
 src_prepare() {