From nobody Sun Dec 22 01:46:33 2024 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1734432429986460.5747609867743; Tue, 17 Dec 2024 02:47:09 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id EBBA9154A; Tue, 17 Dec 2024 05:47:08 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id CEE45153C; Tue, 17 Dec 2024 05:46:50 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 63ECD152D; Tue, 17 Dec 2024 05:46:48 -0500 (EST) 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 CC3F7146B for ; Tue, 17 Dec 2024 05:46:46 -0500 (EST) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-6cJksULnMByXBKsGCNXY3g-1; Tue, 17 Dec 2024 05:46:45 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 81BF219560BA for ; Tue, 17 Dec 2024 10:46:44 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.136]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7549319560AD; Tue, 17 Dec 2024 10:46:43 +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=-1.7 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,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=1734432406; 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; bh=M8UfY8b9TAYD85GmxCMhAxVMUDScGS/0MXRyCk92O04=; b=OG1JiuEka4CKQ03Mb2L8PD7FyBKd71FZpcm68/mtNmPQ7LkYG7hjnF5C/gGGhF23ibiC+Z BWL1sjSYR6e3hx0T6WqpLe0EQB6wVyk+I/gafrcCYCcZ5FT+EN7gQJEsT0rFwWcLb0Wno0 Pof85MxSYJIl+gfPyigTlwhAMklrsUM= X-MC-Unique: 6cJksULnMByXBKsGCNXY3g-1 X-Mimecast-MFC-AGG-ID: 6cJksULnMByXBKsGCNXY3g From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH] rpm: ensure we own directories we might create Date: Tue, 17 Dec 2024 10:46:41 +0000 Message-ID: <20241217104641.3731625-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: -8J3wKrXTOtUnUo6yUFLTCSnT5zYLH-XefFa_EKA2Y0_1734432404 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CCVAQRJLRHZ6EUKF7E4CPSCT6MP3BYG4 X-Message-ID-Hash: CCVAQRJLRHZ6EUKF7E4CPSCT6MP3BYG4 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1734432430663116600 Content-Type: text/plain; charset="utf-8" An RPM must own any directories its creates, unless it can guarantee a dependancy has ownership. Two packages owning the same directory is fine if permissions are consistent. We don't require augeas as a dep in most packages, so we must own the augeas lens directories. Likewise for systemtap tapset dirs. Our own cpu map dir also needs ownership. A few files are re-sorted, so that the files are listed immediately adjacent to the %dir that contains them. https://bugzilla.redhat.com/show_bug.cgi?id=3D2280979 Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Jiri Denemark --- libvirt.spec.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9c1d0a423d..3d5164b534 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2027,7 +2027,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd +%dir %{_datadir}/augeas/lenses %{_datadir}/augeas/lenses/libvirtd.aug +%dir %{_datadir}/augeas/lenses/tests %{_datadir}/augeas/lenses/tests/test_libvirtd.aug %attr(0755, root, root) %{_sbindir}/libvirtd %{_mandir}/man8/libvirtd.8* @@ -2433,15 +2435,17 @@ exit 0 %{_libdir}/libvirt-lxc.so.* %{_libdir}/libvirt-admin.so.* %dir %{_datadir}/libvirt/ +%{_datadir}/libvirt/test-screenshot.png %dir %{_datadir}/libvirt/schemas/ +%{_datadir}/libvirt/schemas/*.rng +%dir %{_datadir}/systemtap/tapset/ %{_datadir}/systemtap/tapset/libvirt_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp %if %{with_qemu} %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %endif -%{_datadir}/libvirt/schemas/*.rng +%dir %{_datadir}/libvirt/cpu_map %{_datadir}/libvirt/cpu_map/*.xml -%{_datadir}/libvirt/test-screenshot.png =20 %if %{with_wireshark} %files wireshark --=20 2.46.0