gentoo auto-resync : 18:06:2023 - 19:48:47

4 files changed, 109 insertions, 0 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index e8b6f2e7ec3e..a76552f9bb6d 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/daemontools-encore/Manifest b/sys-process/daemontools-encore/Manifest
index 697f973c08e7..b287fba7b869 100644
--- a/sys-process/daemontools-encore/Manifest
+++ b/sys-process/daemontools-encore/Manifest
@@ -1,7 +1,9 @@
 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 daemontools-encore-1.11-implicit-func-decl-clang16.patch 229 BLAKE2B be62d72587646aa6f7aee3562963ae65a0a80e6926208dee60f5a071b5fac4582168610a1455381e865e7b69fa3ac5b41404ed574c2ddd9742619c21a5a2ada0 SHA512 53919107ff10390a6d50b04d170b415e6ca03479eaba367ac15a098d66c71cfcfeb104028d8d0f0a8919c84db2dd43546c0ef2357b76f221cfde557a8203de43
+AUX daemontools-encore-1.11-use-posix-complaint-functions.patch 1566 BLAKE2B 62689ba1689e0cbcd0ce2fb972097a896273cacd39e1d45f99dd88aea2d60400f1744d257f14ea5ecf3b47198b3a3ec661ba149c6ed22d1c5c618a2824e955a1 SHA512 6e4f56b59fdb416121a0f4c5902695537f37f741b249e9f30a7ab188c659424cd565cb2e037e4d9e138ad78dc8d232794c0e6131eea1228a572bcaa687ad5e99
 AUX svscan.init-2 592 BLAKE2B 1623e80a0222bcbfbb58f7bea96cca8c3fca94a1e2c4c385e1342cc620e7b68c5b3b7d812bffdfdf05f4e59a3bf5bd17afaa5855c334584dc63f7b2d763bfbea SHA512 cfe2d3ef118262f86d5c91a76ffac2f51564e748c4e9392b42ee9f9e13d90729a795c4dfeba5bc3c5793b988fac62a9ca1fb33e685200bf4fcd354d5872d9d1d
 DIST daemontools-encore-1.11.tar.gz 94917 BLAKE2B 747da62ae97d4e4b28ca5309cbf835fe989db23d9f7a408bcce6fa7b17a658740024867daf9116dcbcb02e16a6b0ee92210bd485ecceef9b7ecbb2e0ea79e110 SHA512 1e1a96a948d551bfc38496740eaa85b7cae0d2469419293b133533da75ca03657fe6108129703ad7b773925c58ce84a4f242eb612133fb0c499f47ae50423a8a
 EBUILD daemontools-encore-1.11-r1.ebuild 1344 BLAKE2B b7010203f9c0fc2bae51b555166fbe195a7aa29f75517428726de91f9f6379433f466cd9b09e76765b43cbb025600fcfcd9fcda787d448652d7f870f4043691f SHA512 68b94dbee70da456eba202080b3245bb56754a394ddcc1ccb7654795f2a891985cb72d2ac6f53c617ba6ecf053fc7be276c841f0635e43e705ba8dc90a0a25ea
+EBUILD daemontools-encore-1.11-r2.ebuild 1407 BLAKE2B 04c139691de4a001fddb1aa423b62fcba9d006d201a33e02018eb4cbb208381a280594c125e81ba3a377fe224fa88e0ffbd84ee221bc62ce87fb6d1c847ba78b SHA512 fccbabd0a57eb3dee16fd19bf31cd5bca9b599d2fdcfb812bb809f6d31913283a494a7c6e56ad56f063e4c8cc3f6093f8f32f29222329dd9e39935580fdc62c1
 MISC metadata.xml 580 BLAKE2B b72cb0ed056665c8a6a88be4f0c2d3ccc0e971c2348d20f4da7cfee52db652bd5ded5d77644f611b84b8dfb2e15ac015e962dfe60f417603cd4f5acfc23ac4c8 SHA512 f0b9446cd8c452c721df0f572020b8f074254a0954d17f22b667238805190152e59bc5cb0d6c5393daca75389f8e2925254737b6548fec66ba73d68d71f3e03d
diff --git a/sys-process/daemontools-encore/daemontools-encore-1.11-r2.ebuild b/sys-process/daemontools-encore/daemontools-encore-1.11-r2.ebuild
new file mode 100644
index 000000000000..611a61497c33
--- /dev/null
+++ b/sys-process/daemontools-encore/daemontools-encore-1.11-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~loong ~x86"
+IUSE="selinux static"
+
+RDEPEND="
+	!app-doc/daemontools-man
+	!sys-process/daemontools
+	selinux? ( sec-policy/selinux-daemontools )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.11-do-not-always-run-tests.patch
+	"${FILESDIR}"/${PN}-1.11-add-missing-setuser-man-page.patch
+	"${FILESDIR}"/${PN}-1.11-implicit-func-decl-clang16.patch
+	"${FILESDIR}"/${PN}-1.11-use-posix-complaint-functions.patch
+)
+
+src_compile() {
+	use static && append-ldflags -static
+	qmail_set_cc
+	emake
+}
+
+src_install() {
+	keepdir /service
+
+	echo "${ED}/usr/bin" > conf-bin || die
+	echo "${ED}/usr/share/man" > conf-man || die
+	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-use-posix-complaint-functions.patch b/sys-process/daemontools-encore/files/daemontools-encore-1.11-use-posix-complaint-functions.patch
new file mode 100644
index 000000000000..bc4c12fc366c
--- /dev/null
+++ b/sys-process/daemontools-encore/files/daemontools-encore-1.11-use-posix-complaint-functions.patch
@@ -0,0 +1,49 @@
+https://github.com/bruceg/daemontools-encore/pull/66
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Tue, 13 Jun 2023 04:27:36 +0000
+Subject: [PATCH] sig_block.c: use posix complaint functions on non glibc
+ systems
+
+This build error came while building on musl /w clang-16.
+In contrast to glibc, musl is not having the "legacy" BSD functions and only POSIX sigprocmask.
+
+The exact error was:
+sig_block.c:15:3: error: call to undeclared function 'sigblock'; ISO C99 and later do not
+      support implicit function declarations [-Wimplicit-function-declaration]
+  sigblock(1 << (sig - 1));
+  ^
+sig_block.c:15:3: note: did you mean 'sig_block'?
+sig_block.c:7:6: note: 'sig_block' declared here
+void sig_block(int sig)
+     ^
+1 warning generated.
+sig_block.c:27:3: error: call to undeclared function 'sigsetmask'; ISO C99 and later do not
+      support implicit function declarations [-Wimplicit-function-declaration]
+  sigsetmask(sigsetmask(~0) & ~(1 << (sig - 1)));
+  ^
+sig_block.c:38:3: error: call to undeclared function 'sigsetmask'; ISO C99 and later do not
+      support implicit function declarations [-Wimplicit-function-declaration]
+  sigsetmask(0);
+  ^
+
+This patch should fix the error
+
+Bug: https://bugs.gentoo.org/898852
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/sig_block.c
++++ b/sig_block.c
+@@ -4,6 +4,11 @@
+ #include "sig.h"
+ #include "hassgprm.h"
+ 
++// Use POSIX complaint functions when using non-Glibc system
++#ifndef __GLIBC__
++#define HASSIGPROCMASK 0
++#endif
++
+ void sig_block(int sig)
+ {
+ #ifdef HASSIGPROCMASK
+-- 
+2.41.0
+