gentoo resync : 22.01.2019

4 files changed, 148 insertions, 0 deletions

diff --git a/sys-process/daemontools-encore/Manifest b/sys-process/daemontools-encore/Manifest
index 618eff20e8e2..426740a32ed0 100644
--- a/sys-process/daemontools-encore/Manifest
+++ b/sys-process/daemontools-encore/Manifest
@@ -1,4 +1,8 @@
+AUX daemontools-encore-1.11-add-missing-setuser-man-page.patch 1315 BLAKE2B e21571d258a0d5ca054201cb5c0839cedd6ce99c3f9a4afc53c6d8f21df04233d84b88e1fa401153fb77d7bcd1c3dabb8b2485cb2bcec05fa7a729b4661581b5 SHA512 2fa48512b13faf6df16b955e496dfebc0c7bf7acfd0fe73530dec3af94a49f2adf95875550d7e48eeb9e78aad065e383a6ecdc678a5af3e474a751dd470205cb
+AUX daemontools-encore-1.11-do-not-always-run-tests.patch 398 BLAKE2B 9b4bc4b361379f897715a1011976cfd6ed6148c92a3f38ae4c2ce83db8294789a25aca9826d3084e7c94ce7233bd8ca9b9ff8fb9f418bade22fae6001fa269c1 SHA512 acd251e9b4a7060c42acd9c8779d7c8675d884444128e825f18e7ce5dac7b526aa3b6508186eebc0fa5f443a2895b2e958dc65b3e99a8b72bd35255d83a0bc1f
 AUX svscan.init-2 592 BLAKE2B 1623e80a0222bcbfbb58f7bea96cca8c3fca94a1e2c4c385e1342cc620e7b68c5b3b7d812bffdfdf05f4e59a3bf5bd17afaa5855c334584dc63f7b2d763bfbea SHA512 cfe2d3ef118262f86d5c91a76ffac2f51564e748c4e9392b42ee9f9e13d90729a795c4dfeba5bc3c5793b988fac62a9ca1fb33e685200bf4fcd354d5872d9d1d
 DIST daemontools-encore-1.10.tar.gz 87096 BLAKE2B f0e5accc319caa1b4f4f15f5bdf2c2d59c5f398698509ad288a9b7ba33944fb49155386bf0edebda20959ea1c7d1fce14be883a0a96c1d2e054886c7df17d64a SHA512 569030fb9941186f167644740d0424987105b7a818d5a3cdb4e90ced5530a16938b7205141ca2f198f83362269f9cc28eb5acafe9cd7f985c8e56d307f706767
+DIST daemontools-encore-1.11.tar.gz 94917 BLAKE2B 747da62ae97d4e4b28ca5309cbf835fe989db23d9f7a408bcce6fa7b17a658740024867daf9116dcbcb02e16a6b0ee92210bd485ecceef9b7ecbb2e0ea79e110 SHA512 1e1a96a948d551bfc38496740eaa85b7cae0d2469419293b133533da75ca03657fe6108129703ad7b773925c58ce84a4f242eb612133fb0c499f47ae50423a8a
 EBUILD daemontools-encore-1.10.ebuild 1129 BLAKE2B 70769f79132000759d9935eac5e3ce796f5f41c40d9b390e5e2eb7b7c30107edadf88c9a0fdf7ade8df0e3197e8fa170b9433dfbea6d114c6a5087e38198c4d1 SHA512 762fdfbe63843eae27445836de30ec3da1688af1715f4693e707d9aa755b534d234808bf720f3cdfcabb5820d56c10297f8d913d27a9e73a80893bd55fc5cfb9
+EBUILD daemontools-encore-1.11.ebuild 1276 BLAKE2B 74488ed09bb6a1363cb6f9b8896de9bb411a2283dcf251abb2c38f4845258d2eaab34b8d1648553bc0fe171b6bfd2efd2c95144962aef51d7de24511eb2ad94d SHA512 c75639dde99bcb9bcbdaba883eee1eb11974c32ed144f9611853db88cac13284f4c950c262fb7926ba18649a563d91730b6355d297b5d6db622dcaba2fa74688
 MISC metadata.xml 666 BLAKE2B fe3b9c108cf02347cdd6cfb191f1ca11d7d3a5fdf0aca3d7d052807bf223dc6ee37e9500c7abb3c255243a391be9279829a153b7833ac5ced4ce797b3fce47e0 SHA512 9c45feddf5f6a53f43aad784abf5f60f129d826a3c24ad3d2921973f8c26fa7ba7470a614da8b0a2d3fec0bb65265d6e917b0cefe972b16f221288977c694188
diff --git a/sys-process/daemontools-encore/daemontools-encore-1.11.ebuild b/sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
new file mode 100644
index 000000000000..916836923265
--- /dev/null
+++ b/sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic qmail
+
+DESCRIPTION="Collection of tools for managing UNIX services"
+HOMEPAGE="https://untroubled.org/daemontools-encore/"
+SRC_URI="https://untroubled.org/daemontools-encore/${P}.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux static"
+
+DEPEND=""
+RDEPEND="selinux? ( sec-policy/selinux-daemontools )
+	!sys-process/daemontools
+	!app-doc/daemontools-man"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.11-do-not-always-run-tests.patch
+	"${FILESDIR}"/${PN}-1.11-add-missing-setuser-man-page.patch
+)
+
+src_compile() {
+	use static && append-ldflags -static
+	qmail_set_cc
+	emake
+}
+
+src_install() {
+	keepdir /service
+
+	echo "${ED%/}/usr/bin" >conf-bin
+	echo "${ED%/}/usr/share/man" >conf-man
+	dodir /usr/bin
+	dodir /usr/share/man
+	emake install
+
+	dodoc ChangeLog CHANGES CHANGES.djb README TODO
+
+	newinitd "${FILESDIR}"/svscan.init-2 svscan
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You can run daemontools using the svscan init.d script,"
+	einfo "or you could run it through inittab."
+	einfo "To use inittab, emerge supervise-scripts and run:"
+	einfo "svscan-add-to-inittab"
+	einfo "Then you can hup init with the command telinit q"
+	einfo
+}
diff --git a/sys-process/daemontools-encore/files/daemontools-encore-1.11-add-missing-setuser-man-page.patch b/sys-process/daemontools-encore/files/daemontools-encore-1.11-add-missing-setuser-man-page.patch
new file mode 100644
index 000000000000..58b159b762e2
--- /dev/null
+++ b/sys-process/daemontools-encore/files/daemontools-encore-1.11-add-missing-setuser-man-page.patch
@@ -0,0 +1,68 @@
+Add missing setuser.8
+
+Upstream-bug: https://github.com/bruceg/daemontools-encore/issues/60
+
+--- /dev/null
++++ b/setuser.8
+@@ -0,0 +1,61 @@
++.TH setuser 8
++.SH NAME
++setuser \- runs another program under a specified account's environment.
++.SH SYNOPSIS
++.B setuser
++.I account
++.I child
++.SH DESCRIPTION
++.I account
++is a single argument.
++.I child
++consists of one or more arguments. 
++
++.B setuser
++sets
++.BR $GID ,
++.BR $UID ,
++.BR $SHELL ,
++.BR $HOME ,
++and
++.BR $USER
++to
++.IR account 's
++gid number, uid number, login shell, home directory, and user name, respectively.
++It changes the working directory to
++.IR account 's
++home, and sets its uid and gid to
++.IR account 's
++uid and gid, with supplementary groups set up.
++It then runs
++.IR child .
++
++.B setuser
++cannot be run by anyone other than root.
++.SH EXIT CODES
++.B setuser
++exits 111 if it cannot find a UNIX account named
++.IB account ,
++if it cannot setup the environment, change directory, setgid, setuid, or run
++.IR child .
++Otherwise its exit code is the same as that of
++.IR child .
++.SH SEE ALSO
++envdir(8),
++envini(8),
++envuidgid(8),
++fghack(8),  
++multilog(8),
++pgrphack(8),
++readproctitle(8),
++setlock(8),
++setuidgid(8),
++softlimit(8),
++supervise(8),
++svc(8),
++svok(8),
++svscan(8),
++svscanboot(8),
++svstat(8),
++tai64n(8),
++tai64nlocal(8)
diff --git a/sys-process/daemontools-encore/files/daemontools-encore-1.11-do-not-always-run-tests.patch b/sys-process/daemontools-encore/files/daemontools-encore-1.11-do-not-always-run-tests.patch
new file mode 100644
index 000000000000..e23faad92f42
--- /dev/null
+++ b/sys-process/daemontools-encore/files/daemontools-encore-1.11-do-not-always-run-tests.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -66,6 +66,9 @@ byte_rchr.o: \
+ compile byte_rchr.c hasmemrchr.h byte.h
+ 	./compile byte_rchr.c
+ 
++check: \
++rts
++
+ chkshsgr: \
+ load chkshsgr.o
+ 	./load chkshsgr 
+@@ -247,7 +250,7 @@ compile iopause.c taia.h tai.h uint64.h select.h iopause.h
+ 	./compile iopause.c
+ 
+ it: \
+-rts sysdeps man
++programs sysdeps man
+ 
+ load: \
+ conf-ld print-ld.sh systype warn-auto.sh