aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www-misc/slowcgi/Manifest6
-rw-r--r--www-misc/slowcgi/files/6.9-Add-flag-to-run-in-the-foreground.patch70
-rw-r--r--www-misc/slowcgi/files/7.0-Add-flag-to-run-in-the-foreground.patch97
-rw-r--r--www-misc/slowcgi/slowcgi-7.0.ebuild (renamed from www-misc/slowcgi/slowcgi-6.9.ebuild)0
4 files changed, 100 insertions, 73 deletions
diff --git a/www-misc/slowcgi/Manifest b/www-misc/slowcgi/Manifest
index b365978..508c51b 100644
--- a/www-misc/slowcgi/Manifest
+++ b/www-misc/slowcgi/Manifest
@@ -1,9 +1,9 @@
AUX 6.8.1-Add-flag-to-run-in-the-foreground.patch 2060 BLAKE2B 228d15895630f4da6e87101ace295e2eca7ab68d955c814c9d3289836ff9ed80c945cc81f222f6170bb94d0a801f795a303462d1ad1b14d3d96277c63aa8a8bf SHA512 db554f3ac6db79a4bcd7078190b550334ee395af214ac8d567940a6cef56c362ada0b2b8ec93fc27c9b4f705945e8af312534ff94e0e4875a5c3d9eceb06e14a
-AUX 6.9-Add-flag-to-run-in-the-foreground.patch 2060 BLAKE2B 228d15895630f4da6e87101ace295e2eca7ab68d955c814c9d3289836ff9ed80c945cc81f222f6170bb94d0a801f795a303462d1ad1b14d3d96277c63aa8a8bf SHA512 db554f3ac6db79a4bcd7078190b550334ee395af214ac8d567940a6cef56c362ada0b2b8ec93fc27c9b4f705945e8af312534ff94e0e4875a5c3d9eceb06e14a
+AUX 7.0-Add-flag-to-run-in-the-foreground.patch 2634 BLAKE2B 969b1829ac576dd2ed80be33f92ebda679907586552ae14881595ba9a3557e6d6f52dbcc8308df3108606a4acbad84d5ccb6faa32c2ff869544469a656972c10 SHA512 7ed4d597c2057bb99d1e97ababe28f68f99da5efe1290b1d9e5bef9a73e136c53f91d370cca94ee29b659d9768d227f199b729d15aca9b7c4254bc18c5bce9da
AUX slowcgi.confd 141 BLAKE2B 7b2880ddcbd1cb4e9976925d8f01085e26323edc4c33d292ed472eee2268134672967246e7fc520aec252e0be439fc6b4b462af1a83dbd7009cfea1d62f8958e SHA512 4b255b338a873f830ac569c04e19a35d2e069abb9bd593657f97651f582158139a2d9fb187446c97dede0d436699fdefa6648034403a240bcebb0a6ea9a9b2c6
AUX slowcgi.initd 297 BLAKE2B 9c1fb1867104beed84725c658a76b606b4ff3a78dc4b8e6722ddff40eee8eefd40522d17c1fefc8869750bc0ebed50a513b62866da9c19ab6e527d378dee2bea SHA512 a24a584c4cbedfa604a22d74851f9d74988037422c765e58174950143d2b481c17527400e178879dd342fb4bc4ce4c26b67095b2c26b5b19672f9a5647e9047a
DIST slowcgi-6.8.1.tar.gz 14337 BLAKE2B 85b09e83421861f7b5107302131feb104429ca5484eb01f954adcad78377093ca6e966d61052a56c49759d96d1216ee85e7923b32737cd49a3ce79f112599b47 SHA512 36a01fe88bc115a01da836b1f65580ce0425f93d5474945a5dee932344ec518640adefe1708e13fc9dea938f749b3dd57f38c215d627c51fc012ab5ec0f2ed8c
-DIST slowcgi-6.9.tar.gz 14267 BLAKE2B 9e845051f448bb8930fda0cf44b819d5d900638cf6a4c30556506e810a73a76ff43d4db972b8c584043a005cdfd8805759b1d03cba6e188807a85922d8055f5e SHA512 220f9c5e08c16b9810c557dcdd255f7a26ded2ce5e41780714d50b0ea4b2ffaab88169ee9cfabe174200d424b31ac79accb4f3036c34ed8b44dbdb99f0a55146
+DIST slowcgi-7.0.tar.gz 14302 BLAKE2B c0adccb1ef7a3b61495443be6018e2a7e56f0e0657083758862989f1c8f19d2a8d77be04ee0c729d99de9b0c6a39500cdcf08d3cd0daec74a8f8e6e8b95ab772 SHA512 6c3c8f13f66132428e7c341c87fb2466f4b31c70b0927af4c6aad597c696764483eeaba38f476ae90052d1e0f674bc72afb3ed25b62ae795eed53f6b3e21e8e8
EBUILD slowcgi-6.8.1.ebuild 613 BLAKE2B 2287eeb44f695b31a950a54e1ffeb125be773a686294918aeee137b80745ace3c1bc5dcdf680a1477cb8a13d83497c948e60b01ffa27d0748d588e67b130b2c2 SHA512 060e1efb68bfd68bfa2c397780c08f5315e9de8f9f39506768626ce6ce6652300cce5df71ea623d41059fdbcd943a93a5f0a525e0318112572296e061324c7f7
-EBUILD slowcgi-6.9.ebuild 613 BLAKE2B 2287eeb44f695b31a950a54e1ffeb125be773a686294918aeee137b80745ace3c1bc5dcdf680a1477cb8a13d83497c948e60b01ffa27d0748d588e67b130b2c2 SHA512 060e1efb68bfd68bfa2c397780c08f5315e9de8f9f39506768626ce6ce6652300cce5df71ea623d41059fdbcd943a93a5f0a525e0318112572296e061324c7f7
+EBUILD slowcgi-7.0.ebuild 613 BLAKE2B 2287eeb44f695b31a950a54e1ffeb125be773a686294918aeee137b80745ace3c1bc5dcdf680a1477cb8a13d83497c948e60b01ffa27d0748d588e67b130b2c2 SHA512 060e1efb68bfd68bfa2c397780c08f5315e9de8f9f39506768626ce6ce6652300cce5df71ea623d41059fdbcd943a93a5f0a525e0318112572296e061324c7f7
MISC metadata.xml 223 BLAKE2B 2c1cd83f1f1d25a43ea978cd66b5c9f6020889613dfaed65d6745858a45d4bf50fda775305420e41c36cafd63d63746ed894411acbced66ab8ae04906dfb8592 SHA512 4f71eacfeb2b21a4ea746ce1663777937b920e942c94eef1fe93c3557e207c9fdb2569369d56637cba563dc50179d62195db6225123ecfedc303600b8a0bb49b
diff --git a/www-misc/slowcgi/files/6.9-Add-flag-to-run-in-the-foreground.patch b/www-misc/slowcgi/files/6.9-Add-flag-to-run-in-the-foreground.patch
deleted file mode 100644
index a9f9e26..0000000
--- a/www-misc/slowcgi/files/6.9-Add-flag-to-run-in-the-foreground.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 71a5493a09045ef3d90db42bdb5e1947c2512900 Mon Sep 17 00:00:00 2001
-From: Wynn Wolf Arbor <wolf@oriole.systems>
-Date: Fri, 5 Jun 2020 21:14:44 +0200
-Subject: [PATCH] Add flag to run in the foreground
-
-slowcgi already has the -d flag to disable forking, but that particular
-flag also enables debug output and stops slowcgi from logging to syslog.
-
-Ordinarily this would be fine, but sadly we know of no clean way to
-track the PID of a forked process with Gentoo's OpenRC and its
-start-stop-daemon(8). We could add support to write a pidfile instead,
-but since we want to support multiple invocations of slowcgi through
-OpenRC and ${RC_SVCNAME}, we need a way of specifying the pidfile
-location in the init script itself.
-
-To solve this reasonably cleanly, add a flag that *only* controls
-whether or not the program daemonizes or not.
----
- slowcgi.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/slowcgi.c b/slowcgi.c
-index 0b5d62a..01f8139 100644
---- a/slowcgi.c
-+++ b/slowcgi.c
-@@ -274,7 +274,7 @@ usage(void)
- {
- extern char *__progname;
- fprintf(stderr,
-- "usage: %s [-d] [-p path] [-s socket] [-U user] [-u user]\n",
-+ "usage: %s [-df] [-p path] [-s socket] [-U user] [-u user]\n",
- __progname);
- exit(1);
- }
-@@ -282,6 +282,7 @@ usage(void)
- struct timeval timeout = { TIMEOUT_DEFAULT, 0 };
- struct slowcgi_proc slowcgi_proc;
- int debug = 0;
-+int foreground = 0;
- int on = 1;
- char *fcgi_socket = "/var/www/run/slowcgi.sock";
-
-@@ -314,11 +315,14 @@ main(int argc, char *argv[])
- }
- }
-
-- while ((c = getopt(argc, argv, "dp:s:U:u:")) != -1) {
-+ while ((c = getopt(argc, argv, "dfp:s:U:u:")) != -1) {
- switch (c) {
- case 'd':
- debug++;
- break;
-+ case 'f':
-+ foreground = 1;
-+ break;
- case 'p':
- chrootpath = optarg;
- break;
-@@ -340,7 +344,7 @@ main(int argc, char *argv[])
- if (geteuid() != 0)
- errx(1, "need root privileges");
-
-- if (!debug && daemon(0, 0) == -1)
-+ if (!debug && !foreground && daemon(0, 0) == -1)
- err(1, "daemon");
-
- if (!debug) {
---
-2.30.0
-
diff --git a/www-misc/slowcgi/files/7.0-Add-flag-to-run-in-the-foreground.patch b/www-misc/slowcgi/files/7.0-Add-flag-to-run-in-the-foreground.patch
new file mode 100644
index 0000000..69e31bf
--- /dev/null
+++ b/www-misc/slowcgi/files/7.0-Add-flag-to-run-in-the-foreground.patch
@@ -0,0 +1,97 @@
+From baed2c0935ca606d6d55d70b07db0cec7322f10c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= <wolf@oriole.systems>
+Date: Fri, 29 Oct 2021 11:45:32 +0200
+Subject: [PATCH] Add flag to run in the foreground
+
+slowcgi already has the -d flag to disable forking, but that particular
+flag also stops slowcgi from logging to syslog and is intended for
+debugging purposes.
+
+Ordinarily this would be fine, but sadly we know of no clean way to
+track the PID of a forked process with Gentoo's OpenRC and its
+start-stop-daemon(8). We could add support to write a pidfile instead,
+but since we want to support multiple invocations of slowcgi through
+OpenRC and ${RC_SVCNAME}, we need a way of specifying the pidfile
+location in the init script itself.
+
+To solve this reasonably cleanly, add a flag that *only* controls
+whether or not the program daemonizes or not. Make sure to mention this
+in the manual too.
+---
+ slowcgi.8 | 6 +++++-
+ slowcgi.c | 10 +++++++---
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/slowcgi.8 b/slowcgi.8
+index cfc4dee..bdfc0b7 100644
+--- a/slowcgi.8
++++ b/slowcgi.8
+@@ -22,7 +22,7 @@
+ .Nd a FastCGI to CGI wrapper server
+ .Sh SYNOPSIS
+ .Nm
+-.Op Fl dv
++.Op Fl dfv
+ .Op Fl p Ar path
+ .Op Fl s Ar socket
+ .Op Fl U Ar user
+@@ -64,6 +64,10 @@ Do not daemonize.
+ If this option is specified,
+ .Nm
+ will run in the foreground and log to stderr.
++.It Fl f
++As
++.Fl d ,
++but log to syslog.
+ .It Fl p Ar path
+ .Xr chroot 2
+ to
+diff --git a/slowcgi.c b/slowcgi.c
+index 9999ac8..96662e0 100644
+--- a/slowcgi.c
++++ b/slowcgi.c
+@@ -269,7 +269,7 @@ usage(void)
+ {
+ extern char *__progname;
+ fprintf(stderr,
+- "usage: %s [-dv] [-p path] [-s socket] [-U user] [-u user]\n",
++ "usage: %s [-dfv] [-p path] [-s socket] [-U user] [-u user]\n",
+ __progname);
+ exit(1);
+ }
+@@ -277,6 +277,7 @@ usage(void)
+ struct timeval timeout = { TIMEOUT_DEFAULT, 0 };
+ struct slowcgi_proc slowcgi_proc;
+ int debug = 0;
++int foreground = 0;
+ int verbose = 0;
+ int on = 1;
+ char *fcgi_socket = "/var/www/run/slowcgi.sock";
+@@ -310,11 +311,14 @@ main(int argc, char *argv[])
+ }
+ }
+
+- while ((c = getopt(argc, argv, "dp:s:U:u:v")) != -1) {
++ while ((c = getopt(argc, argv, "dfp:s:U:u:v")) != -1) {
+ switch (c) {
+ case 'd':
+ debug++;
+ break;
++ case 'f':
++ foreground = 1;
++ break;
+ case 'p':
+ chrootpath = optarg;
+ break;
+@@ -339,7 +343,7 @@ main(int argc, char *argv[])
+ if (geteuid() != 0)
+ errx(1, "need root privileges");
+
+- if (!debug && daemon(0, 0) == -1)
++ if (!debug && !foreground && daemon(0, 0) == -1)
+ err(1, "daemon");
+
+ if (!debug) {
+--
+2.33.1
+
diff --git a/www-misc/slowcgi/slowcgi-6.9.ebuild b/www-misc/slowcgi/slowcgi-7.0.ebuild
index 8ed5723..8ed5723 100644
--- a/www-misc/slowcgi/slowcgi-6.9.ebuild
+++ b/www-misc/slowcgi/slowcgi-7.0.ebuild