From a12d0fab29a3a7f422ff33db8c040241055c6653 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Tue, 26 May 2020 16:43:59 +0300 Subject: [PATCH] goaccess: update patches --- packages/goaccess/Makefile.in.patch | 17 ++++---- packages/goaccess/fix-paths.patch | 64 +++++++++++++++++++++++++++++ packages/goaccess/tcbtdb.h.patch | 12 ------ packages/goaccess/websocket.h.patch | 14 ------- 4 files changed, 72 insertions(+), 35 deletions(-) create mode 100644 packages/goaccess/fix-paths.patch delete mode 100644 packages/goaccess/tcbtdb.h.patch delete mode 100644 packages/goaccess/websocket.h.patch diff --git a/packages/goaccess/Makefile.in.patch b/packages/goaccess/Makefile.in.patch index 23ca46b2f..bb454cb88 100644 --- a/packages/goaccess/Makefile.in.patch +++ b/packages/goaccess/Makefile.in.patch @@ -1,16 +1,15 @@ -diff -uNr goaccess-1.3/Makefile.in goaccess-1.3.mod/Makefile.in ---- goaccess-1.3/Makefile.in 2018-11-23 07:35:59.000000000 +0200 -+++ goaccess-1.3.mod/Makefile.in 2019-02-01 01:28:46.579671652 +0200 -@@ -531,10 +531,9 @@ - src/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) src/$(DEPDIR) +diff -uNr goaccess-1.4/Makefile.in goaccess-1.4.mod/Makefile.in +--- goaccess-1.4/Makefile.in 2020-05-17 18:03:00.000000000 +0300 ++++ goaccess-1.4.mod/Makefile.in 2020-05-26 16:40:08.800612064 +0300 +@@ -621,9 +621,9 @@ @: > src/$(DEPDIR)/$(am__dirstamp) --src/bin2c.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) + src/bin2c.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) + -bin2c$(EXEEXT): $(bin2c_OBJECTS) $(bin2c_DEPENDENCIES) $(EXTRA_bin2c_DEPENDENCIES) +bin2c$(EXEEXT): $(bin2c_SOURCES) @rm -f bin2c$(EXEEXT) -- $(LINK) $(bin2c_OBJECTS) $(bin2c_LDADD) $(LIBS) -+ gcc $(bin2c_SOURCES) $(bin2c_LDADD) $(LIBS) -o bin2c +- $(AM_V_CCLD)$(LINK) $(bin2c_OBJECTS) $(bin2c_LDADD) $(LIBS) ++ $(AM_V_CCLD)gcc $(bin2c_SOURCES) -o bin2c src/base64.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/browsers.$(OBJEXT): src/$(am__dirstamp) \ diff --git a/packages/goaccess/fix-paths.patch b/packages/goaccess/fix-paths.patch new file mode 100644 index 000000000..0d4f1ff99 --- /dev/null +++ b/packages/goaccess/fix-paths.patch @@ -0,0 +1,64 @@ +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 +@@ -314,11 +314,11 @@ + + # Path to read named pipe (FIFO). + # +-#fifo-in /tmp/wspipein.fifo ++#fifo-in @TERMUX_PREFIX@/tmp/wspipein.fifo + + # Path to write named pipe (FIFO). + # +-#fifo-out /tmp/wspipeout.fifo ++#fifo-out @TERMUX_PREFIX@/tmp/wspipeout.fifo + + ###################################### + # File Options +@@ -708,7 +708,7 @@ + # The default value is the /tmp/ directory + # Note the trailing forward-slash. + # +-#db-path /tmp ++#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 +@@ -710,7 +710,7 @@ + .TP + \fB\-\-db-path= + Path where the on-disk database files are stored. The default value is the +-.I /tmp ++.I @TERMUX_PREFIX@/tmp + 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 +@@ -35,7 +35,7 @@ + + /* Total number of storage metrics (GSMetric) */ + #define GSMTRC_TOTAL 19 +-#define DB_PATH "/tmp" ++#define DB_PATH "@TERMUX_PREFIX@/tmp" + + /* 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 --git a/packages/goaccess/tcbtdb.h.patch b/packages/goaccess/tcbtdb.h.patch deleted file mode 100644 index 065b9aea0..000000000 --- a/packages/goaccess/tcbtdb.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr goaccess-1.3/src/tcbtdb.h goaccess-1.3.mod/src/tcbtdb.h ---- goaccess-1.3/src/tcbtdb.h 2018-11-23 04:00:08.000000000 +0200 -+++ goaccess-1.3.mod/src/tcbtdb.h 2019-02-01 01:30:19.191246767 +0200 -@@ -46,7 +46,7 @@ - #define TC_LMEMB 128 - #define TC_NMEMB 256 - #define TC_BNUM 32749 --#define TC_DBPATH "/tmp/goaccess" -+#define TC_DBPATH "@TERMUX_PREFIX@/tmp/goaccess" - #define TC_DBPMODE 0755 - #define TC_ZLIB 1 - #define TC_BZ2 2 diff --git a/packages/goaccess/websocket.h.patch b/packages/goaccess/websocket.h.patch deleted file mode 100644 index a7713528b..000000000 --- a/packages/goaccess/websocket.h.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -uNr goaccess-1.3/src/websocket.h goaccess-1.3.mod/src/websocket.h ---- goaccess-1.3/src/websocket.h 2018-11-23 04:00:08.000000000 +0200 -+++ goaccess-1.3.mod/src/websocket.h 2019-02-01 01:30:02.260971076 +0200 -@@ -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"