mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sys-apps/sysvinit: Removed old.
Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
Lars Wendler
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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. */
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
@@ -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."
|
||||
}
|
||||
@@ -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."
|
||||
}
|
||||
Reference in New Issue
Block a user