From nobody Tue Dec 16 04:58:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1743418349; cv=none; d=zohomail.com; s=zohoarc; b=Vk5VyXDTLhcHK4EsLFZ3/k5dhlQBrqWbHEjZ33y5l3BLPwz3qF4D7STxG75GjpMv3hBbKG2GUn0wq4VauSxWmTuich4vdXul1Cq/aeH8HGKtLOBWiTMU2EMEh4b/ihtE+i4rEjLFfA408zao2NN5ig09rt7Qzy0pWp36Ibx1R4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743418349; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=bOu6Olz8k67ZoDl9PG3YrGfNWk4epbjf8KjQmofDRFA=; b=IxBEIs1ms0rA9fZg0mTVbeJ+FB0W4NoxKvavm/j8S+lBB03birr1hmXE3qTo+ril8xoGalB0FJrhEhu0GUYFkMyGXbXZCI0vpNBwCgU5a/5kWnWx2kYElkp/KaVtfGa8AmijNUO+udAXPHlPuJumh5ZTxsy4SuRaJ4ipzSdnxcQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1743418349766490.9794364496481; Mon, 31 Mar 2025 03:52:29 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3EB4612AD; Mon, 31 Mar 2025 06:52:29 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0F43111C1; Mon, 31 Mar 2025 06:51:01 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0EB1511C2; Mon, 31 Mar 2025 06:50:58 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4BABF127A for ; Mon, 31 Mar 2025 06:49:36 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-207-CenCPxW2P0KgG6l1XeYGnQ-1; Mon, 31 Mar 2025 06:49:34 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9B7291800260 for ; Mon, 31 Mar 2025 10:49:33 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.36]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B209F19560AD; Mon, 31 Mar 2025 10:48:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743418176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W8JKxyETnJmpGnKJElJ8nhujAgD2a1wQuhooHd6QBfM=; b=hnsPIdv0Rmjvsw4MkryGXZTTidqECt9TqAdBGRPRRAo1z42CRmxf2tRXwKlyL2bHT32gLj UMAlwRF2S8DY/AT16Ps0rR/5xOl/RTsU3jFffNBV2y90bvRcfDfBnV7zyVHyqnjqUCB+3f Gc7uKBUREid1PNyyi7933eAWaxHTlN4= X-MC-Unique: CenCPxW2P0KgG6l1XeYGnQ-1 X-Mimecast-MFC-AGG-ID: CenCPxW2P0KgG6l1XeYGnQ_1743418173 To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 1/3] apparmor: assume at least apparmor >= 3 Date: Mon, 31 Mar 2025 11:48:21 +0100 Message-ID: <20250331104823.971241-2-berrange@redhat.com> In-Reply-To: <20250331104823.971241-1-berrange@redhat.com> References: <20250331104823.971241-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: yDD8-601pKuN_67cCZY0GitKHwZcVa5oy9UVPWFvFQ8_1743418173 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: TOJYPAGP7OBR6WIHZZUUXWNS2IBZTY3H X-Message-ID-Hash: TOJYPAGP7OBR6WIHZZUUXWNS2IBZTY3H X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1743418352150019000 Content-Type: text/plain; charset="utf-8" From: Daniel P. Berrang=C3=A9 By assuming version 3, we can drop all the conditional version substitutions from the profiles. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- src/security/apparmor/libvirt-lxc.in | 2 -- src/security/apparmor/libvirt-qemu.in | 4 ---- src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in | 5 ----- src/security/apparmor/usr.sbin.libvirtd.in | 2 -- src/security/apparmor/usr.sbin.virtqemud.in | 2 -- src/security/apparmor/usr.sbin.virtxend.in | 2 -- 6 files changed, 17 deletions(-) diff --git a/src/security/apparmor/libvirt-lxc.in b/src/security/apparmor/l= ibvirt-lxc.in index ffe4d8f21f..11005e7c21 100644 --- a/src/security/apparmor/libvirt-lxc.in +++ b/src/security/apparmor/libvirt-lxc.in @@ -117,6 +117,4 @@ deny /sys/fs/cgroup?*{,/**} wklx, deny /sys/fs?*{,/**} wklx, =20 -@BEGIN_APPARMOR_3@ include if exists -@END_APPARMOR_3@ diff --git a/src/security/apparmor/libvirt-qemu.in b/src/security/apparmor/= libvirt-qemu.in index c63077574e..e4aceacd70 100644 --- a/src/security/apparmor/libvirt-qemu.in +++ b/src/security/apparmor/libvirt-qemu.in @@ -190,7 +190,6 @@ /usr/{lib,lib64}/libswtpm_libtpms.so mr, /usr/lib/@{multiarch}/libswtpm_libtpms.so mr, =20 -@BEGIN_APPARMOR_3@ # support for passt network back-end /usr/bin/passt Cx -> passt, =20 @@ -206,7 +205,6 @@ =20 include if exists } -@END_APPARMOR_3@ =20 # for save and resume /{usr/,}bin/dash rmix, @@ -281,6 +279,4 @@ owner /var/lib/libvirt/qemu/nvram/*_VARS.fd rwk, owner /var/lib/libvirt/qemu/nvram/*_VARS.ms.fd rwk, =20 -@BEGIN_APPARMOR_3@ include if exists -@END_APPARMOR_3@ diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/= security/apparmor/usr.lib.libvirt.virt-aa-helper.in index 90a8b7072c..e209a8bff7 100644 --- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in @@ -74,10 +74,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { /**.[iI][sS][oO] r, /**/disk{,.*} r, =20 -@BEGIN_APPARMOR_3@ include if exists -@END_APPARMOR_3@ -@BEGIN_APPARMOR_2@ - #include -@END_APPARMOR_2@ } diff --git a/src/security/apparmor/usr.sbin.libvirtd.in b/src/security/appa= rmor/usr.sbin.libvirtd.in index 3659ddc219..6267e4f737 100644 --- a/src/security/apparmor/usr.sbin.libvirtd.in +++ b/src/security/apparmor/usr.sbin.libvirtd.in @@ -144,7 +144,5 @@ profile libvirtd @sbindir@/libvirtd flags=3D(attach_dis= connected) { /usr/{lib,lib64,lib/qemu,libexec,libexec/qemu}/qemu-bridge-helper rmix, } =20 -@BEGIN_APPARMOR_3@ include if exists -@END_APPARMOR_3@ } diff --git a/src/security/apparmor/usr.sbin.virtqemud.in b/src/security/app= armor/usr.sbin.virtqemud.in index 86b23465b6..522c098af6 100644 --- a/src/security/apparmor/usr.sbin.virtqemud.in +++ b/src/security/apparmor/usr.sbin.virtqemud.in @@ -136,7 +136,5 @@ profile virtqemud @sbindir@/virtqemud flags=3D(attach_d= isconnected) { /usr/{lib,lib64,lib/qemu,libexec,libexec/qemu}/qemu-bridge-helper rmix, } =20 -@BEGIN_APPARMOR_3@ include if exists -@END_APPARMOR_3@ } diff --git a/src/security/apparmor/usr.sbin.virtxend.in b/src/security/appa= rmor/usr.sbin.virtxend.in index 77fedce352..324a000391 100644 --- a/src/security/apparmor/usr.sbin.virtxend.in +++ b/src/security/apparmor/usr.sbin.virtxend.in @@ -55,7 +55,5 @@ profile virtxend @sbindir@/virtxend flags=3D(attach_disco= nnected) { /etc/libvirt/hooks/** rmix, /etc/xen/scripts/** rmix, =20 -@BEGIN_APPARMOR_3@ include if exists -@END_APPARMOR_3@ } --=20 2.48.1 From nobody Tue Dec 16 04:58:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1743418409; cv=none; d=zohomail.com; s=zohoarc; b=dnUEN9p8mIUxtj3b1KM9zlhjR+ZKglI3nFJhNOUznvKxlHVGDX/TMbYhjI8+5aL4mNqR5tUb2b5Vxg7EmeOSpBF50TFbtd79KMwv4b1Y0gRJMgnbVA6J6im9QqbJF45tFN8dYokAAPz/AsquRffHMoccyFwciZgLDywM+/YzX3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743418409; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=2bdyVeRkRQJ+cfEB8P9FoRlllBvPnmO4y8lDjkqgtxM=; b=Ikto1VfbmFkiEQf7r3PwkNyFUXxx1eudqizXkJR6Ox9j+RcXWqZU+RuAYAa51MBpRO61q7nKQUxZasqjnOZ8lhfMdqWB5+TEJaxZclaoidiabxpHULaBtoWY2jYMrBp6HvUmJg2+ESsuSz01D3f6VWgJNNezmFFvEeXFVylOU2c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1743418409155949.0392499528631; Mon, 31 Mar 2025 03:53:29 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8DFBFA13; Mon, 31 Mar 2025 06:53:28 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C3CF711FA; Mon, 31 Mar 2025 06:51:04 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 856FB11EC; Mon, 31 Mar 2025 06:50:58 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 76CBB12F0 for ; Mon, 31 Mar 2025 06:49:40 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-264-elvw48wTMhSEZrlJVH3gGA-1; Mon, 31 Mar 2025 06:49:36 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9E3E018001F3 for ; Mon, 31 Mar 2025 10:49:35 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.36]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 480A219560AD; Mon, 31 Mar 2025 10:49:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743418180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fVxRG+S/H8hzI0Lw1Z2p1zGoWG3YqKvxrN7M43FSVbc=; b=hynqNz3Bnb0ciDkWhQhw3Oij8sKxA6q3uQZnVwRM6RTOvy49iRKYNnYhTBcwMqc7ZkFcu7 u51S+ibIBfXOErRmDoIyipse3Tc34+lMs4+0abYhlDJ3/yN8KAB+cwEkhOJXxLmIr7LMwG q8uO9zITryDw2/n+0AA4lb+eER0K3p4= X-MC-Unique: elvw48wTMhSEZrlJVH3gGA-1 X-Mimecast-MFC-AGG-ID: elvw48wTMhSEZrlJVH3gGA_1743418175 To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 2/3] Revert "apparmor: Allow version-specific bits in profiles" Date: Mon, 31 Mar 2025 11:48:22 +0100 Message-ID: <20250331104823.971241-3-berrange@redhat.com> In-Reply-To: <20250331104823.971241-1-berrange@redhat.com> References: <20250331104823.971241-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: jaRw0GUDMYBHLMs3C1C78HZE0WsU1jDQ3B7yJyH5N68_1743418175 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: YTEW3KK245RJWPLJDEKVR6GS2NOGMRO5 X-Message-ID-Hash: YTEW3KK245RJWPLJDEKVR6GS2NOGMRO5 X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1743418409919019000 Content-Type: text/plain; charset="utf-8" From: Daniel P. Berrang=C3=A9 This reverts commit 19eb8abc9a4d15190852d644b773a2348f11c9da. It is no longer required since the minimum version can be assumed >=3D 3 Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- src/security/apparmor/meson.build | 34 +------------------------------ 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meso= n.build index b9257c816d..f1319541e4 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build @@ -19,41 +19,9 @@ apparmor_gen_profiles_conf =3D configuration_data({ =20 apparmor_dir =3D sysconfdir / 'apparmor.d' =20 -# Our profiles use some features that only work well on AppArmor 3.x, -# specifically the 'include if exists' directive. In order to keep -# supporting AppArmor 2.x, the bits that are version-specific are -# enclosed in special markers and we decide which ones to include -# based on the AppArmor version detected on the host. -# -# TODO: drop the additional complexity once we no longer target -# distros that ship AppArmor 2.x (Debian 11, Ubuntu 20.04) -if conf.has('WITH_APPARMOR_3') - apparmor_gen_cmd =3D [ - 'sed', - '-e', '/[@]BEGIN_APPARMOR_3[@]/d', - '-e', '/[@]END_APPARMOR_3[@]/d', - '-e', '/[@]BEGIN_APPARMOR_2[@]/,/[@]END_APPARMOR_2[@]/d', - '@INPUT@' - ] -else - apparmor_gen_cmd =3D [ - 'sed', - '-e', '/[@]BEGIN_APPARMOR_3[@]/,/[@]END_APPARMOR_3[@]/d', - '-e', '/[@]BEGIN_APPARMOR_2[@]/d', - '-e', '/[@]END_APPARMOR_2[@]/d', - '@INPUT@' - ] -endif - foreach name : apparmor_gen_profiles - tmp =3D configure_file( - input: '@0@.in'.format(name), - output: '@0@.tmp'.format(name), - command: apparmor_gen_cmd, - capture: true, - ) configure_file( - input: tmp, + input: '@0@.in'.format(name), output: name, configuration: apparmor_gen_profiles_conf, install: true, --=20 2.48.1 From nobody Tue Dec 16 04:58:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1743418374; cv=none; d=zohomail.com; s=zohoarc; b=CCNCYBfl9A55zE9q9j+0xf/Q4FvKo+VLC5KgTELC1bUqO/a3yndq3qUu8XhSQoiNaNk/eHvwmwoOH+vSEhFE1mP6GHLeJkqwFIrf/lSKx0lT/5DoFQ/m67VNeelQRRFQcgx6l3h0vzN/qW6VIqx6qyvUTxFvDve5/wvR8oxF7Tk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743418374; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=VU3l/YQ0FEjp8njEUoMXjuSNkHor2iCUTtHop0D444s=; b=g9bisGgPPm007CFp05bGxDHHUzxSNyHMPSQTgEZXMsJjR0spDbN0sodh1wtBry5waU6xE4Pveb5KCzg7k2aK8E+rLOloESCDXCyXBAB7pTGjO6HQy8FNkTunvhsF2M9WOiPk3bsVIcQj/fgsq1t+QA1A8sRDNDXdoBFtvGUJYdw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1743418374639812.445826361261; Mon, 31 Mar 2025 03:52:54 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id EFC6A927; Mon, 31 Mar 2025 06:52:53 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6C9CD11EF; Mon, 31 Mar 2025 06:51:03 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6E7F21215; Mon, 31 Mar 2025 06:50:58 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4DAB812EB for ; Mon, 31 Mar 2025 06:49:39 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-623-0jBW00ElOYWQFERir_-YrA-1; Mon, 31 Mar 2025 06:49:37 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1D965180035E for ; Mon, 31 Mar 2025 10:49:37 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.36]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1C87219560AD; Mon, 31 Mar 2025 10:49:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743418179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CD38CyuvSxrRChbetjZIylNAhIcuuCNh2tdAqG9lZPc=; b=HI6bwwztYOp3I3cxBv18QzXF84ho3cFR6OfVlrk7XDtOkOnwmzX0o/qfgaWENaFwM22S57 q0JfRapUGT5j+oamZkVIBZgcB4Q6WB5b2lDl8yUyi/1bqAMs7BSW5FSV4IAYa/bfax7APn gf9vI0SdH1xImCEKh+5d4gt4Jl+XOGE= X-MC-Unique: 0jBW00ElOYWQFERir_-YrA-1 X-Mimecast-MFC-AGG-ID: 0jBW00ElOYWQFERir_-YrA_1743418177 To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 3/3] meson: drop remaining checks for apparmor version Date: Mon, 31 Mar 2025 11:48:23 +0100 Message-ID: <20250331104823.971241-4-berrange@redhat.com> In-Reply-To: <20250331104823.971241-1-berrange@redhat.com> References: <20250331104823.971241-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: sL4KKcCuXHtLffTAUqmU0qpnkzqRJIU_laFps83Axa8_1743418177 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ATGQCZINRRKQRORVQ5ZMBAVLYY2FHNMX X-Message-ID-Hash: ATGQCZINRRKQRORVQ5ZMBAVLYY2FHNMX X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1743418375952019000 Content-Type: text/plain; charset="utf-8" From: Daniel P. Berrang=C3=A9 We can now assume at least version three: * Debian 12: 3.0.8 * openSUSE Leap 15.5: 3.0.4 * openSUSE Leap 15.6: 3.1.7 * Ubuntu 22.04: 3.0.4 * Ubuntu 24.04: 4.0.0 Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- meson.build | 3 --- src/security/apparmor/meson.build | 11 ----------- src/security/virt-aa-helper.c | 9 ++------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/meson.build b/meson.build index 56823ca25b..9e23b3089f 100644 --- a/meson.build +++ b/meson.build @@ -929,9 +929,6 @@ endif apparmor_dep =3D dependency('libapparmor', required: get_option('apparmor'= )) if apparmor_dep.found() conf.set('WITH_APPARMOR', 1) - if apparmor_dep.version().version_compare('>=3D3.0.0') - conf.set('WITH_APPARMOR_3', 1) - endif conf.set_quoted('APPARMOR_DIR', sysconfdir / 'apparmor.d') conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor= /profiles') endif diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meso= n.build index f1319541e4..c1bd10717b 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build @@ -44,14 +44,3 @@ install_data( [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], install_dir: apparmor_dir / 'libvirt', ) - -if not conf.has('WITH_APPARMOR_3') - # We only install the empty local override for AppArmor 2.x. For - # AppArmor 3.x, upstream's preference is to avoid creating these - # files in order to limit the amount of filesystem clutter. - install_data( - 'usr.lib.libvirt.virt-aa-helper.local', - install_dir: apparmor_dir / 'local', - rename: 'usr.lib.libvirt.virt-aa-helper', - ) -endif diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 034c042007..25bffdd30b 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1560,13 +1560,8 @@ main(int argc, char **argv) =20 /* create the profile from TEMPLATE */ if (ctl->cmd =3D=3D 'c' || purged) { - g_autofree char *tmp =3D NULL; -#if defined(WITH_APPARMOR_3) - const char *ifexists =3D "if exists "; -#else - const char *ifexists =3D ""; -#endif - tmp =3D g_strdup_printf(" #include %s\n", i= fexists, ctl->uuid); + g_autofree char *tmp =3D g_strdup_printf( + " #include if exists %s\n", ifexists, c= tl->uuid); =20 if (ctl->dryrun) { vah_info(profile); --=20 2.48.1