From nobody Tue Dec 16 12:33:51 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=1743424794; cv=none; d=zohomail.com; s=zohoarc; b=HszDootkmr2Ir6XrH/ikQ6M/wAzFfEfd1DHzAI4IY/c4pkzvhgX+DNEHYNGbq+cVXf/74YjUCGeSpD2YAYPpFyp72rdQ73+wTA2bhVSUieMZj3w37v+yDklmdVEWe1wG6AyWZfdLfKdD36a22AwtyYBzjDR+nBJdPyiSnEOFs7k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743424794; 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=Dq7eb7rtZ/UcdI+nO48Ji8aHW9xjWHrrgn54RHY+eNg=; b=dh24sK3c0rSaudQ0PACu4eJE3Ziug2Ycvi1dcOYAltrEiRTOXJgQvw1LkW4TmUWNANGyiiP1zaJNl2FCtCpwbnohoJ6mud97bX2wC3xhv4gAlm0AWY9hyujVCKdZCB1PWjc5Vz2hnKyYIfTA/gXBYOM2gHEPf5Jkcy9L0CR2qEU= 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 1743424794746514.5837812385486; Mon, 31 Mar 2025 05:39:54 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2489312F7; Mon, 31 Mar 2025 08:39:54 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C02611325; Mon, 31 Mar 2025 08:37:54 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 467F911AA; Mon, 31 Mar 2025 08:37:48 -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 AE20811B1 for ; Mon, 31 Mar 2025 08:37:47 -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-435-6hN9WgViOeWTaGCTsPTReg-1; Mon, 31 Mar 2025 08:37:45 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 C8DD3180AF74 for ; Mon, 31 Mar 2025 12:37:37 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.36]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E8945180A803; Mon, 31 Mar 2025 12:37:36 +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=1743424667; 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=R0V6Zrs6r5L29DZ84GWYpcKhg0vQyXaBdyqVmNFoHkk=; b=VNTlg7KWgS9fdQR2jttn9PLteo2CS6EwjJ4AxNDi2J8HRuEh+CUvYWzVKVIOxoMHhlz5mL BwpMBbQJ57b5UYEJqZwqDbboq7VsqWNTb5lnCyYKG5x3pMsEJ51XUexGgOH/MH4tJwTpGO 6CCDzjFk8BsMzuPYBQ9H/fhm3VBp6EE= X-MC-Unique: 6hN9WgViOeWTaGCTsPTReg-1 X-Mimecast-MFC-AGG-ID: 6hN9WgViOeWTaGCTsPTReg_1743424665 To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 3/5] Revert "apparmor: Allow version-specific bits in abstractions too" Date: Mon, 31 Mar 2025 13:37:29 +0100 Message-ID: <20250331123731.1020743-4-berrange@redhat.com> In-Reply-To: <20250331123731.1020743-1-berrange@redhat.com> References: <20250331123731.1020743-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9KqASNCBtMhV_kwTucQctRf80n07cTqt1JwLDs4VxWY_1743424665 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UTO2I2RJAQIVTOMDLLGKBEHDJSAYMCKP X-Message-ID-Hash: UTO2I2RJAQIVTOMDLLGKBEHDJSAYMCKP 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: 1743424796129019000 Content-Type: text/plain; charset="utf-8" From: Daniel P. Berrang=C3=A9 This reverts commit 63a312fa2d3be0e34a8989deddd39792fc9badf6. There is no longer any need to dynamically generate version specific rules. This revert can be reverted, if the need ever arises again in the future. Signed-off-by: Daniel P. Berrang=C3=A9 --- .../apparmor/{libvirt-lxc.in =3D> libvirt-lxc} | 0 .../{libvirt-qemu.in =3D> libvirt-qemu} | 0 src/security/apparmor/meson.build | 19 ++++--------------- 3 files changed, 4 insertions(+), 15 deletions(-) rename src/security/apparmor/{libvirt-lxc.in =3D> libvirt-lxc} (100%) rename src/security/apparmor/{libvirt-qemu.in =3D> libvirt-qemu} (100%) diff --git a/src/security/apparmor/libvirt-lxc.in b/src/security/apparmor/l= ibvirt-lxc similarity index 100% rename from src/security/apparmor/libvirt-lxc.in rename to src/security/apparmor/libvirt-lxc diff --git a/src/security/apparmor/libvirt-qemu.in b/src/security/apparmor/= libvirt-qemu similarity index 100% rename from src/security/apparmor/libvirt-qemu.in rename to src/security/apparmor/libvirt-qemu diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meso= n.build index b9257c816d..356951c7f1 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build @@ -5,11 +5,6 @@ apparmor_gen_profiles =3D [ 'usr.sbin.virtxend', ] =20 -apparmor_gen_abstractions =3D [ - 'libvirt-qemu', - 'libvirt-lxc', -] - apparmor_gen_profiles_conf =3D configuration_data({ 'sysconfdir': sysconfdir, 'sbindir': sbindir, @@ -61,16 +56,10 @@ foreach name : apparmor_gen_profiles ) endforeach =20 -foreach name : apparmor_gen_abstractions - configure_file( - input: '@0@.in'.format(name), - output: name, - command: apparmor_gen_cmd, - capture: true, - install: true, - install_dir: apparmor_dir / 'abstractions', - ) -endforeach +install_data( + [ 'libvirt-qemu', 'libvirt-lxc' ], + install_dir: apparmor_dir / 'abstractions', +) =20 install_data( [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], --=20 2.48.1