[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools-encore/
commit: 0695613c11c8fd850a8640c9deabf56cff73cb1c
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Oct 9 16:19:56 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Oct 9 16:19:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0695613c
sys-process/daemontools-encore: Stabilize 1.11-r2 amd64, #915442
Signed-off-by: Arthur Zamarin gentoo.org>
sys-process/daemontools-encore/daemontools-encore-1.11-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-process/daemontools-encore/daemontools-encore-1.11-r2.ebuild
b/sys-process/daemontools-encore/daemontools-encore-1.11-r2.ebuild
index 611a61497c33..f1183a2c0350 100644
--- a/sys-process/daemontools-encore/daemontools-encore-1.11-r2.ebuild
+++ b/sys-process/daemontools-encore/daemontools-encore-1.11-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://untroubled.org/daemontools-encore/${P}.tar.gz;
LICENSE="GPL-2 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
+KEYWORDS="amd64 ~loong ~x86"
IUSE="selinux static"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/
commit: bcd53893ebe0401bf1fbde732ba66234dab2791a
Author: Sam James gentoo org>
AuthorDate: Mon Oct 9 06:17:43 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 9 06:17:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd53893
sys-process/daemontools: Stabilize 0.76-r11 ppc64, #915443
Signed-off-by: Sam James gentoo.org>
sys-process/daemontools/daemontools-0.76-r11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-process/daemontools/daemontools-0.76-r11.ebuild
b/sys-process/daemontools/daemontools-0.76-r11.ebuild
index 941cd5c927a3..5aace06e0990 100644
--- a/sys-process/daemontools/daemontools-0.76-r11.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r11.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/admin/${P}/src"
LICENSE="public-domain GPL-2" # GPL-2 for init script
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64
~riscv ~s390 sparc ~x86"
IUSE="selinux static"
RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/
commit: e223769b22aab86b3c560e350cdf6be064d3a875
Author: Sam James gentoo org>
AuthorDate: Mon Oct 9 04:46:11 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 9 04:46:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e223769b
sys-process/daemontools: Stabilize 0.76-r11 arm64, #915443
Signed-off-by: Sam James gentoo.org>
sys-process/daemontools/daemontools-0.76-r11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-process/daemontools/daemontools-0.76-r11.ebuild
b/sys-process/daemontools/daemontools-0.76-r11.ebuild
index 70cb6490b85f..941cd5c927a3 100644
--- a/sys-process/daemontools/daemontools-0.76-r11.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r11.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/admin/${P}/src"
LICENSE="public-domain GPL-2" # GPL-2 for init script
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 sparc ~x86"
IUSE="selinux static"
RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/
commit: 61725185af50d0c0fe815e5db2bd2260f69571c1
Author: Sam James gentoo org>
AuthorDate: Mon Oct 9 04:36:17 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 9 04:36:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61725185
sys-process/daemontools: Stabilize 0.76-r11 arm, #915443
Signed-off-by: Sam James gentoo.org>
sys-process/daemontools/daemontools-0.76-r11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-process/daemontools/daemontools-0.76-r11.ebuild
b/sys-process/daemontools/daemontools-0.76-r11.ebuild
index 3390cd179a7d..0e95f63e25dd 100644
--- a/sys-process/daemontools/daemontools-0.76-r11.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r11.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/admin/${P}/src"
LICENSE="public-domain GPL-2" # GPL-2 for init script
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
IUSE="selinux static"
RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/
commit: 75393a2781a2e74680812cf28b52424611e65471
Author: Sam James gentoo org>
AuthorDate: Mon Oct 9 04:36:18 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 9 04:36:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75393a27
sys-process/daemontools: Stabilize 0.76-r11 sparc, #915443
Signed-off-by: Sam James gentoo.org>
sys-process/daemontools/daemontools-0.76-r11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-process/daemontools/daemontools-0.76-r11.ebuild
b/sys-process/daemontools/daemontools-0.76-r11.ebuild
index 0e95f63e25dd..70cb6490b85f 100644
--- a/sys-process/daemontools/daemontools-0.76-r11.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r11.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/admin/${P}/src"
LICENSE="public-domain GPL-2" # GPL-2 for init script
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 sparc ~x86"
IUSE="selinux static"
RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools-encore/, sys-process/daemontools-encore/files/
commit: bc9f8762d2f2ff1a64ffec7b02909b31a23baac2
Author: Brahmajit Das gmail com>
AuthorDate: Tue Jun 13 04:34:29 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Jun 18 12:08:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc9f8762
sys-process/daemontools-encore: Fix call to undeclared function sigblock
Closes: https://bugs.gentoo.org/898852
Signed-off-by: Brahmajit Das gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31409
Signed-off-by: Joonas Niilola gentoo.org>
.../daemontools-encore-1.11-r2.ebuild | 58 ++
...encore-1.11-use-posix-complaint-functions.patch | 49 ++
2 files changed, 107 insertions(+)
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 ..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 ..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
+Date: Tue, 13 Jun 2023 04:27:36 +
+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
+--- 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
+
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools-encore/
commit: ca0837146e237dce8d792d11c330bcb7622abc6a
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Jun 15 16:21:46 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Jun 15 16:21:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca083714
sys-process/daemontools-encore: Stabilize 1.11-r1 amd64, #908542
Signed-off-by: Arthur Zamarin gentoo.org>
sys-process/daemontools-encore/daemontools-encore-1.11-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-process/daemontools-encore/daemontools-encore-1.11-r1.ebuild
b/sys-process/daemontools-encore/daemontools-encore-1.11-r1.ebuild
index 7cb3f795fc2d..f81001db81c4 100644
--- a/sys-process/daemontools-encore/daemontools-encore-1.11-r1.ebuild
+++ b/sys-process/daemontools-encore/daemontools-encore-1.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@
SRC_URI="https://untroubled.org/daemontools-encore/${P}.tar.gz;
LICENSE="GPL-2 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
+KEYWORDS="amd64 ~loong ~x86"
IUSE="selinux static"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/files/, sys-process/daemontools/
commit: 22032423541019de6e98183ad25f6216f587d231
Author: brahmajit das gmail com>
AuthorDate: Sat Mar 11 14:44:48 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Apr 4 07:53:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22032423
sys-process/daemontools: fix build w/ clang 16
Signed-off-by: brahmajit das gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30054
Signed-off-by: Joonas Niilola gentoo.org>
.../daemontools/daemontools-0.76-r11.ebuild| 54 ++
.../files/0.76-implicit-func-decl-clang16.patch| 13 ++
2 files changed, 67 insertions(+)
diff --git a/sys-process/daemontools/daemontools-0.76-r11.ebuild
b/sys-process/daemontools/daemontools-0.76-r11.ebuild
new file mode 100644
index ..3390cd179a7d
--- /dev/null
+++ b/sys-process/daemontools/daemontools-0.76-r11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Collection of tools for managing UNIX services"
+HOMEPAGE="https://cr.yp.to/daemontools.html;
+SRC_URI="
+ https://cr.yp.to/daemontools/${P}.tar.gz
+ http://smarden.org/pape/djb/manpages/${P}-man-20020131.tar.gz;
+S="${WORKDIR}/admin/${P}/src"
+
+LICENSE="public-domain GPL-2" # GPL-2 for init script
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
+IUSE="selinux static"
+
+RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-errno.patch
+ "${FILESDIR}"/${PV}-C99-decls.patch
+ "${FILESDIR}"/${PV}-makefile.patch
+ "${FILESDIR}"/${PV}-implicit-func-decl-clang16.patch
+)
+
+src_configure() {
+ tc-export AR CC
+ use static && append-ldflags -static
+
+ touch home || die
+}
+
+src_install() {
+ keepdir /service
+
+ dobin $(<../package/commands)
+ dodoc CHANGES ../package/README TODO
+ doman "${WORKDIR}"/${PN}-man/*.8
+
+ newinitd "${FILESDIR}"/svscan.init-0.76-r7 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/files/0.76-implicit-func-decl-clang16.patch
b/sys-process/daemontools/files/0.76-implicit-func-decl-clang16.patch
new file mode 100644
index ..06fe93b5d410
--- /dev/null
+++ b/sys-process/daemontools/files/0.76-implicit-func-decl-clang16.patch
@@ -0,0 +1,13 @@
+diff --git a/sig_pause.c b/sig_pause.c
+index 3d1a793..5280934 100644
+--- a/sig_pause.c
b/sig_pause.c
+@@ -1,5 +1,7 @@
+ /* Public domain. */
+-
++#ifndef _XOPEN_SOURCE
++#define _XOPEN_SOURCE 500
++#endif
+ #include
+ #include "sig.h"
+ #include "hassgprm.h"
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/, sys-process/daemontools/files/
commit: 6481423534333b63e2fed41065dff318c9a4eaaf
Author: David Seifert gentoo org>
AuthorDate: Sat Feb 18 17:28:46 2023 +
Commit: David Seifert gentoo org>
CommitDate: Sat Feb 18 17:28:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64814235
sys-process/daemontools: fix C99 decls
Closes: https://bugs.gentoo.org/894198
Signed-off-by: David Seifert gentoo.org>
sys-process/daemontools/daemontools-0.76-r9.ebuild | 2 +-
sys-process/daemontools/files/0.76-C99-decls.patch | 503 +
sys-process/daemontools/files/0.76-warnings.patch | 74 ---
3 files changed, 504 insertions(+), 75 deletions(-)
diff --git a/sys-process/daemontools/daemontools-0.76-r9.ebuild
b/sys-process/daemontools/daemontools-0.76-r9.ebuild
index 72b91369580f..bce6a908e6e5 100644
--- a/sys-process/daemontools/daemontools-0.76-r9.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r9.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/admin/${P}/src"
PATCHES=(
"${FILESDIR}"/${PV}-errno.patch
- "${FILESDIR}"/${PV}-warnings.patch
+ "${FILESDIR}"/${PV}-C99-decls.patch
)
src_prepare() {
diff --git a/sys-process/daemontools/files/0.76-C99-decls.patch
b/sys-process/daemontools/files/0.76-C99-decls.patch
new file mode 100644
index ..2e1d940a2f85
--- /dev/null
+++ b/sys-process/daemontools/files/0.76-C99-decls.patch
@@ -0,0 +1,503 @@
+--- a/alloc.c
b/alloc.c
+@@ -12,8 +12,7 @@
+ #define space ((char *) realspace)
+ static unsigned int avail = SPACE; /* multiple of ALIGNMENT; 0<=avail<=SPACE
*/
+
+-/*@null@*//*@out@*/char *alloc(n)
+-unsigned int n;
++/*@null@*//*@out@*/char *alloc(unsigned int n)
+ {
+ char *x;
+ n = ALIGNMENT + n - (n & (ALIGNMENT - 1)); /* XXX: could overflow */
+@@ -23,8 +22,7 @@
+ return x;
+ }
+
+-void alloc_free(x)
+-char *x;
++void alloc_free(char *x)
+ {
+ if (x >= space)
+ if (x < space + SPACE)
+--- a/alloc.h
b/alloc.h
+@@ -3,8 +3,8 @@
+ #ifndef ALLOC_H
+ #define ALLOC_H
+
+-extern /*@null@*//*@out@*/char *alloc();
+-extern void alloc_free();
+-extern int alloc_re();
++/*@null@*//*@out@*/char *alloc(unsigned int n);
++void alloc_free(char *x);
++int alloc_re(char **x, unsigned int m, unsigned int n);
+
+ #endif
+--- a/alloc_re.c
b/alloc_re.c
+@@ -3,10 +3,7 @@
+ #include "alloc.h"
+ #include "byte.h"
+
+-int alloc_re(x,m,n)
+-char **x;
+-unsigned int m;
+-unsigned int n;
++int alloc_re(char **x, unsigned int m, unsigned int n)
+ {
+ char *y;
+
+--- a/buffer.c
b/buffer.c
+@@ -2,7 +2,7 @@
+
+ #include "buffer.h"
+
+-void buffer_init(buffer *s,int (*op)(),int fd,char *buf,unsigned int len)
++void buffer_init(buffer *s,int (*op)(int, char*, int),int fd,char
*buf,unsigned int len)
+ {
+ s->x = buf;
+ s->fd = fd;
+--- a/buffer.h
b/buffer.h
+@@ -8,14 +8,14 @@
+ unsigned int p;
+ unsigned int n;
+ int fd;
+- int (*op)();
++ int (*op)(int, char*, int);
+ } buffer;
+
+ #define BUFFER_INIT(op,fd,buf,len) { (buf), 0, (len), (fd), (op) }
+ #define BUFFER_INSIZE 8192
+ #define BUFFER_OUTSIZE 8192
+
+-extern void buffer_init(buffer *,int (*)(),int,char *,unsigned int);
++extern void buffer_init(buffer *, int (*)(int, char*, int), int, char *,
unsigned int);
+
+ extern int buffer_flush(buffer *);
+ extern int buffer_put(buffer *,const char *,unsigned int);
+@@ -50,7 +50,7 @@
+ extern int buffer_copy(buffer *,buffer *);
+
+ extern int buffer_unixread(int,char *,unsigned int);
+-extern int buffer_unixwrite(int,const char *,unsigned int);
++extern int buffer_unixwrite(int, char *, int);
+
+ extern buffer *buffer_0;
+ extern buffer *buffer_0small;
+--- a/buffer_0.c
b/buffer_0.c
+@@ -2,7 +2,7 @@
+
+ #include "buffer.h"
+
+-int buffer_0_read(fd,buf,len) int fd; char *buf; int len;
++int buffer_0_read(int fd, char *buf, int len)
+ {
+ if (buffer_flush(buffer_1) == -1) return -1;
+ return buffer_unixread(fd,buf,len);
+--- a/buffer_get.c
b/buffer_get.c
+@@ -4,7 +4,7 @@
+ #include "byte.h"
+ #include "error.h"
+
+-static int oneread(int (*op)(),int fd,char *buf,unsigned int len)
++static int oneread(int (*op)(int, char*, int),int fd,char *buf,unsigned int
len)
+ {
+ int r;
+
+--- a/buffer_put.c
b/buffer_put.c
+@@ -5,7 +5,7 @@
+ #include "byte.h"
+ #include "error.h"
+
+-static int allwrite(int (*op)(),int fd,const char *buf,unsigned int len)
++static int allwrite(int (*op)(int, char*, int),int fd,const char
*buf,unsigned int len)
+ {
+ int w;
+
+--- a/buffer_write.c
b/buffer_write.c
+@@ -3,7 +3,7 @@
+ #include
+ #include "buffer.h"
+
+-int buffer_unixwrite(int fd,const char *buf,unsigned int len)
++int buffer_unixwrite(int fd, char *buf, int len)
+ {
+ return write(fd,buf,len);
+ }
+--- a/byte.h
b/byte.h
+@@ -3,12 +3,11 @@
+ #ifndef BYTE_H
+ #define BYTE_H
+
+-extern unsigned int byte_chr();
+-extern unsigned int byte_rchr();
+-extern void byte_copy();
+-extern void byte_copyr();
+-extern int byte_diff();
+-extern void byte_zero();
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/, sys-process/daemontools/files/
commit: cd400b97268af2c440ae4a2e2a40f491a81fca27
Author: David Seifert gentoo org>
AuthorDate: Sat Feb 18 17:28:47 2023 +
Commit: David Seifert gentoo org>
CommitDate: Sat Feb 18 17:28:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd400b97
sys-process/daemontools: honour AR, CC
Closes: https://bugs.gentoo.org/721882
Closes: https://bugs.gentoo.org/729424
Signed-off-by: David Seifert gentoo.org>
...-0.76-r9.ebuild => daemontools-0.76-r10.ebuild} | 23 ++--
sys-process/daemontools/files/0.76-makefile.patch | 137 +
2 files changed, 145 insertions(+), 15 deletions(-)
diff --git a/sys-process/daemontools/daemontools-0.76-r9.ebuild
b/sys-process/daemontools/daemontools-0.76-r10.ebuild
similarity index 84%
rename from sys-process/daemontools/daemontools-0.76-r9.ebuild
rename to sys-process/daemontools/daemontools-0.76-r10.ebuild
index bce6a908e6e5..5bf42bc7b17d 100644
--- a/sys-process/daemontools/daemontools-0.76-r9.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r10.ebuild
@@ -1,42 +1,35 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit fixheadtails flag-o-matic qmail
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="Collection of tools for managing UNIX services"
HOMEPAGE="https://cr.yp.to/daemontools.html;
-SRC_URI="https://cr.yp.to/daemontools/${P}.tar.gz
+SRC_URI="
+ https://cr.yp.to/daemontools/${P}.tar.gz
http://smarden.org/pape/djb/manpages/${P}-man-20020131.tar.gz;
+S="${WORKDIR}/admin/${P}/src"
LICENSE="public-domain GPL-2" # GPL-2 for init script
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86"
IUSE="selinux static"
-DEPEND=""
RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
-S="${WORKDIR}/admin/${P}/src"
-
PATCHES=(
"${FILESDIR}"/${PV}-errno.patch
"${FILESDIR}"/${PV}-C99-decls.patch
+ "${FILESDIR}"/${PV}-makefile.patch
)
-src_prepare() {
- default
-
- ht_fix_file Makefile print-{cc,ld}.sh
-
+src_configure() {
+ tc-export AR CC
use static && append-ldflags -static
- qmail_set_cc
-}
-src_compile() {
touch home || die
- emake
}
src_install() {
diff --git a/sys-process/daemontools/files/0.76-makefile.patch
b/sys-process/daemontools/files/0.76-makefile.patch
new file mode 100644
index ..3e47f278b82d
--- /dev/null
+++ b/sys-process/daemontools/files/0.76-makefile.patch
@@ -0,0 +1,137 @@
+--- a/Makefile
b/Makefile
+@@ -19,7 +19,7 @@
+ stralloc_eady.o stralloc_opyb.o stralloc_opys.o stralloc_pend.o \
+ strerr_die.o strerr_sys.o subgetopt.o supervise supervise.o svc svc.o \
+ svok svok.o svscan svscan.o svscanboot svstat svstat.o sysdeps \
+- systype tai64n tai64n.o tai64nlocal tai64nlocal.o tai_now.o \
++ tai64n tai64n.o tai64nlocal tai64nlocal.o tai_now.o \
+ tai_pack.o tai_sub.o tai_unpack.o taia_add.o taia_approx.o \
+ taia_frac.o taia_less.o taia_now.o taia_pack.o taia_sub.o taia_uint.o \
+ time.a timestamp.o uint64.h unix.a wait_nohang.o wait_pid.o
+@@ -85,16 +85,16 @@
+ choose: choose.sh home warn-auto.sh
+ rm -f choose
+ cat warn-auto.sh choose.sh \
+- | sed s}HOME}"`head -1 home`"}g \
++ | sed s}HOME}"`head -n 1 home`"}g \
+ > choose
+ chmod 555 choose
+
+ coe.o: coe.c coe.h compile
+ ./compile coe.c
+
+-compile: conf-cc print-cc.sh systype warn-auto.sh
++compile: conf-cc print-cc.sh warn-auto.sh
+ rm -f compile
+- sh print-cc.sh > compile
++ cat print-cc.sh > compile
+ chmod 555 compile
+
+ deepsleep.o: compile deepsleep.c deepsleep.h iopause.h tai.h taia.h \
+@@ -179,9 +179,9 @@
+
+ it: rts sysdeps
+
+-load: conf-ld print-ld.sh systype warn-auto.sh
++load: conf-ld print-ld.sh warn-auto.sh
+ rm -f load
+- sh print-ld.sh > load
++ cat print-ld.sh > load
+ chmod 555 load
+
+ lock_ex.o: compile hasflock.h lock.h lock_ex.c
+@@ -190,9 +190,9 @@
+ lock_exnb.o: compile hasflock.h lock.h lock_exnb.c
+ ./compile lock_exnb.c
+
+-makelib: print-ar.sh systype warn-auto.sh
++makelib: print-ar.sh warn-auto.sh
+ rm -f makelib
+- sh print-ar.sh > makelib
++ cat print-ar.sh > makelib
+ chmod 555 makelib
+
+ match.o: compile match.c match.h
+@@ -390,7 +390,7 @@
+ svscanboot: home svscanboot.sh warn-auto.sh
+ rm -f svscanboot
+ cat warn-auto.sh svscanboot.sh \
+- | sed s}HOME}"`head -1 home`"}g \
++ | sed s}HOME}"`head -n 1 home`"}g \
+ > svscanboot
+ chmod 555 svscanboot
+
+@@ -402,10 +402,10 @@
+ ./compile svstat.c
+
+ sysdeps: compile direntry.h hasflock.h hasmkffo.h hassgact.h \
+-hassgprm.h hasshsgr.h haswaitp.h iopause.h load select.h systype \
++hassgprm.h hasshsgr.h haswaitp.h iopause.h load select.h \
+ uint64.h
+ rm -f sysdeps
+-
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/files/
commit: 26a3faf8f706697960cdd519d5788ee38911db00
Author: Ulrich Müller gentoo org>
AuthorDate: Sat Feb 18 14:04:53 2023 +
Commit: Ulrich Müller gentoo org>
CommitDate: Sat Feb 18 14:14:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a3faf8
sys-process/daemontools: Remove stale file
Signed-off-by: Ulrich Müller gentoo.org>
sys-process/daemontools/files/svscan.init | 31 ---
1 file changed, 31 deletions(-)
diff --git a/sys-process/daemontools/files/svscan.init
b/sys-process/daemontools/files/svscan.init
deleted file mode 100644
index b8217db42d48..
--- a/sys-process/daemontools/files/svscan.init
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- use net
- before ntpd ntp-client spamd apache apache2
-}
-
-start() {
- ebegin "Starting service scan"
- start-stop-daemon --start --exec /usr/bin/svscan \
- --background --make-pidfile \
- --pidfile /var/run/svscan.pid -- /service
- eend $?
-}
-
-stop() {
- ebegin "Stopping service scan"
- start-stop-daemon --stop --exec /usr/bin/svscan \
- --pidfile /var/run/svscan.pid
- eend $?
-
- ebegin "Stopping service scan services"
- svc -dx /service/* 2>/dev/null
- eend $?
-
- ebegin "Stopping service scan logging"
- svc -dx /service/*/log 2>/dev/null
- eend $?
-}
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/, sys-process/daemontools/files/
commit: c14cbe57d96767bf1c1727d39a2fa219ae8a3030
Author: Ulrich Müller gentoo org>
AuthorDate: Sat Feb 18 14:07:28 2023 +
Commit: Ulrich Müller gentoo org>
CommitDate: Sat Feb 18 14:14:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c14cbe57
sys-process/daemontools: Update LICENSE
Include GPL-2 for init script. Update copyright line of init script.
Update HOMEPAGE and SRC_URI to https. Drop ancient blocker from RDEPEND.
Closes: https://bugs.gentoo.org/426170
Signed-off-by: Ulrich Müller gentoo.org>
...{daemontools-0.76-r8.ebuild => daemontools-0.76-r9.ebuild} | 11 +--
sys-process/daemontools/files/svscan.init-0.76-r7 | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/sys-process/daemontools/daemontools-0.76-r8.ebuild
b/sys-process/daemontools/daemontools-0.76-r9.ebuild
similarity index 82%
rename from sys-process/daemontools/daemontools-0.76-r8.ebuild
rename to sys-process/daemontools/daemontools-0.76-r9.ebuild
index 75d4085cc155..72b91369580f 100644
--- a/sys-process/daemontools/daemontools-0.76-r8.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,18 +6,17 @@ EAPI=7
inherit fixheadtails flag-o-matic qmail
DESCRIPTION="Collection of tools for managing UNIX services"
-HOMEPAGE="http://cr.yp.to/daemontools.html;
-SRC_URI="http://cr.yp.to/daemontools/${P}.tar.gz
+HOMEPAGE="https://cr.yp.to/daemontools.html;
+SRC_URI="https://cr.yp.to/daemontools/${P}.tar.gz
http://smarden.org/pape/djb/manpages/${P}-man-20020131.tar.gz;
-LICENSE="public-domain"
+LICENSE="public-domain GPL-2" # GPL-2 for init script
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86"
IUSE="selinux static"
DEPEND=""
-RDEPEND="selinux? ( sec-policy/selinux-daemontools )
- !app-doc/daemontools-man"
+RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
S="${WORKDIR}/admin/${P}/src"
diff --git a/sys-process/daemontools/files/svscan.init-0.76-r7
b/sys-process/daemontools/files/svscan.init-0.76-r7
index f05f5d4edfb7..4514f6cd379e 100644
--- a/sys-process/daemontools/files/svscan.init-0.76-r7
+++ b/sys-process/daemontools/files/svscan.init-0.76-r7
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
depend() {
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/
commit: be3cc66483263e577c06dd70cd3a4c4c44156943 Author: Mike Gilbert gentoo org> AuthorDate: Sat Feb 18 04:14:46 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Feb 18 04:19:18 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be3cc664 sys-process/daemontools: drop to maintainer-needed Signed-off-by: Mike Gilbert gentoo.org> sys-process/daemontools/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys-process/daemontools/metadata.xml b/sys-process/daemontools/metadata.xml index 73dda144f9ac..115e9d64a669 100644 --- a/sys-process/daemontools/metadata.xml +++ b/sys-process/daemontools/metadata.xml @@ -1,8 +1,5 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - base-sys...@gentoo.org - Gentoo Base System - +
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools-encore/
commit: 73c11d83ea6169c97a0a6f2493532e5220b15724 Author: Mike Gilbert gentoo org> AuthorDate: Sat Feb 18 04:14:11 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Feb 18 04:19:18 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c11d83 sys-process/daemontools-encore: drop to maintainer-needed Signed-off-by: Mike Gilbert gentoo.org> sys-process/daemontools-encore/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys-process/daemontools-encore/metadata.xml b/sys-process/daemontools-encore/metadata.xml index cb96242e263d..f8080fb67571 100644 --- a/sys-process/daemontools-encore/metadata.xml +++ b/sys-process/daemontools-encore/metadata.xml @@ -1,10 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - base-sys...@gentoo.org - Gentoo Base System - + daemontools-encore is a collection of tools for managing UNIX services. It is derived from the public-domain release of daemontools by
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools-encore/files/, sys-process/daemontools-encore/
commit: 669674443447ac910a730a963877cd949320a9db
Author: Sam James gentoo org>
AuthorDate: Sun Dec 25 21:22:30 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 25 21:24:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66967444
sys-process/daemontools-encore: EAPI 8, fix build w/ Clang 16
Closes: https://bugs.gentoo.org/870949
Signed-off-by: Sam James gentoo.org>
...ncore-1.11.ebuild => daemontools-encore-1.11-r1.ebuild} | 14 --
...aemontools-encore-1.11-implicit-func-decl-clang16.patch | 13 +
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
b/sys-process/daemontools-encore/daemontools-encore-1.11-r1.ebuild
similarity index 82%
rename from sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
rename to sys-process/daemontools-encore/daemontools-encore-1.11-r1.ebuild
index 9c5f7b2a5230..7cb3f795fc2d 100644
--- a/sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
+++ b/sys-process/daemontools-encore/daemontools-encore-1.11-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=8
inherit flag-o-matic qmail
@@ -14,14 +14,16 @@ SLOT="0"
KEYWORDS="~amd64 ~loong ~x86"
IUSE="selinux static"
-DEPEND=""
-RDEPEND="selinux? ( sec-policy/selinux-daemontools )
+RDEPEND="
+ !app-doc/daemontools-man
!sys-process/daemontools
- !app-doc/daemontools-man"
+ 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
)
src_compile() {
@@ -33,8 +35,8 @@ src_compile() {
src_install() {
keepdir /service
- echo "${ED%/}/usr/bin" >conf-bin
- echo "${ED%/}/usr/share/man" >conf-man
+ echo "${ED}/usr/bin" > conf-bin || die
+ echo "${ED}/usr/share/man" > conf-man || die
dodir /usr/bin
dodir /usr/share/man
emake install
diff --git
a/sys-process/daemontools-encore/files/daemontools-encore-1.11-implicit-func-decl-clang16.patch
b/sys-process/daemontools-encore/files/daemontools-encore-1.11-implicit-func-decl-clang16.patch
new file mode 100644
index ..35bcb5833ddc
--- /dev/null
+++
b/sys-process/daemontools-encore/files/daemontools-encore-1.11-implicit-func-decl-clang16.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/870949
+--- a/sig_pause.c
b/sig_pause.c
+@@ -1,5 +1,9 @@
+ /* Public domain. */
+
++#ifndef _XOPEN_SOURCE
++#define _XOPEN_SOURCE 500
++#endif
++
+ #include
+ #include "sig.h"
+ #include "hassgprm.h"
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools-encore/
commit: a29c1d778ca14b1607b4d57ebce1bec8ecbe88ee
Author: WANG Xuerui gentoo org>
AuthorDate: Sun Aug 28 06:30:41 2022 +
Commit: WANG Xuerui gentoo org>
CommitDate: Sun Aug 28 06:30:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a29c1d77
sys-process/daemontools-encore: keyword 1.11 for ~loong
Signed-off-by: WANG Xuerui gentoo.org>
sys-process/daemontools-encore/daemontools-encore-1.11.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
b/sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
index 916836923265..9c5f7b2a5230 100644
--- a/sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
+++ b/sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@
SRC_URI="https://untroubled.org/daemontools-encore/${P}.tar.gz;
LICENSE="GPL-2 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~loong ~x86"
IUSE="selinux static"
DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/
commit: bb34c5e09327ada655912ae41eab0725c9d27e31
Author: WANG Xuerui gentoo org>
AuthorDate: Thu May 5 02:21:52 2022 +
Commit: WANG Xuerui gentoo org>
CommitDate: Thu May 5 02:38:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb34c5e0
sys-process/daemontools: keyword 0.76-r8 for ~loong
Signed-off-by: WANG Xuerui gentoo.org>
sys-process/daemontools/daemontools-0.76-r8.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-process/daemontools/daemontools-0.76-r8.ebuild
b/sys-process/daemontools/daemontools-0.76-r8.ebuild
index be5da9bbc09c..75d4085cc155 100644
--- a/sys-process/daemontools/daemontools-0.76-r8.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://cr.yp.to/daemontools/${P}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86"
IUSE="selinux static"
DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/
commit: 068f76f34f3a1167a95ce918008fe05ac77b5c97
Author: Alex Fan yahoo com>
AuthorDate: Mon Jul 19 02:35:46 2021 +
Commit: Yixun Lan gentoo org>
CommitDate: Wed Jul 21 02:21:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=068f76f3
sys-process/daemontools: keyword 0.76-r8 for ~riscv
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alex Fan yahoo.com>
Signed-off-by: Yixun Lan gentoo.org>
sys-process/daemontools/daemontools-0.76-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-process/daemontools/daemontools-0.76-r8.ebuild
b/sys-process/daemontools/daemontools-0.76-r8.ebuild
index d3d7d7abe83..be5da9bbc09 100644
--- a/sys-process/daemontools/daemontools-0.76-r8.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://cr.yp.to/daemontools/${P}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc
x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv
~s390 sparc x86"
IUSE="selinux static"
DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/
commit: 825ab0a65c4bbf95133d2db8c767cb2c92339d2e
Author: Sam James gentoo org>
AuthorDate: Thu Jul 15 21:40:57 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jul 15 21:40:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=825ab0a6
sys-process/daemontools: Stabilize 0.76-r8 arm64, #799035
Signed-off-by: Sam James gentoo.org>
sys-process/daemontools/daemontools-0.76-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-process/daemontools/daemontools-0.76-r8.ebuild
b/sys-process/daemontools/daemontools-0.76-r8.ebuild
index a20353e8885..d3d7d7abe83 100644
--- a/sys-process/daemontools/daemontools-0.76-r8.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://cr.yp.to/daemontools/${P}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390
sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc
x86"
IUSE="selinux static"
DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/
commit: 4dd796748cf5b8455513b658d813a1765e987a68
Author: Lars Wendler gentoo org>
AuthorDate: Thu Nov 7 14:47:19 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Nov 7 17:05:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd79674
sys-process/daemontools: EAPI-7 revbump
Closes: https://bugs.gentoo.org/697166
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler gentoo.org>
...s-0.76-r7.ebuild => daemontools-0.76-r8.ebuild} | 26 --
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/sys-process/daemontools/daemontools-0.76-r7.ebuild
b/sys-process/daemontools/daemontools-0.76-r8.ebuild
similarity index 78%
rename from sys-process/daemontools/daemontools-0.76-r7.ebuild
rename to sys-process/daemontools/daemontools-0.76-r8.ebuild
index 5f2a20bcb1e..98a02977441 100644
--- a/sys-process/daemontools/daemontools-0.76-r7.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
+EAPI=7
-inherit eutils flag-o-matic qmail
+inherit flag-o-matic qmail
DESCRIPTION="Collection of tools for managing UNIX services"
HOMEPAGE="http://cr.yp.to/daemontools.html;
@@ -19,14 +19,16 @@ DEPEND=""
RDEPEND="selinux? ( sec-policy/selinux-daemontools )
!app-doc/daemontools-man"
-S="${WORKDIR}"/admin/${P}/src
+S="${WORKDIR}/admin/${P}/src"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+PATCHES=(
+ "${FILESDIR}"/${PV}-errno.patch
+ "${FILESDIR}"/${PV}-warnings.patch
+)
+
+src_prepare() {
+ default
- epatch "${FILESDIR}"/${PV}-errno.patch
- epatch "${FILESDIR}"/${PV}-warnings.patch
ht_fix_file Makefile print-{cc,ld}.sh
use static && append-ldflags -static
@@ -34,14 +36,14 @@ src_unpack() {
}
src_compile() {
- touch home
- emake || die
+ touch home || die
+ emake
}
src_install() {
keepdir /service
- dobin $(<../package/commands) || die
+ dobin $(<../package/commands)
dodoc CHANGES ../package/README TODO
doman "${WORKDIR}"/${PN}-man/*.8
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools-encore/
commit: 522340181bfa572dec8a168f904d5fae65b0d95b
Author: Michał Górny gentoo org>
AuthorDate: Mon Jul 15 15:27:04 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Jul 15 15:27:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52234018
sys-process/daemontools-encore: Sort KEYWORDS
Signed-off-by: Michał Górny gentoo.org>
sys-process/daemontools-encore/daemontools-encore-1.10.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-process/daemontools-encore/daemontools-encore-1.10.ebuild
b/sys-process/daemontools-encore/daemontools-encore-1.10.ebuild
index 5a8a4fbabf1..b9827594a5d 100644
--- a/sys-process/daemontools-encore/daemontools-encore-1.10.ebuild
+++ b/sys-process/daemontools-encore/daemontools-encore-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/daemontools-encore/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE="selinux static"
DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools-encore/
commit: 55c390726f58734369d9efcf40766e92e4880c31
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Jan 18 02:59:25 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Jan 18 02:59:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c39072
sys-process/daemontools-encore: add GPL-2 to LICENSE
Closes: https://bugs.gentoo.org/426172
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-process/daemontools-encore/daemontools-encore-1.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
b/sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
index 80d87fa6647..91683692326 100644
--- a/sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
+++ b/sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
@@ -9,7 +9,7 @@ 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="MIT"
+LICENSE="GPL-2 MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="selinux static"
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools-encore/, sys-process/daemontools-encore/files/
commit: 1b14c147db4e7d0862cc49fb0c73e1376cf52c20
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Jan 18 02:50:10 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Jan 18 02:51:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b14c147
sys-process/daemontools-encore: bump to v1.11
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-process/daemontools-encore/Manifest| 1 +
.../daemontools-encore-1.11.ebuild | 55 +
...-encore-1.11-add-missing-setuser-man-page.patch | 68 ++
...tools-encore-1.11-do-not-always-run-tests.patch | 21 +++
4 files changed, 145 insertions(+)
diff --git a/sys-process/daemontools-encore/Manifest
b/sys-process/daemontools-encore/Manifest
index 843461195af..bddd090077f 100644
--- a/sys-process/daemontools-encore/Manifest
+++ b/sys-process/daemontools-encore/Manifest
@@ -1 +1,2 @@
DIST daemontools-encore-1.10.tar.gz 87096 BLAKE2B
f0e5accc319caa1b4f4f15f5bdf2c2d59c5f398698509ad288a9b7ba33944fb49155386bf0edebda20959ea1c7d1fce14be883a0a96c1d2e054886c7df17d64a
SHA512
569030fb9941186f167644740d0424987105b7a818d5a3cdb4e90ced5530a16938b7205141ca2f198f83362269f9cc28eb5acafe9cd7f985c8e56d307f706767
+DIST daemontools-encore-1.11.tar.gz 94917 BLAKE2B
747da62ae97d4e4b28ca5309cbf835fe989db23d9f7a408bcce6fa7b17a658740024867daf9116dcbcb02e16a6b0ee92210bd485ecceef9b7ecbb2e0ea79e110
SHA512
1e1a96a948d551bfc38496740eaa85b7cae0d2469419293b133533da75ca03657fe6108129703ad7b773925c58ce84a4f242eb612133fb0c499f47ae50423a8a
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 000..80d87fa6647
--- /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="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 000..58b159b762e
--- /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),
[gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/
commit: e7286560d68fa345b2de1ef080cdb19df668c35d
Author: Alexis Ballier gentoo org>
AuthorDate: Mon Jun 19 13:54:34 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Mon Jun 19 14:03:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7286560
sys-process/daemontools: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
sys-process/daemontools/daemontools-0.76-r7.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-process/daemontools/daemontools-0.76-r7.ebuild
b/sys-process/daemontools/daemontools-0.76-r7.ebuild
index 4b8abf705e0..2550eb7f24e 100644
--- a/sys-process/daemontools/daemontools-0.76-r7.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit eutils flag-o-matic qmail
@@ -10,7 +10,7 @@ SRC_URI="http://cr.yp.to/daemontools/${P}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc
x86 ~x86-fbsd"
IUSE="selinux static"
DEPEND=""
