Respect env CPPFLAGS, and always build with LFS flags #368781 by Malte Starostik.

Package-Manager: portage-2.2.0_alpha33/cvs/Linux x86_64

3 files changed, 102 insertions, 3 deletions

diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog
index d63f181465b4..15691430a96d 100644
--- a/sys-apps/sysvinit/ChangeLog
+++ b/sys-apps/sysvinit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/sysvinit
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.91 2010/10/31 17:24:42 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.92 2011/05/31 13:11:46 vapier Exp $
+
+*sysvinit-2.88-r2 (31 May 2011)
+
+  31 May 2011; Mike Frysinger <vapier@gentoo.org> +sysvinit-2.88-r2.ebuild:
+  Respect env CPPFLAGS, and always build with LFS flags #368781 by Malte
+  Starostik.
 
   31 Oct 2010; Raúl Porcel <armin76@gentoo.org> sysvinit-2.88-r1.ebuild:
   sparc stable wrt #337828
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 4375060c179a..6d76854b8457 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX inittab-2.87 1890 RMD160 ee4dcba9b3c3541905950f1cd5deb74163aab784 SHA1 03af334e70d50511b2de5d25278d3f1673d2e8ee SHA256 fff7016910c9e2aa29e2c4ed76f371723196e3122a4f9f744274f4993ea1a733
 AUX reboot.sh 304 RMD160 bbc92c46217361abfa9ca6842e206e818959886b SHA1 2515f89492a9d225abfdd9f99fb674a8dbb66629 SHA256 967fa572014ac6dd69f5e7e24d5250abad9c20c644563b927b295778608cafef
 AUX shutdown.sh 385 RMD160 5038d76195793b9996429f216fe9d4cd597b7725 SHA1 074471c08e01bfaa32bff4e6745795cf35794bef SHA256 2cc84a5194a949f16a82c6215459f4bf6d8156e50d8d9130d310f085bb208d4c
@@ -10,6 +13,14 @@ DIST sysvinit-2.88dsf.tar.bz2 105551 RMD160 8109e9b90caff544be4a3b37c808baf16914
 DIST sysvinit_2.87dsf.orig.tar.gz 106102 RMD160 69d4bc75ee55a23f650f7bfc7beb5b0433f4df35 SHA1 1939658db6fbb178ea20d4eb6300e668a6636ae3 SHA256 41b7c77942ec22916b36394d623de40c5cc5b058a6994af5ddeec08b284c4765
 EBUILD sysvinit-2.87-r3.ebuild 2729 RMD160 0a496b1915f2dd4d6bb952e2fc9f8727b1034945 SHA1 fe0eac47289dd45385fba3c5df60cef9167bebd7 SHA256 0d24f5177bc5bc4add0dd817070258e3c0af0f46312a3d7156718c3eca3c00eb
 EBUILD sysvinit-2.88-r1.ebuild 2510 RMD160 92c599dd2a6ad592b16fb670afe4b9f7f863ec26 SHA1 a5200cbd953a447333b94c8fc4f57cbbcefc1624 SHA256 62d5487c1d007cb52cd226894098f349edbc4c98cda5ca02ab85eda63cd100ce
+EBUILD sysvinit-2.88-r2.ebuild 2577 RMD160 42ab43e9ef358ef28fddf8831b47109ee1eb09bf SHA1 4d2b60f4d662e1655207c483887eb91da0e3bb73 SHA256 1772dab4449093255426542cf71b3b90d1ce923455980090370a1973a749693e
 EBUILD sysvinit-2.88.ebuild 2468 RMD160 78bbdc2143aeb6797469e4c15e9318f24bb38e85 SHA1 5793263eb935d4e57ee10764fb4a284b6cc7498b SHA256 dd4fefeedecd8719ea04e32a79f9cf6668ad3acf6959813fe7d221cdcd99da9a
-MISC ChangeLog 13603 RMD160 d6ea50fa3ea19fb444dc240e3d4ec4e3741a8a80 SHA1 5e16120acef4a0d3ec864df73d4e0e5c27b175f7 SHA256 2927e427baa118d0751f2eeb0b0ca2aa1858eb9b67e61d32f7ce55d416c0b753
+MISC ChangeLog 13798 RMD160 a4a12f8fc314ca56ab81bbc704ffcddf5beccb5f SHA1 83f2e51240f02681325d678d535fa0a153c6e260 SHA256 1e48ab5aa8b5e73f18c9343f15ecec9971dfcc3c82847db2b9a111086bd08292
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk3k6RkACgkQaC/OocHi7Jak9QD9FCIVhQTWbvJNK8K/90PN9TgP
+IKaFaJE7gpbaVICRgIYA/R2hVTUt+7jVM8vCjgOn75gGMk7DqJp6gaX81IwED7xM
+=n09q
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r2.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r2.ebuild
new file mode 100644
index 000000000000..4884c2942df0
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.88-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r2.ebuild,v 1.1 2011/05/31 13:11:46 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="/sbin/init - parent of all processes"
+HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit"
+SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~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"
+
+S=${WORKDIR}/${P}dsf
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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
+	sed -i '/^CPPFLAGS =$/d' src/Makefile
+
+	# Mung inittab for specific architectures
+	cd "${WORKDIR}"
+	cp "${FILESDIR}"/inittab-2.87 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
+}
+
+src_compile() {
+	local myconf
+
+	tc-export CC
+	append-lfs-flags
+	use static && append-ldflags -static
+	use selinux && myconf=WITH_SELINUX=yes
+	emake -C src ${myconf} || die
+}
+
+src_install() {
+	emake -C src install ROOT="${D}" || die
+	dodoc README doc/*
+
+	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
+}