* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2016-02-03 15:13 Lars Wendler
0 siblings, 0 replies; 14+ messages in thread
From: Lars Wendler @ 2016-02-03 15:13 UTC (permalink / raw
To: gentoo-commits
commit: 4f5d287a02f221da9ffc9ee48917157de6165921
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 3 15:10:31 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 15:13:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f5d287a
sys-apps/sysvinit: Revbump to fix bug #573668
Bumped to EAPI-5. Minor ebuild improvements.
Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/sysvinit/files/inittab-2.88 | 3 ++-
...svinit-2.88-r8.ebuild => sysvinit-2.88-r9.ebuild} | 20 ++++++++++++--------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/sys-apps/sysvinit/files/inittab-2.88 b/sys-apps/sysvinit/files/inittab-2.88
index 5328d30..ffb1ce3 100644
--- a/sys-apps/sysvinit/files/inittab-2.88
+++ b/sys-apps/sysvinit/files/inittab-2.88
@@ -8,6 +8,7 @@
# Modified by: Martin Schlemmer, <azarah@gentoo.org>
# Modified by: Mike Frysinger, <vapier@gentoo.org>
# Modified by: Robin H. Johnson, <robbat2@gentoo.org>
+# Modified by: William Hubbs, <williamh@gentoo.org>
#
# $Id$
@@ -36,7 +37,7 @@ su0:S:wait:/sbin/openrc single
su1:S:wait:/sbin/sulogin
# TERMINALS
-x1:12345:respawn:/sbin/agetty 38400 console linux
+#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
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r8.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
similarity index 89%
rename from sys-apps/sysvinit/sysvinit-2.88-r8.ebuild
rename to sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
index acc8a8d..a6b30a3 100644
--- a/sys-apps/sysvinit/sysvinit-2.88-r8.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI=5
inherit eutils toolchain-funcs flag-o-matic
@@ -27,12 +27,16 @@ RDEPEND="${CDEPEND}
S=${WORKDIR}/${P}dsf
+PATCHES=(
+ "${FILESDIR}/${PN}-2.86-kexec.patch" #80220
+ "${FILESDIR}/${PN}-2.86-shutdown-single.patch" #158615
+ "${FILESDIR}/${P}-makefile.patch" #319197
+ "${FILESDIR}/${P}-selinux.patch" #326697
+ "${FILESDIR}/${P}-shutdown-h.patch" #449354
+)
+
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
+ epatch "${PATCHES[@]}"
sed -i '/^CPPFLAGS =$/d' src/Makefile || die
# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
@@ -99,7 +103,7 @@ src_install() {
doins "${WORKDIR}"/inittab
# dead symlink
- rm -f "${D}"/usr/bin/lastb
+ rm "${D}"/usr/bin/lastb || die
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2016-03-07 19:05 Mike Frysinger
0 siblings, 0 replies; 14+ messages in thread
From: Mike Frysinger @ 2016-03-07 19:05 UTC (permalink / raw
To: gentoo-commits
commit: b7d42b062eeeeeac45e00d2186f3b2c6acc4b784
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 7 19:05:18 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 19:05:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d42b06
sys-apps/sysvinit: fix building w/newer glibc
sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch | 12 ++++++++++++
sys-apps/sysvinit/sysvinit-2.88-r9.ebuild | 1 +
2 files changed, 13 insertions(+)
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch b/sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch
new file mode 100644
index 0000000..efbe47a
--- /dev/null
+++ b/sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch
@@ -0,0 +1,12 @@
+Newer C libraries omit this include from sys/types.h.
+
+--- a/src/bootlogd.c
++++ b/src/bootlogd.c
+@@ -32,6 +32,7 @@
+ *
+ */
+
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/stat.h>
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
index a6b30a3..d2bad7b 100644
--- a/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}/${P}-makefile.patch" #319197
"${FILESDIR}/${P}-selinux.patch" #326697
"${FILESDIR}/${P}-shutdown-h.patch" #449354
+ "${FILESDIR}/${PN}-2.88-sysmacros.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2019-01-28 0:53 Lars Wendler
0 siblings, 0 replies; 14+ messages in thread
From: Lars Wendler @ 2019-01-28 0:53 UTC (permalink / raw
To: gentoo-commits
commit: e584a3a349286aae2d26432e9ec269d10c8efe85
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 00:53:00 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 00:53:00 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e584a3a3
sys-apps/sysvinit: Removed old.
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/sysvinit/Manifest | 2 -
sys-apps/sysvinit/files/inittab-2.88 | 59 ----------
.../sysvinit/files/sysvinit-2.88-makefile.patch | 60 ----------
.../sysvinit/files/sysvinit-2.88-selinux.patch | 38 -------
.../sysvinit/files/sysvinit-2.88-sysmacros.patch | 12 --
.../sysvinit/files/sysvinit-2.88-ttydefaults.patch | 10 --
sys-apps/sysvinit/sysvinit-2.88-r9.ebuild | 122 ---------------------
sys-apps/sysvinit/sysvinit-2.92.ebuild | 122 ---------------------
8 files changed, 425 deletions(-)
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 32422a04565..7b91e7557d4 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,4 +1,2 @@
-DIST sysvinit-2.88dsf.tar.bz2 105551 BLAKE2B 2378a7ab96d059fc781b8b7dd130f4c6311a83527e80e6d40b0970140f0f6c0b081eec502b0c9e461fe5ac02cc064437c2bef2237b20209c8c5f8535a45e50d1 SHA512 0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf
DIST sysvinit-2.91.tar.xz 114412 BLAKE2B 5e044f589f5001c2b5a30eda76bf5c24bb2a7e0d308b7027d54031848407e6b7667b59096044eb186a7f6a862521d4a670c05a17dcc929d07da6515058949606 SHA512 8dcf6de79b03567c300ef5f2b7dd211895745e231510d730092085a15f61f06f28cee7c504b0b022bdcb4b4e903f44946537d4fbb2b5069fb5d29bb099fd45f5
-DIST sysvinit-2.92.tar.xz 117560 BLAKE2B 300c9b7dffb5a07ece9b12682bf49816143215953527b69fe80c4f7f9b487de6c812213c9a851c5636de3989889b3179ace9a17b35c985729655a7c877b67170 SHA512 1395943540bc52d999de64c426c7f807d7688166591a8104e6c8cec2f45f13e0e3dd3d182b91194402c38172f412424a6c7d8c09662b3b5169ba6f928b5592a9
DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
diff --git a/sys-apps/sysvinit/files/inittab-2.88 b/sys-apps/sysvinit/files/inittab-2.88
deleted file mode 100644
index baab75b31ac..00000000000
--- a/sys-apps/sysvinit/files/inittab-2.88
+++ /dev/null
@@ -1,59 +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, <miquels@cistron.nl>
-# Modified by: Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
-# Modified by: Daniel Robbins, <drobbins@gentoo.org>
-# Modified by: Martin Schlemmer, <azarah@gentoo.org>
-# Modified by: Mike Frysinger, <vapier@gentoo.org>
-# Modified by: Robin H. Johnson, <robbat2@gentoo.org>
-# Modified by: William Hubbs, <williamh@gentoo.org>
-#
-
-# 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/files/sysvinit-2.88-makefile.patch b/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch
deleted file mode 100644
index 73c0160803a..00000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://savannah.nongnu.org/bugs/index.php?29758
-
-From 2b7d90f04cdd0e343f413c5c7672615926c02706 Mon Sep 17 00:00:00 2001
-From: wfink <wfink@456724a4-4300-0410-8514-c89748c515a2>
-Date: Tue, 4 May 2010 07:50:12 +0000
-Subject: [PATCH] Fix sysvinit bug #29758
-
-git-svn-id: svn://svn.sv.gnu.org/sysvinit/sysvinit/trunk@87 456724a4-4300-0410-8514-c89748c515a2
-
-diff --git a/src/Makefile b/src/Makefile
-index e2b8028..19675c5 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -92,9 +92,9 @@ all: $(BIN) $(SBIN) $(USRBIN)
- init: LDLIBS += $(INITLIBS) $(STATIC)
- init: init.o init_utmp.o
-
--halt: halt.o ifdown.o hddown.o utmp.o reboot.h
-+halt: halt.o ifdown.o hddown.o utmp.o
-
--last: last.o oldutmp.h
-+last: last.o
-
- mesg: mesg.o
-
-@@ -109,7 +109,7 @@ sulogin: sulogin.o
-
- wall: dowall.o wall.o
-
--shutdown: dowall.o shutdown.o utmp.o reboot.h
-+shutdown: dowall.o shutdown.o utmp.o
-
- bootlogd: LDLIBS += -lutil
- bootlogd: bootlogd.o
-@@ -118,14 +118,22 @@ sulogin.o: CPPFLAGS += $(SELINUX_DEF)
- sulogin.o: sulogin.c
-
- init.o: CPPFLAGS += $(SELINUX_DEF)
--init.o: init.c init.h set.h reboot.h initreq.h
-+init.o: init.c init.h initreq.h paths.h reboot.h set.h
-
--utmp.o: utmp.c init.h
-+utmp.o:
-
- init_utmp.o: CPPFLAGS += -DINIT_MAIN
--init_utmp.o: utmp.c init.h
-+init_utmp.o: utmp.c init.h initreq.h paths.h
- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-
-+utmpdump.o: utmpdump.c oldutmp.h
-+
-+shutdown.o: shutdown.c paths.h reboot.h initreq.h init.h
-+
-+halt.o: halt.c reboot.h
-+
-+last.o: last.c oldutmp.h
-+
- cleanobjs:
- rm -f *.o *.bak
-
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch b/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch
deleted file mode 100644
index 91b7435b25a..00000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-http://svn.savannah.nongnu.org/viewvc?view=rev&root=sysvinit&revision=90
-https://bugs.gentoo.org/326697
-
---- sysvinit/trunk/src/init.c 2010/05/07 15:16:26 89
-+++ sysvinit/trunk/src/init.c 2010/05/17 09:44:34 90
-@@ -54,10 +54,6 @@
-
- #ifdef WITH_SELINUX
- # include <selinux/selinux.h>
--# include <sys/mount.h>
--# ifndef MNT_DETACH /* present in glibc 2.10, missing in 2.7 */
--# define MNT_DETACH 2
--# endif
- #endif
-
- #ifdef __i386__
-@@ -2872,11 +2868,9 @@
-
- #ifdef WITH_SELINUX
- if (getenv("SELINUX_INIT") == NULL) {
-- const int rc = mount("proc", "/proc", "proc", 0, 0);
-- if (is_selinux_enabled() > 0) {
-- putenv("SELINUX_INIT=YES");
-- if (rc == 0) umount2("/proc", MNT_DETACH);
-+ if (is_selinux_enabled() != 1) {
- if (selinux_init_load_policy(&enforce) == 0) {
-+ putenv("SELINUX_INIT=YES");
- execv(myname, argv);
- } else {
- if (enforce > 0) {
-@@ -2887,7 +2881,6 @@
- }
- }
- }
-- if (rc == 0) umount2("/proc", MNT_DETACH);
- }
- #endif
- /* Start booting. */
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch b/sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch
deleted file mode 100644
index efbe47a30be..00000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Newer C libraries omit this include from sys/types.h.
-
---- a/src/bootlogd.c
-+++ b/src/bootlogd.c
-@@ -32,6 +32,7 @@
- *
- */
-
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/stat.h>
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch b/sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch
deleted file mode 100644
index 5db809067e1..00000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 <utmp.h>
- #include <ctype.h>
- #include <stdarg.h>
-+#include <sys/ttydefaults.h>
- #include <sys/syslog.h>
- #include <sys/time.h>
-
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
deleted file mode 100644
index 06533bd44b1..00000000000
--- a/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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 )
- !<sys-apps/openrc-0.13
-"
-
-S=${WORKDIR}/${P}dsf
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.86-kexec.patch" #80220
- "${FILESDIR}/${PN}-2.86-shutdown-single.patch" #158615
- "${FILESDIR}/${P}-makefile.patch" #319197
- "${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() {
- epatch "${PATCHES[@]}"
- 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}"
- cp "${FILESDIR}"/inittab-2.88 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 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() {
- local myconf
-
- tc-export CC
- append-lfs-flags
- export DISTRO= #381311
- use static && append-ldflags -static
- use selinux && myconf=WITH_SELINUX=yes
- emake -C src ${myconf} || die
-}
-
-src_install() {
- emake -C src install ROOT="${D}"
- dodoc README doc/*
-
- insinto /etc
- doins "${WORKDIR}"/inittab
-
- # dead symlink
- rm "${D}"/usr/bin/lastb || 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 [[ ${ROOT} == / ]] ; then
- # 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."
-}
diff --git a/sys-apps/sysvinit/sysvinit-2.92.ebuild b/sys-apps/sysvinit/sysvinit-2.92.ebuild
deleted file mode 100644
index b6ea9ba1c91..00000000000
--- a/sys-apps/sysvinit/sysvinit-2.92.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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"
-[[ "${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 )
- !<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 sh || 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."
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2019-05-26 16:08 Lars Wendler
0 siblings, 0 replies; 14+ messages in thread
From: Lars Wendler @ 2019-05-26 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 0d6bea4c58a8bc97d1394155ed34992f9a588629
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 16:08:35 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun May 26 16:08:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6bea4c
sys-apps/sysvinit: Bump to version 2.95_beta
Package-Manager: Portage-2.3.67, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/sysvinit/Manifest | 1 +
.../files/sysvinit-2.95_beta-shutdown-h.patch | 87 +++++++++++++
sys-apps/sysvinit/sysvinit-2.95_beta.ebuild | 137 +++++++++++++++++++++
3 files changed, 225 insertions(+)
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 85991333fc4..5aee897fb78 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,2 +1,3 @@
DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
DIST sysvinit-2.94.tar.xz 120900 BLAKE2B e45a95246325e93ef49f11573924216937e238761cb9f5979ae2b272838fb3280b1d12c9553992271f7926dc7c7bc18e352a8019a70f54c592971fe043453804 SHA512 8d3b7b777f7c37cf5eaf73d4cdfad8ac54c6115577052bd7ddf3588da8fb7d16b812ffaade0ce300c2c6b7d2acd6e7778130544befc171eab174ee8766b3ec50
+DIST sysvinit-2.95-beta.tar.xz 121352 BLAKE2B 769768185ae3f374ff7bac4a9178796526db9232ed6c735d6165b3f28b219a9804a6e0ae5f78e8558616aa3ae022f4963b9922e7c71bf4997772b8fb1f9d98d7 SHA512 0d1d7559a05142e2bd209fca83e1396e9d3ed32ebe5d4f5f1356ac51e597c0201648e8a80946089fa91e8620302cd60894b7ff343747cee373c0c4459e6224ed
diff --git a/sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch
new file mode 100644
index 00000000000..f24e1029ca5
--- /dev/null
+++ b/sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch
@@ -0,0 +1,87 @@
+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 | 11 ++++-------
+ src/shutdown.c | 12 ++++--------
+ 2 files changed, 8 insertions(+), 15 deletions(-)
+
+--- sysvinit-2.95/man/shutdown.8
++++ sysvinit-2.95/man/shutdown.8
+@@ -66,22 +66,19 @@
+ .\"}}}
+ .\"{{{ -h
+ .IP \fB\-h\fP
+-Halt or power off after shutdown. Usually used with the -P or -H flags,
+-depending on whether we want to poweroff or simply stop the operating system.
++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.
++Halt 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.
+ Halting is often used to run through the shutdown process and leave
+ output on the screen for debugging purposes. Or when the user wants the OS to
+ stop, but leave the power on. To power off at the end of the shutdown sequence
+-use the -P modifier instead.
++use the -P option instead.
+ .\"}}}
+ .\"{{{ -f
+ .IP \fB\-f\fP
+--- sysvinit-2.95/src/shutdown.c
++++ sysvinit-2.95/src/shutdown.c
+@@ -144,9 +144,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"
+@@ -556,9 +554,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;
+@@ -574,6 +574,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;
+@@ -613,12 +615,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.95_beta.ebuild b/sys-apps/sysvinit/sysvinit-2.95_beta.ebuild
new file mode 100644
index 00000000000..f02f81e0645
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.95_beta.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2019 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 ~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 )
+ !<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.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 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
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2019-08-17 18:38 William Hubbs
0 siblings, 0 replies; 14+ messages in thread
From: William Hubbs @ 2019-08-17 18:38 UTC (permalink / raw
To: gentoo-commits
commit: ada626f71628c922b27d692057520caeb72dd03c
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 18:37:18 2019 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 18:37:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada626f7
sys-apps/sysvinit: 2.95-r1 bump to add halt.sh
This adds halt.sh which will be used to either halt or poweroff the
system based on the contents of the INIT_HALT environment variable.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
sys-apps/sysvinit/files/halt.sh | 6 ++
sys-apps/sysvinit/files/inittab-2.95 | 61 +++++++++++++
sys-apps/sysvinit/sysvinit-2.95-r1.ebuild | 139 ++++++++++++++++++++++++++++++
3 files changed, 206 insertions(+)
diff --git a/sys-apps/sysvinit/files/halt.sh b/sys-apps/sysvinit/files/halt.sh
new file mode 100644
index 00000000000..07a32b99574
--- /dev/null
+++ b/sys-apps/sysvinit/files/halt.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ "$INIT_HALT" = HALT ]; then
+ exec /sbin/halt -dhn
+else
+ exec /sbin/poweroff -dhn
+fi
diff --git a/sys-apps/sysvinit/files/inittab-2.95 b/sys-apps/sysvinit/files/inittab-2.95
new file mode 100644
index 00000000000..03f226a8c3b
--- /dev/null
+++ b/sys-apps/sysvinit/files/inittab-2.95
@@ -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, <miquels@cistron.nl>
+# Modified by: Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
+# Modified by: Daniel Robbins, <drobbins@gentoo.org>
+# Modified by: Martin Schlemmer, <azarah@gentoo.org>
+# Modified by: Mike Frysinger, <vapier@gentoo.org>
+# Modified by: Robin H. Johnson, <robbat2@gentoo.org>
+# Modified by: William Hubbs, <williamh@gentoo.org>
+#
+
+# 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 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.95-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild
new file mode 100644
index 00000000000..6dd6484ee44
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 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 ~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 )
+ !<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 sh || 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 [[ ${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
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2021-02-22 7:56 Lars Wendler
0 siblings, 0 replies; 14+ messages in thread
From: Lars Wendler @ 2021-02-22 7:56 UTC (permalink / raw
To: gentoo-commits
commit: 0fae23204018295e711bb1335c797e43b0af9140
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 07:53:03 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 07:56:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fae2320
sys-apps/sysvinit: Bump to version 2.99
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/sysvinit/Manifest | 1 +
.../sysvinit/files/sysvinit-2.99-shutdown-h.patch | 82 ++++++++++++
sys-apps/sysvinit/sysvinit-2.99.ebuild | 144 +++++++++++++++++++++
3 files changed, 227 insertions(+)
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 8dce800e3d0..f91c0f841f4 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -2,3 +2,4 @@ DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda3
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/sysvinit-2.99-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch
new file mode 100644
index 00000000000..a4ceeda69c5
--- /dev/null
+++ b/sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch
@@ -0,0 +1,82 @@
+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.99/man/shutdown.8
++++ sysvinit-2.99/man/shutdown.8
+@@ -66,22 +66,19 @@
+ .\"}}}
+ .\"{{{ -h
+ .IP \fB\-h\fP
+-Halt or power off after shutdown. Usually used with the \fI-P\fP or \fI-H\fP flags,
+-depending on whether we want to poweroff or simply stop the operating system.
++Equivalent to \fI-P\fP, unless \fI-H\fP is specified.
+ .\"}}}
+ .\"{{{ -P
+ .IP \fB\-P\fP
+-Modifier to the \fI-h\fP flag. Halt action is to turn off the power.
+-Must be used with the \fI-h\fP flag.
++Halt action is to turn off the power.
+ .\"}}}
+ .\"{{{ -H
+ .IP \fB\-H\fP
+-Modifier to the \fI-h\fP flag. Halt action is to halt or drop into boot
+-monitor on systems that support it. Must be used with the \fI-h\fP flag.
++Action is to halt or drop into boot monitor on systems that support it.
+ Halting is often used to run through the shutdown process and leave
+ output on the screen for debugging purposes. Or when the user wants the OS to
+ stop, but leave the power on. To power off at the end of the shutdown sequence
+-use the \fI-P\fP modifier instead.
++use the \fI-P\fP option instead.
+ .\"}}}
+ .\"{{{ -f
+ .IP \fB\-f\fP
+--- sysvinit-2.99/src/shutdown.c
++++ sysvinit-2.99/src/shutdown.c
+@@ -144,9 +144,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"
+@@ -556,9 +554,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;
+@@ -574,6 +574,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;
+@@ -613,12 +615,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.99.ebuild b/sys-apps/sysvinit/sysvinit-2.99.ebuild
new file mode 100644
index 00000000000..e2a06d6700d
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.99.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 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.99-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-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 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
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2021-02-22 7:56 Lars Wendler
0 siblings, 0 replies; 14+ messages in thread
From: Lars Wendler @ 2021-02-22 7:56 UTC (permalink / raw
To: gentoo-commits
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, <miquels@cistron.nl>
-# Modified by: Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
-# Modified by: Daniel Robbins, <drobbins@gentoo.org>
-# Modified by: Martin Schlemmer, <azarah@gentoo.org>
-# Modified by: Mike Frysinger, <vapier@gentoo.org>
-# Modified by: Robin H. Johnson, <robbat2@gentoo.org>
-# Modified by: William Hubbs, <williamh@gentoo.org>
-#
-
-# 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, <miquels@cistron.nl>
-# Modified by: Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
-# Modified by: Daniel Robbins, <drobbins@gentoo.org>
-# Modified by: Martin Schlemmer, <azarah@gentoo.org>
-# Modified by: Mike Frysinger, <vapier@gentoo.org>
-# Modified by: Robin H. Johnson, <robbat2@gentoo.org>
-# Modified by: William Hubbs, <williamh@gentoo.org>
-# Modified by: Lars Wendler, <polynomial-c@gentoo.org>
-#
-
-# 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 <uberlord@gentoo.org>
-
---- 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
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2021-05-24 11:36 David Seifert
0 siblings, 0 replies; 14+ messages in thread
From: David Seifert @ 2021-05-24 11:36 UTC (permalink / raw
To: gentoo-commits
commit: 95625117c50ab055cca472b68a07d1cc0b506f64
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 11:35:45 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon May 24 11:35:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95625117
sys-apps/sysvinit: drop 2.97, 2.98-r1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-apps/sysvinit/Manifest | 2 -
sys-apps/sysvinit/files/inittab-2.95 | 61 ---------
.../files/sysvinit-2.95_beta-shutdown-h.patch | 87 -------------
sys-apps/sysvinit/sysvinit-2.97.ebuild | 144 ---------------------
sys-apps/sysvinit/sysvinit-2.98-r1.ebuild | 144 ---------------------
5 files changed, 438 deletions(-)
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index b07e94c6c2a..53b6d60ed55 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,3 +1 @@
-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.95 b/sys-apps/sysvinit/files/inittab-2.95
deleted file mode 100644
index 03f226a8c3b..00000000000
--- a/sys-apps/sysvinit/files/inittab-2.95
+++ /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, <miquels@cistron.nl>
-# Modified by: Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
-# Modified by: Daniel Robbins, <drobbins@gentoo.org>
-# Modified by: Martin Schlemmer, <azarah@gentoo.org>
-# Modified by: Mike Frysinger, <vapier@gentoo.org>
-# Modified by: Robin H. Johnson, <robbat2@gentoo.org>
-# Modified by: William Hubbs, <williamh@gentoo.org>
-#
-
-# 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 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.95_beta-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch
deleted file mode 100644
index f24e1029ca5..00000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch
+++ /dev/null
@@ -1,87 +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 | 11 ++++-------
- src/shutdown.c | 12 ++++--------
- 2 files changed, 8 insertions(+), 15 deletions(-)
-
---- sysvinit-2.95/man/shutdown.8
-+++ sysvinit-2.95/man/shutdown.8
-@@ -66,22 +66,19 @@
- .\"}}}
- .\"{{{ -h
- .IP \fB\-h\fP
--Halt or power off after shutdown. Usually used with the -P or -H flags,
--depending on whether we want to poweroff or simply stop the operating system.
-+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.
-+Halt 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.
- Halting is often used to run through the shutdown process and leave
- output on the screen for debugging purposes. Or when the user wants the OS to
- stop, but leave the power on. To power off at the end of the shutdown sequence
--use the -P modifier instead.
-+use the -P option instead.
- .\"}}}
- .\"{{{ -f
- .IP \fB\-f\fP
---- sysvinit-2.95/src/shutdown.c
-+++ sysvinit-2.95/src/shutdown.c
-@@ -144,9 +144,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"
-@@ -556,9 +554,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;
-@@ -574,6 +574,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;
-@@ -613,12 +615,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.97.ebuild b/sys-apps/sysvinit/sysvinit-2.97.ebuild
deleted file mode 100644
index 6476fe8b57e..00000000000
--- a/sys-apps/sysvinit/sysvinit-2.97.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 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
-
- keepdir /etc/inittab.d
-
- find "${ED}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
- # Reload init to fix unmounting problems of / on next reboot.
- # This is really needed, as without the new version of init cause init
- # not to quit properly on reboot, and causes a fsck of / on next reboot.
- if [[ -z ${ROOT} ]] ; then
- if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
- ln -s /dev/initctl /run/initctl \
- || ewarn "Failed to set /run/initctl symlink!"
- fi
- # Do not return an error if this fails
- /sbin/telinit U &>/dev/null
- fi
-
- elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
- elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
- # Required for new bootlogd service
- if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
- touch "${EROOT}/var/log/boot"
- fi
-}
diff --git a/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild
deleted file mode 100644
index 72ee3268859..00000000000
--- a/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 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-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 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
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2022-04-13 1:58 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-04-13 1:58 UTC (permalink / raw
To: gentoo-commits
commit: d89f6f62cfb518371c77cb10e8fc1e07b85569d9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 01:58:29 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 01:58:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d89f6f62
sys-apps/sysvinit: fix musl build
Closes: https://bugs.gentoo.org/836602
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/sysvinit/files/sysvinit-3.02-musl-limits.patch | 12 ++++++++++++
sys-apps/sysvinit/sysvinit-3.02-r3.ebuild | 2 ++
2 files changed, 14 insertions(+)
diff --git a/sys-apps/sysvinit/files/sysvinit-3.02-musl-limits.patch b/sys-apps/sysvinit/files/sysvinit-3.02-musl-limits.patch
new file mode 100644
index 000000000000..e890fbbcf0f3
--- /dev/null
+++ b/sys-apps/sysvinit/files/sysvinit-3.02-musl-limits.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/836602
+https://github.com/slicer69/sysvinit/issues/5
+--- a/src/bootlogd.c
++++ b/src/bootlogd.c
+@@ -41,6 +41,7 @@
+ #include <getopt.h>
+ #include <dirent.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #ifdef __linux__
+ #include <pty.h>
+ #include <sys/sysmacros.h>
diff --git a/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild b/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild
index a1c99e551867..1742bb216aaf 100644
--- a/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild
@@ -41,6 +41,8 @@ PATCHES=(
"${FILESDIR}/${PN}-2.86-kexec.patch"
# bug #158615
"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
+ # bug #836602
+ "${FILESDIR}/${PN}-3.02-musl-limits.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2022-04-13 22:54 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-04-13 22:54 UTC (permalink / raw
To: gentoo-commits
commit: 081e9ddfa7475f308a069c36d770bd2240ea380f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 22:54:14 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 22:54:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=081e9ddf
sys-apps/sysvinit: add 3.03, drop 3.02-r3
Closes: https://bugs.gentoo.org/836602
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/sysvinit/Manifest | 4 ++--
sys-apps/sysvinit/files/sysvinit-3.02-musl-limits.patch | 12 ------------
.../{sysvinit-3.02-r3.ebuild => sysvinit-3.03.ebuild} | 2 +-
3 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 4aa02107a44b..61b0375974ef 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,5 +1,5 @@
DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd
DIST sysvinit-3.00.tar.xz 127072 BLAKE2B d1c4e509d7c13cf0fb9da290f875e7c0ab0666d843d75d4dd6885112248a859dd077bdf9cc926c4af58473da99a5229bb879c7094afd648d5ebe72597a3ba6a7 SHA512 ba834ac6c48528304373018bfb05dcdd3573d8081dd7dc95a44808804404d77ee4832fedb3f34e67d87f22f201f9526c54910a51c6ed2a42ac55b756843cd825
DIST sysvinit-3.01.tar.xz 126616 BLAKE2B b991c6d2a09b02003cc587379b148f8ca3817c27fcaf81f184f679cfd5325e0b551484bba47bb554a34c7eeba60538f4943de49b1d59bd4bef73d7d086fefdb2 SHA512 66da3830aa32b70f0beea994213145a550e5b5d58a5b54afb17109243d5efface6aba8c296b76dbfb22ce6f86c9c58f237ff71ee04ec7d5b316ad412bf7acbcf
-DIST sysvinit-3.02.tar.xz 219560 BLAKE2B c68505aab9e257fa3fb4153b4d2a51a7a8ac0137f0ee21174c168b1a1e4f12ea6be53679c484e2ea31904a37cd94fb5d913a9885da6c618acdae566b70bb7fae SHA512 44a43e2faff3a0d3410447ffc9b8b7c66eae1a5cba54c2c4d8518d3b2e5accecc68a280c87dbf6d18f943ae466c3c1e09bc633009207cbd777d371effda30831
-DIST sysvinit-3.02.tar.xz.sig 833 BLAKE2B 07f86211d2ded8afea22df246140cb44ec4a949c2450b1cc9d996b4b582da7767726648595c5f1cf584c31c0c59c4b0915a22cc254fed56bd42ac155b544cbfc SHA512 9b8a2b3e480041ead8bd2b16551fb00e387d823ad196cf60f6938eda5accf33e944b7b530d47bc0bdd90de6766cf8d44050c0c3d95b18c8b76d412d0a6c3121a
+DIST sysvinit-3.03.tar.xz 219956 BLAKE2B e2f9d838a67341cabac4b82d90c66b29470727383c4a4d86f2767863a9b9f6d60768069fa79636552aa3bef654bd2f0944cb35eb15a4f053d1fa9aaa4e04473d SHA512 920205d70e1384d11926739ab45d4a04c5a7d7263c50bd06288c806ebc3316d641bd05a5c67497c48951fafe32fc364e88bfb1cb2cc1d6787e9eb6c5e692061b
+DIST sysvinit-3.03.tar.xz.sig 833 BLAKE2B 7d851f4cd12e5745055bb78f531b97b1e9fb9a16260a713fc7ac91000208f04ec8f1109068ebe017838449c73b9e40679f248816050979d9624742dd6023eeef SHA512 a643447ed906b5e3249808eafc85f8b336ebfa6028adf8a8e8df82469b7f08cfe98f44b8e7f6b50168f70925eabf610760a185f10d0529ec1a5ff7337de70dc4
diff --git a/sys-apps/sysvinit/files/sysvinit-3.02-musl-limits.patch b/sys-apps/sysvinit/files/sysvinit-3.02-musl-limits.patch
deleted file mode 100644
index e890fbbcf0f3..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-3.02-musl-limits.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/836602
-https://github.com/slicer69/sysvinit/issues/5
---- a/src/bootlogd.c
-+++ b/src/bootlogd.c
-@@ -41,6 +41,7 @@
- #include <getopt.h>
- #include <dirent.h>
- #include <fcntl.h>
-+#include <limits.h>
- #ifdef __linux__
- #include <pty.h>
- #include <sys/sysmacros.h>
diff --git a/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild b/sys-apps/sysvinit/sysvinit-3.03.ebuild
similarity index 98%
rename from sys-apps/sysvinit/sysvinit-3.02-r3.ebuild
rename to sys-apps/sysvinit/sysvinit-3.03.ebuild
index 1742bb216aaf..6712696261d0 100644
--- a/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.03.ebuild
@@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-shutdown )"
# po4a is for man page translations
BDEPEND="nls? ( app-text/po4a )
- verify-sig? ( sec-keys/openpgp-keys-sysvinit )"
+ verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )"
PATCHES=(
# bug #80220
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2022-08-24 3:16 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-08-24 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 0d844d33c8e40bae73db33784f3579d6eb5e1ad7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 03:01:23 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 03:11:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d844d33
sys-apps/sysvinit: add 3.05
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/sysvinit/Manifest | 2 +
.../files/sysvinit-3.05-fix-man-makefile.patch | 19 +++
sys-apps/sysvinit/sysvinit-3.05.ebuild | 185 +++++++++++++++++++++
3 files changed, 206 insertions(+)
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 68d4255cf96a..f11d8ae2828e 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -4,3 +4,5 @@ DIST sysvinit-3.03.tar.xz 219956 BLAKE2B e2f9d838a67341cabac4b82d90c66b294707273
DIST sysvinit-3.03.tar.xz.sig 833 BLAKE2B 7d851f4cd12e5745055bb78f531b97b1e9fb9a16260a713fc7ac91000208f04ec8f1109068ebe017838449c73b9e40679f248816050979d9624742dd6023eeef SHA512 a643447ed906b5e3249808eafc85f8b336ebfa6028adf8a8e8df82469b7f08cfe98f44b8e7f6b50168f70925eabf610760a185f10d0529ec1a5ff7337de70dc4
DIST sysvinit-3.04.tar.xz 220184 BLAKE2B 5caa94fd09e5660fb39982b8c8d68ca5546d83a7f78450f4d7fe8fcd9ac429cd8d9f1ef63e9276221ac878ca2964874c1065d61bfd9ed8b0d1505b44c775b388 SHA512 059092ee857782e88f88e47475846f859589aa1062a6e1294fe8983a11d04a13811e0dd6d277431f45abc2d9d96e5358f6b2d2df1d291402fada66cd009a5fa9
DIST sysvinit-3.04.tar.xz.sig 833 BLAKE2B 8f04051ea7c03ab447fe309ee61cb4d35a9c02f9a88699423097f9fe4544a26e89536f2625572d0781f792103ce88276db19c2b9ed9489c6ca969d54bc45c117 SHA512 38becfc0d0796570bc75661d4212ad3b1470eea33905694a5264b8b68054d3e47d9250da58f67d52807efcd96334f170a600dff72491f76de94df58077eb4dd0
+DIST sysvinit-3.05.tar.xz 234416 BLAKE2B 56cd57976c34194b07512e05f21782247d2f79e51655de758ee789016fe45ec74d2b036c727e6897f6fd743edf2755715fe22ed4538d8d5f81220b0898c3c62b SHA512 15063d237e247f4eefd9c2e86c986384c1103eb2a84d834d92f00a557106a9c24f5f3530633412997692515a5404c194840fc71b4d3c94eb284ae6c776bb38a3
+DIST sysvinit-3.05.tar.xz.sig 833 BLAKE2B 520be5b28b02a67703eb027515d4c290532bdefdb319d6b74d14dbaa51538410eab9d336637c1b32cd8f27d45353b78f531ba7646157790e2563a38dbf396646 SHA512 ed7816281e81b7c568ee8e3b8a1b2eb3973751d5fc7f626bdfefbe28d0f0d67857862924dd000e12e6c12ed0382c27c1992d2d6326cc1fc3c94559f475402b33
diff --git a/sys-apps/sysvinit/files/sysvinit-3.05-fix-man-makefile.patch b/sys-apps/sysvinit/files/sysvinit-3.05-fix-man-makefile.patch
new file mode 100644
index 000000000000..e6079baca1f5
--- /dev/null
+++ b/sys-apps/sysvinit/files/sysvinit-3.05-fix-man-makefile.patch
@@ -0,0 +1,19 @@
+https://github.com/slicer69/sysvinit/commit/e7622b031dac56e1836d2c6e353da4b7f8367aab
+
+From: Adam Sampson <ats@offog.org>
+Date: Sun, 21 Aug 2022 22:13:09 +0100
+Subject: [PATCH] Use the .po files to work out which manpage dirs to create.
+
+The pattern being used here didn't match anything in a tarball release.
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -214,7 +214,7 @@ install: all
+ fi
+ $(INSTALL_DIR) $(ROOT)/usr/include/
+ $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
+- for lang in '' $(subst ../man/,,$(wildcard ../man/po/??/)); do \
++ for lang in '' $(patsubst ../man/po/%.po,%,$(wildcard ../man/po/??.po)); do \
+ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/$$lang; \
+ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/$$lang; \
+ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/$$lang; \
+
diff --git a/sys-apps/sysvinit/sysvinit-3.05.ebuild b/sys-apps/sysvinit/sysvinit-3.05.ebuild
new file mode 100644
index 000000000000..974bf1d6dc51
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-3.05.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Dropped these because blank as of 3.02
+#PLOCALES="de es fi fr hu id pl"
+PLOCALES="de es fr pl"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sysvinit.asc
+inherit toolchain-funcs flag-o-matic plocale verify-sig
+
+DESCRIPTION="/sbin/init - parent of all processes"
+HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
+# https://github.com/slicer69/sysvinit/issues/12
+#SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
+#SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
+SRC_URI="https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz.sig )"
+S="${WORKDIR}/${P/_*}"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} != *beta* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+IUSE="selinux ibm nls static"
+
+COMMON_DEPEND="
+ selinux? (
+ >=sys-libs/libselinux-1.28
+ )"
+DEPEND="${COMMON_DEPEND}
+ virtual/os-headers"
+# Old OpenRC blocker is for bug #587424
+# Keep for longer than usual given it's cheap and avoid user inconvenience
+RDEPEND="${COMMON_DEPEND}
+ !<app-i18n/man-pages-l10n-4.12.1-r2
+ !<sys-apps/openrc-0.13
+ selinux? ( sec-policy/selinux-shutdown )"
+# po4a is for man page translations
+BDEPEND="nls? ( app-text/po4a )
+ verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )"
+
+PATCHES=(
+ # bug #80220
+ "${FILESDIR}/${PN}-2.86-kexec.patch"
+ # bug #158615
+ "${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
+
+ "${FILESDIR}"/${P}-fix-man-makefile.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e '/^CPPFLAGS =$/d' \
+ -e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
+ src/Makefile || die
+
+ # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
+ sed -i -r \
+ -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
+ -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
+ src/Makefile || die
+
+ # pidof has moved to >=procps-3.3.9
+ sed -i -r \
+ -e '/\/bin\/pidof/d' \
+ -e '/^MAN8/s:\<pidof.8\>::g' \
+ src/Makefile || die
+
+ # logsave is already in e2fsprogs
+ sed -i -r \
+ -e '/^(USR)?S?BIN/s:\<logsave\>::g' \
+ -e '/^MAN8/s:\<logsave.8\>::g' \
+ src/Makefile || die
+
+ # Mung inittab for specific architectures
+ cd "${WORKDIR}" || die
+ cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
+ local insert=()
+ use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
+ use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
+ use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
+ use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
+ use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
+ if use ibm ; then
+ insert+=(
+ '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
+ '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
+ )
+ fi
+ (use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
+ if use x86 || use amd64 ; then
+ sed -i \
+ -e '/ttyS[01]/s:9600:115200:' \
+ inittab
+ fi
+
+ if [[ ${#insert[@]} -gt 0 ]] ; then
+ printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
+ fi
+
+ delete_unused_locale() {
+ local locale=${1}
+
+ einfo "Deleting non-requested man page translations for locale=${locale}"
+ rm "${S}"/man/{po/,}${locale}.po || die
+ rm -rf "${S}"/man/${locale} || die
+
+ sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
+ }
+
+ plocale_for_each_disabled_locale delete_unused_locale
+}
+
+src_compile() {
+ tc-export CC
+
+ append-lfs-flags
+
+ # bug #381311
+ export DISTRO=
+ export VERSION="${PV}"
+
+ use static && append-ldflags -static
+ emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
+
+ if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+ cd man/po || die
+ po4a po4a.cfg || die
+ fi
+}
+
+src_install() {
+ emake -C src install ROOT="${D}"
+ dodoc README doc/*
+
+ insinto /etc
+ doins "${WORKDIR}"/inittab
+
+ newinitd "${FILESDIR}"/bootlogd.initd bootlogd
+ newconfd "${FILESDIR}"/bootlogd.confd bootlogd
+
+ into /
+ dosbin "${FILESDIR}"/halt.sh
+
+ keepdir /etc/inittab.d
+
+ if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+ install_locale_man_pages() {
+ doman -i18n=${1} man/po/${1}/*
+ }
+
+ plocale_for_each_locale install_locale_man_pages
+ fi
+
+ # Dead symlink
+ find "${ED}" -xtype l -delete || die
+
+ find "${ED}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+ # Reload init to fix unmounting problems of / on next reboot.
+ # This is really needed, as without the new version of init cause init
+ # not to quit properly on reboot, and causes a fsck of / on next reboot.
+ if [[ -z ${ROOT} ]] ; then
+ if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
+ ln -s /dev/initctl /run/initctl \
+ || ewarn "Failed to set /run/initctl symlink!"
+ fi
+ # Do not return an error if this fails
+ /sbin/telinit U &>/dev/null
+ fi
+
+ elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
+ elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
+
+ # Required for new bootlogd service
+ if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
+ touch "${EROOT}/var/log/boot"
+ fi
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2022-10-28 19:53 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-10-28 19:53 UTC (permalink / raw
To: gentoo-commits
commit: 02915bfe22603872af1f978b7bce6281f5aaf030
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 19:45:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 19:50:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02915bfe
sys-apps/sysvinit: drop 2.99-r1, 3.01, 3.03, 3.04
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/sysvinit/Manifest | 6 -
.../sysvinit/files/sysvinit-2.99-shutdown-h.patch | 82 ----------
sys-apps/sysvinit/sysvinit-2.99-r1.ebuild | 138 ----------------
sys-apps/sysvinit/sysvinit-3.01.ebuild | 138 ----------------
sys-apps/sysvinit/sysvinit-3.03.ebuild | 177 ---------------------
sys-apps/sysvinit/sysvinit-3.04.ebuild | 177 ---------------------
6 files changed, 718 deletions(-)
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index f11d8ae2828e..f9fff022d581 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,8 +1,2 @@
-DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd
-DIST sysvinit-3.01.tar.xz 126616 BLAKE2B b991c6d2a09b02003cc587379b148f8ca3817c27fcaf81f184f679cfd5325e0b551484bba47bb554a34c7eeba60538f4943de49b1d59bd4bef73d7d086fefdb2 SHA512 66da3830aa32b70f0beea994213145a550e5b5d58a5b54afb17109243d5efface6aba8c296b76dbfb22ce6f86c9c58f237ff71ee04ec7d5b316ad412bf7acbcf
-DIST sysvinit-3.03.tar.xz 219956 BLAKE2B e2f9d838a67341cabac4b82d90c66b29470727383c4a4d86f2767863a9b9f6d60768069fa79636552aa3bef654bd2f0944cb35eb15a4f053d1fa9aaa4e04473d SHA512 920205d70e1384d11926739ab45d4a04c5a7d7263c50bd06288c806ebc3316d641bd05a5c67497c48951fafe32fc364e88bfb1cb2cc1d6787e9eb6c5e692061b
-DIST sysvinit-3.03.tar.xz.sig 833 BLAKE2B 7d851f4cd12e5745055bb78f531b97b1e9fb9a16260a713fc7ac91000208f04ec8f1109068ebe017838449c73b9e40679f248816050979d9624742dd6023eeef SHA512 a643447ed906b5e3249808eafc85f8b336ebfa6028adf8a8e8df82469b7f08cfe98f44b8e7f6b50168f70925eabf610760a185f10d0529ec1a5ff7337de70dc4
-DIST sysvinit-3.04.tar.xz 220184 BLAKE2B 5caa94fd09e5660fb39982b8c8d68ca5546d83a7f78450f4d7fe8fcd9ac429cd8d9f1ef63e9276221ac878ca2964874c1065d61bfd9ed8b0d1505b44c775b388 SHA512 059092ee857782e88f88e47475846f859589aa1062a6e1294fe8983a11d04a13811e0dd6d277431f45abc2d9d96e5358f6b2d2df1d291402fada66cd009a5fa9
-DIST sysvinit-3.04.tar.xz.sig 833 BLAKE2B 8f04051ea7c03ab447fe309ee61cb4d35a9c02f9a88699423097f9fe4544a26e89536f2625572d0781f792103ce88276db19c2b9ed9489c6ca969d54bc45c117 SHA512 38becfc0d0796570bc75661d4212ad3b1470eea33905694a5264b8b68054d3e47d9250da58f67d52807efcd96334f170a600dff72491f76de94df58077eb4dd0
DIST sysvinit-3.05.tar.xz 234416 BLAKE2B 56cd57976c34194b07512e05f21782247d2f79e51655de758ee789016fe45ec74d2b036c727e6897f6fd743edf2755715fe22ed4538d8d5f81220b0898c3c62b SHA512 15063d237e247f4eefd9c2e86c986384c1103eb2a84d834d92f00a557106a9c24f5f3530633412997692515a5404c194840fc71b4d3c94eb284ae6c776bb38a3
DIST sysvinit-3.05.tar.xz.sig 833 BLAKE2B 520be5b28b02a67703eb027515d4c290532bdefdb319d6b74d14dbaa51538410eab9d336637c1b32cd8f27d45353b78f531ba7646157790e2563a38dbf396646 SHA512 ed7816281e81b7c568ee8e3b8a1b2eb3973751d5fc7f626bdfefbe28d0f0d67857862924dd000e12e6c12ed0382c27c1992d2d6326cc1fc3c94559f475402b33
diff --git a/sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch
deleted file mode 100644
index a4ceeda69c5f..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch
+++ /dev/null
@@ -1,82 +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.99/man/shutdown.8
-+++ sysvinit-2.99/man/shutdown.8
-@@ -66,22 +66,19 @@
- .\"}}}
- .\"{{{ -h
- .IP \fB\-h\fP
--Halt or power off after shutdown. Usually used with the \fI-P\fP or \fI-H\fP flags,
--depending on whether we want to poweroff or simply stop the operating system.
-+Equivalent to \fI-P\fP, unless \fI-H\fP is specified.
- .\"}}}
- .\"{{{ -P
- .IP \fB\-P\fP
--Modifier to the \fI-h\fP flag. Halt action is to turn off the power.
--Must be used with the \fI-h\fP flag.
-+Halt action is to turn off the power.
- .\"}}}
- .\"{{{ -H
- .IP \fB\-H\fP
--Modifier to the \fI-h\fP flag. Halt action is to halt or drop into boot
--monitor on systems that support it. Must be used with the \fI-h\fP flag.
-+Action is to halt or drop into boot monitor on systems that support it.
- Halting is often used to run through the shutdown process and leave
- output on the screen for debugging purposes. Or when the user wants the OS to
- stop, but leave the power on. To power off at the end of the shutdown sequence
--use the \fI-P\fP modifier instead.
-+use the \fI-P\fP option instead.
- .\"}}}
- .\"{{{ -f
- .IP \fB\-f\fP
---- sysvinit-2.99/src/shutdown.c
-+++ sysvinit-2.99/src/shutdown.c
-@@ -144,9 +144,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"
-@@ -556,9 +554,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;
-@@ -574,6 +574,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;
-@@ -613,12 +615,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.99-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
deleted file mode 100644
index 589bb6747c9b..000000000000
--- a/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 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"
-
-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.99-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-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
-}
-
-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
- newconfd "${FILESDIR}"/bootlogd.confd 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
-}
diff --git a/sys-apps/sysvinit/sysvinit-3.01.ebuild b/sys-apps/sysvinit/sysvinit-3.01.ebuild
deleted file mode 100644
index 589bb6747c9b..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.01.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 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"
-
-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.99-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-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
-}
-
-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
- newconfd "${FILESDIR}"/bootlogd.confd 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
-}
diff --git a/sys-apps/sysvinit/sysvinit-3.03.ebuild b/sys-apps/sysvinit/sysvinit-3.03.ebuild
deleted file mode 100644
index 392f8ab24242..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.03.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
-S="${WORKDIR}/${P/_*}"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} != *beta* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-IUSE="selinux ibm nls static"
-
-COMMON_DEPEND="
- selinux? (
- >=sys-libs/libselinux-1.28
- )"
-DEPEND="${COMMON_DEPEND}
- virtual/os-headers"
-# Old OpenRC blocker is for bug #587424
-# Keep for longer than usual given it's cheap and avoid user inconvenience
-RDEPEND="${COMMON_DEPEND}
- !<app-i18n/man-pages-l10n-4.12.1-r2
- !<sys-apps/openrc-0.13
- selinux? ( sec-policy/selinux-shutdown )"
-# po4a is for man page translations
-BDEPEND="nls? ( app-text/po4a )
- verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )"
-
-PATCHES=(
- # bug #80220
- "${FILESDIR}/${PN}-2.86-kexec.patch"
- # bug #158615
- "${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e '/^CPPFLAGS =$/d' \
- -e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
- src/Makefile || die
-
- # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
- sed -i -r \
- -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
- -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
- src/Makefile || die
-
- # pidof has moved to >=procps-3.3.9
- sed -i -r \
- -e '/\/bin\/pidof/d' \
- -e '/^MAN8/s:\<pidof.8\>::g' \
- src/Makefile || die
-
- # logsave is already in e2fsprogs
- sed -i -r \
- -e '/^(USR)?S?BIN/s:\<logsave\>::g' \
- -e '/^MAN8/s:\<logsave.8\>::g' \
- src/Makefile || die
-
- # Mung inittab for specific architectures
- cd "${WORKDIR}" || die
- cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
- local insert=()
- use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
- use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
- use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
- use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
- use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
- if use ibm ; then
- insert+=(
- '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
- '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
- )
- fi
- (use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
- if use x86 || use amd64 ; then
- sed -i \
- -e '/ttyS[01]/s:9600:115200:' \
- inittab
- fi
-
- if [[ ${#insert[@]} -gt 0 ]] ; then
- printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
- fi
-
- delete_unused_locale() {
- local locale=${1}
-
- einfo "Deleting non-requested man page translations for locale=${locale}"
- rm "${S}"/man/po/${locale}.po || die
-
- sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
- }
-
- plocale_for_each_disabled_locale delete_unused_locale
-}
-
-src_compile() {
- tc-export CC
-
- append-lfs-flags
-
- # bug #381311
- export DISTRO=
- export VERSION="${PV}"
-
- use static && append-ldflags -static
- emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-
- if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
- cd man/po || die
- po4a po4a.cfg || die
- fi
-}
-
-src_install() {
- emake -C src install ROOT="${D}"
- dodoc README doc/*
-
- insinto /etc
- doins "${WORKDIR}"/inittab
-
- newinitd "${FILESDIR}"/bootlogd.initd bootlogd
- newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-
- into /
- dosbin "${FILESDIR}"/halt.sh
-
- keepdir /etc/inittab.d
-
- if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
- install_locale_man_pages() {
- doman -i18n=${1} man/po/${1}/*
- }
-
- plocale_for_each_locale install_locale_man_pages
- fi
-
- # Dead symlink
- find "${ED}" -xtype l -delete || die
-
- find "${ED}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
- # Reload init to fix unmounting problems of / on next reboot.
- # This is really needed, as without the new version of init cause init
- # not to quit properly on reboot, and causes a fsck of / on next reboot.
- if [[ -z ${ROOT} ]] ; then
- if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
- ln -s /dev/initctl /run/initctl \
- || ewarn "Failed to set /run/initctl symlink!"
- fi
- # Do not return an error if this fails
- /sbin/telinit U &>/dev/null
- fi
-
- elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
- elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
- # Required for new bootlogd service
- if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
- touch "${EROOT}/var/log/boot"
- fi
-}
diff --git a/sys-apps/sysvinit/sysvinit-3.04.ebuild b/sys-apps/sysvinit/sysvinit-3.04.ebuild
deleted file mode 100644
index 392f8ab24242..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.04.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
-S="${WORKDIR}/${P/_*}"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} != *beta* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-IUSE="selinux ibm nls static"
-
-COMMON_DEPEND="
- selinux? (
- >=sys-libs/libselinux-1.28
- )"
-DEPEND="${COMMON_DEPEND}
- virtual/os-headers"
-# Old OpenRC blocker is for bug #587424
-# Keep for longer than usual given it's cheap and avoid user inconvenience
-RDEPEND="${COMMON_DEPEND}
- !<app-i18n/man-pages-l10n-4.12.1-r2
- !<sys-apps/openrc-0.13
- selinux? ( sec-policy/selinux-shutdown )"
-# po4a is for man page translations
-BDEPEND="nls? ( app-text/po4a )
- verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )"
-
-PATCHES=(
- # bug #80220
- "${FILESDIR}/${PN}-2.86-kexec.patch"
- # bug #158615
- "${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e '/^CPPFLAGS =$/d' \
- -e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
- src/Makefile || die
-
- # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
- sed -i -r \
- -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
- -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
- src/Makefile || die
-
- # pidof has moved to >=procps-3.3.9
- sed -i -r \
- -e '/\/bin\/pidof/d' \
- -e '/^MAN8/s:\<pidof.8\>::g' \
- src/Makefile || die
-
- # logsave is already in e2fsprogs
- sed -i -r \
- -e '/^(USR)?S?BIN/s:\<logsave\>::g' \
- -e '/^MAN8/s:\<logsave.8\>::g' \
- src/Makefile || die
-
- # Mung inittab for specific architectures
- cd "${WORKDIR}" || die
- cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
- local insert=()
- use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
- use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
- use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
- use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
- use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
- if use ibm ; then
- insert+=(
- '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
- '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
- )
- fi
- (use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
- if use x86 || use amd64 ; then
- sed -i \
- -e '/ttyS[01]/s:9600:115200:' \
- inittab
- fi
-
- if [[ ${#insert[@]} -gt 0 ]] ; then
- printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
- fi
-
- delete_unused_locale() {
- local locale=${1}
-
- einfo "Deleting non-requested man page translations for locale=${locale}"
- rm "${S}"/man/po/${locale}.po || die
-
- sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
- }
-
- plocale_for_each_disabled_locale delete_unused_locale
-}
-
-src_compile() {
- tc-export CC
-
- append-lfs-flags
-
- # bug #381311
- export DISTRO=
- export VERSION="${PV}"
-
- use static && append-ldflags -static
- emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-
- if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
- cd man/po || die
- po4a po4a.cfg || die
- fi
-}
-
-src_install() {
- emake -C src install ROOT="${D}"
- dodoc README doc/*
-
- insinto /etc
- doins "${WORKDIR}"/inittab
-
- newinitd "${FILESDIR}"/bootlogd.initd bootlogd
- newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-
- into /
- dosbin "${FILESDIR}"/halt.sh
-
- keepdir /etc/inittab.d
-
- if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
- install_locale_man_pages() {
- doman -i18n=${1} man/po/${1}/*
- }
-
- plocale_for_each_locale install_locale_man_pages
- fi
-
- # Dead symlink
- find "${ED}" -xtype l -delete || die
-
- find "${ED}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
- # Reload init to fix unmounting problems of / on next reboot.
- # This is really needed, as without the new version of init cause init
- # not to quit properly on reboot, and causes a fsck of / on next reboot.
- if [[ -z ${ROOT} ]] ; then
- if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
- ln -s /dev/initctl /run/initctl \
- || ewarn "Failed to set /run/initctl symlink!"
- fi
- # Do not return an error if this fails
- /sbin/telinit U &>/dev/null
- fi
-
- elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
- elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
- # Required for new bootlogd service
- if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
- touch "${EROOT}/var/log/boot"
- fi
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2023-07-27 13:50 Mike Gilbert
0 siblings, 0 replies; 14+ messages in thread
From: Mike Gilbert @ 2023-07-27 13:50 UTC (permalink / raw
To: gentoo-commits
commit: 07b943791fb87acef33c0e50ea196e63937d6ffb
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 13:48:34 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 13:49:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b94379
sys-apps/sysvinit: prevent 'halt' from powering off the machine
If you want to power off, use 'poweroff' or 'halt -p' instead.
Closes: https://bugs.gentoo.org/911257
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/sysvinit/files/sysvinit-3.07-halt.patch | 53 +++++++
sys-apps/sysvinit/sysvinit-3.07-r1.ebuild | 190 +++++++++++++++++++++++
2 files changed, 243 insertions(+)
diff --git a/sys-apps/sysvinit/files/sysvinit-3.07-halt.patch b/sys-apps/sysvinit/files/sysvinit-3.07-halt.patch
new file mode 100644
index 000000000000..4e65a912ccde
--- /dev/null
+++ b/sys-apps/sysvinit/files/sysvinit-3.07-halt.patch
@@ -0,0 +1,53 @@
+https://github.com/slicer69/sysvinit/pull/18
+https://bugs.gentoo.org/911257
+
+From fca101c2ff428eb765958ae6e3aaa0eb1adc0fdf Mon Sep 17 00:00:00 2001
+From: Jesse <jsmith@resonatingmedia.com>
+Date: Thu, 27 Jul 2023 00:39:53 -0300
+Subject: [PATCH] Floppym provided patch which causes the halt command to call
+ "shutdown -h -H" instead of "shutdown -h" when halt is invoked without
+ parameters. This forces the shutdown command to set the INIT_HALT variable
+ and assume, unless other conditions apply, that the "halt" call really wants
+ to halt the machine and INIT_HALT should be set. In other words we assume
+ halt wants to halt unless told otherwise. Addresses downstream Gentoo bug ID
+ 911257.
+
+---
+ doc/Changelog | 11 +++++++++++
+ src/halt.c | 4 ++--
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/doc/Changelog b/doc/Changelog
+index c00f6ef..b902756 100644
+--- a/doc/Changelog
++++ b/doc/Changelog
+@@ -1,3 +1,14 @@
++sysvinit (3.08) unreleased; urgency=low
++ * Floppym provided patch which causes the halt command
++ to call "shutdown -h -H" instead of "shutdown -h" when
++ halt is invoked without parameters. This forces the shutdown
++ command to set the INIT_HALT variable and assume, unless other
++ conditions apply, that the "halt" call really wants to halt the
++ machine and INIT_HALT should be set. In other words we
++ assume halt wants to halt unless told otherwise.
++ Addresses downstream Gentoo bug ID 911257.
++
++
+ sysvinit (3.07) released; urgency=low
+ * Fixed killall5 so that processes in the omit list are
+ not sent any signals, including SIGSTOP.
+diff --git a/src/halt.c b/src/halt.c
+index a469147..9bd3a4d 100644
+--- a/src/halt.c
++++ b/src/halt.c
+@@ -162,8 +162,8 @@ void do_shutdown(char *fl, int should_poweroff, char *tm)
+
+ args[i++] = "shutdown";
+ args[i++] = fl;
+- if ( (! strcmp(fl, "-h") ) && (should_poweroff) )
+- args[i++] = "-P";
++ if (! strcmp(fl, "-h"))
++ args[i++] = (should_poweroff ? "-P" : "-H");
+ if (tm) {
+ args[i++] = "-t";
+ args[i++] = tm;
diff --git a/sys-apps/sysvinit/sysvinit-3.07-r1.ebuild b/sys-apps/sysvinit/sysvinit-3.07-r1.ebuild
new file mode 100644
index 000000000000..349a3b1db05e
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-3.07-r1.ebuild
@@ -0,0 +1,190 @@
+# 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 ~hppa ~ia64 ~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 #80220
+ "${FILESDIR}/${PN}-2.86-kexec.patch"
+ # bug #158615
+ "${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
+ # bug 911257
+ "${FILESDIR}/sysvinit-3.07-halt.patch"
+)
+
+src_prepare() {
+ 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
+ rm -rf "${S}"/man/${locale} || die
+
+ sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
+ }
+
+ plocale_for_each_disabled_locale delete_unused_locale
+}
+
+src_compile() {
+ tc-export CC
+
+ append-lfs-flags
+
+ # bug #381311
+ export DISTRO=
+ export VERSION="${PV}"
+
+ use static && append-ldflags -static
+ emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
+
+ if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+ cd man/po || die
+ po4a po4a.cfg || die
+ fi
+}
+
+src_install() {
+ emake -C src install ROOT="${D}"
+ dodoc README doc/*
+
+ insinto /etc
+ doins "${WORKDIR}"/inittab
+
+ newinitd "${FILESDIR}"/bootlogd.initd bootlogd
+ newconfd "${FILESDIR}"/bootlogd.confd bootlogd
+
+ into /
+ dosbin "${FILESDIR}"/halt.sh
+
+ keepdir /etc/inittab.d
+
+ if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+ install_locale_man_pages() {
+ doman -i18n=${1} man/po/${1}/*
+ }
+
+ plocale_for_each_locale install_locale_man_pages
+ fi
+
+ # Dead symlink
+ find "${ED}" -xtype l -delete || die
+
+ find "${ED}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+ # Reload init to fix unmounting problems of / on next reboot.
+ # This is really needed, as without the new version of init cause init
+ # not to quit properly on reboot, and causes a fsck of / on next reboot.
+ if [[ -z ${ROOT} ]] ; then
+ if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
+ ln -s /dev/initctl /run/initctl \
+ || ewarn "Failed to set /run/initctl symlink!"
+ fi
+ # Do not return an error if this fails
+ /sbin/telinit U &>/dev/null
+ fi
+
+ elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
+ elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
+
+ # Required for new bootlogd service
+ if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
+ touch "${EROOT}/var/log/boot"
+ fi
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/
@ 2024-02-26 21:27 Mike Gilbert
0 siblings, 0 replies; 14+ messages in thread
From: Mike Gilbert @ 2024-02-26 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 9df48396fb10edebdf8b37d160fa6325574fe5d5
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 21:26:02 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 21:26:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df48396
sys-apps/sysvinit: drop 3.07, 3.07-r2
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/sysvinit/Manifest | 2 -
sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch | 142 ---------------
.../files/sysvinit-2.94_beta-shutdown-single.patch | 39 ----
sys-apps/sysvinit/files/sysvinit-3.07-halt.patch | 53 ------
sys-apps/sysvinit/sysvinit-3.07-r2.ebuild | 199 ---------------------
sys-apps/sysvinit/sysvinit-3.07.ebuild | 188 -------------------
6 files changed, 623 deletions(-)
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index f3921339ee9d..43552e5147cd 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,4 +1,2 @@
-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-2.86-kexec.patch b/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch
deleted file mode 100644
index 4948806d9eb9..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-halt: add a -k kexec flag
-
---- a/man/halt.8
-+++ b/man/halt.8
-@@ -40,6 +40,7 @@ halt, reboot, poweroff \- stop the system.
- .RB [ \-d ]
- .RB [ \-f ]
- .RB [ \-i ]
-+.RB [ \-k ]
- .br
- .B /sbin/poweroff
- .RB [ \-n ]
-@@ -83,6 +84,8 @@ Put all hard drives on the system in stand-by mode just before halt or power-off
- .IP \fB\-p\fP
- When halting the system, switch off the power. This is the default when halt is
- called as \fBpoweroff\fP.
-+.IP \fB\-k\fP
-+Try to reboot using \fBkexec\fP, if kernel supports it.
- .\"}}}
- .\"{{{ Diagnostics
- .SH DIAGNOSTICS
---- a/src/halt.c
-+++ b/src/halt.c
-@@ -8,7 +8,7 @@
- * execute an "shutdown -r". This is for compatibility with
- * sysvinit 2.4.
- *
-- * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p]
-+ * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p] [-k]
- * -n: don't sync before halting the system
- * -w: only write a wtmp reboot record and exit.
- * -d: don't write a wtmp record.
-@@ -16,6 +16,7 @@
- * -h: put harddisks in standby mode
- * -i: shut down all network interfaces.
- * -p: power down the system (if possible, otherwise halt).
-+ * -k: reboot the system using kexec.
- *
- * Reboot and halt are both this program. Reboot
- * is just a link to halt. Invoking the program
-@@ -74,8 +75,10 @@ extern void write_wtmp(char *user, char *id, int pid, int type, char *line);
- */
- void usage(void)
- {
-- fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s\n",
-- progname, strcmp(progname, "halt") ? "" : " [-p]");
-+ fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s%s\n",
-+ progname,
-+ strcmp(progname, "halt") ? "" : " [-p]",
-+ strcmp(progname, "reboot") ? "" : " [-k]");
- fprintf(stderr, "\t-n: don't sync before halting the system\n");
- fprintf(stderr, "\t-w: only write a wtmp reboot record and exit.\n");
- fprintf(stderr, "\t-d: don't write a wtmp record.\n");
-@@ -84,6 +87,8 @@ void usage(void)
- fprintf(stderr, "\t-i: shut down all network interfaces.\n");
- if (!strcmp(progname, "halt"))
- fprintf(stderr, "\t-p: power down the system (if possible, otherwise halt).\n");
-+ if (!strcmp(progname, "reboot"))
-+ fprintf(stderr, "\t-k: reboot the system using kexec.\n");
- exit(1);
- }
-
-@@ -182,6 +187,7 @@ int main(int argc, char **argv)
- int do_ifdown = 0;
- int do_hddown = 0;
- int do_poweroff = 0;
-+ int do_kexec = 0;
- int c;
- char *tm = NULL;
-
-@@ -201,7 +207,7 @@ int main(int argc, char **argv)
- /*
- * Get flags
- */
-- while((c = getopt(argc, argv, ":ihdfnpwt:")) != EOF) {
-+ while((c = getopt(argc, argv, ":ihdfnpwkt:")) != EOF) {
- switch(c) {
- case 'n':
- do_sync = 0;
-@@ -225,6 +231,9 @@ int main(int argc, char **argv)
- case 'p':
- do_poweroff = 1;
- break;
-+ case 'k':
-+ do_kexec = 1;
-+ break;
- case 't':
- tm = optarg;
- break;
-@@ -242,10 +251,24 @@ int main(int argc, char **argv)
- (void)chdir("/");
-
- if (!do_hard && !do_nothing) {
-+ c = get_runlevel();
-+
-+ /*
-+ * We can't reboot using kexec through this path.
-+ */
-+ if (c != '6' && do_reboot && do_kexec) {
-+ fprintf(stderr, "ERROR: using -k at this"
-+ " runlevel requires also -f\n"
-+ " (You probably want instead to reboot"
-+ " normally and let your reboot\n"
-+ " script, usually /etc/init.d/reboot,"
-+ " specify -k)\n");
-+ exit(1);
-+ }
-+
- /*
- * See if we are in runlevel 0 or 6.
- */
-- c = get_runlevel();
- if (c != '0' && c != '6')
- do_shutdown(do_reboot ? "-r" : "-h", tm);
- }
-@@ -277,6 +300,15 @@ int main(int argc, char **argv)
- if (do_nothing) exit(0);
-
- if (do_reboot) {
-+ /*
-+ * kexec or reboot
-+ */
-+ if (do_kexec)
-+ init_reboot(BMAGIC_KEXEC);
-+
-+ /*
-+ * Fall through if failed
-+ */
- init_reboot(BMAGIC_REBOOT);
- } else {
- /*
---- a/src/reboot.h
-+++ b/src/reboot.h
-@@ -47,5 +47,8 @@
- # define BMAGIC_POWEROFF BMAGIC_HALT
- #endif
-
-+/* for kexec support */
-+#define BMAGIC_KEXEC 0x45584543
-+
- #define init_reboot(magic) reboot(magic)
-
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
deleted file mode 100644
index 9aa85229eee1..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-This patch makes shutdown use the Single User runlevel by default so
-the gettys are shutdown too.
-
-Roy Marples <uberlord@gentoo.org>
-
-Forward-ported from v2.86 to v2.94_beta
-Lars Wendler <polynomial-c@gentoo.org>
-
---- 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/files/sysvinit-3.07-halt.patch b/sys-apps/sysvinit/files/sysvinit-3.07-halt.patch
deleted file mode 100644
index 4e65a912ccde..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-3.07-halt.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/slicer69/sysvinit/pull/18
-https://bugs.gentoo.org/911257
-
-From fca101c2ff428eb765958ae6e3aaa0eb1adc0fdf Mon Sep 17 00:00:00 2001
-From: Jesse <jsmith@resonatingmedia.com>
-Date: Thu, 27 Jul 2023 00:39:53 -0300
-Subject: [PATCH] Floppym provided patch which causes the halt command to call
- "shutdown -h -H" instead of "shutdown -h" when halt is invoked without
- parameters. This forces the shutdown command to set the INIT_HALT variable
- and assume, unless other conditions apply, that the "halt" call really wants
- to halt the machine and INIT_HALT should be set. In other words we assume
- halt wants to halt unless told otherwise. Addresses downstream Gentoo bug ID
- 911257.
-
----
- doc/Changelog | 11 +++++++++++
- src/halt.c | 4 ++--
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/doc/Changelog b/doc/Changelog
-index c00f6ef..b902756 100644
---- a/doc/Changelog
-+++ b/doc/Changelog
-@@ -1,3 +1,14 @@
-+sysvinit (3.08) unreleased; urgency=low
-+ * Floppym provided patch which causes the halt command
-+ to call "shutdown -h -H" instead of "shutdown -h" when
-+ halt is invoked without parameters. This forces the shutdown
-+ command to set the INIT_HALT variable and assume, unless other
-+ conditions apply, that the "halt" call really wants to halt the
-+ machine and INIT_HALT should be set. In other words we
-+ assume halt wants to halt unless told otherwise.
-+ Addresses downstream Gentoo bug ID 911257.
-+
-+
- sysvinit (3.07) released; urgency=low
- * Fixed killall5 so that processes in the omit list are
- not sent any signals, including SIGSTOP.
-diff --git a/src/halt.c b/src/halt.c
-index a469147..9bd3a4d 100644
---- a/src/halt.c
-+++ b/src/halt.c
-@@ -162,8 +162,8 @@ void do_shutdown(char *fl, int should_poweroff, char *tm)
-
- args[i++] = "shutdown";
- args[i++] = fl;
-- if ( (! strcmp(fl, "-h") ) && (should_poweroff) )
-- args[i++] = "-P";
-+ if (! strcmp(fl, "-h"))
-+ args[i++] = (should_poweroff ? "-P" : "-H");
- if (tm) {
- args[i++] = "-t";
- args[i++] = tm;
diff --git a/sys-apps/sysvinit/sysvinit-3.07-r2.ebuild b/sys-apps/sysvinit/sysvinit-3.07-r2.ebuild
deleted file mode 100644
index cba58217087d..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.07-r2.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# 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=/usr/share/openpgp-keys/sysvinit.asc
-inherit toolchain-funcs flag-o-matic plocale verify-sig
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-# https://github.com/slicer69/sysvinit/issues/12
-#SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-#SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
-SRC_URI="https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz.sig )"
-S="${WORKDIR}/${P/_*}"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} != *beta* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-IUSE="selinux ibm nls static"
-
-COMMON_DEPEND="
- 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 #80220
- "${FILESDIR}/${PN}-2.86-kexec.patch"
- # bug #158615
- "${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
- # bug 911257
- "${FILESDIR}/sysvinit-3.07-halt.patch"
-)
-
-src_prepare() {
- 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
- rm -rf "${S}"/man/${locale} || die
-
- sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
- }
-
- plocale_for_each_disabled_locale delete_unused_locale
-}
-
-src_compile() {
- tc-export CC
-
- append-lfs-flags
-
- # bug #381311
- export DISTRO=
- export VERSION="${PV}"
-
- use static && append-ldflags -static
- emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-
- if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
- cd man/po || die
- po4a po4a.cfg || die
- fi
-}
-
-src_install() {
- emake -C src install ROOT="${D}"
- dodoc README doc/*
-
- insinto /etc
- doins "${WORKDIR}"/inittab
-
- newinitd "${FILESDIR}"/bootlogd.initd bootlogd
- newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-
- into /
- dosbin "${FILESDIR}"/halt.sh
-
- keepdir /etc/inittab.d
-
- if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
- install_locale_man_pages() {
- doman -i18n=${1} man/po/${1}/*
- }
-
- plocale_for_each_locale install_locale_man_pages
- fi
-
- # Dead symlink
- find "${ED}" -xtype l -delete || die
-
- find "${ED}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
- # Reload init to fix unmounting problems of / on next reboot.
- # This is really needed, as without the new version of init cause init
- # not to quit properly on reboot, and causes a fsck of / on next reboot.
- if [[ -z ${ROOT} ]] ; then
- if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
- ln -s /dev/initctl /run/initctl \
- || ewarn "Failed to set /run/initctl symlink!"
- fi
- # Do not return an error if this fails
- /sbin/telinit U &>/dev/null
- fi
-
- elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
- elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
- # Required for new bootlogd service
- if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
- touch "${EROOT}/var/log/boot"
- fi
-
- 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
-}
diff --git a/sys-apps/sysvinit/sysvinit-3.07.ebuild b/sys-apps/sysvinit/sysvinit-3.07.ebuild
deleted file mode 100644
index 0d8ffacb778a..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.07.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# 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=/usr/share/openpgp-keys/sysvinit.asc
-inherit toolchain-funcs flag-o-matic plocale verify-sig
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-# https://github.com/slicer69/sysvinit/issues/12
-#SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-#SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
-SRC_URI="https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz.sig )"
-S="${WORKDIR}/${P/_*}"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} != *beta* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-IUSE="selinux ibm nls static"
-
-COMMON_DEPEND="
- 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 #80220
- "${FILESDIR}/${PN}-2.86-kexec.patch"
- # bug #158615
- "${FILESDIR}/${PN}-2.94_beta-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
- rm -rf "${S}"/man/${locale} || die
-
- sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
- }
-
- plocale_for_each_disabled_locale delete_unused_locale
-}
-
-src_compile() {
- tc-export CC
-
- append-lfs-flags
-
- # bug #381311
- export DISTRO=
- export VERSION="${PV}"
-
- use static && append-ldflags -static
- emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-
- if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
- cd man/po || die
- po4a po4a.cfg || die
- fi
-}
-
-src_install() {
- emake -C src install ROOT="${D}"
- dodoc README doc/*
-
- insinto /etc
- doins "${WORKDIR}"/inittab
-
- newinitd "${FILESDIR}"/bootlogd.initd bootlogd
- newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-
- into /
- dosbin "${FILESDIR}"/halt.sh
-
- keepdir /etc/inittab.d
-
- if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
- install_locale_man_pages() {
- doman -i18n=${1} man/po/${1}/*
- }
-
- plocale_for_each_locale install_locale_man_pages
- fi
-
- # Dead symlink
- find "${ED}" -xtype l -delete || die
-
- find "${ED}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
- # Reload init to fix unmounting problems of / on next reboot.
- # This is really needed, as without the new version of init cause init
- # not to quit properly on reboot, and causes a fsck of / on next reboot.
- if [[ -z ${ROOT} ]] ; then
- if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
- ln -s /dev/initctl /run/initctl \
- || ewarn "Failed to set /run/initctl symlink!"
- fi
- # Do not return an error if this fails
- /sbin/telinit U &>/dev/null
- fi
-
- elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
- elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
- # Required for new bootlogd service
- if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
- touch "${EROOT}/var/log/boot"
- fi
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-02-26 21:27 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-28 0:53 [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/, sys-apps/sysvinit/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2024-02-26 21:27 Mike Gilbert
2023-07-27 13:50 Mike Gilbert
2022-10-28 19:53 Sam James
2022-08-24 3:16 Sam James
2022-04-13 22:54 Sam James
2022-04-13 1:58 Sam James
2021-05-24 11:36 David Seifert
2021-02-22 7:56 Lars Wendler
2021-02-22 7:56 Lars Wendler
2019-08-17 18:38 William Hubbs
2019-05-26 16:08 Lars Wendler
2016-03-07 19:05 Mike Frysinger
2016-02-03 15:13 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox