From nobody Wed Mar 01 22:06:58 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 4PRpHR1ktrz3vQkc; Wed, 1 Mar 2023 22:06:59 +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 4PRpHR17ftz3Kp3; Wed, 1 Mar 2023 22:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677708419; 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=oQA8r3M9hgJ8Sp1IV1TV1YqQkkwLWCiSPaTm/lUnuFg=; b=Can2JVT0Vm3okwy+BBsKuzEhMPk49eEHQA9guaRY4J/eZY0m47p5V67mn8uO+b+D1SdIsv 6/8Cn3I0oc+MebWVDPrjMVZgYTWdRrvgmuNInfS60Da+WSb1uq1zJW0iYbRocJ9BqZalRs dbXNS3wRZ+e0gHU65pDsYA9dJavhE2AYwk5qhdcOAlPcCO0eFO40CQitSOp3IkMw6eGvFI /wacNhTMeuzPVh7osAPBfkqTuPKzfBelJ0snzKJ2k66027Prna1aCpv5+fdxVGV8wGw/d7 7uKuL2pZCIY2p9y8s5nvQSPViIqgEAfvdyeZXXrLlYyHLchUmC3RzqwXvp9nwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677708419; 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=oQA8r3M9hgJ8Sp1IV1TV1YqQkkwLWCiSPaTm/lUnuFg=; b=wOxCyoMbwQypCy6y/aBXUx5V860AriyHtUe6dv+zrZxJ7XCdc3xPotX625ijiJQubuNs0n b3p3WUtL750M7m/iKL47yRJiwu9UIaoGgXb7p7elHRrIfyUIrSXAC4DKYxI3C42r5lvxlL i2AoycDNZKsWEJF1zwRMMhiZNwic89u0X6lsabT2ZojA145u4uXq5VtKLB1aTdX7Z+KhcE 81jISIZZyz5iwd/p0jK94fwDJ7S2SjYwM8Bw+Hhb8PZJINVuuA8cwrDq7kncmfToj6Djaa xW7VLW2uSq8kG3DEjg1JMb6Ho/1/nhlLWAxnlrbmAVlKglSjlS1MrsJF20Vbtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677708419; a=rsa-sha256; cv=none; b=qClr3PL5At/n3+a+sV78EJpDqP8YURXVYYaoylvdLOWKIcXYm+AgP1BX6bmrmzRVN/Lycq Lo6DHMXSJp7FkLZkRpQdJAD3RHcc5RN5mj9V9NzPITy+vYYG0f1ruHWzyObXgnOZdt+KXs 02i0ZRVj2qHrlQmwj5gYf9GGxbToofJMFCxXsYl0CfL7NpG0RpLCOEOjRK4Eu+VOrxfDZi 6D9s/YAav0S+kUMbhmRWewCYciHbwjbd+P5z3NnixSqwqU63rz/6oi/+HB9x+UEAF6MQDx B/OWYhh/TjE1zxnLKpiJsRpdOJJ5rF0hzbf7rnIhECVPlsQt4wjQVY/O9GHrSw== 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 4PRpHR08M0zrLm; Wed, 1 Mar 2023 22:06:59 +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 321M6wsH045618; Wed, 1 Mar 2023 22:06:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321M6wxV045617; Wed, 1 Mar 2023 22:06:58 GMT (envelope-from git) Date: Wed, 1 Mar 2023 22:06:58 GMT Message-Id: <202303012206.321M6wxV045617@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: a5994971c0c1 - main - sysutils/goaccess: Update to 1.7.1 (again) 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: a5994971c0c12e2404bd8de2019b6e2c8775b76c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5994971c0c12e2404bd8de2019b6e2c8775b76c commit a5994971c0c12e2404bd8de2019b6e2c8775b76c Author: Adam Weinberger AuthorDate: 2023-03-01 22:05:40 +0000 Commit: Adam Weinberger CommitDate: 2023-03-01 22:06:54 +0000 sysutils/goaccess: Update to 1.7.1 (again) Includes a fix for a wacky segfault involving our basename(3) being a snowflake. --- sysutils/goaccess/Makefile | 2 +- sysutils/goaccess/distinfo | 6 ++--- sysutils/goaccess/files/patch-src_parser.c | 38 ++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/sysutils/goaccess/Makefile b/sysutils/goaccess/Makefile index 20683963a352..55ec4b33221a 100644 --- a/sysutils/goaccess/Makefile +++ b/sysutils/goaccess/Makefile @@ -1,5 +1,5 @@ PORTNAME= goaccess -PORTVERSION= 1.7 +PORTVERSION= 1.7.1 CATEGORIES= sysutils MASTER_SITES= https://tar.goaccess.io/ 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; + }