On Fri, Aug 07, 2020 at 12:33:49AM +0300, Kirill Bychkov wrote:
> Missed your previous mail.
> I'm OK with moving config to /etc/goaccess/ as upstream have done.
> Probably browsers.list could be @sampled here with the tweak to
> config file setting its default location.
>
and here's a diff @sampling both files under ${SYSCONFDIR}/goaccess/ - i
wouldnt modify the default config file, as it doesnt seem to add much
value by default, but at least browsers.list is here for users to
discover it.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/goaccess/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile 10 Aug 2019 21:24:31 -0000 1.24
+++ Makefile 7 Aug 2020 06:00:59 -0000
@@ -2,8 +2,7 @@
COMMENT = realtime console web log analyzer
-DISTNAME = goaccess-1.3
-REVISION = 2
+DISTNAME = goaccess-1.4
CATEGORIES = www
@@ -34,14 +33,5 @@
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
FAKE_FLAGS = confdir="${PREFIX}/share/examples/goaccess"
-
-FLAVORS = tokyocabinet
-FLAVOR ?=
-
-.if ${FLAVOR:Mtokyocabinet}
-WANTLIB += bz2 tokyocabinet z
-LIB_DEPENDS += databases/tokyocabinet
-CONFIGURE_ARGS += --enable-tcb=btree
-.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/goaccess/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 28 Nov 2018 19:40:27 -0000 1.13
+++ distinfo 7 Aug 2020 06:00:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (goaccess-1.3.tar.gz) = jHdcXCS/hakz/W8SSQBIRzQtZUKqUz5OwCqve+Qde5s=
-SIZE (goaccess-1.3.tar.gz) = 541374
+SHA256 (goaccess-1.4.tar.gz) = 6Pu5/4UlVtct/Z8dATS6B1zltMQSiZAqb04Nl8aTd74=
+SIZE (goaccess-1.4.tar.gz) = 595264
Index: patches/patch-config_goaccess_conf
===================================================================
RCS file: /cvs/ports/www/goaccess/patches/patch-config_goaccess_conf,v
retrieving revision 1.1
diff -u -r1.1 patch-config_goaccess_conf
--- patches/patch-config_goaccess_conf 20 Jan 2019 13:36:51 -0000 1.1
+++ patches/patch-config_goaccess_conf 7 Aug 2020 06:00:59 -0000
@@ -20,38 +20,15 @@
######################################
# Date Format Options (required)
######################################
-@@ -653,31 +663,10 @@ static-file .flv
- #std-geoip false
-
- # Specify path to GeoIP database file. i.e., GeoLiteCity.dat
--# .dat file needs to be downloaded from maxmind.com.
-+# Free GeoLite2 databases are available in the geolite2-city/country packages.
+@@ -698,7 +708,10 @@ static-file .flv
+ # Download the GeoLite2-Country.mmdb.gz
+ # gunzip GeoLite2-Country.mmdb.gz
#
--# For IPv4 City database:
--# wget -N
http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
--# gunzip GeoLiteCity.dat.gz
--#
--# For IPv6 City database:
--# wget -N
http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz
--# gunzip GeoLiteCityv6.dat.gz
--#
--# For IPv6 Country database:
--# wget -N http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz
--# gunzip GeoIPv6.dat.gz
--#
--# For GeoIP2 City database:
--# wget -N
http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz
--# gunzip GeoLite2-City.mmdb.gz
--#
--# For GeoIP2 Country database:
--# wget -N
http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz
--# gunzip GeoLite2-Country.mmdb.gz
--#
--# Note: `geoip-city-data` is an alias of `geoip-database`
--#
-#geoip-database /usr/local/share/GeoIP/GeoLiteCity.dat
++
++# Free GeoLite2 databases are available in the geolite2-city/country packages.
+#geoip-database /var/db/GeoIP/GeoLite2-City.mmdb
+geoip-database /var/db/GeoIP/GeoLite2-Country.mmdb
######################################
- # Tokyo Cabinet Options
+ # Persistence Options
Index: patches/patch-src_browsers_c
===================================================================
RCS file: /cvs/ports/www/goaccess/patches/patch-src_browsers_c,v
retrieving revision 1.1
diff -u -r1.1 patch-src_browsers_c
--- patches/patch-src_browsers_c 20 Jan 2019 13:36:51 -0000 1.1
+++ patches/patch-src_browsers_c 7 Aug 2020 06:00:59 -0000
@@ -5,7 +5,7 @@
Index: src/browsers.c
--- src/browsers.c.orig
+++ src/browsers.c
-@@ -116,6 +116,8 @@ static const char *browsers[][2] = {
+@@ -114,6 +114,8 @@ static const char *browsers[][2] = {
{"MicroMessenger", "Others"},
{"Apache", "Others"},
{"JOSM", "Others"},
@@ -14,10 +14,10 @@
/* Feed-reader-as-a-service */
{"AppleNewsBot", "Feeds"},
-@@ -183,6 +185,7 @@ static const char *browsers[][2] = {
- {"Python", "Crawlers"},
- {"LinkedIn", "Crawlers"},
+@@ -189,6 +191,7 @@ static const char *browsers[][2] = {
{"Microsoft-WebDAV", "Crawlers"},
+ {"DuckDuckGo-Favicons-Bot", "Crawlers"},
+ {"bingbot", "Crawlers"},
+ {"The Knowledge AI", "Crawlers"},
/* Podcast fetchers */
Index: patches/patch-src_gholder_c
===================================================================
RCS file: patches/patch-src_gholder_c
diff -N patches/patch-src_gholder_c
--- patches/patch-src_gholder_c 20 Jan 2019 15:38:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_gholder_c,v 1.2 2019/01/20 15:38:34 kirby Exp $
-
-upstream commit 61a4648ecb6e9cbedbc79a2ae0e69a69a348273d
-
-Index: src/gholder.c
---- src/gholder.c.orig
-+++ src/gholder.c
-@@ -32,6 +32,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-
Index: patches/patch-src_parser_c
===================================================================
RCS file: patches/patch-src_parser_c
diff -N patches/patch-src_parser_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_parser_c 7 Aug 2020 06:00:59 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/parser.c
+--- src/parser.c.orig
++++ src/parser.c
+@@ -54,7 +54,6 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#include <malloc.h>
+
+ #include "gkhash.h"
+
Index: patches/patch-src_settings_c
===================================================================
RCS file: patches/patch-src_settings_c
diff -N patches/patch-src_settings_c
--- patches/patch-src_settings_c 20 Jan 2019 13:36:51 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-src_settings_c,v 1.1 2019/01/20 13:36:51 sthen Exp $
-
-From a224c92d27919d30cf5cfeafde41f9c50c6f84f2 Mon Sep 17 00:00:00 2001
-From: Stuart Henderson <st...@users.noreply.github.com>
-Date: Fri, 11 Jan 2019 10:28:32 +0000
-Subject: [PATCH] Fix fallback to global config
-
-Index: src/settings.c
---- src/settings.c.orig
-+++ src/settings.c
-@@ -121,6 +121,7 @@ char *
- get_config_file_path (void)
- {
- char *upath = NULL, *rpath = NULL;
-+ FILE *file;
-
- /* determine which config file to open, default or custom */
- if (conf.iconfigfile != NULL) {
-@@ -138,12 +139,14 @@ get_config_file_path (void)
- }
-
- /* otherwise, fallback to global config file */
-- if (rpath == NULL && conf.load_global_config) {
-+ if ((file = fopen (rpath, "r")) == NULL && conf.load_global_config) {
- upath = get_global_config ();
- rpath = realpath (upath, NULL);
- if (upath) {
- free (upath);
- }
-+ } else {
-+ fclose (file);
- }
-
- return rpath;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/goaccess/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 20 Jan 2019 13:36:51 -0000 1.5
+++ pkg/PLIST 7 Aug 2020 06:00:59 -0000
@@ -2,10 +2,16 @@
@bin bin/goaccess
@man man/man1/goaccess.1
share/examples/goaccess/
+@sample ${SYSCONFDIR}/goaccess/
share/examples/goaccess/browsers.list
+@sample ${SYSCONFDIR}/goaccess/browsers.list
share/examples/goaccess/goaccess.conf
-@sample ${SYSCONFDIR}/goaccess.conf
+@sample ${SYSCONFDIR}/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
