From owner-dev-commits-src-all@freebsd.org Wed Jan 6 06:28:30 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 365EB4C4C4C; Wed, 6 Jan 2021 06:28:30 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9fZQ0xnKz4m19; Wed, 6 Jan 2021 06:28:30 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id EDA876B3F; Wed, 6 Jan 2021 06:28:29 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 072C8BDD0; Wed, 6 Jan 2021 07:28:27 +0100 (CET) From: "Kristof Provost" To: "Hartmann, O." Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: fda7daf06301 - main - pfctl: Stop sharing pf_ruleset.c with the kernel Date: Wed, 06 Jan 2021 07:28:27 +0100 X-Mailer: MailMate (1.13.2r5673) Message-ID: <1D693FF6-3D56-40C0-A058-5EFF0E3058FD@FreeBSD.org> In-Reply-To: <20210106055051.51e28498@hermann.fritz.box> References: <202101052237.105MbsPa081440@gitrepo.freebsd.org> <20210106055051.51e28498@hermann.fritz.box> MIME-Version: 1.0 Content-Type: text/plain; format=flowed Content-Transfer-Encoding: quoted-printable X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2021 06:28:30 -0000 On 6 Jan 2021, at 5:50, Hartmann, O. wrote: > On Tue, 5 Jan 2021 22:37:54 GMT > Kristof Provost wrote: > >> The branch main has been updated by kp: >> >> URL: = >> https://cgit.FreeBSD.org/src/commit/?id=3Dfda7daf06301beef1bdad3989123= 2a12c6925b22 >> >> commit fda7daf06301beef1bdad39891232a12c6925b22 >> Author: Kristof Provost >> AuthorDate: 2020-12-24 15:02:04 +0000 >> Commit: Kristof Provost >> CommitDate: 2021-01-05 22:35:37 +0000 >> >> pfctl: Stop sharing pf_ruleset.c with the kernel >> >> Now that we've split up the datastructures used by the kernel and >> userspace there's essentually no more overlap between the = >> pf_ruleset.c >> code used by userspace and kernelspace. >> >> Copy the userspace bits to the pfctl directory and stop using the = >> kernel >> file. >> >> Reviewed by: philip >> MFC after: 2 weeks >> Sponsored by: Orange Business Services >> Differential Revision: https://reviews.freebsd.org/D27764 >> --- >> sbin/pfctl/Makefile | 3 - >> sbin/pfctl/pf_ruleset.c | 343 = >> ++++++++++++++++++++++++++++++++++++++++++++ >> sys/netpfil/pf/pf_ruleset.c | 286 = >> +----------------------------------- >> 3 files changed, 349 insertions(+), 283 deletions(-) >> > > It seems that now make buildkernel fails (at least for me): > > > [...] > =3D=3D=3D> lib/libelftc (all) > --- all_subdir_sbin --- > /usr/src/sys/netpfil/pf/pf_ruleset.c:62:2: error: "Kernel only file. = > Please use > sbin/pfctl/pf_ruleset.c instead." #error "Kernel only file. Please use > sbin/pfctl/pf_ruleset.c instead." ^ > /usr/src/sys/netpfil/pf/pf_ruleset.c:71:39: warning: type specifier = > missing, defaults to > 'int' [-Wimplicit-int] VNET_DEFINE(struct pf_kanchor_global, = > pf_anchors); > ^ > /usr/src/sys/netpfil/pf/pf_ruleset.c:71:1: warning: type specifier = > missing, defaults to > 'int' [-Wimplicit-int] VNET_DEFINE(struct pf_kanchor_global, = > pf_anchors); > ^ > /usr/src/sys/netpfil/pf/pf_ruleset.c:72:33: warning: type specifier = > missing, defaults to > 'int' [-Wimplicit-int] VNET_DEFINE(struct pf_kanchor, = > pf_main_anchor); > ^ > /usr/src/sys/netpfil/pf/pf_ruleset.c:72:1: warning: type specifier = > missing, defaults to > 'int' [-Wimplicit-int] VNET_DEFINE(struct pf_kanchor, = > pf_main_anchor); > ^ > /usr/src/sys/netpfil/pf/pf_ruleset.c:72:1: error: conflicting types = > for 'VNET_DEFINE' > /usr/src/sys/netpfil/pf/pf_ruleset.c:71:1: note: previous declaration = > is here > VNET_DEFINE(struct pf_kanchor_global, pf_anchors); > > What architecture are you building for? What kernel config? Do you have = anything in src.conf or make.conf? Regards, Kristof