commit: 83339c07d8e9bf4d9251375fd7e6b6a6626b69f4 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Feb 22 07:56:05 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Feb 22 07:56:17 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83339c07
sys-apps/sysvinit: Removed old Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-apps/sysvinit/Manifest | 2 - sys-apps/sysvinit/files/inittab-2.91 | 61 --------- sys-apps/sysvinit/files/inittab-2.98 | 62 --------- .../files/sysvinit-2.86-shutdown-single.patch | 36 ------ .../files/sysvinit-2.92_beta-shutdown-h.patch | 81 ------------ sys-apps/sysvinit/sysvinit-2.93.ebuild | 127 ------------------ sys-apps/sysvinit/sysvinit-2.96.ebuild | 139 -------------------- sys-apps/sysvinit/sysvinit-2.98.ebuild | 144 --------------------- 8 files changed, 652 deletions(-) diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index f91c0f841f4..b07e94c6c2a 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -1,5 +1,3 @@ -DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72 -DIST sysvinit-2.96.tar.xz 122164 BLAKE2B 10c28d3bb57fc744b66c3a7ac78912fb6a9d987e9f6f32f82953d23a9884020daa6fa8c7722e6d8145d9899f7f7dc623f69f885d3d8fbbcd313d0e69ffb66497 SHA512 1388398568ebfe53460796f8ab75a3ead6111612888ea36e8f1c0db4d41ef6f45fc217abb7804519ff1143a78d97c95b24e42c8c22c95a47b9436484bfb6f45d DIST sysvinit-2.97.tar.xz 126848 BLAKE2B dd2612de531a89f1fdbfaeb8b5975aeba9541a6b570587a881bdb11406991c1a9b254d1802725298eb13362d625d3859b520ee964782a0fe43d3f038a28b49e6 SHA512 89950080a120b62bdd297f3a59898dd11e10c7438cf18774bad16c65ce5fb2e190726e601c6f263def32cff59867c0984edcd99d527eb80297901085afbb2e90 DIST sysvinit-2.98.tar.xz 127028 BLAKE2B 302219cd0753dee20772d78ad073e279f430ededab93feaecd166d9be9f91f0f5e97fcfe3e5893d9db963ba638e66e1f6670a94f6e2328fbfdb92325563a129c SHA512 37bc3279b58ce3d808abb78eb6aa8c18a55f991343cc66316ad5b8c2fbb8dce95b83dd995cdab1df8c82a5ab155d0ad65bc3cee3860e4ba4ba4f8c2ac865c3f7 DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd diff --git a/sys-apps/sysvinit/files/inittab-2.91 b/sys-apps/sysvinit/files/inittab-2.91 deleted file mode 100644 index f9ed8d1126a..00000000000 --- a/sys-apps/sysvinit/files/inittab-2.91 +++ /dev/null @@ -1,61 +0,0 @@ -# -# /etc/inittab: This file describes how the INIT process should set up -# the system in a certain run-level. -# -# Author: Miquel van Smoorenburg, <[email protected]> -# Modified by: Patrick J. Volkerding, <[email protected]> -# Modified by: Daniel Robbins, <[email protected]> -# Modified by: Martin Schlemmer, <[email protected]> -# Modified by: Mike Frysinger, <[email protected]> -# Modified by: Robin H. Johnson, <[email protected]> -# Modified by: William Hubbs, <[email protected]> -# - -# Default runlevel. -id:3:initdefault: - -# System initialization, mount local filesystems, etc. -si::sysinit:/sbin/openrc sysinit - -# Further system initialization, brings up the boot runlevel. -rc::bootwait:/sbin/openrc boot - -l0u:0:wait:/sbin/telinit u -l0:0:wait:/sbin/openrc shutdown -l0s:0:wait:/sbin/halt -dhnp -l1:1:wait:/sbin/openrc single -l2:2:wait:/sbin/openrc nonetwork -l3:3:wait:/sbin/openrc default -l4:4:wait:/sbin/openrc default -l5:5:wait:/sbin/openrc default -l6u:6:wait:/sbin/telinit u -l6:6:wait:/sbin/openrc reboot -l6r:6:wait:/sbin/reboot -dkn -#z6:6:respawn:/sbin/sulogin - -# new-style single-user -su0:S:wait:/sbin/openrc single -su1:S:wait:/sbin/sulogin - -# TERMINALS -#x1:12345:respawn:/sbin/agetty 38400 console linux -c1:12345:respawn:/sbin/agetty 38400 tty1 linux -c2:2345:respawn:/sbin/agetty 38400 tty2 linux -c3:2345:respawn:/sbin/agetty 38400 tty3 linux -c4:2345:respawn:/sbin/agetty 38400 tty4 linux -c5:2345:respawn:/sbin/agetty 38400 tty5 linux -c6:2345:respawn:/sbin/agetty 38400 tty6 linux - -# SERIAL CONSOLES -#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100 -#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100 - -# What to do at the "Three Finger Salute". -ca:12345:ctrlaltdel:/sbin/shutdown -r now - -# Used by /etc/init.d/xdm to control DM startup. -# Read the comments in /etc/init.d/xdm for more -# info. Do NOT remove, as this will start nothing -# extra at boot if /etc/init.d/xdm is not added -# to the "default" runlevel. -x:a:once:/etc/X11/startDM.sh diff --git a/sys-apps/sysvinit/files/inittab-2.98 b/sys-apps/sysvinit/files/inittab-2.98 deleted file mode 100644 index 15a6f224172..00000000000 --- a/sys-apps/sysvinit/files/inittab-2.98 +++ /dev/null @@ -1,62 +0,0 @@ -# -# /etc/inittab: This file describes how the INIT process should set up -# the system in a certain run-level. -# -# Author: Miquel van Smoorenburg, <[email protected]> -# Modified by: Patrick J. Volkerding, <[email protected]> -# Modified by: Daniel Robbins, <[email protected]> -# Modified by: Martin Schlemmer, <[email protected]> -# Modified by: Mike Frysinger, <[email protected]> -# Modified by: Robin H. Johnson, <[email protected]> -# Modified by: William Hubbs, <[email protected]> -# Modified by: Lars Wendler, <[email protected]> -# - -# Default runlevel. -id:3:initdefault: - -# System initialization, mount local filesystems, etc. -si::sysinit:/sbin/openrc sysinit - -# Further system initialization, brings up the boot runlevel. -rc::bootwait:/sbin/openrc boot - -l0u:0:wait:/sbin/telinit u -l0:0:wait:/sbin/openrc shutdown -l0s:0:wait:/sbin/halt.sh -l1:1:wait:/sbin/openrc single -l2:2:wait:/sbin/openrc nonetwork -l3:3:wait:/sbin/openrc default -l4:4:wait:/sbin/openrc default -l5:5:wait:/sbin/openrc default -l6u:6:wait:/sbin/telinit u -l6:6:wait:/sbin/openrc reboot -l6r:6:wait:/sbin/reboot -dkn -#z6:6:respawn:/sbin/sulogin - -# new-style single-user -su0:S:wait:/sbin/openrc single -su1:S:wait:/sbin/sulogin - -# TERMINALS -#x1:12345:respawn:/sbin/agetty 38400 console linux -c1:12345:respawn:/sbin/agetty --noclear 38400 tty1 linux -c2:2345:respawn:/sbin/agetty 38400 tty2 linux -c3:2345:respawn:/sbin/agetty 38400 tty3 linux -c4:2345:respawn:/sbin/agetty 38400 tty4 linux -c5:2345:respawn:/sbin/agetty 38400 tty5 linux -c6:2345:respawn:/sbin/agetty 38400 tty6 linux - -# SERIAL CONSOLES -#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100 -#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100 - -# What to do at the "Three Finger Salute". -ca:12345:ctrlaltdel:/sbin/shutdown -r now - -# Used by /etc/init.d/xdm to control DM startup. -# Read the comments in /etc/init.d/xdm for more -# info. Do NOT remove, as this will start nothing -# extra at boot if /etc/init.d/xdm is not added -# to the "default" runlevel. -x:a:once:/etc/X11/startDM.sh diff --git a/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch b/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch deleted file mode 100644 index b8e403f629f..00000000000 --- a/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch +++ /dev/null @@ -1,36 +0,0 @@ -This patch makes shutdown use the Single User runlevel by default so -the gettys are shutdown too. - -Roy Marples <[email protected]> - ---- a/man/shutdown.8 -+++ b/man/shutdown.8 -@@ -44,7 +44,7 @@ mail and news processing programs a chance to exit cleanly, etc. - \fBshutdown\fP does its job by signalling the \fBinit\fP process, - asking it to change the runlevel. - Runlevel \fB0\fP is used to halt the system, runlevel \fB6\fP is used --to reboot the system, and runlevel \fB1\fP is used to put to system into -+to reboot the system, and runlevel \fBS\fP is used to put to system into - a state where administrative tasks can be performed; this is the default - if neither the \fI-h\fP or \fI-r\fP flag is given to \fBshutdown\fP. - To see which actions are taken on halt or reboot see the appropriate ---- a/src/shutdown.c -+++ b/src/shutdown.c -@@ -506,7 +506,7 @@ int main(int argc, char **argv) - usage(); - exit(1); - } -- strcpy(down_level, "1"); -+ strcpy(down_level, "S"); - halttype = NULL; - - /* Process the options. */ -@@ -685,6 +685,8 @@ int main(int argc, char **argv) - strcpy(newstate, "for reboot"); - break; - case '1': -+ case 'S': -+ case 's': - strcpy(newstate, "to maintenance mode"); - break; - default: diff --git a/sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch deleted file mode 100644 index e53a9208c6d..00000000000 --- a/sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch +++ /dev/null @@ -1,81 +0,0 @@ -other inits have moved to not requiring the -h flag when used with -H/-P. -modify sysvinit to be the same since it really doesn't matter. - -https://bugs.gentoo.org/449354 - -patch by Doug Goldstein - ---- - man/shutdown.8 | 8 +++----- - src/shutdown.c | 12 ++++-------- - 2 files changed, 7 insertions(+), 13 deletions(-) - ---- sysvinit-2.92/man/shutdown.8 -+++ sysvinit-2.92/man/shutdown.8 -@@ -66,17 +66,15 @@ - .\"}}} - .\"{{{ -h - .IP \fB\-h\fP --Halt or power off after shutdown. -+Equivalent to -P, unless -H is specified. - .\"}}} - .\"{{{ -P - .IP \fB\-P\fP --Modifier to the -h flag. Halt action is to turn off the power. --Must be used with the -h flag. -+Action is to turn off the power. - .\"}}} - .\"{{{ -H - .IP \fB\-H\fP --Modifier to the -h flag. Halt action is to halt or drop into boot --monitor on systems that support it. Must be used with the -h flag. -+Action is to halt or drop into boot monitor on systems that support it. - .\"}}} - .\"{{{ -f - .IP \fB\-f\fP ---- sysvinit-2.92/src/shutdown.c -+++ sysvinit-2.92/src/shutdown.c -@@ -135,9 +135,7 @@ - "\t\t -r: reboot after shutdown.\n" - "\t\t -h: halt after shutdown.\n" - "\t\t -P: halt action is to turn off power.\n" -- "\t\t can only be used along with -h flag.\n" - "\t\t -H: halt action is to just halt.\n" -- "\t\t can only be used along with -h flag.\n" - "\t\t -f: do a 'fast' reboot (skip fsck).\n" - "\t\t -F: Force fsck on reboot.\n" - "\t\t -n: do not go through \"init\" but go down real fast.\n" -@@ -546,9 +544,11 @@ - switch(c) { - case 'H': - halttype = "HALT"; -+ down_level[0] = '0'; - break; - case 'P': - halttype = "POWEROFF"; -+ down_level[0] = '0'; - break; - case 'a': /* Access control. */ - useacl = 1; -@@ -564,6 +564,8 @@ - break; - case 'h': /* Halt after shutdown */ - down_level[0] = '0'; -+ if (!halttype) -+ halttype = "POWEROFF"; - break; - case 'f': /* Don't perform fsck after next boot */ - fastboot = 1; -@@ -603,12 +605,6 @@ - } - } - -- if (NULL != halttype && down_level[0] != '0') { -- fprintf(stderr, "shutdown: -H and -P flags can only be used along with -h flag.\n"); -- usage(); -- exit(1); -- } -- - /* Do we need to use the shutdown.allow file ? */ - if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) { - diff --git a/sys-apps/sysvinit/sysvinit-2.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild deleted file mode 100644 index c9bc3963c51..00000000000 --- a/sys-apps/sysvinit/sysvinit-2.93.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="/sbin/init - parent of all processes" -HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"; -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 s390 sparc x86" -IUSE="selinux ibm static kernel_FreeBSD" - -CDEPEND=" - selinux? ( - >=sys-libs/libselinux-1.28 - )" -DEPEND="${CDEPEND} - virtual/os-headers" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-shutdown ) - !<sys-apps/openrc-0.13 -" - -S="${WORKDIR}/${P/_*}" - -PATCHES=( - "${FILESDIR}/${PN}-2.86-kexec.patch" #80220 - "${FILESDIR}/${PN}-2.86-shutdown-single.patch" #158615 - "${FILESDIR}/${PN}-2.92_beta-shutdown-h.patch" #449354 -) - -src_prepare() { - default - sed -i '/^CPPFLAGS =$/d' 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 - - # Mung inittab for specific architectures - cd "${WORKDIR}" || die - cp "${FILESDIR}"/inittab-2.91 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 kernel_FreeBSD ; then - sed -i \ - -e 's/linux/cons25/g' \ - -e 's/ttyS0/cuaa0/g' \ - -e 's/ttyS1/cuaa1/g' \ - inittab #121786 - fi - 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 -} - -src_compile() { - tc-export CC - append-lfs-flags - export DISTRO= #381311 - export VERSION="${PV}" - use static && append-ldflags -static - emake -C src $(usex selinux 'WITH_SELINUX=yes' '') -} - -src_install() { - emake -C src install ROOT="${D}" - dodoc README doc/* - - insinto /etc - doins "${WORKDIR}"/inittab - - # dead symlink - rm "${ED%/}"/usr/bin/lastb || die - - newinitd "${FILESDIR}"/bootlogd.initd bootlogd -} - -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 [[ ${ROOT} == / ]] ; then - if [[ -e /dev/initctl && ! -e /run/initctl ]]; then - ln -s /dev/initctl /run/initctl - 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-2.96.ebuild b/sys-apps/sysvinit/sysvinit-2.96.ebuild deleted file mode 100644 index b82c9e06198..00000000000 --- a/sys-apps/sysvinit/sysvinit-2.96.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="/sbin/init - parent of all processes" -HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"; -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" -IUSE="selinux ibm static kernel_FreeBSD" - -CDEPEND=" - selinux? ( - >=sys-libs/libselinux-1.28 - )" -DEPEND="${CDEPEND} - virtual/os-headers" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-shutdown ) - !<sys-apps/openrc-0.13 -" - -S="${WORKDIR}/${P/_*}" - -PATCHES=( - "${FILESDIR}/${PN}-2.86-kexec.patch" #80220 - "${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615 - "${FILESDIR}/${PN}-2.95_beta-shutdown-h.patch" #449354 -) - -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.95 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 kernel_FreeBSD ; then - sed -i \ - -e 's/linux/cons25/g' \ - -e 's/ttyS0/cuaa0/g' \ - -e 's/ttyS1/cuaa1/g' \ - inittab #121786 - fi - 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 -} - -src_compile() { - tc-export CC - append-lfs-flags - export DISTRO= #381311 - export VERSION="${PV}" - use static && append-ldflags -static - emake -C src $(usex selinux 'WITH_SELINUX=yes' '') -} - -src_install() { - emake -C src install ROOT="${D}" - dodoc README doc/* - - insinto /etc - doins "${WORKDIR}"/inittab - - # dead symlink - rm "${ED}"/usr/bin/lastb || die - - newinitd "${FILESDIR}"/bootlogd.initd bootlogd - into / - dosbin "${FILESDIR}"/halt.sh -} - -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 - 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-2.98.ebuild b/sys-apps/sysvinit/sysvinit-2.98.ebuild deleted file mode 100644 index b2d86e1da2d..00000000000 --- a/sys-apps/sysvinit/sysvinit-2.98.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="/sbin/init - parent of all processes" -HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"; -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" -IUSE="selinux ibm static kernel_FreeBSD" - -CDEPEND=" - selinux? ( - >=sys-libs/libselinux-1.28 - )" -DEPEND="${CDEPEND} - virtual/os-headers" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-shutdown ) - !<sys-apps/openrc-0.13 -" - -S="${WORKDIR}/${P/_*}" - -PATCHES=( - "${FILESDIR}/${PN}-2.86-kexec.patch" #80220 - "${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615 - "${FILESDIR}/${PN}-2.95_beta-shutdown-h.patch" #449354 -) - -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 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 kernel_FreeBSD ; then - sed -i \ - -e 's/linux/cons25/g' \ - -e 's/ttyS0/cuaa0/g' \ - -e 's/ttyS1/cuaa1/g' \ - inittab #121786 - fi - 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 -} - -src_compile() { - tc-export CC - append-lfs-flags - export DISTRO= #381311 - export VERSION="${PV}" - use static && append-ldflags -static - emake -C src $(usex selinux 'WITH_SELINUX=yes' '') -} - -src_install() { - emake -C src install ROOT="${D}" - dodoc README doc/* - - insinto /etc - doins "${WORKDIR}"/inittab - - newinitd "${FILESDIR}"/bootlogd.initd bootlogd - into / - dosbin "${FILESDIR}"/halt.sh - - keepdir /etc/inittab.d - - # 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 -}
