From nobody Tue Jan 10 21:56:20 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 4Ns4QD6N5sz2pLkw; Tue, 10 Jan 2023 21:56:20 +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 4Ns4QD5qHyz3GTb; Tue, 10 Jan 2023 21:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673387780; 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=9ylwHRr9eN4BGJWjYxxp6o+xJLYH1Ak2Bh58XIy1hjo=; b=jdf+7fB5hapnHyCRU+up2bY1mYA2CcHZwA6HxzTytTKc4C3OsVKHaNMSfjboEd4kKb76d1 yxDvVoDZLRCOIRY7pkI12ZaB63YMHNlb5td+O1UgYIUmgs/pjE2lFfYyVUW2Cd2ASxOUOA mcCzDxqCodQjgjOPkiWdAjegLleBid1p6oTLfpbcn54WPsaTTuZx7AXCszF5+1DDBy2Dnd GLxz5YYuQiqAE+bYubJq2fgik9UudvuwMw3C1k8c4nbFXUwWx+G/KaZ4S/kYL1W/FyLY8v we4Eac2b4e/S+heONuS+kNGivYJJmlO+3ujJK1Y7uoKg5sTvP+khVX2AvtnM2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673387780; 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=9ylwHRr9eN4BGJWjYxxp6o+xJLYH1Ak2Bh58XIy1hjo=; b=cwFvSwYZZbdkQ3LPOQ1E08F7KCC8Fx5tRMBsih6zFsBhyduhurMWHf/2Vd77lKqSlCByYW EP+omIALJlhvyNMbhl9r4lW/UU8Nb0GAO1jfZ6O3h4LJupiNl2dv9sKYjJIFYMM39117I0 C0My5bTqTRs4C214iFnEjkjSdpUcTc5x1gK7sJFu5gfkMdNMGisjHOvMdAwunQ5vBYZ0Z4 /F0Vm9U4yCcQ6+Xl2Idpdh7i/3aiP0+tBSpcFFMNvaBx+M4OR68ejCMLPHPlaaQCE860Kk JowkOTFcg6mxZF0OFVOS+4r1pnDUzZQNfPkn4T8ZtmDdfvcYfwL2kgWroTqEOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673387780; a=rsa-sha256; cv=none; b=QtTsFKX+iLpvWt3oh66LECIO6dMe0BElve29LnIdTDXlbAhQnyF7Ho4LK2KONziKbAM4SP CbaroICtPN7jbAn5P3gr0IPyTSbY7ZWIDbdJyL6tIk6V53GhWg0KlpFpbHz+/xkk89agyb pdyza3g/jG5xV00StZtbNewXGPwqnglLOddt+am6rA+V6s+InLHvCbNEUPRlloAcAqJqq7 LOXL1srj0vi98SmxYKJ9UCZrp+Jft00xdGKdyLr0/yFvKTmRcaH1FkAt+mLN21lLhb94Qy CsSoMsqsxDEiIAyN2GKi7RTWVvuiClazTnrd4CemuXNKeE2cXjYcFMVF1oWcCw== 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 4Ns4QD4rqQzPR7; Tue, 10 Jan 2023 21:56:20 +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 30ALuKfu079911; Tue, 10 Jan 2023 21:56:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30ALuKDL079910; Tue, 10 Jan 2023 21:56:20 GMT (envelope-from git) Date: Tue, 10 Jan 2023 21:56:20 GMT Message-Id: <202301102156.30ALuKDL079910@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Gmelin Subject: git: e0f97bd73c2e - main - 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/main X-Git-Reftype: branch X-Git-Commit: e0f97bd73c2e38fd3a4cf500b3f80f3166b0feca Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0f97bd73c2e38fd3a4cf500b3f80f3166b0feca commit e0f97bd73c2e38fd3a4cf500b3f80f3166b0feca Author: Michael Gmelin AuthorDate: 2023-01-10 21:53:46 +0000 Commit: Michael Gmelin CommitDate: 2023-01-10 21:53:46 +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 --- 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