From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CB73A1381FA for ; Sun, 18 May 2014 17:38:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47ACAE0B41; Sun, 18 May 2014 17:38:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB4EAE0B41 for ; Sun, 18 May 2014 17:38:21 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3B163401F6 for ; Sun, 18 May 2014 17:38:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 5AC501818D for ; Sun, 18 May 2014 17:38:19 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1400434573.bccd3a4285c19191b175a32d12f144552f008b78.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:musl commit in: sys-apps/sysvinit/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: sys-apps/sysvinit/sysvinit-2.88-r99.ebuild sys-apps/sysvinit/sysvinit-2.88-r999.ebuild X-VCS-Directories: sys-apps/sysvinit/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: bccd3a4285c19191b175a32d12f144552f008b78 X-VCS-Branch: musl Date: Sun, 18 May 2014 17:38:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0c34ee23-4030-402d-826c-fb0b104570fd X-Archives-Hash: b02da9a9f665a6e4a176fd988e0b13a1 commit: bccd3a4285c19191b175a32d12f144552f008b78 Author: Anthony G. Basile gentoo org> AuthorDate: Sun May 18 17:36:06 2014 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sun May 18 17:36:13 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=bccd3a42 sys-apps/sysvinit: sync up with 2.88-r7 This removes the build/instation of last/lastb which are now provided by util-linux- 2.24.1. --- ...it-2.88-r99.ebuild => sysvinit-2.88-r999.ebuild} | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/sys-apps/sysvinit/sysvinit-2.88-r99.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r999.ebuild similarity index 80% rename from sys-apps/sysvinit/sysvinit-2.88-r99.ebuild rename to sys-apps/sysvinit/sysvinit-2.88-r999.ebuild index 6dc91fd..f443b6e 100644 --- a/sys-apps/sysvinit/sysvinit-2.88-r99.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.88-r999.ebuild @@ -30,10 +30,16 @@ src_prepare() { epatch "${FILESDIR}"/${P}-musl.patch sed -i '/^CPPFLAGS =$/d' src/Makefile || die - # mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux + # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux sed -i -r \ - -e '/^(USR)?S?BIN/s:\<(mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ - -e '/^MAN[18]/s:\<(mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ + -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:\::g' \ src/Makefile || die # Mung inittab for specific architectures @@ -42,8 +48,9 @@ src_prepare() { 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' ) + use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) if use ibm ; then insert+=( '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' @@ -86,6 +93,9 @@ src_install() { insinto /etc doins "${WORKDIR}"/inittab + # dead symlink + rm -f "${D}"/usr/bin/lastb + doinitd "${FILESDIR}"/{reboot,shutdown}.sh } @@ -98,5 +108,6 @@ pkg_postinst() { /sbin/telinit U &>/dev/null fi - elog "The mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to sys-apps/util-linux." + 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." }