Move last and lastb from sysvinit to util-linux wrt #491742 by Alexander Tsoy

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 127 insertions, 15 deletions

diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog
index bf0a3adba136..67c4e7d61db8 100644
--- a/sys-apps/sysvinit/ChangeLog
+++ b/sys-apps/sysvinit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/sysvinit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.132 2014/01/21 01:19:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.133 2014/02/15 06:27:22 ssuominen Exp $
+
+*sysvinit-2.88-r7 (15 Feb 2014)
+
+  15 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> +sysvinit-2.88-r7.ebuild:
+  Move last and lastb from sysvinit to util-linux wrt #491742 by Alexander Tsoy
 
   21 Jan 2014; Mike Frysinger <vapier@gentoo.org> sysvinit-2.88-r4.ebuild,
   sysvinit-2.88-r5.ebuild, sysvinit-2.88-r6.ebuild:
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 3c1085223226..4a4f8dde4210 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -13,22 +13,17 @@ DIST sysvinit-2.88dsf.tar.bz2 105551 SHA256 60bbc8c1e1792056e23761d22960b30bb13e
 EBUILD sysvinit-2.88-r4.ebuild 3009 SHA256 170569ba30cdedccc8d75c587c1922527ab35cb0e9e6ebf72522096f9476816f SHA512 efffa976c915ea477774ca9fb145f02a8e2d6ca4848b0bbd538e195bce0a99121f1f08dd9d277fe2e2cd74fa871eb327f42cb04bd29e5bd186b511bbd9304c3c WHIRLPOOL 227ad29e809dbde1374c59533847d997b79c7f735c2082e9d7040ea07b2bc0784362b6ee118597edb833b63933b466221cc337b373ffbe5eb0ed4d5f68a7d68d
 EBUILD sysvinit-2.88-r5.ebuild 3171 SHA256 21fddb3a34d4e482c03b60bbe4c7e34fe62fe4f764f46e5cea589da11386d62c SHA512 c0517e8695ac112b477315e88542614e181fa2b7292b28a01cf9a1057f12940d461219638212c320aef662fd8d06dbc78bfc7c21c8746c2fafdca0ba2a20343b WHIRLPOOL f43fac3615412fec25c4c834144dba08b2fb79174acfee48795cc8666c5eb4ffdfabbbea99ee9f4ac58ab76103d71784799a177e7550c23bc87ffe4b90b339de
 EBUILD sysvinit-2.88-r6.ebuild 3360 SHA256 fd9ce1ddd6680ef888aeb7cf22c01c808fbcdc223d1829f091718ee3e021f5c9 SHA512 c9504aaf8c2801eaa586c57c24147c7e4149a7c77f468a794b09e4b41d52fcb059cb40e31688172ee8996af2924054002273c9e0872365111eea8a8c11d9a8c5 WHIRLPOOL 92350d245c0998befd4081aba61e7f5d69e62af264155d44a80a3596f6214c1acd2cfce809345fe398a01ca0b5f194d5b7f940743126862f14a039ac52796ce6
-MISC ChangeLog 19384 SHA256 304b16100d12963c1f3b9896d7ce9f9f8c8785ca044a08f6fa0a54936b8192ee SHA512 93bdffd3328746ce68f0ca779ecbba8313f270c80150a1f748791a13fc3434262d573a7ced56236009166c9f81d5936f1c598491bdb87cec8ed2ce3d95ed586c WHIRLPOOL b12d52d12ec1053c12d99eb9cbd85068799ef38e33b736bc4842004f65eeec69f0afae66a0cfee73e47fb122719844a927e71d4988fb04c4d7acf782588233fe
+EBUILD sysvinit-2.88-r7.ebuild 3452 SHA256 28d3cca1d8cd7e1d88d3a1f5095ae5f4e2cb08e40fed6767df5d142661fbfa89 SHA512 bf93480e2f05a4d2b43482d7cdee2b00f68b530d76b35f7deca52dcb194dd4c6b927bbf8915a2206e538fe43beb94b66ca0af228de99fde8c78e04d2dc2789e9 WHIRLPOOL ca931978013309c5e05afbfcd019726b1ad1b02ec2cd744fe63567f9be195418b5999b872b487f3591f66a99e3af152cc96c56e58e0a8da7d062dd31254a625c
+MISC ChangeLog 19581 SHA256 7a71f2a542c6a5a4efa4d5d59965bbe711535f7470357da0da8b1b2705ba80ed SHA512 0f8ff1f0cbee416696437705aa289d9132e92f96fb03f651144ef6a606ba49d804d369697b2c783f7f33eb2317028746ede358af93c47b01a4fcd7c0efefa01c WHIRLPOOL bb51a195fdde7c243122f8cc424d398c047327ddf2d5de5b631c44540cb52887b8de6524548118ff820d98bdcb34d6a80a66cc76b979a6cd6e2095cbaddf168f
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS3cs1AAoJEPGu1DbS6WIAq+MP/3iHv+lxCgNXSQKXC1l46fwp
-UxZD3dirYMuN/3/nN5rc5d4x0RgUDZFRKIJKLdAV9j+sc+xVS5YkreVQy+RIUHVc
-T8rP/69jobQpLk2tPKiqYK5vhReTQsG6IEI9sI7DuL896/nCJK3u43cgOnp/yf09
-ggOMx2+GpNi1K2t5ujKCOeViXd9X8mbJ7fss2zFT8zvgnDpKegswGeuUU/P9XL3q
-GDRb96Z9gvAcH0ywnAISLdX6hTD7C5zsjIag/XXVYeQJvUvb0wGdPUViWQZNTyWC
-gWZ1orEpRwUbrmUVfvxLYlhHYOTDAIn56LFnjvHFIIw45UpcN9ZkhLXTHgkp15DF
-zRrGn5aBfYEOsv2WeYSQO+qKpp6MCWkiRtFktGsutm6V4SkpgEFYXeuB54/SyUYC
-mIWFnnzabFFqo4NV2RQ7oFnNJ3n3bpnOurWL/dCUgtcvY2OMy+C7T1oFtnHGMAQy
-ilCyvoYUHEfU9FrqlWixB/iQkh72Ke1+xFjm1wl1PtgbUC/rPMjr98uGemRUr93m
-LOQcc9QeCWl0j2pz5Zej9j77zR86/a5k32HGy1jRpXD4toaQSpNgAlS7LFnhmtJV
-s3aIMlU2EXAViul+qMoSxgJZ+iarjLOcaUO8vmkZMk/Hu/zTbc3/VhcoBYl2s42P
-cDUEpF+CMo8t+OnhHPqb
-=TOyQ
+iQEcBAEBCAAGBQJS/whsAAoJEEdUh39IaPFN9+cH/12pSs5i6RIDwLqpRThk+F/E
+FFUxWMkyOF8PPiVWkViKlIsLx8vI+iQl3sP9dJLOEYwsd1Pc7UNbgrUCmgANm/DH
+xiIf2/L2EK1UwJsFPbQl7MPDTExhWX3T9ax068zfCv69Y36XEAZGJ78LBo/7wQUi
+nKdzSmkDdzARBssqVJ6eu/CO9L2h4RJGeq/kE4q2Pys0sfb5msY4H+SiOUutu47g
+Q/tTW7xAghkNUpxTNYXMJ/q4EIgKAn/m78brvclgMk1NNk03OBoRac0MrQumc/aw
+VMf9MitPe1M4Mvk9eLX5efeUtzJ8qZIY8FtFYcN1lUP4V5ZHvEIcglQ4z1w2EuE=
+=hwmP
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r7.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r7.ebuild
new file mode 100644
index 000000000000..24dd4946022e
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.88-r7.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r7.ebuild,v 1.1 2014/02/15 06:27:22 ssuominen Exp $
+
+EAPI="4"
+
+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 ~arm64 ~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_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
+	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.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 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 -f "${D}"/usr/bin/lastb
+
+	doinitd "${FILESDIR}"/{reboot,shutdown}.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
+		# 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-apps/procps."
+}