From owner-dev-commits-src-all@freebsd.org Sun Mar 21 01:39:33 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 482405BA868; Sun, 21 Mar 2021 01:39:33 +0000 (UTC) (envelope-from bz@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F30fs1CwRz3krV; Sun, 21 Mar 2021 01:39:33 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id E0F92286D7; Sun, 21 Mar 2021 01:39:32 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 82C898D4A172; Sun, 21 Mar 2021 01:39:30 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 5E376E707B3; Sun, 21 Mar 2021 01:39:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id pS2M2cTz4FsG; Sun, 21 Mar 2021 01:39:27 +0000 (UTC) Received: from [127.0.0.1] (unknown [IPv6:fde9:577b:c1a9:4902:79d8:45c4:6b20:2cd]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 7B3BBE707AF; Sun, 21 Mar 2021 01:39:27 +0000 (UTC) From: "Bjoern A. Zeeb" To: "Emmanuel Vadot" , "Dr Robert N. M. Watson" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8c3eaf244a41 - main - pkgbase: Install all BSM includes with INCS Date: Sun, 21 Mar 2021 01:39:24 +0000 X-Mailer: MailMate (2.0BETAr6151) Message-ID: <690AB8BF-69F3-465A-BB2F-F72145935195@FreeBSD.org> In-Reply-To: <202103160613.12G6DJlN061954@gitrepo.freebsd.org> References: <202103160613.12G6DJlN061954@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8"; 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: Sun, 21 Mar 2021 01:39:33 -0000 On 16 Mar 2021, at 6:13, Emmanuel Vadot wrote: Hi manu, Cc: rwatson > The branch main has been updated by manu: > > URL: = > https://cgit.FreeBSD.org/src/commit/?id=3D8c3eaf244a417a4ee105834410a52= 144206102e5 > > commit 8c3eaf244a417a4ee105834410a52144206102e5 > Author: Emmanuel Vadot > AuthorDate: 2021-03-16 06:12:46 +0000 > Commit: Emmanuel Vadot > CommitDate: 2021-03-16 06:12:46 +0000 > > pkgbase: Install all BSM includes with INCS > > Now they are correctly taggued and put them into the libbsm = > package > > Reviewed by: bapt > Differential Revision: https://reviews.freebsd.org/D29165 > MFC after: 2 weeks > --- > include/Makefile | 27 +++++++++++++++++++++++++-- > 1 file changed, 25 insertions(+), 2 deletions(-) > > diff --git a/include/Makefile b/include/Makefile > index 8ddfd7015918..cf760359d2f5 100644 > --- a/include/Makefile > +++ b/include/Makefile =2E. > @@ -175,6 +193,11 @@ INCSGROUPS=3D INCS \ > VERIEXEC \ > WG > > +.if ${MK_AUDIT} !=3D "no" > +INCSGROUPS+=3D BSM > +INCSGROUPS+=3D SECAUDIT > +.endif > + > .if ${MK_IPFILTER} !=3D "no" > INCSGROUPS+=3D IPFILTER > .endif This breaks builds for WITHOUT_AUDIT=3D I believe. Files in libc = (gen/fstab.c) include sys/mount.h which includes sys/ucred.h which = unconditionally includes bsm/audit.h (and has been for a decade or more, = and so does sys/sysent.h) which now is not found anymore if audit is = turned off. I believe sys/ucred.h can be fixed: iff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index 6a9becb54c7..b23374f48c9 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -38,8 +38,8 @@ #if defined(_KERNEL) || defined(_WANT_UCRED) #include #include -#endif #include +#endif struct loginclass; Sadly this won=E2=80=99t fix lib/libkvm/kvm_proc.c and = lib/libprocstat/libprocstat.c which define _WANT_UCRED and at least = kvm_proc.c and probably kdump and rpcgen consumers rely on sysent and = whatever else I missed with a quick look again which are not as easily = fixed. How do we check in kernel header files for user space build options to = be set correctly? That would actually not fix the problem for sysent.h = as we=E2=80=99d have a missing type. And for ucred with the places actua= lly = asking for it as well. Given we cannot change the size of these structs = I believe we have to unconditionally install at least audit.h (for now)? /bz