commit: 9bdb60ee44e1a52e1a91e3b6e328b268a4d6ea67 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Dec 23 03:21:58 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Dec 23 03:22:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bdb60ee
sys-apps/sysvinit: add 3.12 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/sysvinit/Manifest | 2 + sys-apps/sysvinit/sysvinit-3.12.ebuild | 201 +++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+) diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index 066be535c901..6c7da88b3ab4 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -6,3 +6,5 @@ DIST sysvinit-3.10.tar.xz 240060 BLAKE2B 894f1ad140f1e92f4d4a2220a9abff6ba106d9f DIST sysvinit-3.10.tar.xz.sig 833 BLAKE2B 98e931a055f18c757f84ba555fcb9b5771c51690918d31ac0eb078218b3aa53065caeb5647abcc3e606b245bdd450b4649cb2274560a9fc27844dc7a1eac7a9c SHA512 7759fc58a6298c645a2868bfeea750656bf424c49235e860a4ee5c92a766437dcd566ddcd01b37cfa4dff53ab3b1c96f4dcd41f7234f8c64c01f8edb0932a681 DIST sysvinit-3.11.tar.xz 240212 BLAKE2B a7233509ec31ef6834e145d5912b2c1d3832bf63ffab6eb75c864cd2a9c4fe053b0e3a5abc20891c7d29596f95dd3aa518e69ad111d5586011fee37b4e23d7cb SHA512 12e2d11b76702b493e8f083e5409b98a1daf41a8d9fb7ef8a36416bb0310d5a26b92eaee0c9396c03cf08842258b953f79541ae147ef730f3bc54530da4d1029 DIST sysvinit-3.11.tar.xz.sig 833 BLAKE2B 34938ad711aca2a58decad1fb5345fcfddbffbc8e062802aa2e8c8f1603ffeb9a19f9305aabb7b7b80bbc7e9087acac4e5173f51f4a90c70594b45a2b4e78704 SHA512 fa5719970d8ac7c0d172fccb0de9a2f69c9e0530914d1968902c1ba23e2600a9c748240e98e8c1014d939fb2f23579733b6a7a96551f7151420a8bbc1d897eec +DIST sysvinit-3.12.tar.xz 240948 BLAKE2B 15e42e2e4df76d903db24cebd77d14cf063c53a91f4d1bc8beb0322ae265f0068dfcb77afabb27796137ea986816e56238310c6c8969c34a1d8e44b1dc2044cb SHA512 d70cc014504edbf71717a014fe209be1ab5029e83cec0162bd9b7526111e5e88d9caf573c30a91f443966508f647d5b41631077f7d8ca0ef121fc82639e6aa81 +DIST sysvinit-3.12.tar.xz.sig 833 BLAKE2B efecf6301d489800303cbadb4ca5aee599724f62dc208aaba14fd96807c7bd958be93250e0897285ede1db170a69d50b9c9ec5ad29a6d83bf0f62f4927d1f7c1 SHA512 52ddae5f7011efb9120721e4c4ad119efbbabc479d771da064a1ce4db80f8f7d5e916c477ace862ba154b7193f78bcad8edb6317eb38dbf986dfe1396b86f246 diff --git a/sys-apps/sysvinit/sysvinit-3.12.ebuild b/sys-apps/sysvinit/sysvinit-3.12.ebuild new file mode 100644 index 000000000000..a7beec09b9b9 --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-3.12.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 +}
