public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/
Date: Wed, 18 Sep 2024 00:12:00 +0000 (UTC)	[thread overview]
Message-ID: <1726618282.faf508962a593b0dfdc48d60ec4ebdd0d02d4f3b.sam@gentoo> (raw)

commit:     faf508962a593b0dfdc48d60ec4ebdd0d02d4f3b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 00:11:22 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 00:11:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faf50896

sys-apps/sysvinit: add 3.10

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/sysvinit/Manifest             |   2 +
 sys-apps/sysvinit/sysvinit-3.10.ebuild | 201 +++++++++++++++++++++++++++++++++
 2 files changed, 203 insertions(+)

diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 388b7cada10a..f865ddebde29 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -2,3 +2,5 @@ DIST sysvinit-3.08.tar.xz 268296 BLAKE2B ec4a4ff3663ac7d67808b50b67631ff4fe1ab56
 DIST sysvinit-3.08.tar.xz.sig 833 BLAKE2B b1cbe8a95faa16a22e92e2a8841643aeaf7a5a31cc9fa9628a7ee2400aac1b3a184ae01f09c75d48d5d55a71f7e62feb25c16345644bfb4fcd19cbd061f86573 SHA512 1af105d84b98428766cc315d8dea068e6c5a7ad52008291ba7c1d5accbcaeead4999fd714fc152c1038e54953f9b469bd0f792a0830e68c3e2f43afcd36e0e2d
 DIST sysvinit-3.09.tar.xz 239600 BLAKE2B 81c3e80dd66896110b1a2488415dd20fae03b4b7d8d4f40d175c195942e1c13367a7f1cf9efd1c79a37e16684bd12e1c76dbb1f8faab44e495e8de684fe744ef SHA512 ddd3681e24c699f9f0cf2cfc44488e32205a8fcf1723b79da47b95adef0c0edc1d9fd387d259dba15a2158fbd0b7920d789b46a9f3c7cd016a12bb1dc92f00d4
 DIST sysvinit-3.09.tar.xz.sig 833 BLAKE2B f00020388eb330d753c4280d96b1363c1b539bf8b8cc21a79f055970f44acebf14e690b132dc09ed43e6db8907624083e7b5cc5849808fd804188d97c5eafd2d SHA512 c509bb8dc4fee98ac8e4502bc10e1058dc91126eeb0767a56167267bc14d4b09353b98d8d3a8a5c5dc2b5a0e2e315e0c8c9d3d662ac14510466ae5092504e672
+DIST sysvinit-3.10.tar.xz 240060 BLAKE2B 894f1ad140f1e92f4d4a2220a9abff6ba106d9f84ee0e001ee8d5a0f41a2877e08110d442a2bcd52efc5662838fae36835b067091d37b9f4d295b47c01c26153 SHA512 769fb7995bd01074202d06f0cd2bd5661bd170fc9e83a631c3400d7db8d705520250f47165bdf3dd73d78f9730749f97f7ca8d84e2f30e5fb1949ac3fbaeb053
+DIST sysvinit-3.10.tar.xz.sig 833 BLAKE2B 98e931a055f18c757f84ba555fcb9b5771c51690918d31ac0eb078218b3aa53065caeb5647abcc3e606b245bdd450b4649cb2274560a9fc27844dc7a1eac7a9c SHA512 7759fc58a6298c645a2868bfeea750656bf424c49235e860a4ee5c92a766437dcd566ddcd01b37cfa4dff53ab3b1c96f4dcd41f7234f8c64c01f8edb0932a681

diff --git a/sys-apps/sysvinit/sysvinit-3.10.ebuild b/sys-apps/sysvinit/sysvinit-3.10.ebuild
new file mode 100644
index 000000000000..a7beec09b9b9
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-3.10.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2024 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=/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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+IUSE="selinux ibm nls static"
+
+COMMON_DEPEND="
+	acct-group/root
+	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.18.1-r1
+	!<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 #158615
+	"${FILESDIR}/${PN}-3.08-shutdown-single.patch"
+)
+
+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
+	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
+
+	# Munge 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="${ED}"
+	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 ${EROOT} ]] ; 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
+
+	local ver
+	for ver in ${REPLACING_VERSIONS}; do
+		ver_test ${ver} -ge 3.07-r2 && continue
+		ewarn "Previously, the 'halt' command caused the system to power off"
+		ewarn "even if option -p was not given. This long-standing bug has"
+		ewarn "been fixed, and the command now behaves as documented."
+		break
+	done
+}


             reply	other threads:[~2024-09-18  0:12 UTC|newest]

Thread overview: 143+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-18  0:12 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-29  2:48 [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/ Sam James
2024-06-01  3:46 Ionen Wolkens
2024-05-11 15:19 Sam James
2024-04-29  8:10 Arthur Zamarin
2024-04-29  8:10 Arthur Zamarin
2024-04-29  8:10 Arthur Zamarin
2024-04-29  8:10 Arthur Zamarin
2024-04-29  8:10 Arthur Zamarin
2024-04-29  8:10 Arthur Zamarin
2024-03-28  4:47 Sam James
2024-02-26 21:27 Mike Gilbert
2024-01-18  8:06 Florian Schmaus
2024-01-03  2:20 Ionen Wolkens
2023-12-21  0:07 Ionen Wolkens
2023-12-14  4:15 Sam James
2023-08-17 19:26 Ulrich Müller
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-05-01  9:11 Ulrich Müller
2023-05-01  3:48 Sam James
2023-03-04  5:42 Arthur Zamarin
2023-03-04  5:42 Arthur Zamarin
2023-03-04  5:42 Arthur Zamarin
2023-03-04  5:42 Arthur Zamarin
2023-03-04  5:42 Arthur Zamarin
2023-03-04  5:42 Arthur Zamarin
2023-03-04  5:42 Arthur Zamarin
2023-03-04  5:42 Arthur Zamarin
2023-01-18 12:34 Andreas K. Hüttel
2023-01-09  7:32 Sam James
2022-12-18  6:30 Sam James
2022-10-29 21:32 Sam James
2022-09-26  6:24 Arthur Zamarin
2022-09-25  7:44 Arthur Zamarin
2022-09-25  6:25 Agostino Sarubbo
2022-09-25  6:24 Agostino Sarubbo
2022-09-25  6:20 Agostino Sarubbo
2022-09-25  6:20 Agostino Sarubbo
2022-09-25  4:54 Sam James
2022-09-25  4:54 Sam James
2022-07-27  5:30 Sam James
2022-05-04  4:01 Sam James
2022-04-27  3:46 Sam James
2022-04-17 17:06 Sam James
2022-04-13 23:52 Sam James
2022-04-09 19:29 Arthur Zamarin
2022-04-02 12:04 Arthur Zamarin
2022-04-02  8:03 Agostino Sarubbo
2022-04-01  6:53 Arthur Zamarin
2022-03-30 11:46 Agostino Sarubbo
2022-03-29 23:33 Sam James
2022-03-29 23:33 Sam James
2022-03-29 17:13 Ulrich Müller
2022-03-29 16:20 Ionen Wolkens
2022-03-29 14:07 Ulrich Müller
2022-03-29 11:49 Ulrich Müller
2022-03-29 10:46 Sam James
2022-03-29  5:31 Sam James
2022-03-29  5:29 Sam James
2022-01-04  3:29 Sam James
2021-12-14  9:42 Lars Wendler
2021-09-20 23:05 Lars Wendler
2021-05-13 19:02 Sam James
2021-05-13 18:56 Sam James
2021-05-13 16:59 Sam James
2021-05-13 16:55 Sam James
2021-05-13 16:54 Sam James
2021-05-13 16:44 Sam James
2021-05-13 16:29 Sam James
2021-04-12 22:08 Sam James
2021-04-12 22:08 Sam James
2021-04-12 17:33 Sam James
2021-04-07 22:44 Sam James
2021-04-07 22:42 Sam James
2021-02-01 18:04 Sergei Trofimovich
2020-11-23  8:01 Sergei Trofimovich
2020-11-18 15:07 Agostino Sarubbo
2020-11-18 15:07 Agostino Sarubbo
2020-11-18  0:41 Sam James
2020-11-18  0:39 Sam James
2020-11-17 20:43 Thomas Deutschmann
2020-11-17 18:55 Agostino Sarubbo
2020-11-17 18:50 Agostino Sarubbo
2020-11-17 18:45 Agostino Sarubbo
2020-11-10 11:18 Lars Wendler
2020-07-07  9:22 Lars Wendler
2020-07-07  9:22 Lars Wendler
2020-05-02 11:29 Ulrich Müller
2019-09-12  7:52 Lars Wendler
2019-09-12  7:52 Lars Wendler
2019-08-23 21:21 Lars Wendler
2019-06-16  9:58 Lars Wendler
2019-05-04  0:03 Mikle Kolyada
2019-04-20 22:44 Aaron Bauman
2019-04-08  6:42 Mikle Kolyada
2019-03-15 13:19 Lars Wendler
2019-03-11 22:42 Sergei Trofimovich
2019-03-11 19:58 Sergei Trofimovich
2019-03-10 22:17 Sergei Trofimovich
2019-03-10 21:38 Matt Turner
2019-03-10 21:38 Matt Turner
2019-03-10 14:44 Mikle Kolyada
2019-03-10 14:44 Mikle Kolyada
2019-03-10 14:44 Mikle Kolyada
2019-03-10 14:22 Mikle Kolyada
2019-03-09 19:18 Thomas Deutschmann
2019-03-09  8:57 Mikle Kolyada
2019-02-25 12:01 Lars Wendler
2019-02-18 16:18 Lars Wendler
2019-01-28  0:48 Matt Turner
2019-01-28  0:48 Matt Turner
2019-01-18  9:49 Mart Raudsepp
2018-12-28  7:10 Mikle Kolyada
2018-11-30 11:13 Tobias Klausmann
2018-11-27  9:09 Lars Wendler
2018-11-26 19:04 Mikle Kolyada
2018-11-24 10:45 Sergei Trofimovich
2018-11-24 10:39 Sergei Trofimovich
2018-11-23 21:32 Lars Wendler
2018-11-23 20:30 Thomas Deutschmann
2018-11-23 17:28 Mikle Kolyada
2018-11-23 16:49 Sergei Trofimovich
2018-11-23 13:47 Lars Wendler
2018-10-21 11:44 Lars Wendler
2018-06-19  7:46 Lars Wendler
2018-03-30 20:42 William Hubbs
2018-03-30 17:21 Mike Gilbert
2018-03-30 10:58 Lars Wendler
2017-01-04 21:54 Mike Gilbert
2016-11-10  6:20 Mike Frysinger
2016-09-15 16:24 William Hubbs
2016-06-06 13:33 Agostino Sarubbo
2016-05-25 23:36 Matt Turner
2016-05-24 20:08 Markus Meier
2016-05-23  4:17 Jeroen Roovers
2016-02-03 15:18 Lars Wendler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1726618282.faf508962a593b0dfdc48d60ec4ebdd0d02d4f3b.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox