[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/, sys-apps/sysvinit/files/
commit: 9da120256a116c967567bde0946556775260802f Author: Sam James gentoo org> AuthorDate: Fri Aug 18 04:19:23 2023 + Commit: Sam James gentoo org> CommitDate: Fri Aug 18 09:22:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da12025 sys-apps/sysvinit: add 3.08 Signed-off-by: Sam James gentoo.org> sys-apps/sysvinit/Manifest | 2 + .../files/sysvinit-3.08-shutdown-single.patch | 38 sys-apps/sysvinit/sysvinit-3.08.ebuild | 201 + 3 files changed, 241 insertions(+) diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index c2427f7b9e4c..f3921339ee9d 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -1,2 +1,4 @@ DIST sysvinit-3.07.tar.xz 263352 BLAKE2B 51943290c5f41ac6eb421a3ee1529d07bc127a44306973a2f3180079a28119001ad6b44c25156986fe249dd025f5eb1929189edfb5da72ee4fa64b5fd4cd5993 SHA512 57d8365ae9ab4e3b6ab948d1ac9a4f1fe86c4e86c06ea3b12fca7f7be88ef39b5e04787fbfec9417aaf06cff0db3a90e18e6a6135e205f7eb74a5e7c897491fd DIST sysvinit-3.07.tar.xz.sig 833 BLAKE2B 7a05a2d44a7006f61bb41abc8ae3d5207cc4558156e5cc553cc9477f4d1366bf847013e22c382aa9112b6c4c9c33d4a5465e73ca810a041c459a927d710dfadc SHA512 50047ce638fd5af19c3894c4dfcada3e1b2e359331b18f6dbc5f526e91f250b736625877362c7741dbd83c9fee79ec8e4e7a57c4aa72102c017b23518064733a +DIST sysvinit-3.08.tar.xz 268296 BLAKE2B ec4a4ff3663ac7d67808b50b67631ff4fe1ab56d376df15868df0eb79cbc329b192af124380eec6a797d827c3c7c5586058310d803f42ee1934dcffbfbe876f7 SHA512 a523e030e559ecc56391f9424e240fbe54a714bb3c522ca0bb410b649a1c08c5e9f03d298340a5586565f18d8640b1b418fa09294b41fb95a9cd2a686316b758 +DIST sysvinit-3.08.tar.xz.sig 833 BLAKE2B b1cbe8a95faa16a22e92e2a8841643aeaf7a5a31cc9fa9628a7ee2400aac1b3a184ae01f09c75d48d5d55a71f7e62feb25c16345644bfb4fcd19cbd061f86573 SHA512 1af105d84b98428766cc315d8dea068e6c5a7ad52008291ba7c1d5accbcaeead4999fd714fc152c1038e54953f9b469bd0f792a0830e68c3e2f43afcd36e0e2d diff --git a/sys-apps/sysvinit/files/sysvinit-3.08-shutdown-single.patch b/sys-apps/sysvinit/files/sysvinit-3.08-shutdown-single.patch new file mode 100644 index ..571f951f073c --- /dev/null +++ b/sys-apps/sysvinit/files/sysvinit-3.08-shutdown-single.patch @@ -0,0 +1,38 @@ +This patch makes shutdown use the Single User runlevel by default so +the gettys are shutdown too. + +Roy Marples + +Forward-ported from v2.86 to v2.94_beta +Lars Wendler +--- 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 \fB-h\fP or \fB-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 +@@ -547,7 +547,7 @@ int main(int argc, char **argv) + usage(); + exit(1); + } +- strcpy(down_level, "1"); ++ strcpy(down_level, "S"); + halttype = NULL; + memset(when, '\0', WHEN_SIZE); + +@@ -734,6 +734,8 @@ int main(int argc, char **argv) + strncpy(newstate, "for reboot", STATELEN); + break; + case '1': ++ case 'S': ++ case 's': + strncpy(newstate, "to maintenance mode", STATELEN); + break; + default: diff --git a/sys-apps/sysvinit/sysvinit-3.08.ebuild b/sys-apps/sysvinit/sysvinit-3.08.ebuild new file mode 100644 index ..df7929079fae --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-3.08.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2023 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/, sys-apps/sysvinit/files/
commit: ba311ecca29333b688b1b5b9fe9725b77b9e5a88 Author: Lars Wendler gentoo org> AuthorDate: Fri Dec 3 11:52:36 2021 + Commit: Lars Wendler gentoo org> CommitDate: Fri Dec 3 11:54:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba311ecc sys-apps/sysvinit: Revbump so users can customize bootlogd startup Thanks-to: Bogdan gmail.com> Closes: https://bugs.gentoo.org/828061 Signed-off-by: Lars Wendler gentoo.org> sys-apps/sysvinit/files/bootlogd.confd | 2 ++ sys-apps/sysvinit/files/bootlogd.initd | 4 ++-- sys-apps/sysvinit/{sysvinit-2.99.ebuild => sysvinit-2.99-r1.ebuild} | 1 + sys-apps/sysvinit/{sysvinit-3.00.ebuild => sysvinit-3.00-r1.ebuild} | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys-apps/sysvinit/files/bootlogd.confd b/sys-apps/sysvinit/files/bootlogd.confd new file mode 100644 index ..ac456db6ecf7 --- /dev/null +++ b/sys-apps/sysvinit/files/bootlogd.confd @@ -0,0 +1,2 @@ +# Put your bootlog options into this +#BOOTLOGD_ARGS="-l /var/log/boot" diff --git a/sys-apps/sysvinit/files/bootlogd.initd b/sys-apps/sysvinit/files/bootlogd.initd index a42219271a80..ef238c13922b 100644 --- a/sys-apps/sysvinit/files/bootlogd.initd +++ b/sys-apps/sysvinit/files/bootlogd.initd @@ -1,8 +1,8 @@ #!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="bootlogd - record boot messages (sysvinit)" pidfile="/run/bootlogd" command="/sbin/bootlogd" -command_args="-p ${pidfile}" +command_args="-p ${pidfile} ${BOOTLOGD_ARGS}" diff --git a/sys-apps/sysvinit/sysvinit-2.99.ebuild b/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild similarity index 98% rename from sys-apps/sysvinit/sysvinit-2.99.ebuild rename to sys-apps/sysvinit/sysvinit-2.99-r1.ebuild index f370b1a50ee7..9d78abebae42 100644 --- a/sys-apps/sysvinit/sysvinit-2.99.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild @@ -110,6 +110,7 @@ src_install() { doins "${WORKDIR}"/inittab newinitd "${FILESDIR}"/bootlogd.initd bootlogd + newconfd "${FILESDIR}"/bootlogd.confd bootlogd into / dosbin "${FILESDIR}"/halt.sh diff --git a/sys-apps/sysvinit/sysvinit-3.00.ebuild b/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild similarity index 98% rename from sys-apps/sysvinit/sysvinit-3.00.ebuild rename to sys-apps/sysvinit/sysvinit-3.00-r1.ebuild index e2a06d6700d2..83d6e6f7635b 100644 --- a/sys-apps/sysvinit/sysvinit-3.00.ebuild +++ b/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild @@ -110,6 +110,7 @@ src_install() { doins "${WORKDIR}"/inittab newinitd "${FILESDIR}"/bootlogd.initd bootlogd + newconfd "${FILESDIR}"/bootlogd.confd bootlogd into / dosbin "${FILESDIR}"/halt.sh
[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/, sys-apps/sysvinit/files/
commit: 70742d346f28949a1fe6d675784a5fcde8bee6ec Author: Aisha Tammy aisha cc> AuthorDate: Thu Sep 10 01:31:21 2020 + Commit: Piotr Karbowski gentoo org> CommitDate: Sat Jan 30 19:17:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70742d34 sys-apps/sysvinit: refactor startDM to display-manager-init Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Aisha Tammy aisha.cc> Signed-off-by: Piotr Karbowski gentoo.org> sys-apps/sysvinit/files/inittab-2.98-r1 | 63 + sys-apps/sysvinit/sysvinit-2.98-r1.ebuild | 144 ++ 2 files changed, 207 insertions(+) diff --git a/sys-apps/sysvinit/files/inittab-2.98-r1 b/sys-apps/sysvinit/files/inittab-2.98-r1 new file mode 100644 index 000..89c8bd9274b --- /dev/null +++ b/sys-apps/sysvinit/files/inittab-2.98-r1 @@ -0,0 +1,63 @@ +# +# /etc/inittab: This file describes how the INIT process should set up +#the system in a certain run-level. +# +# Author: Miquel van Smoorenburg, +# Modified by: Patrick J. Volkerding, +# Modified by: Daniel Robbins, +# Modified by: Martin Schlemmer, +# Modified by: Mike Frysinger, +# Modified by: Robin H. Johnson, +# Modified by: William Hubbs, +# Modified by: Lars Wendler, +# Modified by: Aisha Tammy, +# + +# 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/display-manager to control DM startup. +# Read the comments in /etc/init.d/display-manager for more +# info. Do NOT remove, as this will start nothing +# extra at boot if /etc/init.d/display-manager is not added +# to the "default" runlevel. +x:a:once:/usr/bin/startDM diff --git a/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild new file mode 100644 index 000..3fdd9425576 --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild @@ -0,0 +1,144 @@ +# 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 ) + !::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:\::g' \ + src/Makefile || die + + # logsave is already in e2fsprogs + sed -i -r \ + -e '/^(USR)?S?BIN/s:\::g' \ + -e '/^MAN8/s:\::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+=(
[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/, sys-apps/sysvinit/files/
commit: 3c8b823949d8a278b06dd60de0bc2fe5893fa0b5 Author: Lars Wendler gentoo org> AuthorDate: Tue Nov 17 08:38:34 2020 + Commit: Lars Wendler gentoo org> CommitDate: Tue Nov 17 08:38:54 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c8b8239 sys-apps/sysvinit: Bump to version 2.98 Don't clear agetty on tty1 by default Closes: https://bugs.gentoo.org/731656 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> sys-apps/sysvinit/Manifest | 1 + sys-apps/sysvinit/files/inittab-2.98 | 62 ++ sys-apps/sysvinit/sysvinit-2.98.ebuild | 144 + 3 files changed, 207 insertions(+) diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index 0a33a2d91ad..8dce800e3d0 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -1,3 +1,4 @@ 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 diff --git a/sys-apps/sysvinit/files/inittab-2.98 b/sys-apps/sysvinit/files/inittab-2.98 new file mode 100644 index 000..15a6f224172 --- /dev/null +++ b/sys-apps/sysvinit/files/inittab-2.98 @@ -0,0 +1,62 @@ +# +# /etc/inittab: This file describes how the INIT process should set up +#the system in a certain run-level. +# +# Author: Miquel van Smoorenburg, +# Modified by: Patrick J. Volkerding, +# Modified by: Daniel Robbins, +# Modified by: Martin Schlemmer, +# Modified by: Mike Frysinger, +# Modified by: Robin H. Johnson, +# Modified by: William Hubbs, +# Modified by: Lars Wendler, +# + +# 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/sysvinit-2.98.ebuild b/sys-apps/sysvinit/sysvinit-2.98.ebuild new file mode 100644 index 000..b2d86e1da2d --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.98.ebuild @@ -0,0 +1,144 @@ +# 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/, sys-apps/sysvinit/files/
commit: b5e3f074c5d9c0e83f03e6320d6685fa7dbc4154 Author: Lars Wendler gentoo org> AuthorDate: Sat Apr 20 22:51:54 2019 + Commit: Lars Wendler gentoo org> CommitDate: Sat Apr 20 22:51:54 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5e3f074 sys-apps/sysvinit: Removed old. Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-apps/sysvinit/Manifest | 1 - .../sysvinit/files/sysvinit-2.88-shutdown-h.patch | 65 sys-apps/sysvinit/sysvinit-2.91-r1.ebuild | 117 - 3 files changed, 183 deletions(-) diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index a7aa2c886a0..85991333fc4 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -1,3 +1,2 @@ -DIST sysvinit-2.91.tar.xz 114412 BLAKE2B 5e044f589f5001c2b5a30eda76bf5c24bb2a7e0d308b7027d54031848407e6b7667b59096044eb186a7f6a862521d4a670c05a17dcc929d07da6515058949606 SHA512 8dcf6de79b03567c300ef5f2b7dd211895745e231510d730092085a15f61f06f28cee7c504b0b022bdcb4b4e903f44946537d4fbb2b5069fb5d29bb099fd45f5 DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72 DIST sysvinit-2.94.tar.xz 120900 BLAKE2B e45a95246325e93ef49f11573924216937e238761cb9f5979ae2b272838fb3280b1d12c9553992271f7926dc7c7bc18e352a8019a70f54c592971fe043453804 SHA512 8d3b7b777f7c37cf5eaf73d4cdfad8ac54c6115577052bd7ddf3588da8fb7d16b812ffaade0ce300c2c6b7d2acd6e7778130544befc171eab174ee8766b3ec50 diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch deleted file mode 100644 index 716999c39c3..000 --- a/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch +++ /dev/null @@ -1,65 +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 - sysvinit-2.88dsf/man/shutdown.8 -+++ sysvinit-2.88dsf/man/shutdown.8 -@@ -66,16 +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 --Halt action is to turn off the power. -+Action is to power-off the machine. - .\"}}} - .\"{{{ -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 the machine. - .\"}}} - .\"{{{ -f - .IP \fB\-f\fP sysvinit-2.88dsf/src/shutdown.c -+++ sysvinit-2.88dsf/src/shutdown.c -@@ -514,9 +514,11 @@ - switch(c) { - case 'H': - halttype = "HALT"; -+ down_level[0] = '0'; - break; - case 'P': - halttype = "POWERDOWN"; -+ down_level[0] = '0'; - break; - case 'a': /* Access control. */ - useacl = 1; -@@ -532,6 +534,8 @@ - break; - case 'h': /* Halt after shutdown */ - down_level[0] = '0'; -+ if (!halttype) -+ halttype = "POWERDOWN"; - break; - case 'f': /* Don't perform fsck after next boot */ - fastboot = 1; -@@ -565,12 +569,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.91-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild deleted file mode 100644 index 18216a73072..000 --- a/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2019 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" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="selinux ibm static kernel_FreeBSD" - -CDEPEND=" - selinux? ( -
[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/, sys-apps/sysvinit/files/
commit: e844db03b763517f1fcf187ea74d2211f26d5d1c Author: Lars Wendler gentoo org> AuthorDate: Mon Feb 18 08:34:10 2019 + Commit: Lars Wendler gentoo org> CommitDate: Mon Feb 18 08:38:24 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e844db03 sys-apps/sysvinit: Bump to version 2.94_beta Package-Manager: Portage-2.3.61, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-apps/sysvinit/Manifest | 1 + .../files/sysvinit-2.94_beta-shutdown-single.patch | 39 +++ sys-apps/sysvinit/sysvinit-2.94_beta.ebuild| 128 + 3 files changed, 168 insertions(+) diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index 7b91e7557d4..93b32e5f002 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -1,2 +1,3 @@ DIST sysvinit-2.91.tar.xz 114412 BLAKE2B 5e044f589f5001c2b5a30eda76bf5c24bb2a7e0d308b7027d54031848407e6b7667b59096044eb186a7f6a862521d4a670c05a17dcc929d07da6515058949606 SHA512 8dcf6de79b03567c300ef5f2b7dd211895745e231510d730092085a15f61f06f28cee7c504b0b022bdcb4b4e903f44946537d4fbb2b5069fb5d29bb099fd45f5 DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72 +DIST sysvinit-2.94-beta.tar.xz 120584 BLAKE2B 7fe9bdfcdbccd13cb34a0a48da45314f1d960c49380255f99df151717c9228b6f0cdd8362795d5e6145eb483845cfbb5966937853ff826f60f0db57cd121d06c SHA512 f403e352572247d3a9c30f591d0119950b0332c51dd3c5d33f5140f7effb1832b314322dc79bb4f2958ac370c461808651e1f712d67a877ef7f9e21d463abcb1 diff --git a/sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch b/sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch new file mode 100644 index 000..9aa85229eee --- /dev/null +++ b/sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch @@ -0,0 +1,39 @@ +This patch makes shutdown use the Single User runlevel by default so +the gettys are shutdown too. + +Roy Marples + +Forward-ported from v2.86 to v2.94_beta +Lars Wendler + +--- sysvinit-2.94/man/shutdown.8 sysvinit-2.94/man/shutdown.8 +@@ -44,7 +44,7 @@ + \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 +--- sysvinit-2.94/src/shutdown.c sysvinit-2.94/src/shutdown.c +@@ -547,7 +547,7 @@ + usage(); + exit(1); + } +- strcpy(down_level, "1"); ++ strcpy(down_level, "S"); + halttype = NULL; + memset(when, '\0', WHEN_SIZE); + +@@ -734,6 +734,8 @@ + strncpy(newstate, "for reboot", STATELEN); + break; + case '1': ++ case 'S': ++ case 's': + strncpy(newstate, "to maintenance mode", STATELEN); + break; + default: diff --git a/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild b/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild new file mode 100644 index 000..c79dc75f1d4 --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2019 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 ~sh ~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 ) + !::g' \ + -e '/^MAN[18]/s:\<(last|lastb|logsave|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:\::g' \ + src/Makefile || die + + # Mung inittab for specific architectures + cd "${WORKDIR}" || die + cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab" + local insert=() +
[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/, sys-apps/sysvinit/files/
commit: e9654deb25729984b2edf5ebaaa47be7b11da741 Author: Lars Wendler gentoo org> AuthorDate: Tue Nov 27 09:03:36 2018 + Commit: Lars Wendler gentoo org> CommitDate: Tue Nov 27 09:03:36 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9654deb sys-apps/sysvinit: bootlogd init script improvements. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-apps/sysvinit/files/{bootlogd => bootlogd.initd} | 6 +- sys-apps/sysvinit/sysvinit-2.92.ebuild | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys-apps/sysvinit/files/bootlogd b/sys-apps/sysvinit/files/bootlogd.initd old mode 100755 new mode 100644 similarity index 77% rename from sys-apps/sysvinit/files/bootlogd rename to sys-apps/sysvinit/files/bootlogd.initd index 3f3e3634e35..a42219271a8 --- a/sys-apps/sysvinit/files/bootlogd +++ b/sys-apps/sysvinit/files/bootlogd.initd @@ -5,8 +5,4 @@ description="bootlogd - record boot messages (sysvinit)" pidfile="/run/bootlogd" command="/sbin/bootlogd" -command_args="-c -p ${pidfile}" - -depend() { - need localmount root -} +command_args="-p ${pidfile}" diff --git a/sys-apps/sysvinit/sysvinit-2.92.ebuild b/sys-apps/sysvinit/sysvinit-2.92.ebuild index 55808c88205..b6ea9ba1c91 100644 --- a/sys-apps/sysvinit/sysvinit-2.92.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.92.ebuild @@ -102,7 +102,7 @@ src_install() { # dead symlink rm "${ED%/}"/usr/bin/lastb || die - doinitd "${FILESDIR}"/bootlogd + newinitd "${FILESDIR}"/bootlogd.initd bootlogd } pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/, sys-apps/sysvinit/files/
commit: 437d6c26e5fbecd737d73bd7c1bf0aa5c815bd9d Author: Lars Wendler gentoo org> AuthorDate: Fri Nov 23 13:44:48 2018 + Commit: Lars Wendler gentoo org> CommitDate: Fri Nov 23 13:47:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=437d6c26 sys-apps/sysvinit: Bump to version 2.92_beta Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-apps/sysvinit/Manifest | 1 + sys-apps/sysvinit/files/bootlogd | 12 ++ .../files/sysvinit-2.92_beta-shutdown-h.patch | 71 sys-apps/sysvinit/sysvinit-2.92_beta.ebuild| 122 + 4 files changed, 206 insertions(+) diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index 6534e5b81ab..4415458d985 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -2,3 +2,4 @@ DIST sysvinit-2.88dsf.tar.bz2 105551 BLAKE2B 2378a7ab96d059fc781b8b7dd130f4c6311 DIST sysvinit-2.89.tar.bz2 113231 BLAKE2B defb82041edd5d9b95a7c73c950df18107aad292279270b0248b6c803b297c7c2f3edebfeb96ef2d7c3908de689ae265790b2379b9fb63c03d42138af8c418c1 SHA512 3582da52364e3c1f1a488c415f875ab264630cb23f85bc356915f50afc5a42ace18278ed04086cf38c1fe9c7a860f6fc3c2bb1cc50e5560b350a92c24411682c DIST sysvinit-2.90.tar.xz 112840 BLAKE2B 24ecd6cbb0dd5c6695ae60fcfab062cafcbe7867cdba2cb3b05c7cf0e9c129364c968e70579ef904f5c617788bc607bdb9068d633afd53e0bb3cbcf41d562f0f SHA512 0fc05cba767d6285504c1c791e2e136cff7865fc6ef8beb8287bede305668ab09590a9b25ebc75bfc2060ea76707ac3dc529bc661a6a92c7b2cc23f5b0a801e6 DIST sysvinit-2.91.tar.xz 114412 BLAKE2B 5e044f589f5001c2b5a30eda76bf5c24bb2a7e0d308b7027d54031848407e6b7667b59096044eb186a7f6a862521d4a670c05a17dcc929d07da6515058949606 SHA512 8dcf6de79b03567c300ef5f2b7dd211895745e231510d730092085a15f61f06f28cee7c504b0b022bdcb4b4e903f44946537d4fbb2b5069fb5d29bb099fd45f5 +DIST sysvinit-2.92-beta.tar.xz 117508 BLAKE2B 3798afc719bc83f7e70727f7de9862eebed81d3f8c708840c6b32d00e83c2a1f43433c9b7bbcdc5560a4a33207caa000e72b7aba3d18abefc13b12e753ffd5fe SHA512 6e1d09c14d07a5159c73149336a97f6c1edac980dc9d9c330c5deaf9a0ee5235fc7add22f00df75f467442479cd900aa9acf538865eb7c10db75b490ff41eb72 diff --git a/sys-apps/sysvinit/files/bootlogd b/sys-apps/sysvinit/files/bootlogd new file mode 100755 index 000..3f3e3634e35 --- /dev/null +++ b/sys-apps/sysvinit/files/bootlogd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="bootlogd - record boot messages (sysvinit)" +pidfile="/run/bootlogd" +command="/sbin/bootlogd" +command_args="-c -p ${pidfile}" + +depend() { + need localmount root +} 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 new file mode 100644 index 000..cf8786ac4a2 --- /dev/null +++ b/sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch @@ -0,0 +1,71 @@ +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 | 10 -- + 2 files changed, 7 insertions(+), 11 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 +@@ -546,9 +546,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 +566,8 @@ + break; + case 'h': /* Halt after shutdown */ + down_level[0] = '0'; ++ if (!halttype) ++ halttype = "POWEROFF"; + break; + case 'f': /* Don't
[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/, sys-apps/sysvinit/files/
commit: d91617e997cdde5eb4c1fba797fdcb221dcbbd8a Author: Mike Gilbert gentoo org> AuthorDate: Sun Oct 28 19:12:43 2018 + Commit: William Hubbs gentoo org> CommitDate: Wed Oct 31 14:10:03 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d91617e9 sys-apps/sysvinit: call telinit u when halting or rebooting Closes: https://bugs.gentoo.org/642858 Package-Manager: Portage-2.3.51_p2, Repoman-2.3.11_p27 Signed-off-by: Mike Gilbert gentoo.org> Signed-off-by: William Hubbs gentoo.org> sys-apps/sysvinit/files/inittab-2.91 | 61 sys-apps/sysvinit/sysvinit-2.91-r1.ebuild | 117 ++ 2 files changed, 178 insertions(+) diff --git a/sys-apps/sysvinit/files/inittab-2.91 b/sys-apps/sysvinit/files/inittab-2.91 new file mode 100644 index 000..f9ed8d1126a --- /dev/null +++ b/sys-apps/sysvinit/files/inittab-2.91 @@ -0,0 +1,61 @@ +# +# /etc/inittab: This file describes how the INIT process should set up +#the system in a certain run-level. +# +# Author: Miquel van Smoorenburg, +# Modified by: Patrick J. Volkerding, +# Modified by: Daniel Robbins, +# Modified by: Martin Schlemmer, +# Modified by: Mike Frysinger, +# Modified by: Robin H. Johnson, +# Modified by: William Hubbs, +# + +# 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/sysvinit-2.91-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild new file mode 100644 index 000..da9b190c71d --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2018 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ) + !::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:\::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 sh || use sparc) && sed -i '/ttyS0/s:#::' inittab + if use
[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/, sys-apps/sysvinit/files/
commit: 871c2b0416906b5dffe731425e0420b0219562d8 Author: William Hubbs gentoo org> AuthorDate: Thu Sep 15 17:15:05 2016 + Commit: William Hubbs gentoo org> CommitDate: Thu Sep 15 17:15:05 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871c2b04 sys-apps/sysvinit: remove old version Package-Manager: portage-2.2.28 sys-apps/sysvinit/files/inittab-2.87 | 58 --- sys-apps/sysvinit/files/reboot.sh | 11 --- sys-apps/sysvinit/files/shutdown.sh | 13 sys-apps/sysvinit/sysvinit-2.88-r7.ebuild | 118 -- 4 files changed, 200 deletions(-) diff --git a/sys-apps/sysvinit/files/inittab-2.87 b/sys-apps/sysvinit/files/inittab-2.87 deleted file mode 100644 index 1fcb8bb.. --- a/sys-apps/sysvinit/files/inittab-2.87 +++ /dev/null @@ -1,58 +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,-# Modified by: Patrick J. Volkerding, -# Modified by: Daniel Robbins, -# Modified by: Martin Schlemmer, -# Modified by: Mike Frysinger, -# Modified by: Robin H. Johnson, -# -# $Id$ - -# Default runlevel. -id:3:initdefault: - -# System initialization, mount local filesystems, etc. -si::sysinit:/sbin/rc sysinit - -# Further system initialization, brings up the boot runlevel. -rc::bootwait:/sbin/rc boot - -l0:0:wait:/sbin/rc shutdown -l0s:0:wait:/sbin/halt -dhp -l1:1:wait:/sbin/rc single -l2:2:wait:/sbin/rc nonetwork -l3:3:wait:/sbin/rc default -l4:4:wait:/sbin/rc default -l5:5:wait:/sbin/rc default -l6:6:wait:/sbin/rc reboot -l6r:6:wait:/sbin/reboot -dk -#z6:6:respawn:/sbin/sulogin - -# new-style single-user -su0:S:wait:/sbin/rc single -su1:S:wait:/sbin/sulogin - -# TERMINALS -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/reboot.sh b/sys-apps/sysvinit/files/reboot.sh deleted file mode 100644 index 3e50f71.. --- a/sys-apps/sysvinit/files/reboot.sh +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -opts="-dpk" -[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i" - -/sbin/reboot "${opts}" 2>/dev/null - -# hmm, if the above failed, that's kind of odd ... -# so let's force a reboot -/sbin/reboot -f diff --git a/sys-apps/sysvinit/files/shutdown.sh b/sys-apps/sysvinit/files/shutdown.sh deleted file mode 100644 index 502ef52.. --- a/sys-apps/sysvinit/files/shutdown.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -opts="-d" -[ "${INIT_HALT}" != "HALT" ] && opts="${opts}p" -[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i" -[ "${RC_DOWN_HARDDISK}" = "yes" ] && opts="${opts}h" - -/sbin/halt "${opts}" - -# hmm, if the above failed, that's kind of odd ... -# so let's force a halt -/sbin/halt -f diff --git a/sys-apps/sysvinit/sysvinit-2.88-r7.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r7.ebuild deleted file mode 100644 index 1ccda21.. --- a/sys-apps/sysvinit/sysvinit-2.88-r7.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils 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}dsf.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 ) -" - -S=${WORKDIR}/${P}dsf - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220 - epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615 - epatch "${FILESDIR}"/${P}-makefile.patch
[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/, sys-apps/sysvinit/files/
commit: cb2ec6d9b731edf1a2a4e64897f21472dd974fb2 Author: Anthony G. Basile gentoo org> AuthorDate: Wed Apr 27 23:57:00 2016 + Commit: Anthony G. Basile gentoo org> CommitDate: Wed Apr 27 23:57:34 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb2ec6d9 sys-apps/sysvinit: add missing header, bug #551626 Package-Manager: portage-2.2.26 sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch | 10 ++ sys-apps/sysvinit/sysvinit-2.88-r9.ebuild | 1 + 2 files changed, 11 insertions(+) diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch b/sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch new file mode 100644 index 000..5db8090 --- /dev/null +++ b/sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch @@ -0,0 +1,10 @@ +--- sysvinit/trunk/src/init.c 2014/01/26 16:40:03 134 sysvinit/trunk/src/init.c 2014/01/26 22:00:42 135 +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild index d2bad7b..04f3a4b 100644 --- a/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild @@ -34,6 +34,7 @@ PATCHES=( "${FILESDIR}/${P}-selinux.patch" #326697 "${FILESDIR}/${P}-shutdown-h.patch" #449354 "${FILESDIR}/${PN}-2.88-sysmacros.patch" + "${FILESDIR}/${PN}-2.88-ttydefaults.patch" #551626 ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/, sys-apps/sysvinit/files/
commit: 73028e585d848395b750bf611148d8412fe6f317 Author: William Hubbs gentoo org> AuthorDate: Mon Feb 1 15:13:26 2016 + Commit: William Hubbs gentoo org> CommitDate: Mon Feb 1 15:17:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73028e58 sys-apps/sysvinit: revision bump to 2.88-r8 for several bug fixes: https://bugs.gentoo.org/show_bug.cgi?id=487384 https://bugs.gentoo.org/show_bug.cgi?id=506030 https://bugs.gentoo.org/show_bug.cgi?id=548826 https://bugs.gentoo.org/show_bug.cgi?id=573348 sys-apps/sysvinit/files/inittab-2.88 | 59 +++ sys-apps/sysvinit/sysvinit-2.88-r8.ebuild | 116 ++ 2 files changed, 175 insertions(+) diff --git a/sys-apps/sysvinit/files/inittab-2.88 b/sys-apps/sysvinit/files/inittab-2.88 new file mode 100644 index 000..5328d30 --- /dev/null +++ b/sys-apps/sysvinit/files/inittab-2.88 @@ -0,0 +1,59 @@ +# +# /etc/inittab: This file describes how the INIT process should set up +#the system in a certain run-level. +# +# Author: Miquel van Smoorenburg,+# Modified by: Patrick J. Volkerding, +# Modified by: Daniel Robbins, +# Modified by: Martin Schlemmer, +# Modified by: Mike Frysinger, +# Modified by: Robin H. Johnson, +# +# $Id$ + +# 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 + +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 +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/sysvinit-2.88-r8.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r8.ebuild new file mode 100644 index 000..acc8a8d --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.88-r8.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils toolchain-funcs flag-o-matic + +DESCRIPTION="/sbin/init - parent of all processes" +HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit; +SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ) +" + +S=${WORKDIR}/${P}dsf + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220 + epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615 + epatch "${FILESDIR}"/${P}-makefile.patch #319197 + epatch "${FILESDIR}"/${P}-selinux.patch #326697 + epatch "${FILESDIR}"/${P}-shutdown-h.patch #449354 + 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:\ ::g' \ + src/Makefile || die + + # Mung inittab for specific architectures + cd "${WORKDIR}" + cp "${FILESDIR}"/inittab-2.88 inittab || die "cp inittab" + local insert=() + use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) +