From 5d29b7e5d2cd87a292a6e16d1b99bd674fd0a644 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Thu, 13 Nov 2014 19:07:40 +0000 Subject: [PATCH] version bump for bug #522786 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x30C46538 --- sys-process/runit/ChangeLog | 8 +- sys-process/runit/Manifest | 15 ++- sys-process/runit/files/2-2.1.2 | 6 + sys-process/runit/files/3-2.1.2 | 14 +++ sys-process/runit/files/run.getty-2.1.2 | 2 + sys-process/runit/runit-2.1.2.ebuild | 141 ++++++++++++++++++++++++ 6 files changed, 180 insertions(+), 6 deletions(-) create mode 100644 sys-process/runit/files/2-2.1.2 create mode 100644 sys-process/runit/files/3-2.1.2 create mode 100644 sys-process/runit/files/run.getty-2.1.2 create mode 100644 sys-process/runit/runit-2.1.2.ebuild 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 +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 -files/3-1.4, files/3, runit-2.1.1-r1.ebuild: diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest index 613b1a02c2bc..12e0ab979642 100644 --- a/sys-process/runit/Manifest +++ b/sys-process/runit/Manifest @@ -3,18 +3,23 @@ Hash: SHA256 AUX 1 175 SHA256 fd9520369851473556c038b55679dcb1eb1265d1220e8c3cf4aac2dfae4e6594 SHA512 04fa0e61c3db9f85cafea61c77c11da79d6d7a261425874e610821c92ea74d2d79a7ff7c47dacf830faaa007d9d9c7048ade0c19470f7a8fd1c8f80964cdf9d1 WHIRLPOOL f0213863f70305cc0bbde8c99cd7c9ba698863b9f20cdefdca2d9b53e126fcbe2fb095a3c16e7a4920a3254ec8419cbf03a89f57249fdb4afc72d85f797c4889 AUX 2 551 SHA256 d0cb35c4ecdd5ef9179af22f24cb371eb8f1082ec1af7850237842bd49ccba0f SHA512 0176a59c84e135df2f92546567bbc3b0ad5709734da7cd435bf117c2e4c359098584a7e30c89b7c0fa0fa796c49bbe3f59d52ebd6a510e71004e9415ca4bd89e WHIRLPOOL 93cca0ab872980e1956e177fe638cd712b808f022662869959ef42fc1ea69d32ebd61364658ddcff6617615f6863d3a99dc805ab7077e0b8604159b8ed3b32fd +AUX 2-2.1.2 551 SHA256 c04edfd1dfb0feacca6837dcc06896e00149b72920940817a2bed750b1bf5ff5 SHA512 0745a113d8713d1a8609a3380d45fc113c835571f90c72ae25cb5a24ce496e709666f6a1767370fa6ba937696f62ee753b78d9c71f47255965f960b4ec9817ec WHIRLPOOL 78bd96be41be9f47d14628d831f699ace42f5fb6d5978f4729f6c8622fa4b7ee591b55482e7709754c1402348acbdbebccb0b96d41099e13b59c2ad313f2171b AUX 3 372 SHA256 56b835cb329e71d14523038cd382ad92f77317a2c1bb75e9414bf468fa57f03b SHA512 8511045da385878f2ecc238b68d0c4317b5ac677028393b6ace7d575e0a1bceaf1e6ce639db01501461bcaa7521a5856a4e9a65097babf9a653a4747bddcd553 WHIRLPOOL 5daf16b59a23386103549167b27266225e1e54355d3e7973f7a275439b2eaf295619a3cf8d978125814eb916821edbf44a7d843e5d0d7237f6de0b3870007d4f +AUX 3-2.1.2 384 SHA256 7b5780349fa8db43b220909c03b66c3e25010d3749e261bda59522cd863edf75 SHA512 f16bf2c0d0fb8e0c31c12a2e478c0b4a747eaff7cc0c3cc3531cf3e0afe0141168d5d9cc419e2ca82b6411a726e1d20d3cb5661ba662533fcc6c31bbd1353687 WHIRLPOOL f85de8fc14ea683a56dde9a4ecf3b26f709f266f78a13e1f78bd1f3380c265cfdd080e6619b531d39e6459d98dc94649c78985657a39fa86467605b4ff6519d6 AUX ctrlaltdel 189 SHA256 84eff8b4bd83ebded1689404f5da22a442e82e7f9d5d8df61a1a3032f80b503c SHA512 a0980e1dbcd2c591997e62e3e1b8ab660c36f007d12f6dd3eb6607d286c0056eb96c40b997b2c9569a7e3a6bf9a2a39d8050c31aa09a9c0ba6eb931183049b1b WHIRLPOOL 8e477312206adbc89f00e6df5acc37542dbf300558b58bd580a80f7da868924096583a706ae495b0266b9ed66516e1fa4886a27f91dbbd3afdee885560ca5fdc AUX finish.getty 30 SHA256 6c5db3570b4abbc2547ee7923c18879912f197b52883abb08586f529cccd5aa5 SHA512 122a4ab21dbd5e6b77e0225bda48f813ec680c85767fdc917933bd1a88d854b6714809ebd63d0fa6b81c25c5e0a9de224aa920565e8d197556e7d99c5836681d WHIRLPOOL 531628897da4a74a84bd75730a2812eb7338b88bfadb988479705bab02b550c72a7863e07b0149dc8a98e73be03dd6a71f166722d785356ad3499560ae59c1a1 AUX run.getty 44 SHA256 3b4105965417490496352da0fa36d7e79e8ff27989ce7d33023251654d6c119e SHA512 c23aa0ba79043a5717e5567f39bb714154f68c1e417538013943a65de5584b775c265423dd5d47c52027a1be1621f8fb017b115d75d127a31b2ef7cae3ed9eea WHIRLPOOL 987669e356d167019db08885d9f54f91639b8ede3d449295175e96ecf2ed8c39dc4b88c4f18ae1d66a3279547fd877e08ae8b405b678a211d446645f7592fc06 +AUX run.getty-2.1.2 62 SHA256 4afddc7c4c8e7c24f73edd598015db3aa4d5eb521b18304ba7c80825ec64f10a SHA512 99907c69b038c95996fbbdc72f1f482de3e10c3d6533ef8cda094e0631ba6530f9a20e46a71c9b5e75047d61e5a7ec19a36d52716424ccef47c74e81a19ebaa1 WHIRLPOOL c4242bc3d69e059978e029da564ab6d9d95a419ebd7c9b3f068ee254aa972e29cf746f657ef1922d7291b2ca8b4f4dcae08800c08c276701c45d41d5fb5a5141 DIST runit-2.1.1.tar.gz 109661 SHA256 ffcf2d27b32f59ac14f2d4b0772a3eb80d9342685a2042b7fbbc472c07cf2a2c SHA512 a927a757386653fdc40437884e3dc2d1dda6aaf5f1919f301fcf604e559836bd44e5fcb296d69e7f4260fd881475124c44996530de4948d35d8a102b206ca470 WHIRLPOOL ff378ace3c4e0829a435eec8a9e40da7df6e0e0b00ad8c821a169d2e88a38aee4608147316eec1cfc2e676780fefb4bab81e56e3fe7be80bbb6bd08656373208 +DIST runit-2.1.2.tar.gz 110916 SHA256 6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf WHIRLPOOL c70ecafcdd874b08e6bd47a904903eae03884b71eca30306c6eb512fc72ee8c93a5b0badc4a954e248421157e07bf0620789a810901365c2eeac38107cd62747 EBUILD runit-2.1.1-r1.ebuild 1943 SHA256 807825247e5847b8dbceccd6ea256d0a7ff47316fdcd16667ce9ff04e7f14b4b SHA512 429b3f3870368b584ad2503cb51c9b230a13cff4484da6e688a9781780cd72c2db052f1d7e4d31ef39b48e25f6027e3a0bb9572d16201f715467a40d9426bdbe WHIRLPOOL b9b6245d4e085d630bf2a30ebef75e7f837a7597a4c4adeeb62f8b586463ab35102e569301fc31a99e52892fd9031fe74dfe3e11cc45aadb618006f75c5dfdd3 -MISC ChangeLog 5867 SHA256 b90402fc584befbe403301e6a216d47f2f7ce2f4eb0a4981cd3c1b0ccd623074 SHA512 de6ab89b505b4abf0c634e3eada8990d95066e95a27b6e3543dadcfbd52369106d6b5f24518d833084127238818e15adfaae5d8814f6db4ab714ffd514d7e66c WHIRLPOOL 434e82fb5a13dd368e3331ea661d592ee3285c26690a2c0562202e770d4ecfd5022841d64ffdbafca97e8d7bd3c07ef85e35cb09267fe17f4255fbd58f4648fc +EBUILD runit-2.1.2.ebuild 3956 SHA256 fc04eb495cffd05923fb238537bfd2633f287a3eb7a2a8d8b52fd6a5fe72cf42 SHA512 6505de3d61fe60cc137c9b0e0360d69eca7ef2f6b1d06c7348c634163e1270f58281d228c58af81def1a3c5ed0376836715618c9e534c7542d7136b85d4e091e WHIRLPOOL 00b37ea1595c3b1f072e9851fe38c439ad4cc9a5af7d21a69f963fa6cf0815c2768a36800f2fcd8e4634dbcf392797bde5a5ffe4abc5ec0a8675435e469615b7 +MISC ChangeLog 6057 SHA256 cff7fd8f9cfcbd4e0ef2f7420ace07ae0caae70149f88c6ea6bdf8b6209e79d8 SHA512 1ae7cffa6e33fd9a58103354335e405082e4be8734df0909296e25e9aa7a6b91c127044af6b66faec26cc8524cdc9c6083dd6b472d8f9593878f74b18ec4c8e8 WHIRLPOOL 2620fb905ffef38a72bf277215a49b9906a27ad6cb0bee8c5e4cf87549142ba73f1748b8c2fec9aeedb97c66047be6b3de7c50f08d8c5ba6e058e2f9f6f46e05 MISC metadata.xml 228 SHA256 3802abab34ac1cd651bf39ec188765876376abbbaeb5c67cdb24b17df69c9b01 SHA512 168d4a018449523cfcd0dbc8f4e90696701665ff2595aa3127cd8c2cacc3c1bf89f9f9ef7df09192b91d86ce23e8a069efe7250af366d14aac9ce8ed73531826 WHIRLPOOL e2acc8db9feb1c444cc7d78bd14e01a5fdf1bf31a59170d05344637f9ee89f07333540c8c44029fe327978bc3f810b52a941accd9fee9267d5c180989f36eac1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlNG7psACgkQblQW9DDEZThViACgo0YlRiLEHEIIjdh15uqW1G52 -lVoAniSoW5vKs2QDaiLTbeWqwgKYNxfO -=36uF +iEYEAREIAAYFAlRlAXsACgkQblQW9DDEZTgZlwCfW/EhxdyH6HLznPgdIlBlOnEJ +x44AoLF5MTeHJ9l40to26NYn6xRDxyO3 +=qjAu -----END PGP SIGNATURE----- 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 '