Move /etc/init.d/{reboot,shutdown}.sh to this package and disable the POSIX caps...

Package-Manager: portage-2.1.2_rc3

diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog
index 686116aac915b69221cfdfa3eb8551622b0deae4..a61ddb4b00ca23132512dfa5788c26111a925c3e 100644 (file)
--- a/sys-apps/sysvinit/ChangeLog
+++ b/sys-apps/sysvinit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/sysvinit
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.33 2006/09/10 19:23:03 christel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.34 2006/12/09 08:13:34 vapier Exp $
+
+*sysvinit-2.86-r6 (09 Dec 2006)
+
+  09 Dec 2006; Mike Frysinger <vapier@gentoo.org> +files/reboot.sh,
+  +files/shutdown.sh, +sysvinit-2.86-r6.ebuild:
+  Move /etc/init.d/{reboot,shutdown}.sh to this package and disable the POSIX
+  caps patch for now #147572.
 
   10 Sep 2006; Christel Dahlskjaer <christel@gentoo.org>
   sysvinit-2.86-r5.ebuild:

diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 4f30bb7cc8b548f5d8bc7b1d8b7dcf66c8a69140..4df4bc46db95e2cb8b1e56a90a52b4ccabe8829f 100644 (file)
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.86-gentoo.patch 641 RMD160 9e3f9ace9e58c3352f536649491a8a5b3f89e512 SHA1 d5bd112a171285768f5618e530cab5d22f7b6f55 SHA256 6edd083b1b09b75f76b75fc299e2ddab7344a0df8f212e3cd86f27c44caa8c01
 MD5 5f94105e0b503a39fda5fb65d885e16c files/2.86-gentoo.patch 641
 RMD160 9e3f9ace9e58c3352f536649491a8a5b3f89e512 files/2.86-gentoo.patch 641
@@ -22,6 +25,14 @@ AUX inittab 1645 RMD160 d0e2122734b8a9574519012a9a970aefd8cb2de1 SHA1 d6e3071cf3
 MD5 1a4d6956c283308cfefa26c0f7c44c4c files/inittab 1645
 RMD160 d0e2122734b8a9574519012a9a970aefd8cb2de1 files/inittab 1645
 SHA256 5471f187bbfc56ad2d5b4d9a49edb5c77e627f3290a591d49f783a10cdd48e66 files/inittab 1645
+AUX reboot.sh 293 RMD160 6d8abcf12238dc29a456f3182ed191d151f0be77 SHA1 555f203d916be5e95f95fe5c9d83e97b7a397aba SHA256 54c5782af0aec743f32d558649bb93b98c695226b1c1567630d85602ee978245
+MD5 f668a2cf2b73a29757015f23e406d87b files/reboot.sh 293
+RMD160 6d8abcf12238dc29a456f3182ed191d151f0be77 files/reboot.sh 293
+SHA256 54c5782af0aec743f32d558649bb93b98c695226b1c1567630d85602ee978245 files/reboot.sh 293
+AUX shutdown.sh 387 RMD160 7b321fbc976aa99ac46e81b3b8e994fab69497d7 SHA1 44c0d9ed38137527b1b22e170b6741ba65930803 SHA256 4c11826df5a72dd4bf37bec76cd74302bb89d306c411fbcadbba56f51983b8eb
+MD5 02ab06def8d740a38d62319a3e0fdd86 files/shutdown.sh 387
+RMD160 7b321fbc976aa99ac46e81b3b8e994fab69497d7 files/shutdown.sh 387
+SHA256 4c11826df5a72dd4bf37bec76cd74302bb89d306c411fbcadbba56f51983b8eb files/shutdown.sh 387
 AUX sysvinit-2.86-POSIX-1003.1e.patch 1358 RMD160 a4e22a9c6c13373c0196aeb7c274e05bc0ea552f SHA1 878078b0b3c7a5090d19588085d91ba6bf749d8d SHA256 73729ddfae95826bf6f3e7f1bf0da53c8647d24126fb7a307020f5a5fa8bff04
 MD5 a20a459c789828c7b994e6ec93ed223a files/sysvinit-2.86-POSIX-1003.1e.patch 1358
 RMD160 a4e22a9c6c13373c0196aeb7c274e05bc0ea552f files/sysvinit-2.86-POSIX-1003.1e.patch 1358
@@ -48,32 +59,32 @@ RMD160 9ba2959e6375bee10e00ba9be9cd22d5e0103007 files/sysvinit-2.86-utmp-64bit.p
 SHA256 2126f4c0e1512b133da8d629691b5dc52c730e188b5790cb4e3c681e3912e03e files/sysvinit-2.86-utmp-64bit.patch 1112
 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-r3.ebuild 3059 RMD160 d6cdc920a013ee00d2e1c6421be3c41a5dd62b0f SHA1 9c0b89f852a10a2c1fbb87ee8c30d08dc6efcd16 SHA256 f280b6c24d7b707ee5bbb98edda38624062a24041fe8eae82bc554d3d69cf418
-MD5 f6a11b79bc4c15813b73475f28fd4fff sysvinit-2.86-r3.ebuild 3059
-RMD160 d6cdc920a013ee00d2e1c6421be3c41a5dd62b0f sysvinit-2.86-r3.ebuild 3059
-SHA256 f280b6c24d7b707ee5bbb98edda38624062a24041fe8eae82bc554d3d69cf418 sysvinit-2.86-r3.ebuild 3059
-EBUILD sysvinit-2.86-r4.ebuild 3058 RMD160 65b16cf294047851d2020ea4482fda0a090b76eb SHA1 c6301003104baf765542040217d5c57577b640e1 SHA256 72fa061978aca2c82ecb39fe2313509d992a2a3f940fad425b58b660e45e0925
-MD5 817bb2297c121340e21d45faee8a7c2e sysvinit-2.86-r4.ebuild 3058
-RMD160 65b16cf294047851d2020ea4482fda0a090b76eb sysvinit-2.86-r4.ebuild 3058
-SHA256 72fa061978aca2c82ecb39fe2313509d992a2a3f940fad425b58b660e45e0925 sysvinit-2.86-r4.ebuild 3058
 EBUILD sysvinit-2.86-r5.ebuild 3134 RMD160 7a1c10615a3389303b38c67f37d8fae06a980f3b SHA1 439651e2ba94368e1617af2032ec311de095f7f0 SHA256 ed54554500a1257234eec159a09537faa19452e8e527c9af3f39e3e9fa893d93
 MD5 ecc43caf01b1bcf6eb315db2d173b9b2 sysvinit-2.86-r5.ebuild 3134
 RMD160 7a1c10615a3389303b38c67f37d8fae06a980f3b sysvinit-2.86-r5.ebuild 3134
 SHA256 ed54554500a1257234eec159a09537faa19452e8e527c9af3f39e3e9fa893d93 sysvinit-2.86-r5.ebuild 3134
-MISC ChangeLog 4891 RMD160 e5d27c60b14e32cb57e697fa721f7d363135ae2e SHA1 0c7103c73c4de041fc8b0e767eaf824ce8f22d15 SHA256 c5b515b4c8cdb92f72e8ed2de2cfbe183fbea050d3b2ff74674b5cfd47d34d53
-MD5 e5afc5d1b8ce49a1e28a6e02ab7e34a6 ChangeLog 4891
-RMD160 e5d27c60b14e32cb57e697fa721f7d363135ae2e ChangeLog 4891
-SHA256 c5b515b4c8cdb92f72e8ed2de2cfbe183fbea050d3b2ff74674b5cfd47d34d53 ChangeLog 4891
+EBUILD sysvinit-2.86-r6.ebuild 3212 RMD160 024ae4ccc0ecac7cb78d4c342cdaedf301da5ba8 SHA1 6a2e0a6dcd7acdcd8a87c28200fe926df75d1032 SHA256 4ebb01348633df1939f63b425d7e18c7a460223b75f88f3c3016c6da296e380d
+MD5 01cfa21cc79426ef4af60bbded9dbe4b sysvinit-2.86-r6.ebuild 3212
+RMD160 024ae4ccc0ecac7cb78d4c342cdaedf301da5ba8 sysvinit-2.86-r6.ebuild 3212
+SHA256 4ebb01348633df1939f63b425d7e18c7a460223b75f88f3c3016c6da296e380d sysvinit-2.86-r6.ebuild 3212
+MISC ChangeLog 5147 RMD160 cc8068551b4e927ca7a623e988a1f4939c44667f SHA1 229fdaedf0f8397b86405d5296580ff2c132f427 SHA256 9ad3d2109e0e06c02ddca2f869e00b8003af8ef8c8336df766ef2fc3401d3033
+MD5 7f1ae2e5052a35a7797cc6c6d59c260d ChangeLog 5147
+RMD160 cc8068551b4e927ca7a623e988a1f4939c44667f ChangeLog 5147
+SHA256 9ad3d2109e0e06c02ddca2f869e00b8003af8ef8c8336df766ef2fc3401d3033 ChangeLog 5147
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 a0a89857120e374f52bb610074e602f7 files/digest-sysvinit-2.86-r3 488
-RMD160 586ea36bc8586bf1f30e9a51715e6ab520a798ac files/digest-sysvinit-2.86-r3 488
-SHA256 b2bb79f2cb614dae61f284fc74c63b65f0434e0f8e66212ccb698577d671f62d files/digest-sysvinit-2.86-r3 488
-MD5 a0a89857120e374f52bb610074e602f7 files/digest-sysvinit-2.86-r4 488
-RMD160 586ea36bc8586bf1f30e9a51715e6ab520a798ac files/digest-sysvinit-2.86-r4 488
-SHA256 b2bb79f2cb614dae61f284fc74c63b65f0434e0f8e66212ccb698577d671f62d files/digest-sysvinit-2.86-r4 488
 MD5 a0a89857120e374f52bb610074e602f7 files/digest-sysvinit-2.86-r5 488
 RMD160 586ea36bc8586bf1f30e9a51715e6ab520a798ac files/digest-sysvinit-2.86-r5 488
 SHA256 b2bb79f2cb614dae61f284fc74c63b65f0434e0f8e66212ccb698577d671f62d files/digest-sysvinit-2.86-r5 488
+MD5 a0a89857120e374f52bb610074e602f7 files/digest-sysvinit-2.86-r6 488
+RMD160 586ea36bc8586bf1f30e9a51715e6ab520a798ac files/digest-sysvinit-2.86-r6 488
+SHA256 b2bb79f2cb614dae61f284fc74c63b65f0434e0f8e66212ccb698577d671f62d files/digest-sysvinit-2.86-r6 488
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFenBXamhnQswr0vIRAtL7AKCqpIZwd8vGIsG5ZyDKEqV1wCTYyACeM04g
+Q8bntAJhGFlFKs4rffEeK/8=
+=3AXR
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/sysvinit/files/digest-sysvinit-2.86-r6 b/sys-apps/sysvinit/files/digest-sysvinit-2.86-r6
new file mode 100644 (file)
index 0000000..7fc9a56
--- /dev/null
+++ b/sys-apps/sysvinit/files/digest-sysvinit-2.86-r6
@@ -0,0 +1,6 @@
+MD5 650af823f937d386e81520b1741d4d45 sysvinit-2.86-kexec.patch 4139
+RMD160 5f8e9ccd3a39701cf47a1a541c78a4be971d46fc sysvinit-2.86-kexec.patch 4139
+SHA256 936245ef3060939bec3099efc006009336b3672422c1de41983b277ab5ddac47 sysvinit-2.86-kexec.patch 4139
+MD5 7d5d61c026122ab791ac04c8a84db967 sysvinit-2.86.tar.gz 99009
+RMD160 46587ab51390b5c8cd3179a3690f86efdbe9b4b9 sysvinit-2.86.tar.gz 99009
+SHA256 035f98fae17d9cff002993c564ccc83dc4ed136127172caeff872b6abdb679d8 sysvinit-2.86.tar.gz 99009

diff --git a/sys-apps/sysvinit/files/reboot.sh b/sys-apps/sysvinit/files/reboot.sh
new file mode 100755 (executable)
index 0000000..aeade86
--- /dev/null
+++ b/sys-apps/sysvinit/files/reboot.sh
@@ -0,0 +1,11 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+opts="-dpk"
+[[ ${RC_DOWN_INTERFACE} == "yes" ]] && opts="${opts}i"
+
+/sbin/reboot "${opts}"
+
+# hmm, if the above failed, that's kind of odd ...
+# so let's force a reboot
+/sbin/reboot -f

diff --git a/sys-apps/sysvinit/files/shutdown.sh b/sys-apps/sysvinit/files/shutdown.sh
new file mode 100755 (executable)
index 0000000..4197d38
--- /dev/null
+++ b/sys-apps/sysvinit/files/shutdown.sh
@@ -0,0 +1,13 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+opts="-d"
+[[ ${INIT_HALT} != "HALT" ]] && opts="${opts}p"
+[[ ${RC_DOWN_INTERFACE} == "yes" ]] && opts="${opts}i"
+[[ ${RC_DOWN_HARDDISK} == "yes" ]] && opts="${opts}h"
+
+/sbin/halt "${opts}"
+
+# hmm, if the above failed, that's kind of odd ...
+# so let's force a halt
+/sbin/halt -f

diff --git a/sys-apps/sysvinit/sysvinit-2.86-r6.ebuild b/sys-apps/sysvinit/sysvinit-2.86-r6.ebuild
new file mode 100644 (file)
index 0000000..7e3ec00
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.86-r6.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86-r6.ebuild,v 1.1 2006/12/09 08:13:34 vapier 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"
+KEYWORDS="-*"
+IUSE="selinux ibm static"
+
+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}"/sysvinit-2.86-off-by-one.patch
+       epatch "${DISTDIR}"/sysvinit-2.86-kexec.patch
+       #epatch "${FILESDIR}"/sysvinit-2.86-POSIX-1003.1e.patch #5818
+       epatch "${FILESDIR}"/sysvinit-2.86-execl.patch
+       epatch "${FILESDIR}"/sysvinit-2.86-utmp-64bit.patch
+       cd src
+       epatch "${FILESDIR}"/${PV}-gentoo.patch
+       use selinux && epatch "${FILESDIR}"/${PV}-selinux-1.patch
+
+       # Mung inittab for specific architectures
+       cd "${WORKDIR}"
+       cp "${FILESDIR}"/inittab . || die "cp inittab"
+       local insert=""
+       if use ibm ; then
+               insert="#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n'
+               insert="${insert}#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0"
+       fi
+       use arm && insert='#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100'
+       use hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100'
+       (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
+       [[ -n ${insert} ]] && echo "# Architecture specific features"$'\n'"${insert}" >> inittab
+}
+
+src_compile() {
+       use static && append-ldflags -static
+
+       # Note: The LCRYPT define below overrides the test in
+       # sysvinit's Makefile.  This is because sulogin must be linked
+       # to libcrypt in any case, but when building stage2 in
+       # catalyst, /usr/lib/libcrypt.a isn't available.  In truth
+       # this doesn't change how sulogin is built since ld would use
+       # the shared obj by default anyway!  The other option is to
+       # refrain from building sulogin, but that isn't a good option.
+       # (09 Jul 2004 agriffis)
+       emake -C src \
+               CC="$(tc-getCC)" \
+               DISTRO="Gentoo" \
+               LCRYPT="-lcrypt" \
+               all change_console \
+               || die
+}
+
+src_install() {
+       dodoc README doc/*
+
+       cd src
+       make install DISTRO="Gentoo" ROOT="${D}" || die "make install"
+
+       into /
+       dosbin change_console || die
+       doman 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
+}