From: Roy Marples Date: Tue, 13 Mar 2007 21:19:39 +0000 (+0000) Subject: Bump for non bash scripts. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3f17d45790c898de05378772ed6e8e4f403e5ee4;p=gentoo.git Bump for non bash scripts. Package-Manager: portage-2.1.2.2 --- diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog index 946cdfa0ea5f..7e97b7f1f09a 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.46 2007/03/13 14:12:38 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.47 2007/03/13 21:19:39 uberlord Exp $ + +*sysvinit-2.86-r8 (13 Mar 2007) + + 13 Mar 2007; Roy Marples files/reboot.sh, + files/shutdown.sh, +sysvinit-2.86-r8.ebuild: + Bump for non bash scripts. 13 Mar 2007; Raúl Porcel sysvinit-2.86-r7.ebuild: x86 stable diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index ac74c406d182..69fec7a84af6 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -22,14 +22,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 reboot.sh 300 RMD160 6a2cd08daa813502c0a2ce3d4065bd08c13c0261 SHA1 aa1700eb02046b4ffa0f6b030fe83c6ba0374f8f SHA256 aed9f9e94124753cd728041ceb0b4206549004e40c24594b381c96d2cc3153c4 +MD5 db3262587e5d38f23d1e8ebab792ab30 files/reboot.sh 300 +RMD160 6a2cd08daa813502c0a2ce3d4065bd08c13c0261 files/reboot.sh 300 +SHA256 aed9f9e94124753cd728041ceb0b4206549004e40c24594b381c96d2cc3153c4 files/reboot.sh 300 +AUX shutdown.sh 385 RMD160 5038d76195793b9996429f216fe9d4cd597b7725 SHA1 074471c08e01bfaa32bff4e6745795cf35794bef SHA256 2cc84a5194a949f16a82c6215459f4bf6d8156e50d8d9130d310f085bb208d4c +MD5 6f3b1e4382c8395cfb6b475730e6ac71 files/shutdown.sh 385 +RMD160 5038d76195793b9996429f216fe9d4cd597b7725 files/shutdown.sh 385 +SHA256 2cc84a5194a949f16a82c6215459f4bf6d8156e50d8d9130d310f085bb208d4c files/shutdown.sh 385 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 @@ -72,10 +72,14 @@ EBUILD sysvinit-2.86-r7.ebuild 3313 RMD160 049d9aa8e2ddaeeb8485dc407313dc9409c68 MD5 341626459d61647af330a57c401170b3 sysvinit-2.86-r7.ebuild 3313 RMD160 049d9aa8e2ddaeeb8485dc407313dc9409c683a7 sysvinit-2.86-r7.ebuild 3313 SHA256 f2165fd15214afc724ea0c1ee13c018d13f341663e82c1c548677b8733e0beb5 sysvinit-2.86-r7.ebuild 3313 -MISC ChangeLog 6739 RMD160 23a2ad64e4fee07c38fba720e8760618c90ae2a5 SHA1 6b02bc9263b69e062eb80f343854a4f55fc4035c SHA256 3042bee67754be23f9653d8208452dc873f165596bcfe307e9e32d449c672e6f -MD5 7f9b5dec1776e54e82da30d90a3e5c7b ChangeLog 6739 -RMD160 23a2ad64e4fee07c38fba720e8760618c90ae2a5 ChangeLog 6739 -SHA256 3042bee67754be23f9653d8208452dc873f165596bcfe307e9e32d449c672e6f ChangeLog 6739 +EBUILD sysvinit-2.86-r8.ebuild 3314 RMD160 d7dbbdf555df86f8b785e9ac154585f937792046 SHA1 6f1635a9c88b58f4de174a06c90a16a304edd9c5 SHA256 32cc60af3d75cc29b43732604ddaed6b5daf65785e676194ea14f258d88b8f65 +MD5 6204da976f1716bbdbd9cc75788b6beb sysvinit-2.86-r8.ebuild 3314 +RMD160 d7dbbdf555df86f8b785e9ac154585f937792046 sysvinit-2.86-r8.ebuild 3314 +SHA256 32cc60af3d75cc29b43732604ddaed6b5daf65785e676194ea14f258d88b8f65 sysvinit-2.86-r8.ebuild 3314 +MISC ChangeLog 6916 RMD160 aea55172bb81e552c70af8bb1d60f068fe2724b3 SHA1 014e5a440767405d30074de03ea6ed9373460872 SHA256 05e050bbf7416360140117d1d7f7141bc74d572bd9896d258ef7f188ae7f68f9 +MD5 42d12aa6d24877e22a61b6f085608381 ChangeLog 6916 +RMD160 aea55172bb81e552c70af8bb1d60f068fe2724b3 ChangeLog 6916 +SHA256 05e050bbf7416360140117d1d7f7141bc74d572bd9896d258ef7f188ae7f68f9 ChangeLog 6916 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -89,3 +93,6 @@ SHA256 b2bb79f2cb614dae61f284fc74c63b65f0434e0f8e66212ccb698577d671f62d files/di MD5 a0a89857120e374f52bb610074e602f7 files/digest-sysvinit-2.86-r7 488 RMD160 586ea36bc8586bf1f30e9a51715e6ab520a798ac files/digest-sysvinit-2.86-r7 488 SHA256 b2bb79f2cb614dae61f284fc74c63b65f0434e0f8e66212ccb698577d671f62d files/digest-sysvinit-2.86-r7 488 +MD5 a0a89857120e374f52bb610074e602f7 files/digest-sysvinit-2.86-r8 488 +RMD160 586ea36bc8586bf1f30e9a51715e6ab520a798ac files/digest-sysvinit-2.86-r8 488 +SHA256 b2bb79f2cb614dae61f284fc74c63b65f0434e0f8e66212ccb698577d671f62d files/digest-sysvinit-2.86-r8 488 diff --git a/sys-apps/sysvinit/files/digest-sysvinit-2.86-r8 b/sys-apps/sysvinit/files/digest-sysvinit-2.86-r8 new file mode 100644 index 000000000000..7fc9a567296b --- /dev/null +++ b/sys-apps/sysvinit/files/digest-sysvinit-2.86-r8 @@ -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 index aeade86dfab9..4557adc971fa 100755 --- a/sys-apps/sysvinit/files/reboot.sh +++ b/sys-apps/sysvinit/files/reboot.sh @@ -2,10 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 opts="-dpk" -[[ ${RC_DOWN_INTERFACE} == "yes" ]] && opts="${opts}i" +[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i" -/sbin/reboot "${opts}" +/sbin/reboot "${opts}" 2>/dev/null # hmm, if the above failed, that's kind of odd ... -# so let's force a reboot +# unless it's busybox /sbin/reboot -f diff --git a/sys-apps/sysvinit/files/shutdown.sh b/sys-apps/sysvinit/files/shutdown.sh index 4197d387e8dc..502ef5273cd6 100755 --- a/sys-apps/sysvinit/files/shutdown.sh +++ b/sys-apps/sysvinit/files/shutdown.sh @@ -2,9 +2,9 @@ # 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" +[ "${INIT_HALT}" != "HALT" ] && opts="${opts}p" +[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i" +[ "${RC_DOWN_HARDDISK}" = "yes" ] && opts="${opts}h" /sbin/halt "${opts}" diff --git a/sys-apps/sysvinit/sysvinit-2.86-r8.ebuild b/sys-apps/sysvinit/sysvinit-2.86-r8.ebuild new file mode 100644 index 000000000000..8d9e2e1c7c47 --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.86-r8.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86-r8.ebuild,v 1.1 2007/03/13 21:19:39 uberlord 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" + +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 + epatch "${FILESDIR}/${P}"-shutdown-single.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 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 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 +}