Bug #246502, adding l0s and l6r ready for openrc-0.4.0.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64

4 files changed, 166 insertions, 3 deletions

diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog
index 873c10b1ae77..0387bc84a545 100644
--- a/sys-apps/sysvinit/ChangeLog
+++ b/sys-apps/sysvinit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/sysvinit
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.60 2007/12/24 16:39:33 ranger Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.61 2008/12/05 23:51:11 robbat2 Exp $
+
+*sysvinit-2.86-r11 (05 Dec 2008)
+
+  05 Dec 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/inittab-2.86-r11, +sysvinit-2.86-r11.ebuild:
+  Bug #246502, adding l0s and l6r ready for openrc-0.4.0.
 
   24 Dec 2007; Brent Baude <ranger@gentoo.org> sysvinit-2.86-r10.ebuild:
   Marking sysvinit-2.86-r10 ppc64 for bug 202790
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 5e146c1914b1..54c65fb370f5 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -4,6 +4,7 @@ AUX 2.86-selinux.patch 6525 RMD160 b50310333e3c7da300daadddee6135471b0a07ee SHA1
 AUX change_console.8 657 RMD160 03a46941d92dd280d92252f83f58273353c0b7bb SHA1 243fa45d631a167314b49dfc8c5a14607e44999f SHA256 918dba79243a84a3c6dfd967e44c0d7375d49cfbe0452806a981c534b6022990
 AUX change_console.c 929 RMD160 168c97e47c6dae4f378b4ae13040156fad2a75db SHA1 5fb2a3ca5faaf15ee8c9f97a169771f15fd4500c SHA256 1e61b16274dee6f27ae69db13aff9230195feb6719f650dad027520503ea69b4
 AUX inittab 1645 RMD160 d0e2122734b8a9574519012a9a970aefd8cb2de1 SHA1 d6e3071cf30e30238c30f18179107df61e620829 SHA256 5471f187bbfc56ad2d5b4d9a49edb5c77e627f3290a591d49f783a10cdd48e66
+AUX inittab-2.86-r11 1922 RMD160 f6338b5c9cc20d266c5c35a22f0e88b387f046c3 SHA1 02ecc554e2fc6e6c819c0ee70e63d2c7c5265610 SHA256 24a56af8a1414c4de04e4b10d1187010109484a4a2f73226ed25251f0e76cafa
 AUX reboot.sh 304 RMD160 bbc92c46217361abfa9ca6842e206e818959886b SHA1 2515f89492a9d225abfdd9f99fb674a8dbb66629 SHA256 967fa572014ac6dd69f5e7e24d5250abad9c20c644563b927b295778608cafef
 AUX shutdown.sh 385 RMD160 5038d76195793b9996429f216fe9d4cd597b7725 SHA1 074471c08e01bfaa32bff4e6745795cf35794bef SHA256 2cc84a5194a949f16a82c6215459f4bf6d8156e50d8d9130d310f085bb208d4c
 AUX sysvinit-2.86-POSIX-1003.1e.patch 1358 RMD160 a4e22a9c6c13373c0196aeb7c274e05bc0ea552f SHA1 878078b0b3c7a5090d19588085d91ba6bf749d8d SHA256 73729ddfae95826bf6f3e7f1bf0da53c8647d24126fb7a307020f5a5fa8bff04
@@ -18,7 +19,8 @@ AUX sysvinit-2.86-utmp-smp.patch 1546 RMD160 96907658206fb6594ad7cf379cb6d716df0
 DIST sysvinit-2.86-kexec.patch 4139 RMD160 5f8e9ccd3a39701cf47a1a541c78a4be971d46fc SHA1 5dc952d6b1585c926a67f11eeee835e56aeea5b0 SHA256 936245ef3060939bec3099efc006009336b3672422c1de41983b277ab5ddac47
 DIST sysvinit-2.86.tar.gz 99009 RMD160 46587ab51390b5c8cd3179a3690f86efdbe9b4b9 SHA1 3e78df609a2ff0fea6304cb662a7f10298d03667 SHA256 035f98fae17d9cff002993c564ccc83dc4ed136127172caeff872b6abdb679d8
 EBUILD sysvinit-2.86-r10.ebuild 2988 RMD160 195322b20d7cc3a1e6013611339de5b8ab5d051b SHA1 70d73bf765c3343fe8801c2d32a7ec73674fde43 SHA256 1f59adbcace2e2562322bcdc624d9417dcf1302b4af31727a9e82f0f0a943246
+EBUILD sysvinit-2.86-r11.ebuild 3167 RMD160 a64c8c587739552c1c9a23560e20f479565d485f SHA1 536743d97ab466e49c339e816936eeb266ec5dcb SHA256 bfd4da4ae5b1bafedc8ef419c6880bfdd8754a35c643d3edc0ddfdd4f902d810
 EBUILD sysvinit-2.86-r8.ebuild 3383 RMD160 b704af8f8e52ee34d810c9ad73c1246cf07e88ad SHA1 3cecfc5962f11f174f3dfc109b61935df55c3698 SHA256 dbacac340330f12e8f5c1c85172805f4732d8165f6921e2038b943b11f52759a
 EBUILD sysvinit-2.86-r9.ebuild 3561 RMD160 0dba148e169224aabd9757d235b36a64313d312d SHA1 d9d23c373d884d3c1287fdad7b23b2cc3f139b37 SHA256 20ef0f387757a529b2a51f5cf3815b5c53114016a02e3b5907c2dd5a92620b09
-MISC ChangeLog 8793 RMD160 7c4b6a540773eb593ecdf88c4987cf05cddceac6 SHA1 dd53bfa70579b380e54e1150051c262f33892a37 SHA256 3a7fef070d4b4f5fa23081d4460ba078f0654b2159fbf77713f3b70fd71f2ccc
+MISC ChangeLog 8994 RMD160 bb81066850203a8e4177f588a0aca773f483ee32 SHA1 e6bf57fda5fa62c4bbdd80641b0dc02d844dd14d SHA256 63a9cb943d1017344de070744f0943da099c723dc29025995858353b4a4b5204
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-apps/sysvinit/files/inittab-2.86-r11 b/sys-apps/sysvinit/files/inittab-2.86-r11
new file mode 100644
index 000000000000..1be1624fdc10
--- /dev/null
+++ b/sys-apps/sysvinit/files/inittab-2.86-r11
@@ -0,0 +1,59 @@
+#
+# /etc/inittab:  This file describes how the INIT process should set up
+#                the system in a certain run-level.
+#
+# Author:  Miquel van Smoorenburg, <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>
+#
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.86-r11,v 1.1 2008/12/05 23:51:13 robbat2 Exp $
+
+# Default runlevel.
+id:3:initdefault:
+
+# System initialization, mount local filesystems, etc.
+si::sysinit:/sbin/rc sysinit
+
+# Further system initialization, brings up the boot runlevel.
+rc::bootwait:/sbin/rc boot
+
+l0:0:wait:/sbin/rc shutdown 
+l0s:0:wait:/sbin/halt -dhip
+l1:S1:wait:/sbin/rc single
+l2:2:wait:/sbin/rc nonetwork
+l3:3:wait:/sbin/rc default
+l4:4:wait:/sbin/rc default
+l5:5:wait:/sbin/rc default
+l6:6:wait:/sbin/rc reboot
+l6r:6:wait:/sbin/reboot -dk
+#z6:6:respawn:/sbin/sulogin
+
+# Do not uncomment yet. Pending bug 246502
+#BL2#s0:S:wait:/sbin/rc single
+#BL2#s1:S:wait:/sbin/sulogin
+
+# TERMINALS
+c1:12345:respawn:/sbin/agetty 38400 tty1 linux
+c2:2345:respawn:/sbin/agetty 38400 tty2 linux
+c3:2345:respawn:/sbin/agetty 38400 tty3 linux
+c4:2345:respawn:/sbin/agetty 38400 tty4 linux
+c5:2345:respawn:/sbin/agetty 38400 tty5 linux
+c6:2345:respawn:/sbin/agetty 38400 tty6 linux
+
+# SERIAL CONSOLES
+#s0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100
+#s1:12345:respawn:/sbin/agetty 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.86-r11.ebuild b/sys-apps/sysvinit/sysvinit-2.86-r11.ebuild
new file mode 100644
index 000000000000..e41ce18b6adf
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.86-r11.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86-r11.ebuild,v 1.1 2008/12/05 23:51:11 robbat2 Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="/sbin/init - parent of all processes"
+HOMEPAGE="http://freshmeat.net/projects/sysvinit/"
+SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/${P}.tar.gz
+	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/${P}.tar.gz
+	http://www.gc-linux.org/down/isobel/kexec/sysvinit/sysvinit-2.86-kexec.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux ibm static kernel_FreeBSD"
+
+RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 )"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	cp "${FILESDIR}"/change_console.{c,8} src/ || die
+	epatch "${FILESDIR}"/${P}-docs.patch
+	epatch "${FILESDIR}"/${P}-shutdown-usage.patch
+	epatch "${FILESDIR}"/${P}-off-by-one.patch
+	epatch "${DISTDIR}"/${P}-kexec.patch
+	epatch "${FILESDIR}"/${P}-execl.patch
+	epatch "${FILESDIR}"/${P}-utmp-64bit.patch
+	epatch "${FILESDIR}"/${P}-shutdown-single.patch
+	epatch "${FILESDIR}"/${P}-utmp-smp.patch
+	epatch "${FILESDIR}"/${P}-build.patch
+	use selinux && epatch "${FILESDIR}"/${PV}-selinux-1.patch
+
+	# Mung inittab for specific architectures
+	cd "${WORKDIR}"
+	cp "${FILESDIR}"/inittab-2.86-r11 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 hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100'
+	use s390 && insert='s0:12345:respawn:/sbin/agetty 38400 console'
+	if use ibm ; then
+		insert="${insert}#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n'
+		insert="${insert}#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
+	[[ -n ${insert} ]] && echo "# Architecture specific features"$'\n'"${insert}" >> inittab
+	
+	# Ready for baselayout2/openrc-0.4.0, commented pending bug 246502
+	#has_version =sys-apps/baselayout-2* && sed -i -e '/^#BL2#/s,^#BL2#,,g' inittab
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	emake -C src \
+		CC="$(tc-getCC)" \
+		all change_console \
+		|| die
+}
+
+src_install() {
+	emake -C src \
+		install \
+		ROOT="${D}" \
+		|| die "make install"
+	dodoc README doc/*
+
+	into /
+	dosbin src/change_console || die
+	doman src/change_console.8
+
+	insinto /etc
+	doins "${WORKDIR}"/inittab || die "inittab"
+
+	doinitd "${FILESDIR}"/{reboot,shutdown}.sh || 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
+}