version bump for bug #522786

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)

5 files changed, 170 insertions, 1 deletions

diff --git a/sys-process/runit/ChangeLog b/sys-process/runit/ChangeLog
index 5bf96f8c85e9..007eb5626d95 100644
--- a/sys-process/runit/ChangeLog
+++ b/sys-process/runit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/runit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/ChangeLog,v 1.48 2014/04/10 19:18:50 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/ChangeLog,v 1.49 2014/11/13 19:07:30 williamh Exp $
+
+*runit-2.1.2 (13 Nov 2014)
+
+  13 Nov 2014; William Hubbs <williamh@gentoo.org> +runit-2.1.2.ebuild,
+  +files/2-2.1.2, +files/3-2.1.2, +files/run.getty-2.1.2:
+  version bump for bug #522786
 
   10 Apr 2014; William Hubbs <williamh@gentoo.org> -files/3-1.4, files/3,
   runit-2.1.1-r1.ebuild:
diff --git a/sys-process/runit/files/2-2.1.2 b/sys-process/runit/files/2-2.1.2
new file mode 100644
index 000000000000..5d503709e220
--- /dev/null
+++ b/sys-process/runit/files/2-2.1.2
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+PATH=/command:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin
+
+exec env - PATH=$PATH \
+runsvdir /etc/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
diff --git a/sys-process/runit/files/3-2.1.2 b/sys-process/runit/files/3-2.1.2
new file mode 100644
index 000000000000..3dd5a486c19d
--- /dev/null
+++ b/sys-process/runit/files/3-2.1.2
@@ -0,0 +1,14 @@
+#!/bin/sh
+exec >/dev/console 2>&1
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+echo 'Waiting for getties to stop...'
+sv -w 10 force-shutdown /etc/service/getty-*
+
+echo 'Waiting for services to stop...'
+sv -w 300 force-shutdown /etc/service/*
+
+echo 'Shutdown...'
+test -x /etc/runit/reboot && LAST=6    || LAST=0
+test -x /etc/runit/reboot && RC=reboot || RC=shutdown
+RUNLEVEL=$LAST /sbin/rc $RC
diff --git a/sys-process/runit/files/run.getty-2.1.2 b/sys-process/runit/files/run.getty-2.1.2
new file mode 100644
index 000000000000..33b2e7853275
--- /dev/null
+++ b/sys-process/runit/files/run.getty-2.1.2
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/chpst -P /sbin/agetty 38400 TTY linux
diff --git a/sys-process/runit/runit-2.1.2.ebuild b/sys-process/runit/runit-2.1.2.ebuild
new file mode 100644
index 000000000000..d394b79541a2
--- /dev/null
+++ b/sys-process/runit/runit-2.1.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-2.1.2.ebuild,v 1.1 2014/11/13 19:07:30 williamh Exp $
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic versionator
+
+DESCRIPTION="A UNIX init scheme with service supervision"
+HOMEPAGE="http://smarden.org/runit/"
+SRC_URI="http://smarden.org/runit/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static"
+
+S=${WORKDIR}/admin/${P}/src
+
+src_prepare() {
+	# we either build everything or nothing static
+	sed -i -e 's:-static: :' Makefile
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_install() {
+	into /
+	dobin $(<../package/commands)
+	dodir /sbin
+	mv "${ED}"/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
+	dosym ../etc/runit/2 /sbin/runsvdir-start
+	into /usr
+
+	cd ..
+	dodoc package/{CHANGES,README,THANKS,TODO}
+	dohtml doc/*.html
+	doman man/*.[18]
+
+dodir /etc/runit
+	exeinto /etc/runit
+	doexe "${FILESDIR}"/{1,ctrlaltdel}
+	newexe "${FILESDIR}"/2-${PV} 2
+	newexe "${FILESDIR}"/3-${PV} 3
+
+	dodir /etc/sv
+	for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
+		exeinto /etc/sv/getty-$tty/
+		newexe "${FILESDIR}"/finish.getty finish
+		newexe "${FILESDIR}"/run.getty-${PV} run
+		for script in finish run; do
+			sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/sv/getty-$tty/$script
+		done
+	done
+
+	# make sv command work
+	cat <<-EOF > "${T}"/env.d
+		#/etc/env.d/20runit
+		SVDIR="/etc/service/"
+	EOF
+	insinto /etc/env.d
+	newins "${T}"/env.d 20runit
+}
+
+pkg_preinst() {
+	if has_version 'sys-process/runit' &&
+		has_version '<sys-process/runit-2.1.2' &&
+		[ -d "${EROOT}"etc/runit/runsvdir/all ]; then
+		if [ -e "${EROOT}"etc/sv ]; then
+			mv -f "${EROOT}"etc/sv "${EROOT}"etc/sv.bak || die
+			ewarn "${EROOT}etc/sv was moved to ${EROOT}etc/sv.bak"
+		fi
+		mv "${EROOT}"etc/runit/runsvdir/all "${EROOT}"etc/sv|| die
+		ln -sf "${EROOT}"etc/sv "${EROOT}"etc/runit/runsvdir/all || die
+		cp -a "${EROOT}"etc/runit/runsvdir "${T}" || die
+		touch "${T}"/make_var_service || die
+	fi
+}
+
+default_config() {
+	local sv="${EROOT}"etc/sv
+	local service="${EROOT}"etc/service
+	mkdir -p "${service}" || die
+	for x in tty1 tty2 tty3 tty4 tty5 tty6; do
+	ln -sf "${sv}"/getty-$x "${service}"/getty-$x || die
+	done
+	einfo "The links to services runit will supervise are installed"
+	einfo "in $service."
+	einfo "If you need multiple runlevels, please see the documentation"
+	einfo "for how to set them up."
+	einfo
+}
+
+migrate_from_211() {
+	# Create /etc/service and /var/service if requested
+	if [ -e "${T}"/make_var_service ]; then
+		ln -sf "${EROOT}"etc/runit/runsvdir/current "${EROOT}"etc/service || die
+		ln -sf "${EROOT}"etc/runit/runsvdir/current "${EROOT}"var/service || die
+	fi
+	if [ -d "${T}"/runsvdir ]; then
+		cp -a "${T}"/runsvdir "${EROOT}"etc/runit || die
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		default_config
+	elif [ ! version_is_at_least 2.1.2 $REPLACING_VERSIONS ]; then
+		migrate_from_211
+	fi
+
+	ewarn "To make sure sv works correctly in your currently open"
+	ewarn "shells, please run the following command:"
+	ewarn
+	ewarn "source /etc/profile"
+	ewarn
+
+	if [ -L "${EROOT}"var/service ]; then
+		ewarn "Once this version of runit is active, please remove the"
+		ewarn "compatibility symbolic link at ${EROOT}var/service"
+		ewarn "The correct path now is ${EROOT}etc/service"
+		ewarn
+	fi
+
+	if [ -L "${EROOT}"etc/runit/runsvdir/all ]; then
+		ewarn "${EROOT}etc/runit/runsvdir/all has moved to"
+		iewarn "${EROOT}etc/sv."
+		ewarn "Any symbolic links under ${EROOT}etc/runit/runsvdir"
+		ewarn "which point to services through ../all should be updated to"
+		ewarn "point to them through ${EROOT}etc/sv."
+		ewarn "Once that is done, ${EROOT}etc/runit/runsvdir/all should be"
+		ewarn "removed."
+		ewarn
+	fi
+}