From owner-dev-commits-src-all@freebsd.org Wed Jan 6 16:12:03 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 9D5F64D5771; Wed, 6 Jan 2021 16:12:03 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9vWl1BM5z4WG4; Wed, 6 Jan 2021 16:12:02 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.229.168]) by shaw.ca with ESMTPA id xBPikXIXp34axxBPkkYj9e; Wed, 06 Jan 2021 09:12:01 -0700 X-Authority-Analysis: v=2.4 cv=LvQsdlRc c=1 sm=1 tr=0 ts=5ff5e151 a=7AlCcx2GqMg+lh9P3BclKA==:117 a=7AlCcx2GqMg+lh9P3BclKA==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=EmqxpYm9HcoA:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=Pej5ICdeRofg9T6lYGQA:9 a=CjuIK1q_8ugA:10 a=UJ0tAi3fqDAA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 5742A13EF; Wed, 6 Jan 2021 08:11:56 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 106GBuf8085541; Wed, 6 Jan 2021 08:11:56 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202101061611.106GBuf8085541@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Kyle Evans cc: Cy Schubert , Kristof Provost , "Hartmann, O." , src-committers , 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 In-reply-to: References: <202101052237.105MbsPa081440@gitrepo.freebsd.org> <20210106055051.51e28498@hermann.fritz.box> <1D693FF6-3D56-40C0-A058-5EFF0E3058FD@FreeBSD.org> <20210106102002.5af4db05@hermann.fritz.box> <202101061430.106EU2Og058101@slippy.cwsent.com> Comments: In-reply-to Kyle Evans message dated "Wed, 06 Jan 2021 09:45:34 -0600." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 06 Jan 2021 08:11:56 -0800 X-CMAE-Envelope: MS4xfKJ0VACZmN3YZ2yj8eEj//l+cA3+cBZ96Rb2Y8RkxQWGvIPopEyV49ET0C1uIZgGxhVteayuBs4TRq/UrW4tDCRceZphAJWEpZ5SK4wQ3JSNSO3tWg/7 +pdwFRsqm+bGXslAaXHZl7ojfezGDPKK+OvBhxeoqcUTgXfSzmwHh17NoFcl7lKxchhJAatoOtFlk5/jfqQM3q+25RvZu+qvE7MdnKvS9QzLOeVlCMdhP1ro E2PSnhL7ja3+9z3LNCbgL7bQFrlPQSlYeU3Ww34JU8J1vz1lvwYlVlt6y5kucd5anVtDnOCak6tV5oMRgkESQFK27hiQbZ1reZSBk3fyEOHy8eOghbyzRLNm VhmEpro4u0jFeq9rey8D0JISoF0EOwzvQB/iq0v6EQSMRREunuc= X-Rspamd-Queue-Id: 4D9vWl1BM5z4WG4 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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 16:12:03 -0000 In message , Kyle Evans writes: > On Wed, Jan 6, 2021 at 8:30 AM Cy Schubert wrote: > > In message c > > om> > > , Kyle Evans writes: > > > On Wed, Jan 6, 2021, 03:22 Kristof Provost wrote: > > > > > > > On 6 Jan 2021, at 10:20, Hartmann, O. wrote: > > > > > > > > > > amd64. > > > > > kernel config is custom, no debug, IPFW, MAC. pf is not used, we use > > > > IPFW. > > > > Please share your kernel config as well. > > > > > > > > Best regards, > > > > Kristof > > > > > > > I note that the original report says buildkernel, but the log exercpt is > > > from buildworld. Looks like pf_ruleset.c kept the name, so this needs a > > > dependency cleanup rule in tools/build to build the right one on > > > WITHOUT_CLEAN builds. > > > > > > > Yes, this is the problem. > > > > This should do, I think: > > diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh > index 8b249ccf55f..7d078f52c84 100755 > --- a/tools/build/depend-cleanup.sh > +++ b/tools/build/depend-cleanup.sh > @@ -56,3 +56,6 @@ if [ -e "$OBJTOP"/rescue/rescue/rescue.c ] && \ > echo "Removing old rescue(8) tree" > rm -rf "$OBJTOP"/rescue/rescue > fi > + > +# 20210105 fda7daf06301 pfctl gained its own version of pf_ruleset.c > +clean_dep sbin/pfctl pf_ruleset c We should add ncurses (for 821aa63a09402935da0a73abf20ba0441562aa07) here as well. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few.