From nobody Sun Jun 11 12:45:31 2023 X-Original-To: dev-commits-ports-main@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 4QfF0X1tJwz4cvLT; Sun, 11 Jun 2023 12:45:32 +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 4QfF0X1SSFz4bXx; Sun, 11 Jun 2023 12:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686487532; 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=BbdRmN+oGt42nkL5KGdH8TOlaPRNvbBf5InMS04weDE=; b=KDsgSPxB4enj4lxlO+zexJUaeSxrjQ1itxBCCpFSTD6P17uRk2PFYkS0DjNHU2BkVwn5tN a5Ywd+8KVNRIPFEpXzmddUWyEE6ssCWRGf49BUC4hRFuehKwg24S7qc0rRJeivAjIFFJwI N9zcfTCUhldIzVIa9zvyyxZC9GWBWnJ7/V0dpZDz+fAQXtQ+1H4isP2sRRpRzzpzxuarPi 5icGYssWSw63h9zketCDFEkurwiWZQS2aFvtNrdaYE2vIX5ly7QDKxtwRf3ItLkVTQeR8F 2PtIaPnnnIfLTGgrBRE5v5i3nbKo7koDeg/oyNnONOD9MgTEDyQ7aVnbsLfmRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686487532; 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=BbdRmN+oGt42nkL5KGdH8TOlaPRNvbBf5InMS04weDE=; b=jCjNS6RLgJdUH+4REoeJXDWU6krUCpveZv5beNtaDfeRQHz+Vk87GKvgKCxHfkpJecp1Qt isC1zD6FQJAYsPr8wjVkfndVMDdAwrta4kRaEvtimA1Loy2UaWHb64sM5Q/IU9ZyLwFmUY QIu9yuAM52/uArY7t/q87bF0g87ZbEjdOKX6mEIqWSLTZ8HPqjqshknc/WJNwOhd3sf0AS T0TwIFwMHxb6CoF6Lyz8E2EBwWoV1zTjB3qnJeOAkI83qRrD5lQU91YkmYtGTCduBaPXSJ wBNWIuwuwMck8CXVMet1XZoanYtXb3uxn/opdAo4KAjV6ULh8Jhf23buBRsJxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686487532; a=rsa-sha256; cv=none; b=RsyndvHfdmOL+Pls6S8EYVcjILS9k00bC+RucoSLkkT/kZ595QAPm5ai2fEn13qcrl1p7O 3myEqlevLpC3Rlpyyp1Wwp+lQrS+M1+jEwzbJSgSuhT20fqGusHbwjd6ZBqUQKUFirxiPS eadvkeOpjsErH/QbnznWvyrMjMLlczYoR+72Voj9wSpkbHuKK47aG0AZ+TrfaweD1tdIVD G9dSmy11bmj7gg3xLxZkYCAnynhsZerJAiCemJNHEVC/UMqyldG1m9D1Dc77Zts6kgyxyD H+z4lFM4URLrnubkdCqa58ShDiNRK4jwlvtFFRjob1fBF+X8sLgE/o98FqHknQ== 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 4QfF0X0X4Wzyts; Sun, 11 Jun 2023 12:45:32 +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 35BCjV2A010063; Sun, 11 Jun 2023 12:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35BCjVuW010062; Sun, 11 Jun 2023 12:45:31 GMT (envelope-from git) Date: Sun, 11 Jun 2023 12:45:31 GMT Message-Id: <202306111245.35BCjVuW010062@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: a74e4cf1e218 - main - sysutils/pftop: Fix output on 14.0-CURRENT List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: a74e4cf1e218ec06729cdff8c7e38d2fd4d44c3e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=a74e4cf1e218ec06729cdff8c7e38d2fd4d44c3e commit a74e4cf1e218ec06729cdff8c7e38d2fd4d44c3e Author: Michael Gmelin AuthorDate: 2023-06-11 12:42:31 +0000 Commit: Michael Gmelin CommitDate: 2023-06-11 12:42:31 +0000 sysutils/pftop: Fix output on 14.0-CURRENT Reported by: herbert@gojira.at --- sysutils/pftop/Makefile | 2 +- sysutils/pftop/files/extra-patch-config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile index cba2ecd65aeb..815e0d68f125 100644 --- a/sysutils/pftop/Makefile +++ b/sysutils/pftop/Makefile @@ -1,6 +1,6 @@ PORTNAME= pftop PORTVERSION= 0.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils net MAINTAINER= grembo@FreeBSD.org diff --git a/sysutils/pftop/files/extra-patch-config.h b/sysutils/pftop/files/extra-patch-config.h index d24f88179718..ecd30c862dad 100644 --- a/sysutils/pftop/files/extra-patch-config.h +++ b/sysutils/pftop/files/extra-patch-config.h @@ -12,7 +12,7 @@ $OpenBSD: patch-config_h,v 1.4 2008/12/20 04:36:11 canacar Exp $ + #ifdef HAVE_PFSYNC_STATE +#if OS_LEVEL > 45 -+typedef struct pfsync_state_1400 pf_state_t; ++typedef struct pfsync_state_1301 pf_state_t; +#else typedef struct pfsync_state pf_state_t; +#endif