Subject: [PATCH] main/darkhttpd: --daemon should not be used with supervise-daemon

From: Wictor Lund <[email-masked]>
Date: Wed, 19 Feb 2020 21:45:26 +0200

When --daemon is present when darkhttpd is supervised, openrc can't kill
darkhttpd.
---
 main/darkhttpd/darkhttpd.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/darkhttpd/darkhttpd.initd b/main/darkhttpd/darkhttpd.initd
index dc23c6e621..93154234d8 100644
--- a/main/darkhttpd/darkhttpd.initd
+++ b/main/darkhttpd/darkhttpd.initd
@@ -6,7 +6,7 @@ name="darkhttpd web server"
 description="Simple, single-threaded, static content webserver"
 
 command="/usr/bin/darkhttpd"
-command_args="${document_root:-/var/www/localhost/htdocs} --chroot --daemon --uid darkhttpd --gid www-data $darkhttpd_args"
+command_args="${document_root:-/var/www/localhost/htdocs} --chroot --uid darkhttpd --gid www-data $darkhttpd_args"
 
 optional_arg() {
 	if [ -n "$2" ]; then
-- 
2.24.1

---

From: Wictor Lund <[email-masked]>
Date: Wed, 19 Feb 2020 22:29:30 +0200

When --daemon is present when darkhttpd is supervised, openrc can't kill
darkhttpd.
---
 main/darkhttpd/APKBUILD        | 2 +-
 main/darkhttpd/darkhttpd.initd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/darkhttpd/APKBUILD b/main/darkhttpd/APKBUILD
index aa7c9bb583..68e95611d8 100644
--- a/main/darkhttpd/APKBUILD
+++ b/main/darkhttpd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Alan Lacerda <[email-masked]>
 pkgname=darkhttpd
 pkgver=1.12
-pkgrel=3
+pkgrel=4
 pkgdesc="A simple, single-threaded, static content webserver"
 url="https://unix4lyfe.org/darkhttpd/"
 arch="all"
diff --git a/main/darkhttpd/darkhttpd.initd b/main/darkhttpd/darkhttpd.initd
index dc23c6e621..93154234d8 100644
--- a/main/darkhttpd/darkhttpd.initd
+++ b/main/darkhttpd/darkhttpd.initd
@@ -6,7 +6,7 @@ name="darkhttpd web server"
 description="Simple, single-threaded, static content webserver"

 optional_arg() {
 	if [ -n "$2" ]; then
-- 
2.24.1