From c386999fd983f02017bd7b754fdb7b009ac3c6b0 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Tue, 10 Nov 2020 21:04:04 +0200 Subject: [PATCH] goaccess: update patch fix-paths.patch --- packages/goaccess/fix-paths.patch | 79 ++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 27 deletions(-) diff --git a/packages/goaccess/fix-paths.patch b/packages/goaccess/fix-paths.patch index 0d4f1ff99..299e1345a 100644 --- a/packages/goaccess/fix-paths.patch +++ b/packages/goaccess/fix-paths.patch @@ -1,6 +1,6 @@ -diff -uNr goaccess-1.4/config/goaccess.conf goaccess-1.4.mod/config/goaccess.conf ---- goaccess-1.4/config/goaccess.conf 2020-05-17 18:46:09.000000000 +0300 -+++ goaccess-1.4.mod/config/goaccess.conf 2020-05-26 16:42:33.661750284 +0300 +diff -uNr goaccess-1.4.1/config/goaccess.conf goaccess-1.4.1.mod/config/goaccess.conf +--- goaccess-1.4.1/config/goaccess.conf 2020-09-24 17:57:46.000000000 +0300 ++++ goaccess-1.4.1.mod/config/goaccess.conf 2020-11-10 21:02:00.115410052 +0200 @@ -314,11 +314,11 @@ # Path to read named pipe (FIFO). @@ -15,18 +15,29 @@ diff -uNr goaccess-1.4/config/goaccess.conf goaccess-1.4.mod/config/goaccess.con ###################################### # File Options -@@ -708,7 +708,7 @@ - # The default value is the /tmp/ directory - # Note the trailing forward-slash. - # +@@ -708,8 +708,8 @@ + ###################################### + + # Path where the persisted database files are stored on disk. +-# The default value is the /tmp directory. -#db-path /tmp ++# The default value is the @TERMUX_PREFIX@/tmp directory. +#db-path @TERMUX_PREFIX@/tmp # Persist parsed data into disk. #persist true -diff -uNr goaccess-1.4/goaccess.1 goaccess-1.4.mod/goaccess.1 ---- goaccess-1.4/goaccess.1 2020-05-18 01:31:19.000000000 +0300 -+++ goaccess-1.4.mod/goaccess.1 2020-05-26 16:42:13.793594655 +0300 +diff -uNr goaccess-1.4.1/goaccess.1 goaccess-1.4.1.mod/goaccess.1 +--- goaccess-1.4.1/goaccess.1 2020-11-08 04:58:38.000000000 +0200 ++++ goaccess-1.4.1.mod/goaccess.1 2020-11-10 21:03:05.247736960 +0200 +@@ -452,7 +452,7 @@ + .TP + \fB\-\-no-global-config + Do not load the global configuration file. This directory should normally be +-/usr/local/etc, unless specified with ++@TERMUX_PREFIX@/etc, unless specified with + .I --sysconfdir=/dir. + See --dcf option for finding the default configuration file. + .SS @@ -710,7 +710,7 @@ .TP \fB\-\-db-path= @@ -36,9 +47,21 @@ diff -uNr goaccess-1.4/goaccess.1 goaccess-1.4.mod/goaccess.1 directory. .SH CUSTOM LOG/DATE FORMAT -diff -uNr goaccess-1.4/src/gstorage.h goaccess-1.4.mod/src/gstorage.h ---- goaccess-1.4/src/gstorage.h 2020-05-17 15:34:51.000000000 +0300 -+++ goaccess-1.4.mod/src/gstorage.h 2020-05-26 16:41:52.349426524 +0300 +diff -uNr goaccess-1.4.1/src/goaccess.c goaccess-1.4.1.mod/src/goaccess.c +--- goaccess-1.4.1/src/goaccess.c 2020-11-08 05:27:09.000000000 +0200 ++++ goaccess-1.4.1.mod/src/goaccess.c 2020-11-10 21:02:06.035439655 +0200 +@@ -1365,7 +1365,7 @@ + char *path = NULL; + + if ((tmp = getenv ("TMPDIR")) == NULL) +- tmp = "/tmp"; ++ tmp = "@TERMUX_PREFIX@/tmp"; + + memset (fname, 0, sizeof (fname)); + genstr (fname, RAND_FN - 1); +diff -uNr goaccess-1.4.1/src/gstorage.h goaccess-1.4.1.mod/src/gstorage.h +--- goaccess-1.4.1/src/gstorage.h 2020-11-08 04:25:14.000000000 +0200 ++++ goaccess-1.4.1.mod/src/gstorage.h 2020-11-10 21:02:17.427496682 +0200 @@ -35,7 +35,7 @@ /* Total number of storage metrics (GSMetric) */ @@ -48,17 +71,19 @@ diff -uNr goaccess-1.4/src/gstorage.h goaccess-1.4.mod/src/gstorage.h /* Enumerated Storage Metrics */ typedef enum GSMetric_ { -diff -uNr goaccess-1.4/src/websocket.h goaccess-1.4.mod/src/websocket.h ---- goaccess-1.4/src/websocket.h 2020-05-17 15:34:51.000000000 +0300 -+++ goaccess-1.4.mod/src/websocket.h 2020-05-26 16:41:43.281355373 +0300 -@@ -90,8 +90,8 @@ - #define MAX(a,b) (((a)>(b))?(a):(b)) - #include "gslist.h" - --#define WS_PIPEIN "/tmp/wspipein.fifo" --#define WS_PIPEOUT "/tmp/wspipeout.fifo" -+#define WS_PIPEIN "@TERMUX_PREFIX@/tmp/wspipein.fifo" -+#define WS_PIPEOUT "@TERMUX_PREFIX@/tmp/wspipeout.fifo" - - #define WS_BAD_REQUEST_STR "HTTP/1.1 400 Invalid Request\r\n\r\n" - #define WS_SWITCH_PROTO_STR "HTTP/1.1 101 Switching Protocols" +diff -uNr goaccess-1.4.1/src/options.c goaccess-1.4.1.mod/src/options.c +--- goaccess-1.4.1/src/options.c 2020-11-08 04:25:14.000000000 +0200 ++++ goaccess-1.4.1.mod/src/options.c 2020-11-10 21:02:11.731468158 +0200 +@@ -248,10 +248,10 @@ + " --keep-last= - Keep the last NDAYS in storage.\n" + " --no-ip-validation - Disable client IPv4/6 validation.\n" + " --num-tests= - Number of lines to test. >= 0 (10 default)\n" +- " --persist - Persist data to disk on exit to the given --db-path or to /tmp.\n" ++ " --persist - Persist data to disk on exit to the given --db-path or to @TERMUX_PREFIX@/tmp.\n" + " --process-and-exit - Parse log and exit without outputting data.\n" + " --real-os - Display real OS names. e.g, Windows XP, Snow Leopard.\n" +- " --restore - Restore data from disk from the given --db-path or from /tmp.\n" ++ " --restore - Restore data from disk from the given --db-path or from @TERMUX_PREFIX@/tmp.\n" + " --sort-panel=PANEL,METRIC,ORDER - Sort panel on initial load. e.g., --sort-panel=VISITORS,BY_HITS,ASC.\n" + " See manpage for a list of panels/fields.\n" + " --static-file= - Add static file extension. e.g.: .mp3. Extensions are case sensitive.\n"