diff --git a/sysutils/goaccess/Makefile b/sysutils/goaccess/Makefile index 20683963a352..55ec4b33221a 100644 --- a/sysutils/goaccess/Makefile +++ b/sysutils/goaccess/Makefile @@ -1,48 +1,48 @@ PORTNAME= goaccess -PORTVERSION= 1.7 +PORTVERSION= 1.7.1 CATEGORIES= sysutils MASTER_SITES= https://tar.goaccess.io/ MAINTAINER= adamw@FreeBSD.org COMMENT= Real-time web log analyzer WWW= https://goaccess.io LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING USES= alias compiler:c11 pkgconfig ncurses USE_RC_SUBR= goaccess INSTALL_TARGET= install-strip GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-utf8 CFLAGS+= -I${NCURSESINC} -I${LOCALBASE}/include LDFLAGS+= -L${NCURSESLIB} -L${LOCALBASE}/lib PORTDOCS= AUTHORS ChangeLog NEWS README TODO OPTIONS_DEFINE= DOCS GEOIP2 NLS SSL OPTIONS_DEFAULT=GEOIP2 SSL OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext-runtime GEOIP2_DESC= IP location support GEOIP2_CONFIGURE_ENABLE=geoip=mmdb GEOIP2_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb SSL_DESC= Use SSL for WebSocket SSL_CONFIGURE_WITH= openssl SSL_USES= ssl post-install: ${MV} ${STAGEDIR}${ETCDIR}/goaccess.conf \ ${STAGEDIR}${ETCDIR}/goaccess.conf.sample post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/sysutils/goaccess/distinfo b/sysutils/goaccess/distinfo index f258acd573f8..1906b9f4b991 100644 --- a/sysutils/goaccess/distinfo +++ b/sysutils/goaccess/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672545959 -SHA256 (goaccess-1.7.tar.gz) = a7549cb5bc78e99fb6c4f75aa53bed98403156123c08eeedef7831dafe87e676 -SIZE (goaccess-1.7.tar.gz) = 678718 +TIMESTAMP = 1677708077 +SHA256 (goaccess-1.7.1.tar.gz) = 3d6876d91d02816a93ad86e179369942d914a82bf09d6a6c02964ed7de48610d +SIZE (goaccess-1.7.1.tar.gz) = 677872 diff --git a/sysutils/goaccess/files/patch-src_parser.c b/sysutils/goaccess/files/patch-src_parser.c new file mode 100644 index 000000000000..5cacf7f48677 --- /dev/null +++ b/sysutils/goaccess/files/patch-src_parser.c @@ -0,0 +1,38 @@ +From 94fc846b7b7001bb9fecd22b7f698b6753915f0a Mon Sep 17 00:00:00 2001 +From: Adam Weinberger +Date: Wed, 1 Mar 2023 16:44:09 -0500 +Subject: [PATCH] Fix null pointer exception on FreeBSD (fixes #2476) + +--- + src/parser.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/parser.c b/src/parser.c +index c5ca3ae43..8670e0e70 100644 +--- src/parser.c ++++ src/parser.c +@@ -134,7 +134,7 @@ set_glog (Logs * logs, const char *filename) { + GLog *tmp = NULL, *glog = NULL; + int newlen = 0; + char const *err; +- char *fvh = NULL, *fn = (char *) filename; ++ char *fvh = NULL, *fn = NULL; + + if (logs->size - 1 < logs->idx) { + newlen = logs->size + 1; +@@ -147,6 +147,7 @@ set_glog (Logs * logs, const char *filename) { + logs->size = newlen; + } + ++ fn = xstrdup (filename); /* ensure fn is a string */ + glog = logs->glog; + glog[logs->idx].errors = xcalloc (MAX_LOG_ERRORS, sizeof (char *)); + glog[logs->idx].filename = xstrdup (fn); +@@ -161,6 +162,7 @@ set_glog (Logs * logs, const char *filename) { + logs->processed = &(glog[logs->idx].processed); + logs->filename = glog[logs->idx].filename; + logs->idx++; ++ free (fn); + + return 0; + }