From nobody Thu Oct 20 20:24:19 2022 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 4MtfFv5Pqlz4gV3X; Thu, 20 Oct 2022 20:24:19 +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 4MtfFv5122z3N9x; Thu, 20 Oct 2022 20:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666297459; 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=6gm0lsAsxQTPQ+Nu7JaNBb9D8lAtuu1DRGKoow8YWXE=; b=vg5bwei8BbFh4bQeAFZl8hRHyiSqbzoH7LgoUXrQolR9SzDkf3H6UJmtkVdjESI6lKiTSW z8Aqb2xiyH3aOc10/97QTx27yO7EYLLKrS8bWvYp67nMS3AJhTtJh4bdCvGv3foZKeTvov HUGwGB1AXbJYpi9mtNI9HK3PQklHL/3+GJOM/pklFgzOE00mACRELPAgMeQtjhrBsjaknE k7RGjK5nTbunDUSb2lVe88vD3NI3JEyEQF2/g9Ya5/Hq5D3/9xnu4KkjD7ti2v59qRVmul 9OgndTZGw7L+bcKX7g1hoJ1uqaSDbmSEk2NSgM4C2nLQo9/zeGYutqfmL7cNAg== 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 4MtfFv46dfz1034; Thu, 20 Oct 2022 20:24:19 +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 29KKOJI9089449; Thu, 20 Oct 2022 20:24:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29KKOJsk089448; Thu, 20 Oct 2022 20:24:19 GMT (envelope-from git) Date: Thu, 20 Oct 2022 20:24:19 GMT Message-Id: <202210202024.29KKOJsk089448@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: a8fb74ec973e - main - net-mgmt/ng_ipacct: Fix build on 14.0. 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: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8fb74ec973ebe38b110bf232f8b1b9de219e65d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666297459; 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=6gm0lsAsxQTPQ+Nu7JaNBb9D8lAtuu1DRGKoow8YWXE=; b=Pznao00FI0G4Cx/WZNTcWz1g3bv2olVVlp/uQZAC/FJFrWHWp2eKdQosjQbT5VpgZDhSN7 EJbFznbf3HnsmmsGgtDxT3N4YjEQOabNzQHqxG1e0ppQv24xD0hVSw25UcdrGdU4UxPPj7 5iF57svJdoxslaPT/B+eCJ/FpqGnHm4ji+J5+ydwdZCy0VdO6NIAdtmjslfkgUkdko2EMC Frfo/9KbNbdHDjAVQF2OlkRfp5OlpS1Z2ImBcFgz9/uiHa7ZAZqQUlE3EpklBzqZzGb+RP d1C1oFM5pxxXX8OL2rCva7qX65grYzhYnu/a2tMkgyYfA0gkEgkS4ZXUvfk71A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666297459; a=rsa-sha256; cv=none; b=xzRfKb9vC4phkVI9LIl3+bHllWmCqVPuCB+AOU7udls38/eObz3HUCiEGuicJpY9bf+RYX 9kIVT911gTCkIIGycqU/gU4dNPvRw9c1b32uuF6FJ+I8xjXET4ayGtX/FeAkHB0gVnStmL PeTZKL1M2+EgCyBGrhww7tn46g1PTBXNRzLhgghgxkgJsFk3bD9KYcVpS38AbtILuxziR6 0H+u02TIFm4h0MT9lgSX74pnRLLQ3fREnVduAS7w7kIOlS2oTpYq6qk5MSHXRfTvt/leNg Hty+mOuVpbLkDH2jvhtG0Mshlav89CnOuNg95JQW6QV1YYiiPr37fVSU99JyCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=a8fb74ec973ebe38b110bf232f8b1b9de219e65d commit a8fb74ec973ebe38b110bf232f8b1b9de219e65d Author: John Baldwin AuthorDate: 2022-10-20 20:23:12 +0000 Commit: John Baldwin CommitDate: 2022-10-20 20:23:12 +0000 net-mgmt/ng_ipacct: Fix build on 14.0. src commit 0f617ae48a911caab3130d0e80cfb425bc3b653b moved the prototype of in_pcblookup_local to a new header. src commit 28d0a740dd9a6 added "opt_kern_tls.h" #include to . PR: 266556 Differential Revision: https://reviews.freebsd.org/D36546 --- net-mgmt/ng_ipacct/files/patch-ng__ipacct_Makefile | 11 +++++++++++ net-mgmt/ng_ipacct/files/patch-ng__ipacct_ng__ipacct.c | 12 ++++++++++++ 2 files changed, 23 insertions(+) diff --git a/net-mgmt/ng_ipacct/files/patch-ng__ipacct_Makefile b/net-mgmt/ng_ipacct/files/patch-ng__ipacct_Makefile new file mode 100644 index 000000000000..9efecce6d4db --- /dev/null +++ b/net-mgmt/ng_ipacct/files/patch-ng__ipacct_Makefile @@ -0,0 +1,11 @@ +--- ng_ipacct/Makefile.orig 2022-09-13 09:00:08 UTC ++++ ng_ipacct/Makefile +@@ -1,7 +1,7 @@ KMOD= ng_ipacct + # $Id: Makefile,v 1.4 2005/07/31 07:58:18 romanp Exp $ + + KMOD= ng_ipacct +-SRCS= ng_ipacct.c opt_netgraph.h ++SRCS= ng_ipacct.c opt_netgraph.h opt_kern_tls.h + + CFLAGS+= -g -I${.CURDIR} + diff --git a/net-mgmt/ng_ipacct/files/patch-ng__ipacct_ng__ipacct.c b/net-mgmt/ng_ipacct/files/patch-ng__ipacct_ng__ipacct.c new file mode 100644 index 000000000000..b62bc827ebf4 --- /dev/null +++ b/net-mgmt/ng_ipacct/files/patch-ng__ipacct_ng__ipacct.c @@ -0,0 +1,12 @@ +--- ng_ipacct/ng_ipacct.c.orig 2022-09-13 09:05:22 UTC ++++ ng_ipacct/ng_ipacct.c +@@ -49,6 +49,9 @@ static const char rcs_id[] = + #include + #include + #include ++#if __FreeBSD_version >= 1400039 ++#include ++#endif + #include + #include + #include