From owner-dev-commits-src-main@freebsd.org Sat Apr 10 14:25:21 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 7E2E25CD95D; Sat, 10 Apr 2021 14:25:21 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay109.isp.belgacom.be (mailrelay109.isp.belgacom.be [195.238.20.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "relay.skynet.be", Issuer "GlobalSign RSA OV SSL CA 2018" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHcjD5Pp5z3PNQ; Sat, 10 Apr 2021 14:25:20 +0000 (UTC) (envelope-from tijl@freebsd.org) IronPort-SDR: DKQ38tHSTxSLcJCIC+8wTxB9wssQiiMUHHIXvgbJM0WkSnCJsl92Cis0s+5Fok9wQxnDY110hm LbuiwbW0XGL4ea/0L5/auXImzTSbonKopmKr6xmyWkqvs8rLP5lNBTaMHGv2Ylo2XE4R8XdMpi dA+njS/Oxxxe+2H5b6/ph+MNAMXe/DMz7dv/0F1vkb15+WJC/4Md8mRqVH6yYhYqeBf44JmjLA 5UIV2007oVjVZKF4YBJ4hOWtdPRZL8PilbudvQRzHfQeXRWUKj+P2r892etC0KfIyQ3kehs0Jm ePk= X-IPAS-Result: =?us-ascii?q?A2AEAAAVtHFg/wSs8lFaGgEBAQEBAQEBAQEDAQEBARIBA?= =?us-ascii?q?QEBAgIBAQEBQAmBNQUBAQEBCwGDIVYBUBqMZmCGOIIeOQGaL4F8CwEBAQEBA?= =?us-ascii?q?QEBATMKBAEBhFACgXgmNAkOAgMBAQEDAgMBAQEBAQYBAQEBAQEFBAGBA4UXO?= =?us-ascii?q?Q2COCKDawEFOj8QCw4KLlcGE4JygwsLrB2BNIEBgz8BgRiDZoEDBoE5AY1MQ?= =?us-ascii?q?4ILgRODIj6BUXgXBBiHPQSCR4EOLIEbeAEXnhKdAoJDUoljkwoylCOQToZHm?= =?us-ascii?q?jiZPIITTTAIgyRQGQ6XI4VHPwMvCy0CBgoBAQMJjREBAQ?= IronPort-PHdr: A9a23:iim61xFUefTFmZLEhaMFzJ1Gfw5LhN3EVjU92t8ck7tLN56b1NHcB iT32/xhgRfzUJnB7Loc0qyK6vGmADxaqs/Y7jgrS99lb1c9k8IYnggtUoauKHbQC7rUVRE8B 9lIT1R//nu2YgB/Ecf6YEDO8DXptWZBUhrwOhBoKevrB4Xck9q41/yo+53Ufg5EmCexbal9I RmrqQjdrNQajIh8Jqo+1xfFv3pFcPlKyG11Il6egwzy7dqq8p559CRQtfMh98peXqj/Yq81U 79WAik4Pm4s/MHkugXNQgWJ5nsHT2UZiQFIDBTf7BH7RZj+rC33vfdg1SaAPM32Sbc0WSm+7 6puVRTlhjsLOyI//WrKjMF7kaBVrw+7pxFnzYDaYJ+bOud9cKzfc9MVSnZOUMlKWixdAI6xd ZcDA/YdMepGqYT2ulsArQG5BQmpHO7h1DpKhnvr1qAk1OQhFhrG0xIlH90UtnTUt8j+OaAOU eC0zqnIyS7OYfNM2Tjj9ofFbw0vr/+WUbJ3a8rRxlAiGgXYhVqftYLrJSma1vgRs2eF9epgU /qihnAjpgxsrDWiwtshh4rHi48J1FzJ6yZ0zZsrKdC8TEN2YMOpHYZOui+UOIZ7TMcvTW51t SomxbMLuIO2cSkExpkh2hXRZfuHc42S7RLiUuacOTl4hGh7d72hnBmy6lWvxvf7Vsmu31ZHq DdOnNrUtn0V1BHf99KLRuVy80u/wzqDygLe5v9eLU07k6fQNoQvzaQqlpUJtETOBir2mELrg 6CIbkgk4e2o6/j/YrXhu5+cK5d4igHgPaQqncyyGec4PRIKX2ia/OSzyqfj/UrjTLVWj/02k K3ZvIrGKsQcoa65GBFa0oM55Ba5FDeqytMYnWMILF5deRKHiZbmO03WLf37EPuzmUqgnTh1y /zcI7HsAIvBImLMnbv5eLZy8U9cyA49zdBF4JJUD6kMIO7yWk/zsNzVFRE5MxaqzOn5E9p9z Z4RVXiIAq+DP6PeqUWI6f43I+mQeI8Vvy7wJOU76P7wlHM2hVgdfays3ZsWdHC4Be1qI16DY XXwm9sBFH0Fvgs4TOHxhl2CSyBcaGipUKIn+z43EoWmDZ3MRoq1mryOwD+7HoFKZmBBEl2DD Gnnd5udV/gQbyKSJ8phkj0YVbi6UoMhzguuuxPjx7V9KurU/jYVtZz51Ndr+eLcjgoy+iFuA 8SayWGNQHl+nnkUSD8uwKB/vUt9x0+Y0ahin/NUDMBc5/RMUgc/NJ7c0/B6BM7oWgLaZdqJR kymTcu4Dj4qVdI+3sUCY0FnG9WtlhrDxTalA6cJl7yXA5w56qfc0GL3J8Zg0HvG2rMhgEc4T cRULm2pm7Rz9w/JB47GwA2lkPOHcKEV2jPA8C+9xGaJoAkMVQd2TI3rR30STHD669Pj6RWRY aWpDOEb1Q8J4smFMaZPY9vyxQFaRfXnEPrEbm+boEv2AgyHkODfJLH2cnkQiX2OQHMPlBoeq C7uCA== IronPort-HdrOrdr: A9a23:leL4a6tLQefq3VMHTg0D1WvW7skCVIMji2hD6mlwRA09T+Wzkc eykPMHkSLugDEKV3063fyGMq+MQXTTnKQFnLU5F7GkQQXgpS+UPJhvhLGSuQHINg/f0qpm1a lme7VjE9GYNzNHpOvz/QXQKadd/PCp/Kykju/VzTNMYGhRGsRdxihjDALzKDwReCBiBYAlUL qwj/A3xQaIXHQMc4CGAWMYVPLIvN3BmPvdASIuIh489U2ziim146TxCBiS0lMmVSlTqI1Skl TttyzcyuGdv+qgyhnavlWjiKh+vNf60NNMCIitp6EuRQnEsQqjaIR/V7Dqhllcyt2H0kogk9 XHvn4bTrxOwk7WF1vF2CfF6k3J2yo15zvYxUafmmb45fH+LQhWN+NxwapEbx2c0EY7pdd6yq 4O5X6BroFaFwmopkrAzumNfStD0kCzpWMmme4VkmY3a+cjQY4Uh4Qa5UtUHpAhMUvBibwPIa 1VDM/a7PNtaFufK1r4kwBUsbiRd0V2BQ6NSkwassya1FFt7QtE83c= X-IronPort-Anti-Spam-Filtered: true Received: from 4.172-242-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.242.172.4]) by relay.proximus.be with ESMTP; 10 Apr 2021 16:25:18 +0200 Received: from localhost (localhost [127.0.0.1]) by kalimero.tijl.coosemans.org (8.16.1/8.16.1) with ESMTP id 13AEPIB2001508; Sat, 10 Apr 2021 16:25:18 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Sat, 10 Apr 2021 16:25:17 +0200 From: =?UTF-8?B?VMSzbA==?= Coosemans To: Emmanuel Vadot 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 Message-ID: <20210410162517.56e112f9@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=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4FHcjD5Pp5z3PNQ X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:5432, ipnet:195.238.0.0/19, country:BE] 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: Sat, 10 Apr 2021 14:25:21 -0000 On Tue, 16 Mar 2021 06:13:19 GMT Emmanuel Vadot wrote: > The branch main has been updated by manu: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8c3eaf244a417a4ee105834410a52144206102e5 > > 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 > @@ -38,7 +38,7 @@ PHDRS= sched.h _semaphore.h > LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdatomic.h stdint.h \ > syslog.h ucontext.h > > -LDIRS= bsm cam geom net net80211 netgraph netinet netinet6 \ > +LDIRS= cam geom net net80211 netgraph netinet netinet6 \ > netipsec netsmb nfs nfsclient nfsserver sys vm > > LSUBDIRS= cam/ata cam/mmc cam/nvme cam/scsi \ > @@ -58,7 +58,6 @@ LSUBDIRS= cam/ata cam/mmc cam/nvme cam/scsi \ > netinet/cc \ > netinet/netdump \ > netinet/tcp_stacks \ > - security/audit \ > security/mac_biba security/mac_bsdextended security/mac_lomac \ > security/mac_mls security/mac_partition \ > security/mac_veriexec \ > @@ -76,6 +75,25 @@ ACPICADIR= ${INCLUDEDIR}/dev/acpica > AGP= agpreg.h > AGPDIR= ${INCLUDEDIR}/dev/agp > > +.PATH: ${SRCTOP}/sys/bsm > +BSM= audit.h \ > + audit_errno.h \ > + audit_internal.h \ > + audit_record.h \ > + audit_domain.h \ > + audit_fcntl.h \ > + audit_kevents.h \ > + audit_socket_type.h > +BSMPACKAGE= libbsm > +BSMDIR= ${INCLUDEDIR}/bsm > + > +.PATH: ${SRCTOP}/sys/security/audit > +SECAUDIT= audit.h \ > + audit_ioctl.h \ > + audit_private.h > +SECAUDITPACKAGE= libbsm > +SECAUDITDIR= ${INCLUDEDIR}/security/audit > + > .PATH: ${SRCTOP}/sys/fs/cd9660 > FS9660= cd9660_mount.h \ > cd9660_node.h \ > @@ -175,6 +193,11 @@ INCSGROUPS= INCS \ > VERIEXEC \ > WG > > +.if ${MK_AUDIT} != "no" > +INCSGROUPS+= BSM > +INCSGROUPS+= SECAUDIT > +.endif > + > .if ${MK_IPFILTER} != "no" > INCSGROUPS+= IPFILTER > .endif This breaks builds with WITHOUT_AUDIT because sys/ucred.h includes bsm/audit.h. It looks like bsm headers need to be installed unconditionally for now.