pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/goaccess Update to 1.4. From the changelog:
details: https://anonhg.NetBSD.org/pkgsrc/rev/b658c7d665e9
branches: trunk
changeset: 445670:b658c7d665e9
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Wed Jan 27 08:17:31 2021 +0000
description:
Update to 1.4. From the changelog:
- Added a caching storage mechanism to improve parsing raw data and data
rendering.
- Added a mechanism to avoid counting duplicate data when restoring persisted
data from disk.
- Added additional option to the HTML report to set a maximum number of items
per page to 3.
- Added a list of podcast-related user agents under '%sysconfdir%'.
- Added 'Android 10' to the list of Android codenames.
- Added a 'widescreen' layout to the HTML report (e.g., 4K TV/KPI Dashboard).
- Added 'Beaker', 'Brave', and 'Firefox Focus' to the list of browsers
- Added command line option --user-name=username to avoid running GoAccess as
root when outputting a real-time report.
- Added 'DuckDuckGo' and 'MSNBot' browsers to the browsers.list.
- Added 'facebookexternalhit' to the default crawler list.
- Added German translation (DE).
- Added Kubernetes Nginx Ingress Log Format to the default config file.
- Added 'macOS Catalina' to the list of OSX codenames.
- Added minor CSS updates to HTML report.
- Added missing header '<sys/socket.h>' to fix FreeBSD build
- Added new 'Edg' token to the list of browsers.
- Added '--no-ip-validation' command line to disable client IP validation
- Added '--persist' and '--restore' options to persist to disk and restore a
dump from disk.
- Added Portuguese translation (pt-BR)
- Added Swedish translation (SV)
- Added the ability to parse server cache status and a new panel to display
those metrics.
- Changed accumulated time to work by default on '--persist' and '--restore'.
- Changed back how the hits and visitors percentage is calculated to be more
intuitive.
- Changed Geo Location panel display default to show only if database file is
provided ('LIBMAXMINDDB').
- Changed initial processing time from secs to HH:MM:SS in HTML output.
- Changed '--max-items' for the static HTML report to allow no limit on
output entries.
- Changed required 'gettext' version to 0.19
- Changed to ignore 'SIGPIPE' with 'SIG_IGN'
- Changed version to 10.15 for 'macOS Catalina'.
- Ensure proper escaping on default AWSELB log format.
- Ensure valid requests counter is not affected on duplicate entries when
restoring data.
- Fixed issue preventing Ctrl-C (SIGINT) for the curses interface to stop the
program.
- Fixed issue where HTML report wouldn't update the tables when changing per
page option.
- Fixed issue where it wouldn't find either the user's or global config file.
- Fixed issue where changing the number of items per page in the HTML report
would not automatically refresh the tables.
- Fixed issue where last updated label was not updated in real-time.
- Fixed issue where overall date range wasn't showing the right start/end parse
dates.
- Fixed issue where tailing a file could potentially re-parse part of the log.
- Fixed memory leak when fetching country/continent while using 'LIBMAXMINDDB'.
- Fixed several '-Wcast-qual' warnings.
- Fixed unwanted added characters to the HTML output.
- Fixed websocket issue returning a 400 due to request header size.
- Increased 'MAX_LINE_CONF' so a JSON string can be properly parsed from the
config file.
- Removed deprecated option '--geoip-city-data' from config file.
- Removed unnecessary dependency from snapcraft.yaml.
- Removed some old browsers from the default curated list.
- Replaced TokyoCabinet storage for a non-dependency in-memory persistent
storage.
pkgsrc changes:
- Remove 'tokyocabinet' option, no longer needed
- Switch 'geoip' option to libmaxminddb
diffstat:
www/goaccess/Makefile | 9 +-
www/goaccess/PLIST | 6 +-
www/goaccess/distinfo | 17 ++---
www/goaccess/options.mk | 15 +---
www/goaccess/patches/patch-Makefile.am | 10 +-
www/goaccess/patches/patch-src_error.c | 14 -----
www/goaccess/patches/patch-src_json.c | 14 -----
www/goaccess/patches/patch-src_parser.c | 14 +++++
www/goaccess/patches/patch-src_tcbtdb.c | 14 -----
www/goaccess/patches/patch-username | 86 ---------------------------------
10 files changed, 40 insertions(+), 159 deletions(-)
diffs (284 lines):
diff -r 8422fca16276 -r b658c7d665e9 www/goaccess/Makefile
--- a/www/goaccess/Makefile Wed Jan 27 06:17:37 2021 +0000
+++ b/www/goaccess/Makefile Wed Jan 27 08:17:31 2021 +0000
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.28 2020/04/25 20:02:35 schmonz Exp $
+# $NetBSD: Makefile,v 1.29 2021/01/27 08:17:31 schmonz Exp $
-DISTNAME= goaccess-1.3
-PKGREVISION= 6
+DISTNAME= goaccess-1.4
CATEGORIES= www
MASTER_SITES= http://tar.goaccess.io/
MAINTAINER= wiedi%frubar.net@localhost
-HOMEPAGE= http://goaccess.prosoftcorp.com/
-COMMENT= Real-time web log analyzer
+HOMEPAGE= https://goaccess.io/
+COMMENT= Real-time web log analyzer and viewer
LICENSE= gnu-gpl-v2
TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
diff -r 8422fca16276 -r b658c7d665e9 www/goaccess/PLIST
--- a/www/goaccess/PLIST Wed Jan 27 06:17:37 2021 +0000
+++ b/www/goaccess/PLIST Wed Jan 27 08:17:31 2021 +0000
@@ -1,9 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2019/08/23 01:48:00 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/01/27 08:17:31 schmonz Exp $
bin/goaccess
man/man1/goaccess.1
share/examples/goaccess/browsers.list
share/examples/goaccess/goaccess.conf
+share/examples/goaccess/podcast.list
+share/locale/de/LC_MESSAGES/goaccess.mo
share/locale/es/LC_MESSAGES/goaccess.mo
share/locale/fr/LC_MESSAGES/goaccess.mo
share/locale/ja/LC_MESSAGES/goaccess.mo
+share/locale/pt_BR/LC_MESSAGES/goaccess.mo
+share/locale/sv/LC_MESSAGES/goaccess.mo
share/locale/zh_CN/LC_MESSAGES/goaccess.mo
diff -r 8422fca16276 -r b658c7d665e9 www/goaccess/distinfo
--- a/www/goaccess/distinfo Wed Jan 27 06:17:37 2021 +0000
+++ b/www/goaccess/distinfo Wed Jan 27 08:17:31 2021 +0000
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.18 2020/03/30 11:31:25 roy Exp $
+$NetBSD: distinfo,v 1.19 2021/01/27 08:17:31 schmonz Exp $
-SHA1 (goaccess-1.3.tar.gz) = 24e889533e8d7a0fc533e7a0ad1bb303b2bb1af4
-RMD160 (goaccess-1.3.tar.gz) = b4744d1500a86ab56c94ce3612a8121b38cb3a37
-SHA512 (goaccess-1.3.tar.gz) = 7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1
-Size (goaccess-1.3.tar.gz) = 541374 bytes
-SHA1 (patch-Makefile.am) = f0fb958f91856fa8996c4e6691207c77a47af6d0
+SHA1 (goaccess-1.4.tar.gz) = ace27f1d6426afa7f758bf8ae35efee9f8710067
+RMD160 (goaccess-1.4.tar.gz) = a5e53bbd9eab3f3b6a5c9639a8bb5fb7fd0df0bc
+SHA512 (goaccess-1.4.tar.gz) = de5f6759a10193a625efb1f70a7aeed68f6bac3c6977f8a34f67c0320eeb995c2e063df9e6f5196de2dd5aaf42b7a90f3e9599a20ecdbc67d0f89c87f1ba852c
+Size (goaccess-1.4.tar.gz) = 595264 bytes
+SHA1 (patch-Makefile.am) = e72d4ac63fd2f9f236ce1feae9b021db2128b725
SHA1 (patch-configure) = 5ecf98e50dbbbb2a435b70fb8194f6a039c5c99e
SHA1 (patch-configure.ac) = 7cf4b8b57e2f335a81cfd81f929aafe7aa41aa79
-SHA1 (patch-src_error.c) = 522ea4010c86914715cdb40c1ac33045d4342daa
-SHA1 (patch-src_json.c) = ab8575a654299a5d08de635ca5bb71093419ca8e
-SHA1 (patch-src_tcbtdb.c) = fb0005899b08f74d0d3e6be4d5947a39fabdf278
-SHA1 (patch-username) = 6ac114fac0f86d9a3387edd93b40f12e4222be8f
+SHA1 (patch-src_parser.c) = b796554dfeafb4f07ba205fbb47252faf4358109
diff -r 8422fca16276 -r b658c7d665e9 www/goaccess/options.mk
--- a/www/goaccess/options.mk Wed Jan 27 06:17:37 2021 +0000
+++ b/www/goaccess/options.mk Wed Jan 27 08:17:31 2021 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: options.mk,v 1.6 2020/03/24 11:50:10 roy Exp $
+# $NetBSD: options.mk,v 1.7 2021/01/27 08:17:31 schmonz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.goaccess
-PKG_SUPPORTED_OPTIONS= geoip ssl tokyocabinet wide-curses
-PKG_SUGGESTED_OPTIONS= ssl tokyocabinet wide-curses
+PKG_SUPPORTED_OPTIONS= geoip ssl wide-curses
+PKG_SUGGESTED_OPTIONS= ssl wide-curses
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgeoip)
-. include "../../net/GeoIP/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-geoip=legacy
+. include "../../geography/libmaxminddb/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-geoip=mmdb
.endif # geoip
.if !empty(PKG_OPTIONS:Mssl)
@@ -16,11 +16,6 @@
CONFIGURE_ARGS+= --with-openssl
.endif # ssl
-.if !empty(PKG_OPTIONS:Mtokyocabinet)
-CONFIGURE_ARGS+= --enable-tcb=btree
-. include "../../databases/tokyocabinet/buildlink3.mk"
-.endif #tokyocabinet
-
.if !empty(PKG_OPTIONS:Mwide-curses)
CONFIGURE_ARGS+= --enable-utf8
.endif #wide-curses
diff -r 8422fca16276 -r b658c7d665e9 www/goaccess/patches/patch-Makefile.am
--- a/www/goaccess/patches/patch-Makefile.am Wed Jan 27 06:17:37 2021 +0000
+++ b/www/goaccess/patches/patch-Makefile.am Wed Jan 27 08:17:31 2021 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-Makefile.am,v 1.4 2019/08/23 01:48:00 schmonz Exp $
+$NetBSD: patch-Makefile.am,v 1.5 2021/01/27 08:17:31 schmonz Exp $
Deploy example config in the correct place.
---- Makefile.am.orig 2018-11-23 05:35:46.000000000 +0000
+--- Makefile.am.orig 2020-05-17 12:34:51.000000000 +0000
+++ Makefile.am
-@@ -108,7 +108,7 @@ else
- ./bin2c resources/js/app.js src/appjs.h app_js
+@@ -114,7 +114,7 @@ if DEBUG
+ ./bin2c $(srcdir)/resources/js/app.js src/appjs.h app_js
endif
-confdir = $(sysconfdir)/goaccess
+confdir = $(PREFIX)/share/examples/goaccess
dist_conf_DATA = config/goaccess.conf
dist_conf_DATA += config/browsers.list
-
+ dist_conf_DATA += config/podcast.list
diff -r 8422fca16276 -r b658c7d665e9 www/goaccess/patches/patch-src_error.c
--- a/www/goaccess/patches/patch-src_error.c Wed Jan 27 06:17:37 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_error.c,v 1.1 2020/03/22 22:45:00 roy Exp $
-
-va_list requires stdarg.h
-
---- src/error.c.orig 2020-03-22 22:27:42.074306097 +0000
-+++ src/error.c 2020-03-22 22:28:19.609993187 +0000
-@@ -32,6 +32,7 @@
- #include <config.h>
- #endif
-
-+#include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <signal.h>
diff -r 8422fca16276 -r b658c7d665e9 www/goaccess/patches/patch-src_json.c
--- a/www/goaccess/patches/patch-src_json.c Wed Jan 27 06:17:37 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_json.c,v 1.1 2020/03/22 22:45:00 roy Exp $
-
-va_list requires stdarg.h
-
---- src/json.c.orig 2020-03-22 22:28:55.816959313 +0000
-+++ src/json.c 2020-03-22 22:29:26.309825982 +0000
-@@ -34,6 +34,7 @@
-
- #include <errno.h>
- #include <ctype.h>
-+#include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff -r 8422fca16276 -r b658c7d665e9 www/goaccess/patches/patch-src_parser.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/goaccess/patches/patch-src_parser.c Wed Jan 27 08:17:31 2021 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_parser.c,v 1.1 2021/01/27 08:17:31 schmonz Exp $
+
+Remove non-portable include.
+
+--- src/parser.c.orig 2020-05-17 15:46:01.000000000 +0000
++++ src/parser.c
+@@ -54,7 +54,6 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#include <malloc.h>
+
+ #include "gkhash.h"
+
diff -r 8422fca16276 -r b658c7d665e9 www/goaccess/patches/patch-src_tcbtdb.c
--- a/www/goaccess/patches/patch-src_tcbtdb.c Wed Jan 27 06:17:37 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_tcbtdb.c,v 1.1 2020/03/23 17:15:57 roy Exp $
-
-va_list requires stdarg.h
-
---- src/tcbtdb.c.orig 2020-03-23 16:42:43.613997461 +0000
-+++ src/tcbtdb.c 2020-03-23 16:43:08.793204575 +0000
-@@ -37,6 +37,7 @@
- #include <tcutil.h>
- #include <fcntl.h>
- #include <sys/types.h>
-+#include <stdarg.h>
- #include <unistd.h>
-
- #include "tcbtdb.h"
diff -r 8422fca16276 -r b658c7d665e9 www/goaccess/patches/patch-username
--- a/www/goaccess/patches/patch-username Wed Jan 27 06:17:37 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-$NetBSD: patch-username,v 1.1 2020/03/30 11:31:25 roy Exp $
-
-Accepted upstream here:
-https://github.com/allinurl/goaccess/pull/1718
-
---- src/settings.h.orig 2020-03-24 14:02:12.012898702 +0000
-+++ src/settings.h 2020-03-24 14:02:53.094348769 +0000
-@@ -147,6 +147,7 @@
- int color_scheme; /* color scheme */
- int crawlers_only ; /* crawlers only */
- int daemonize; /* run program as a Unix daemon */
-+ const char *username; /* user to run program as */
- int double_decode; /* need to double decode */
- int enable_html_resolver; /* html/json/csv resolver */
- int geo_db; /* legacy geoip db */
---- src/options.c.orig 2020-03-24 14:01:49.531659575 +0000
-+++ src/options.c 2020-03-24 14:02:51.274006910 +0000
-@@ -133,6 +133,7 @@
- {"real-time-html" , no_argument , 0 , 0 } ,
- {"sort-panel" , required_argument , 0 , 0 } ,
- {"static-file" , required_argument , 0 , 0 } ,
-+ {"user-name" , required_argument , 0 , 0 } ,
- #ifdef HAVE_LIBSSL
- {"ssl-cert" , required_argument , 0 , 0 } ,
- {"ssl-key" , required_argument , 0 , 0 } ,
-@@ -457,6 +458,9 @@
- if (!strcmp ("daemonize", name))
- conf.daemonize = 1;
-
-+ if (!strcmp ("user-name", name))
-+ conf.username = oarg;
-+
- /* WebSocket origin */
- if (!strcmp ("origin", name))
- conf.origin = oarg;
---- src/goaccess.c.orig 2018-11-23 02:15:07.000000000 +0000
-+++ src/goaccess.c 2020-03-27 11:28:44.797783056 +0000
-@@ -44,6 +44,7 @@
-
- #include <fcntl.h>
- #include <pthread.h>
-+#include <pwd.h>
- #include <signal.h>
- #include <stdint.h>
- #include <stdio.h>
-@@ -205,6 +206,27 @@
- free (gwsreader);
- }
-
-+/* Drop permissions to the user specified. */
-+static void
-+drop_permissions(void)
-+{
-+ struct passwd *pw;
-+
-+ errno = 0;
-+ if ((pw = getpwnam(conf.username)) == NULL) {
-+ if (errno == 0)
-+ FATAL ("No such user %s", conf.username);
-+ FATAL ("Unable to retreive user %s: %s", conf.username, strerror (errno));
-+ }
-+
-+ if (setgroups (1, &pw->pw_gid) == -1)
-+ FATAL ("setgroups: %s", strerror (errno));
-+ if (setgid (pw->pw_gid) == -1)
-+ FATAL ("setgid: %s", strerror (errno));
-+ if (setuid (pw->pw_uid) == -1)
-+ FATAL ("setuid: %s", strerror (errno));
-+}
-+
- /* Open the pidfile whose name is specified in the given path and write
- * the daemonized given pid. */
- static void
-@@ -1369,7 +1391,11 @@
- static void
- initializer (void)
- {
-- /* initialize modules and set first */
-+ /* drop permissions right away */
-+ if (conf.username)
-+ drop_permissions ();
-+
-+ /* then initialize modules and set */
- gscroll.current = init_modules ();
- /* setup to use the current locale */
- set_locale ();
Home |
Main Index |
Thread Index |
Old Index