From nobody Tue Dec 16 12:47:53 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 --- 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