From nobody Sat Sep 21 00:57:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597794001; cv=none; d=zohomail.com; s=zohoarc; b=dVW5PFMbvuTFRTFBe5m6lylv0EB1xx7+8fAj5/SIufUT2q1Qu9/X3vf4eMWSk4B3mfbd/SAsYzElAi6FUcQS0xH6Lrg7DwEGmQxoG6zx5EDvhQO3J3b8SNaRk7U6YasIomkZ0q3W0SMhllZ1gcqmwLyk80kZoFsNfpg7zpc4yp8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597794001; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/x/0P912A/oliycztlAyePHYty+0d010UXpE+B9PHx0=; b=jfV9m8uoVPIKodEVDkkM4V9pe2KTXnRld5WcIVPlxr4ezU/CIjgX4g7VIiTdJizFcb4kazrQ0kEpqKodyJV5xSeYRcjwYLYKgo2YoT+VShhSrwOkYs7ilxcEpJDLgupeVv6O7FlD5JvI39z3QEgm5FLCFr2lbAmJORJjHIGDgvY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1597794001644566.8945433602863; Tue, 18 Aug 2020 16:40:01 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-349-TcsNz8_YMt-tdtUbIohe5A-1; Tue, 18 Aug 2020 19:39:58 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DA7E7801AAE; Tue, 18 Aug 2020 23:39:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B794E6CE4E; Tue, 18 Aug 2020 23:39:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8B29B6037D; Tue, 18 Aug 2020 23:39:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 07INdQbN030688 for ; Tue, 18 Aug 2020 19:39:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 988487A40F; Tue, 18 Aug 2020 23:39:26 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.133]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F0B2F7A1E6 for ; Tue, 18 Aug 2020 23:39:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597794000; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/x/0P912A/oliycztlAyePHYty+0d010UXpE+B9PHx0=; b=UM317x2y3aUpFL3K5WgswmAcan+Zo5VxL7qVNOJjxpttEUQNsl35Oxm05pq/UMIbjNqjBU 1XFSCU353zB7Eb4MNYOJmJ7bnoGdKe24j5h2zufjEnXLU8fpr/nGwGLNXUN3psWu0wXSsw K4UAdrFSghUgaLUVkn2Ww7wTiy7jhyo= X-MC-Unique: TcsNz8_YMt-tdtUbIohe5A-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] meson: Set WITH_APPARMOR_PROFILES Date: Wed, 19 Aug 2020 01:39:18 +0200 Message-Id: <20200818233919.45137-2-abologna@redhat.com> In-Reply-To: <20200818233919.45137-1-abologna@redhat.com> References: <20200818233919.45137-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This variable is used in src/security/meson.build to decide whether to install the AppArmor profiles, and at the moment even when the user specifies -Dapparmor_profiles=3Dtrue they don't get installed. Signed-off-by: Andrea Bolognani Reviewed-by: Christian Ehrhardt --- meson.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meson.build b/meson.build index a72d0c0e85..c10b63ba69 100644 --- a/meson.build +++ b/meson.build @@ -966,6 +966,9 @@ endif =20 apparmor_dep =3D dependency('libapparmor', required: get_option('apparmor'= )) if apparmor_dep.found() + if get_option('apparmor_profiles') + conf.set('WITH_APPARMOR_PROFILES', 1) + endif conf.set('WITH_APPARMOR', 1) conf.set_quoted('APPARMOR_DIR', '/etc/apparmor.d') conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor= /profiles') --=20 2.26.2 From nobody Sat Sep 21 00:57:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597793984; cv=none; d=zohomail.com; s=zohoarc; b=QX0KoTxsFvBGnGXAxHfnx/Tm3OupeyzrsDp0bW8oZ/NmCRwU4ClpExUFgfY2m5xkT/Vy/7mJJJUA8+mbqtIjT3wrYlKPvj+wR1e51DKzT2GUj1CzG3d5rDA4Y+KBnf52oNyEF137P69ImlYZzDhiwp1s6I1RnnuA80LdHAK0RXw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597793984; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YvtPYO0vFa6n79UpZG7Tqcoh62V0ffD4LM8pUKbE1Y4=; b=UHjvCvZS4Nyaze5uKNY0HAVnZK0caJKtKndLk76jltMOYPWVVfkKni39NrlBGaz3+dvlmcTjG8VW1CRulXSDQpZnyzBRxjrQ18559m1AVM7+6pXReTxUtlYIMd3kTKGSMrN8EhqZwwYDPgjhtjDPCiz7hpY0UBpineOQRaLeM18= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1597793984597428.51030270358706; Tue, 18 Aug 2020 16:39:44 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-224-4JMjRT3UPHa2GtMbfgK-vQ-1; Tue, 18 Aug 2020 19:39:41 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60CE518686EF; Tue, 18 Aug 2020 23:39:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A9A37DFC0; Tue, 18 Aug 2020 23:39:34 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 599396037B; Tue, 18 Aug 2020 23:39:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 07INdRGQ030696 for ; Tue, 18 Aug 2020 19:39:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id AD0C87A1E6; Tue, 18 Aug 2020 23:39:27 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.133]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0DBE97A413 for ; Tue, 18 Aug 2020 23:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597793983; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=YvtPYO0vFa6n79UpZG7Tqcoh62V0ffD4LM8pUKbE1Y4=; b=bzCUgw6rrosUPSxzCEMRDi5WyRmZUGkub8nqtICrP6CWgU+0h9Ecezr+9dUOXY55LoeI5H Xprl+HczgXHsN6E4n6+7yDuK3EL19PwigKmaMzzl2gfrcJX0h6vMpQyYdsxiuqYrgafQTP rnX6hlqA62FsmG+eMf/iv41uosx5emM= X-MC-Unique: 4JMjRT3UPHa2GtMbfgK-vQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] meson: Don't hardcode /etc in APPARMOR_DIR Date: Wed, 19 Aug 2020 01:39:19 +0200 Message-Id: <20200818233919.45137-3-abologna@redhat.com> In-Reply-To: <20200818233919.45137-1-abologna@redhat.com> References: <20200818233919.45137-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" src/security/apparmor/meson.build builds this path dynamically based on the value of sysconfdir, so we should do the same here or the code and the filesystem might end up disagreeing. Signed-off-by: Andrea Bolognani Reviewed-by: Christian Ehrhardt --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index c10b63ba69..2846c9b9f2 100644 --- a/meson.build +++ b/meson.build @@ -970,7 +970,7 @@ if apparmor_dep.found() conf.set('WITH_APPARMOR_PROFILES', 1) endif conf.set('WITH_APPARMOR', 1) - conf.set_quoted('APPARMOR_DIR', '/etc/apparmor.d') + conf.set_quoted('APPARMOR_DIR', sysconfdir / 'apparmor.d') conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor= /profiles') endif =20 --=20 2.26.2