From nobody Sat Jun 10 10:06:09 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 4QdYW55gSzz4crWj; Sat, 10 Jun 2023 10:06:09 +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 4QdYW559lrz4FQ1; Sat, 10 Jun 2023 10:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686391569; 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=dUEQnSgk1psgxHGWCWua63qKVTXR5h4IZzdCcQB8OgE=; b=MqjW/hNgazlJ5HZw44HED20SyX3aUuA4Q8rRvLA8nf8fw3pX/DtvSlwfU165lZCbHcIEOo vu1I6e3kssmc2RsqQwVwIXjeWt2cCAR+R5c7VTtY68GkXeNQsAvOzBHBFjpQLUFjno7crG 7bySicB6+P1igsGsOnTBAIXskZ1/ClElkkWxk25bmPX++FjcrQfdXYp3XAa5Tw2fJG1EdN +pzVsNbmEJC+seJHliBXiUO8NqyAqhMI2kV3CoAP1GgU2Yr4wIb/i/5oHefTEpd+DDjOuy D1GxmR9bRFkMNPT0fvQ8H2LziuBXjHCu+2s7QmZELGZZrvRDULEDs79rS+xTjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686391569; 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=dUEQnSgk1psgxHGWCWua63qKVTXR5h4IZzdCcQB8OgE=; b=OpLG125LiXxZ/Ec1cWq+9z2Uogxqbaempr7sMfeSWmuqV9dwKvlT0OOonxRRIBz++l9tZU z8nVXAqao3X+WGWsl//Fb2T5ZPObUdcC83C5Z3M99+MHJaLb7PlaRM8xuSxtiKew9yx1yk WkdgT65/elfdkYR+n0lyGOxWZ+tYjR0UCZeFngAyTXeEnXKLaagNwRiJYXCGpXq68O/N4G 8iXfZpAzeiV2RF8B4+fPwL1eMzwaCphgOGH/Mue0CcdCVQqcH2P2zu+PxPh0EQkXFNOHHt yPbZdV9V3ttUZIqykHgDfVbaci6vGckoAEnk1xCXvNXxKr7172dcVLAswCLBDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686391569; a=rsa-sha256; cv=none; b=ZIfrJ4AWHVB+yb7zQulXYP+iIqwPUzYd0D7UChIraMvQ3A2bZk3vo8eEYXSCqfz9vKZ3tR 2bHhYjp13sdRNGdZ33MrrZ71LszuDHUTXLdRvbXYkYFF4XSBjDbTbBPd5Di5ZOyWE+TIqi BcL/OuwWuCJPnb9I75szXPQ+x1ZWWgRA4fL2fbV9TX4agbB38YA/hWrGP8g47RGhypIexx RL7mFDsOR7U5Wj+2a/qSJv9zX5Vg3M7gCrtGoZrv3G9Ow9VcK/4i5mH6T24Tg9CF+IDRL5 bpcF+ctOSAnZD3hw5XROTeDxuOk2drBp4ZQ9JcNSU8toCX4ZCcGyfHNJYua3rA== 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 4QdYW544xhz1CgX; Sat, 10 Jun 2023 10:06:09 +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 35AA69P2073983; Sat, 10 Jun 2023 10:06:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35AA69It073982; Sat, 10 Jun 2023 10:06:09 GMT (envelope-from git) Date: Sat, 10 Jun 2023 10:06:09 GMT Message-Id: <202306101006.35AA69It073982@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: 637c0bace261 - main - sysutils/pftop: Fix build 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: 637c0bace26138529a36232e948549ad59342ba9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=637c0bace26138529a36232e948549ad59342ba9 commit 637c0bace26138529a36232e948549ad59342ba9 Author: Michael Gmelin AuthorDate: 2023-06-10 10:03:39 +0000 Commit: Michael Gmelin CommitDate: 2023-06-10 10:03:39 +0000 sysutils/pftop: Fix build on 14.0-CURRENT --- sysutils/pftop/Makefile | 10 ++++++++-- sysutils/pftop/files/extra-patch-config.h | 6 +++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile index f3c6d879f637..cba2ecd65aeb 100644 --- a/sysutils/pftop/Makefile +++ b/sysutils/pftop/Makefile @@ -1,6 +1,6 @@ PORTNAME= pftop PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils net MAINTAINER= grembo@FreeBSD.org @@ -22,7 +22,13 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bpf_dump.c \ ${FILESDIR}/extra-patch-sf-gencode.h MAKE_ARGS= LOCALBASE="${PREFIX}" \ - OSLEVEL=45 + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400090 +MAKE_ARGS+= OSLEVEL=46 +.else +MAKE_ARGS+= OSLEVEL=45 +.endif + CFLAGS+= -DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 \ -DHAVE_FINE_GRAINED_LOCKING=1 diff --git a/sysutils/pftop/files/extra-patch-config.h b/sysutils/pftop/files/extra-patch-config.h index 6d2873c42ab1..d24f88179718 100644 --- a/sysutils/pftop/files/extra-patch-config.h +++ b/sysutils/pftop/files/extra-patch-config.h @@ -1,7 +1,7 @@ $OpenBSD: patch-config_h,v 1.4 2008/12/20 04:36:11 canacar Exp $ --- config.h.orig Tue Nov 6 22:34:18 2007 +++ config.h Fri Dec 19 20:28:01 2008 -@@ -74,11 +74,20 @@ +@@ -74,11 +74,24 @@ #define HAVE_PFSYNC_STATE #endif @@ -11,7 +11,11 @@ $OpenBSD: patch-config_h,v 1.4 2008/12/20 04:36:11 canacar Exp $ +#endif + #ifdef HAVE_PFSYNC_STATE ++#if OS_LEVEL > 45 ++typedef struct pfsync_state_1400 pf_state_t; ++#else typedef struct pfsync_state pf_state_t; ++#endif typedef struct pfsync_state_host pf_state_host_t; typedef struct pfsync_state_peer pf_state_peer_t; +#ifdef HAVE_NETWORK_ORDER