From owner-dev-commits-src-main@freebsd.org Wed Jan 6 19:35:10 2021 Return-Path: Delivered-To: dev-commits-src-main@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 6701A4DB9C3; Wed, 6 Jan 2021 19:35:10 +0000 (UTC) (envelope-from flo@smeets.xyz) Received: from mail-out.smeets.xyz (mail-out.smeets.xyz [IPv6:2a01:4f8:10a:3543:ffff:0:25:11]) by mx1.freebsd.org (Postfix) with ESMTP id 4DB0260sWlz4nK3; Wed, 6 Jan 2021 19:35:09 +0000 (UTC) (envelope-from flo@smeets.xyz) Received: from mail.smeets.xyz (mail.smeets.xyz [IPv6:2a01:4f8:10a:3543::25:3]) by mail-out.smeets.xyz (Postfix) with ESMTP id EBF491C2F3; Wed, 6 Jan 2021 20:35:02 +0100 (CET) Received: from amavis.smeets.xyz (amavis.smeets.xyz [IPv6:2a01:4f8:10a:3543::aa:4]) by mail.smeets.xyz (Postfix) with ESMTP id E4FFEB0655; Wed, 6 Jan 2021 20:35:02 +0100 (CET) X-Virus-Scanned: amavisd-new at smeets.xyz Received: from mail.smeets.xyz ([IPv6:2a01:4f8:10a:3543::25:3]) by amavis.smeets.xyz (amavis.smeets.xyz [IPv6:2a01:4f8:10a:3543::aa:4]) (amavisd-new, port 10025) with ESMTP id jgEcOb7NlVL0; Wed, 6 Jan 2021 20:35:02 +0100 (CET) Received: from nibbler.home.lan (p2003000631ae245361da993fdf258291.dip0.t-ipconnect.de [IPv6:2003:6:31ae:2453:61da:993f:df25:8291]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) by mail.smeets.xyz (Postfix) with ESMTPSA id 6C808B06FF; Wed, 6 Jan 2021 20:35:00 +0100 (CET) Subject: Re: git: fda7daf06301 - main - pfctl: Stop sharing pf_ruleset.c with the kernel To: Kristof Provost , Kyle Evans Cc: Cy Schubert , "Hartmann, O." , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org 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> <0FF4FD8F-8E07-4CBE-B370-A7D8B722C892@FreeBSD.org> <56DF787E-3BE8-473E-8B35-50DC594B682A@FreeBSD.org> From: Florian Smeets Message-ID: <65d8ccf2-8852-c213-a7b1-c12d5742a3b7@smeets.xyz> Date: Wed, 6 Jan 2021 20:34:59 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <56DF787E-3BE8-473E-8B35-50DC594B682A@FreeBSD.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="algA4P4ldKajvFrGnr91UIR6z0103Ve0w" X-Rspamd-Queue-Id: 4DB0260sWlz4nK3 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2021 19:35:10 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --algA4P4ldKajvFrGnr91UIR6z0103Ve0w Content-Type: multipart/mixed; boundary="Gkwdnw31itBexB3mOeKaEmvcQ10GcCibX"; protected-headers="v1" From: Florian Smeets To: Kristof Provost , Kyle Evans Cc: Cy Schubert , "Hartmann, O." , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <65d8ccf2-8852-c213-a7b1-c12d5742a3b7@smeets.xyz> Subject: Re: git: fda7daf06301 - main - pfctl: Stop sharing pf_ruleset.c with the kernel 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> <0FF4FD8F-8E07-4CBE-B370-A7D8B722C892@FreeBSD.org> <56DF787E-3BE8-473E-8B35-50DC594B682A@FreeBSD.org> In-Reply-To: <56DF787E-3BE8-473E-8B35-50DC594B682A@FreeBSD.org> --Gkwdnw31itBexB3mOeKaEmvcQ10GcCibX Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 06.01.21 18:38, Kristof Provost wrote: > I think clean_dep is intended for kernel use. This seems to work for me= : >=20 > =C2=A0=C2=A0=C2=A0=C2=A0diff --git a/tools/build/depend-cleanup.sh > b/tools/build/depend-cleanup.sh > =C2=A0=C2=A0=C2=A0=C2=A0index 8b249ccf55fa..0b3ff9bcc635 100755 > =C2=A0=C2=A0=C2=A0=C2=A0--- a/tools/build/depend-cleanup.sh > =C2=A0=C2=A0=C2=A0=C2=A0+++ b/tools/build/depend-cleanup.sh > =C2=A0=C2=A0=C2=A0=C2=A0@@ -56,3 +56,11 @@ if [ -e "$OBJTOP"/rescue/res= cue/rescue.c ] && \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 echo= "Removing old rescue(8) tree" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 rm -= rf "$OBJTOP"/rescue/rescue > =C2=A0=C2=A0=C2=A0=C2=A0 fi > =C2=A0=C2=A0=C2=A0=C2=A0+ > =C2=A0=C2=A0=C2=A0=C2=A0+# 20210105=C2=A0 fda7daf06301=C2=A0=C2=A0 pfct= l gained its own version of > pf_ruleset.c > =C2=A0=C2=A0=C2=A0=C2=A0+if [ -e "$OBJTOP"/sbin/pfctl/.depend.pf_rulese= t.o ] && \ > =C2=A0=C2=A0=C2=A0=C2=A0+=C2=A0=C2=A0=C2=A0 egrep -qw "sys/netpfil/pf/p= f_ruleset.c" \ > =C2=A0=C2=A0=C2=A0=C2=A0+=C2=A0=C2=A0=C2=A0 "$OBJTOP"/sbin/pfctl/.depen= d.pf_ruleset.o; then > =C2=A0=C2=A0=C2=A0=C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 echo "Rem= oving old pf_ruleset dependecy file" > =C2=A0=C2=A0=C2=A0=C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 rm -rf "$= OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o > =C2=A0=C2=A0=C2=A0=C2=A0+fi >=20 Yeah, that works for me, on a system where it failed with the previously mentioned error message. Thansk, Florian --Gkwdnw31itBexB3mOeKaEmvcQ10GcCibX-- --algA4P4ldKajvFrGnr91UIR6z0103Ve0w Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEE7LNouHkIv7aRTXJp71uk3NWp88AFAl/2EOMFAwAAAAAACgkQ71uk3NWp88A1 HBAAoJvOuFN3JZpX83A1KiG/mSA6E9dbqNGuUkwpEyTjSTc7YJC8qzgSDbCF1XFvFoDf1Lo1iYBW UVfJU2bbKaALmO9dwr+G3ye1vTYXCetTUfMckIBH9oMKzYvfIGus5PrG6IT79Rh6v4aSHoNZzIGs dDJjDNm2Q2AxIM9J7jGAwkjFuIgFvl6IRP/UbdGGKXzrAv9UPvEnSaSM6QMmQdvTIaF4lF3jTZVX dqEKoPympsiCqec6fuMRVP6306U42S58iJImI8PAPy+aNJtQ3jOfKF8a0iY+8MZSsaDFeqjFo6A/ tI3ih2kvChQZMPaigq2ZiSoUKz2lyPj+s4JxKcgR0aIzD3BbyNEauILYDtgZHe7joMXM8Rn7tXFw earfJdEli5lNHsFpvkuHzZGRHVDkEYoiiRXQHw5K7eTg4LTUJsHcNj5NV7/en1WOCv14AvJ+vDiO 4zjr3tJQgNAy8jTpLx8Eepjhpn2Ov6cRVL/zGvMfODiwI96P42uavwrjGhWdnZB3ppC641Y0LID1 NHQuveE48FY7vJiHN5uzp/2vKR0MYrqJwe2DFzwr4wrq96/6vUmcDFqJqf1va8vRbfZc1dwCmJ13 jAovt3YBO8pjldqmw+8wagkGexF65t7ecYgb4hnhbIhQyzQbM389N925+2uu0fWaLf6dLJkk8vZU Vw8= =CIyy -----END PGP SIGNATURE----- --algA4P4ldKajvFrGnr91UIR6z0103Ve0w--