From 1c21a05b6b83dcc62e26c2cec93bffb81af21f3f Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 18 Nov 2022 17:31:57 +0900 Subject: [PATCH] goaccess: Bump to 1.6.5 --- packages/goaccess/build.sh | 5 ++--- packages/goaccess/fix-paths.patch | 31 +++++++++++++++++++++---------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/packages/goaccess/build.sh b/packages/goaccess/build.sh index 20d14b12cc..56a08befea 100644 --- a/packages/goaccess/build.sh +++ b/packages/goaccess/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://goaccess.io TERMUX_PKG_DESCRIPTION="An open source real-time web log analyzer and interactive viewer" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.5.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=1.6.5 TERMUX_PKG_SRCURL=https://tar.goaccess.io/goaccess-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=a0ce2f9393b2622484e469e95a809dfd52ade4d4200491e43ede1fcb52ab1c8a +TERMUX_PKG_SHA256=355edbf8af2c14879fa4b90c68adcde340eb4efbc443d27de4f8a03a01002df9 TERMUX_PKG_DEPENDS="ncurses, openssl" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/goaccess/fix-paths.patch b/packages/goaccess/fix-paths.patch index 299e1345a0..2b9d0564f8 100644 --- a/packages/goaccess/fix-paths.patch +++ b/packages/goaccess/fix-paths.patch @@ -74,16 +74,27 @@ diff -uNr goaccess-1.4.1/src/gstorage.h goaccess-1.4.1.mod/src/gstorage.h 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" +@@ -277,7 +277,7 @@ + " --date-spec= - Date specificity. Possible values: `date`\n" + " (default), `hr` or `min`.\n" + " --db-path= - Persist data to disk on exit to the given\n" +- " path or /tmp as default.\n" ++ " path or @TERMUX_PREFIX@/tmp as default.\n" + " --double-decode - Decode double-encoded values.\n" + " --enable-panel= - Enable parsing/displaying the given panel.\n" + " --fname-as-vhost= - Use log filename(s) as virtual host(s).\n" +@@ -301,12 +301,12 @@ + " --no-strict-status - Disable HTTP status code 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" + " --persist - Persist data to disk on exit to the given\n" +- " --db-path or to /tmp.\n" ++ " --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" + " --real-os - Display real OS names. e.g, Windows XP,\n" + " Snow Leopard.\n" + " --restore - Restore data from disk from the given\n" +- " --db-path or from /tmp.\n" ++ " --db-path or from @TERMUX_PREFIX@/tmp.\n" + " --sort-panel=PANEL,METRIC,ORDER - Sort panel on initial load. e.g.,\n" + " --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"