From 5bc3fbba29f2a242645ddc0e5b9ffe56dc40e22d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 28 Oct 2005 02:14:27 +0000 Subject: Fix display bug in starting some processes #110420 by Kir Kolyshkin. Package-Manager: portage-2.0.53_rc6 --- sys-apps/sysvinit/ChangeLog | 8 ++- sys-apps/sysvinit/Manifest | 29 ++++---- sys-apps/sysvinit/files/digest-sysvinit-2.86-r2 | 2 + .../sysvinit/files/sysvinit-2.86-off-by-one.patch | 16 +++++ sys-apps/sysvinit/sysvinit-2.86-r2.ebuild | 79 ++++++++++++++++++++++ 5 files changed, 120 insertions(+), 14 deletions(-) create mode 100644 sys-apps/sysvinit/files/digest-sysvinit-2.86-r2 create mode 100644 sys-apps/sysvinit/files/sysvinit-2.86-off-by-one.patch create mode 100644 sys-apps/sysvinit/sysvinit-2.86-r2.ebuild (limited to 'sys-apps') diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog index 73e3bd273d2d..38e0fb83d2cf 100644 --- a/sys-apps/sysvinit/ChangeLog +++ b/sys-apps/sysvinit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/sysvinit # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.22 2005/10/04 14:47:44 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.23 2005/10/28 02:14:27 vapier Exp $ + +*sysvinit-2.86-r2 (28 Oct 2005) + + 28 Oct 2005; Mike Frysinger + +files/sysvinit-2.86-off-by-one.patch, +sysvinit-2.86-r2.ebuild: + Fix display bug in starting some processes #110420 by Kir Kolyshkin. 04 Oct 2005; Martin Schlemmer files/inittab: Update inittab to bind agetty at least to tty1 for single mode. Noted by diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index 846b6efc47ee..47a5327614a4 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -1,24 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 cb1165247fe26db95505195995ecac1b sysvinit-2.86.ebuild 2501 -MD5 4bb35af95759582d45324cdf3bc237b7 sysvinit-2.85-r1.ebuild 2545 -MD5 520060e528e8b35b8d90afedaef657be ChangeLog 3205 -MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 322fc86dcd9b6307f84415f6a7db0772 sysvinit-2.86-r1.ebuild 2513 -MD5 89c112138ee2f33829ad80c3dcc18328 files/digest-sysvinit-2.86-r1 132 -MD5 b956965acd5408afa0a3937001b2d55e files/sysvinit-2.86-docs.patch 1899 -MD5 89c112138ee2f33829ad80c3dcc18328 files/digest-sysvinit-2.86 132 -MD5 180a4654bbd070b1264a440c753e6cc0 files/sysvinit-2.86-shutdown-usage.patch 235 +MD5 b4f735ef2277945fcde23360c630cae2 ChangeLog 3427 MD5 5f94105e0b503a39fda5fb65d885e16c files/2.86-gentoo.patch 641 -MD5 0e94e6657416b0d48d13abf86297f2e4 files/inittab 1667 MD5 3ba9251f1f4f0ae0dd30d682b28183dd files/2.86-selinux.patch 6525 MD5 38c0059ecfaa1b09e59a75cc2780aa94 files/digest-sysvinit-2.85-r1 64 +MD5 89c112138ee2f33829ad80c3dcc18328 files/digest-sysvinit-2.86 132 +MD5 89c112138ee2f33829ad80c3dcc18328 files/digest-sysvinit-2.86-r1 132 +MD5 89c112138ee2f33829ad80c3dcc18328 files/digest-sysvinit-2.86-r2 132 +MD5 0e94e6657416b0d48d13abf86297f2e4 files/inittab 1667 MD5 3c171d9c843284ce606663e4e6da26e9 files/sysvinit-2.85-selinux.patch 6448 +MD5 b956965acd5408afa0a3937001b2d55e files/sysvinit-2.86-docs.patch 1899 +MD5 701137886382265cf08d69a20fb89627 files/sysvinit-2.86-off-by-one.patch 310 +MD5 180a4654bbd070b1264a440c753e6cc0 files/sysvinit-2.86-shutdown-usage.patch 235 +MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 4bb35af95759582d45324cdf3bc237b7 sysvinit-2.85-r1.ebuild 2545 +MD5 322fc86dcd9b6307f84415f6a7db0772 sysvinit-2.86-r1.ebuild 2513 +MD5 118099df7250dd6cff1b76c5e755240e sysvinit-2.86-r2.ebuild 2566 +MD5 cb1165247fe26db95505195995ecac1b sysvinit-2.86.ebuild 2501 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDQpae1ZcsMnZjRyIRAqBuAJ9rFLKQrbJUKh9YPLXzECPO2G+65wCgm+mo -srV/kYjkMDXfPTrxoAdG2a8= -=2/6T +iD8DBQFDYYmSgIKl8Uu19MoRAnvvAJ973uRdxDi6hO4TsdXLeSal20zfcQCfYxzS +7+/7dJzk7tr5zj6UZAGp4ss= +=U99a -----END PGP SIGNATURE----- diff --git a/sys-apps/sysvinit/files/digest-sysvinit-2.86-r2 b/sys-apps/sysvinit/files/digest-sysvinit-2.86-r2 new file mode 100644 index 000000000000..36e59eb1e93b --- /dev/null +++ b/sys-apps/sysvinit/files/digest-sysvinit-2.86-r2 @@ -0,0 +1,2 @@ +MD5 7d5d61c026122ab791ac04c8a84db967 sysvinit-2.86.tar.gz 99009 +MD5 650af823f937d386e81520b1741d4d45 sysvinit-2.86-kexec.patch 4139 diff --git a/sys-apps/sysvinit/files/sysvinit-2.86-off-by-one.patch b/sys-apps/sysvinit/files/sysvinit-2.86-off-by-one.patch new file mode 100644 index 000000000000..8447e280cbf4 --- /dev/null +++ b/sys-apps/sysvinit/files/sysvinit-2.86-off-by-one.patch @@ -0,0 +1,16 @@ +Fix bug where proc names are truncated + +http://bugzilla.openvz.org/60 +http://bugs.gentoo.org/110420 + +--- src/init.c ++++ src/init.c +@@ -466,7 +466,7 @@ + + if (maxproclen > 2) { + memset(argv0, 0, maxproclen); +- strncpy(argv0, buf, maxproclen - 2); ++ strncpy(argv0, buf, maxproclen - 1); + } + + return len; diff --git a/sys-apps/sysvinit/sysvinit-2.86-r2.ebuild b/sys-apps/sysvinit/sysvinit-2.86-r2.ebuild new file mode 100644 index 000000000000..f7d79c73cde6 --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.86-r2.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86-r2.ebuild,v 1.1 2005/10/28 02:14:27 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" +IUSE="selinux bootstrap build ibm static" + +RDEPEND="selinux? ( >=sys-libs/libselinux-1.18 sys-libs/libsepol )" +DEPEND="${RDEPEND} + virtual/os-headers" + +src_unpack() { + unpack ${P}.tar.gz + cd "${S}" + 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 + cd src + epatch "${FILESDIR}"/${PV}-gentoo.patch + use selinux && epatch "${FILESDIR}"/${PV}-selinux.patch + cp "${FILESDIR}"/inittab "${WORKDIR}"/ || die "cp inittab" + + if use ibm ; then + cat <<-EOF >> "${WORKDIR}"/inittab + #HVC / HVSI CONSOLE + #hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0 + #hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0 + EOF + fi +} + +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" \ + || die +} + +src_install() { + dodoc README doc/* + + cd src + make install DISTRO="Gentoo" ROOT="${D}" || die "make install" + + insinto /etc + doins "${WORKDIR}"/inittab || die "inittab" +} + +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} == / ]] && ! use build && ! use bootstrap; then + # Do not return an error if this fails + /sbin/init U &>/dev/null + fi +} -- cgit v1.2.3-65-gdbad