mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-27 09:21:41 +02:00
d77034b167
- no wxPython GUI anymore in upstream so remove the -gui package. - no more ping.test in upstream so just drop the corresponding patch; ns-ping.test is still here but the test driver will skip it properly in non-root environment anyway. - sync configure feature flags with makedepends even if they just confirm the default. On mipseln8hf this upgrade fixes exactly the same tests failure as described in commit 4a50fb4c...
57 lines
1.4 KiB
Diff
57 lines
1.4 KiB
Diff
diff --git a/src/names.c b/src/names.c
|
|
index 603b536..44064ec 100644
|
|
--- a/src/names.c
|
|
+++ b/src/names.c
|
|
@@ -104,47 +104,11 @@ void make_names(bool daemon) {
|
|
}
|
|
|
|
#else
|
|
- bool fallback = false;
|
|
-
|
|
- if(daemon) {
|
|
- if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK)) {
|
|
- fallback = true;
|
|
- }
|
|
- } else {
|
|
- char fname[PATH_MAX];
|
|
- snprintf(fname, sizeof(fname), LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
|
|
-
|
|
- if(access(fname, R_OK)) {
|
|
- snprintf(fname, sizeof(fname), "%s" SLASH "pid", confbase);
|
|
-
|
|
- if(!access(fname, R_OK)) {
|
|
- fallback = true;
|
|
- }
|
|
- }
|
|
- }
|
|
-
|
|
- if(!fallback) {
|
|
- if(!logfilename) {
|
|
- xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
|
|
- }
|
|
-
|
|
- if(!pidfilename) {
|
|
- xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
|
|
- }
|
|
- } else {
|
|
- if(!logfilename) {
|
|
- xasprintf(&logfilename, "%s" SLASH "log", confbase);
|
|
- }
|
|
-
|
|
- if(!pidfilename) {
|
|
- if(daemon) {
|
|
- logger(DEBUG_ALWAYS, LOG_WARNING, "Could not access " LOCALSTATEDIR SLASH " (%s), storing pid and socket files in %s" SLASH, strerror(errno), confbase);
|
|
- }
|
|
-
|
|
- xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
|
|
- }
|
|
- }
|
|
+ if(!logfilename)
|
|
+ xasprintf(&logfilename, "/var/log" SLASH "%s.log", identname);
|
|
|
|
+ if(!pidfilename)
|
|
+ xasprintf(&pidfilename, "/run" SLASH "%s.pid", identname);
|
|
#endif
|
|
|
|
if(!unixsocketname) {
|