From nobody Tue Jan 10 21:58:15 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 4Ns4SS02Nqz2pM2K; Tue, 10 Jan 2023 21:58:16 +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 4Ns4SR6dgzz3Gr9; Tue, 10 Jan 2023 21:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673387895; 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=0DrI/y5HR9ykKga40Cx6QCYljYo39r5e6sqyhSwKPto=; b=nfalm6byDC9ftiWMHEk9FbS54px5TpsLR1G83ydo8oXwrKk3hwPXLc4Z00NuFT1t0Thn/Z quXrKzphuAOC0HIfZ2bkMGlO5KEHBcNpOuZu9Upso4cZ28fSBFmxHIOzLqM2mI0jeHMK7l Y9m2dxaxI+mk6FUcNXUvQBKhosicxoFfExdPd78juyhHsgbl0FOX2P22qMNEWnYBY7nrPX MCJfa7UoQe9lXhAhY9edQVarOdRqyMsfVBFJEQoX/Ae1SPLxMOAs46yF+6FAst091gKdLx 4I9ofK6+pUxCxMlafcRE2XHxWIcZmlQZHOEUZ6/oBbSX6a0fT/DDSkYa3j4Adg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673387895; 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=0DrI/y5HR9ykKga40Cx6QCYljYo39r5e6sqyhSwKPto=; b=d3L0q6j2NZgJvts4CRPcIS8r8K7G78sKO1vwmDnP1mXhl6PU8Y0cVZz68oaFKpH/jLncoS HgXsGz2tdt+ZIBenRE1WG/baosjsCnujglNFmhAwMX/T3EYuL3BYjgNcRuDYWp02Y0eWpj DZxFFo7LYSMOZv2Rhwm0e+ImbAqC5ct3xmHi1mKy5ZXNsHdYs4ZzL5HFLUlYkf33Ln+Wpj qSCssoCAKL2C3S8Sx+udLdq5CLMc7r4oeu3eZmNqUS+gCxav9ptp03Lcyo9BFwxhV4fO3I 5YVQgiWMNAOKQoSLyq0/ii7O3SlcHP56mCLpKWdZyOASKAhRbdPjTVRxZQwrHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673387895; a=rsa-sha256; cv=none; b=w03Ig+wf9+9SuaWyBxdB6JlxiFNdqKE1fvhMM8hoWjEAl3ZZfgrXSb+YtxUibTSlHOfhc5 yd2Z5OmVzHNWVHI5tLRvmB8ov1ufinPX8mHq1gHCquGhR5jqNeOqyw+PPOkZgXxj9FtWNU ZPGM9Nk7ZhU/pLjlXmib1227/7o4siPQH0XC/9CQ8LS7f6vpoxOjuVXbLFnI6dAuIaED5V IaZxf0NGrPdcqAWFaFQE7z9LrnEJYeu1AlUaeuVbim8kcX9iIcf36H5Y/jFPrkLDXrsd/n aZnUYN92d70uBW3YIyh/enekyPdCnMB8OdXE6N58vMfZFRBzYE/dh9jyQz3iRA== 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 4Ns4SR5gyszPRc; Tue, 10 Jan 2023 21:58:15 +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 30ALwFJT080258; Tue, 10 Jan 2023 21:58:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30ALwFQv080257; Tue, 10 Jan 2023 21:58:15 GMT (envelope-from git) Date: Tue, 10 Jan 2023 21:58:15 GMT Message-Id: <202301102158.30ALwFQv080257@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Michael Gmelin Subject: git: 5159e8dfa71f - 2023Q1 - sysutils/pftop: Fix STATES display 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: grembo X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 5159e8dfa71f7adcc112b979c389e0057d1fc6c4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=5159e8dfa71f7adcc112b979c389e0057d1fc6c4 commit 5159e8dfa71f7adcc112b979c389e0057d1fc6c4 Author: Michael Gmelin AuthorDate: 2023-01-10 21:53:46 +0000 Commit: Michael Gmelin CommitDate: 2023-01-10 21:57:11 +0000 sysutils/pftop: Fix STATES display This stops pftop from segfaulting and makes it show the correct total states counter. Reported by: Herbert J. Skuhra (cherry picked from commit e0f97bd73c2e38fd3a4cf500b3f80f3166b0feca) --- sysutils/pftop/Makefile | 2 +- sysutils/pftop/files/extra-patch-pftop.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile index 73cf4707a070..f3c6d879f637 100644 --- a/sysutils/pftop/Makefile +++ b/sysutils/pftop/Makefile @@ -1,6 +1,6 @@ PORTNAME= pftop PORTVERSION= 0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils net MAINTAINER= grembo@FreeBSD.org diff --git a/sysutils/pftop/files/extra-patch-pftop.c b/sysutils/pftop/files/extra-patch-pftop.c index e22198745b33..c066876c4b5c 100644 --- a/sysutils/pftop/files/extra-patch-pftop.c +++ b/sysutils/pftop/files/extra-patch-pftop.c @@ -343,7 +343,7 @@ $OpenBSD: patch-pftop_c,v 1.12 2009/12/02 21:16:10 sthen Exp $ #endif #ifdef HAVE_RULE_STATES +#ifdef HAVE_PFSYNC_KEY -+ print_fld_size(FLD_STATS, *pr->states_tot); ++ print_fld_size(FLD_STATS, pr->u_states_tot); +#else print_fld_size(FLD_STATS, pr->states); #endif