sysutils/goaccess: Update to 1.7.2

Remove patches that I finally got around to upstreaming.
This commit is contained in:
Adam Weinberger 2023-03-31 22:00:11 -04:00
parent af7b7bf612
commit a61e35c236
5 changed files with 4 additions and 75 deletions

View file

@ -1,5 +1,5 @@
PORTNAME= goaccess
PORTVERSION= 1.7.1
PORTVERSION= 1.7.2
CATEGORIES= sysutils
MASTER_SITES= https://tar.goaccess.io/

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1677708077
SHA256 (goaccess-1.7.1.tar.gz) = 3d6876d91d02816a93ad86e179369942d914a82bf09d6a6c02964ed7de48610d
SIZE (goaccess-1.7.1.tar.gz) = 677872
TIMESTAMP = 1680313793
SHA256 (goaccess-1.7.2.tar.gz) = 0e9aaba29c021d1c6a187130a91404730183ee8ab81cd31381854b47149d126b
SIZE (goaccess-1.7.2.tar.gz) = 679321

View file

@ -1,13 +0,0 @@
--- src/goaccess.c.orig 2020-05-17 12:34:51 UTC
+++ src/goaccess.c
@@ -1175,8 +1175,10 @@ set_locale (void) {
char *loc_ctype;
setlocale (LC_ALL, "");
+#ifdef ENABLE_NLS
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
+#endif
loc_ctype = getenv ("LC_CTYPE");
if (loc_ctype != NULL)

View file

@ -1,20 +0,0 @@
--- src/labels.h.orig 2018-11-23 02:16:45 UTC
+++ src/labels.h
@@ -30,11 +30,17 @@
#ifndef LABELS_H_INCLUDED
#define LABELS_H_INCLUDED
+#ifdef ENABLE_NLS
#include <libintl.h>
#define _(String) dgettext (PACKAGE , String)
#define gettext_noop(String) String
#define N_(String) gettext_noop (String)
+#else
+#define _(String) String
+#define gettext_noop(String) String
+#define N_(String) String
+#endif
/* global lang attribute */
#define DOC_LANG _( "en")

View file

@ -1,38 +0,0 @@
From 94fc846b7b7001bb9fecd22b7f698b6753915f0a Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@adamw.org>
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;
}