From nobody Sat Apr 1 02:01:05 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PpL3j2KYCz42L8b; Sat, 1 Apr 2023 02:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PpL3j1thfz4DbH; Sat, 1 Apr 2023 02:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680314465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7pXN75QO7lq7xMKyhC0nUzXHq+nbq+0sZnV/4QsFyRQ=; b=BQnOOR4jQ7rZNeEagSfb2sii194NYHzkiZariUwxD2XoB3nX0MpqCtPbiF0gziPNZM2mu5 ircBhB2vUDx2OzYHbSxpr7b5qFF06Llz2BvD1kwAErumqWx7Y9Q6Lt+zX3GMLkbLDNFB2h Zldp/C2Lb5MHts1i4XVGdZdhduHOYtawOzo2GgKZSibKICEJ43TzwjYklZCs+tMj2knFV1 H5+exbYPtmnonzg4YFeX4hOuxBgO4DpLIHkCHzUA518+PGf3J0ftv69pySzHh2n8/IofQa mcpFTc2KuQ4o3jFiqNqstSiWdPJ2db7zvS+Z4Bywoqq1MljVAs2ySFJZIx/h8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680314465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7pXN75QO7lq7xMKyhC0nUzXHq+nbq+0sZnV/4QsFyRQ=; b=dkNtjL365AbJ+i6oR3WqVmkmrodq6YBuULs7YVmm3xHcYrOTeQMoMe8k1zsWRKRFdpR5aH NarObHWSTLkFMPAr7xRroIWdWnG3j2jZOPaERz8/o4Rdoy3mgdETyJ1uc+RF9xJUhMh6pJ pIJr1XKM6NUxDrByoMm82cl21ec/IcJQffUXRAkC36N92JRgFh2oPnSNZtKlN69lRjWoxF kKPzd1uaku+SeGPOrU6e2Bpdu/phpfPfoQGhnE4qw4lVvc3u3kDO/rtbj/1RZgYpiuz+2D Fw/0uO6ie1doQl40s59zIBKqQjqkNOWulocwvOJTmLlpY0HbWRl0xiRbjA8yGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680314465; a=rsa-sha256; cv=none; b=bBpLuTUlALYP6yrc/+CMSmYqY+cg/SZBHAD4AGgQg2F+g6yENmKWHk2IGsFgDgJiE/ABWw XplCjFS/fhoGksOTgXJ5hhx7bqI8pvpsWeWj5g2ahLfWO4av543VW48BV61wSmiPpgufa5 1pb3RsReOvayAPsPaJB382acZt04QPTxYW3iZ+MVDAnxeLLWTtxw3jbCVn1uglxEj3SeEN BQ+AjFn3U4A75/maMGqhGzYVk9HxJvH8k6GvWB2+OybYn9fLacSU4WxD4AS1QfxpiyPNX0 ysIN6Jo2/eEwyNLKrQs2HsgL6i0REKeVGmUkMnzBiJl+b4VQIqW9tRFkDVSDRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpL3j0xRgzHKZ; Sat, 1 Apr 2023 02:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 331215v1080373; Sat, 1 Apr 2023 02:01:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 331215ln080372; Sat, 1 Apr 2023 02:01:05 GMT (envelope-from git) Date: Sat, 1 Apr 2023 02:01:05 GMT Message-Id: <202304010201.331215ln080372@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: a61e35c236b6 - main - sysutils/goaccess: Update to 1.7.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a61e35c236b6ec955cef411454a3b0f935252e1a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=a61e35c236b6ec955cef411454a3b0f935252e1a commit a61e35c236b6ec955cef411454a3b0f935252e1a Author: Adam Weinberger AuthorDate: 2023-04-01 02:00:11 +0000 Commit: Adam Weinberger CommitDate: 2023-04-01 02:00:11 +0000 sysutils/goaccess: Update to 1.7.2 Remove patches that I finally got around to upstreaming. --- sysutils/goaccess/Makefile | 2 +- sysutils/goaccess/distinfo | 6 ++--- sysutils/goaccess/files/patch-src_goaccess.c | 13 ---------- sysutils/goaccess/files/patch-src_labels.h | 20 --------------- sysutils/goaccess/files/patch-src_parser.c | 38 ---------------------------- 5 files changed, 4 insertions(+), 75 deletions(-) diff --git a/sysutils/goaccess/Makefile b/sysutils/goaccess/Makefile index 55ec4b33221a..5f697e3fd1a3 100644 --- a/sysutils/goaccess/Makefile +++ b/sysutils/goaccess/Makefile @@ -1,5 +1,5 @@ PORTNAME= goaccess -PORTVERSION= 1.7.1 +PORTVERSION= 1.7.2 CATEGORIES= sysutils MASTER_SITES= https://tar.goaccess.io/ diff --git a/sysutils/goaccess/distinfo b/sysutils/goaccess/distinfo index 1906b9f4b991..019a89ef7d07 100644 --- a/sysutils/goaccess/distinfo +++ b/sysutils/goaccess/distinfo @@ -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 diff --git a/sysutils/goaccess/files/patch-src_goaccess.c b/sysutils/goaccess/files/patch-src_goaccess.c deleted file mode 100644 index c9f0c3892d3d..000000000000 --- a/sysutils/goaccess/files/patch-src_goaccess.c +++ /dev/null @@ -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) diff --git a/sysutils/goaccess/files/patch-src_labels.h b/sysutils/goaccess/files/patch-src_labels.h deleted file mode 100644 index 88f5cfed5489..000000000000 --- a/sysutils/goaccess/files/patch-src_labels.h +++ /dev/null @@ -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 - - #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") diff --git a/sysutils/goaccess/files/patch-src_parser.c b/sysutils/goaccess/files/patch-src_parser.c deleted file mode 100644 index 5cacf7f48677..000000000000 --- a/sysutils/goaccess/files/patch-src_parser.c +++ /dev/null @@ -1,38 +0,0 @@ -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; - }