From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8329A13835A for ; Sat, 5 Sep 2020 07:54:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0709E08BD; Sat, 5 Sep 2020 07:54:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8456FE08BD for ; Sat, 5 Sep 2020 07:54:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F811340CD7 for ; Sat, 5 Sep 2020 07:54:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 898F42D2 for ; Sat, 5 Sep 2020 07:54:04 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1599292426.a4d74d2fec11558f4de07a0411e143d5dbe2db72.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/files/, app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/files/libvirt-6.5.0-fix-paths-for-apparmor.patch app-emulation/libvirt/libvirt-6.5.0-r1.ebuild app-emulation/libvirt/libvirt-6.5.0.ebuild X-VCS-Directories: app-emulation/libvirt/ app-emulation/libvirt/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: a4d74d2fec11558f4de07a0411e143d5dbe2db72 X-VCS-Branch: master Date: Sat, 5 Sep 2020 07:54:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e331a976-c255-4433-8241-10454ad2b5b4 X-Archives-Hash: d38618ca64ca608a8bb9d9c3f312f94d commit: a4d74d2fec11558f4de07a0411e143d5dbe2db72 Author: aporilel yandex ru> AuthorDate: Sun Aug 23 11:20:28 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sat Sep 5 07:53:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d74d2f app-emulation/libvirt: add apparmor rule for seavgabios Closes: https://bugs.gentoo.org/629718 Signed-off-by: Anton Smirnov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/15255 Signed-off-by: Joonas Niilola gentoo.org> .../libvirt-6.5.0-fix-paths-for-apparmor.patch | 82 ++++++++++++++++++++++ ...ibvirt-6.5.0.ebuild => libvirt-6.5.0-r1.ebuild} | 2 +- 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/app-emulation/libvirt/files/libvirt-6.5.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-6.5.0-fix-paths-for-apparmor.patch new file mode 100644 index 00000000000..97e50cd357c --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-6.5.0-fix-paths-for-apparmor.patch @@ -0,0 +1,82 @@ +diff --git a/src/Makefile.in b/src/Makefile.in +index 36bd280..07cebdf 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -4473,7 +4473,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ + $(NULL) + + SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \ +- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ ++ security/apparmor/usr.libexec.virt-aa-helper.in \ + security/apparmor/usr.sbin.libvirtd.in \ + $(NULL) + +@@ -13821,11 +13821,11 @@ security/apparmor/%: $(srcdir)/security/apparmor/%.in + @WITH_APPARMOR_PROFILES_TRUE@install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) + @WITH_APPARMOR_PROFILES_TRUE@ $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" + @WITH_APPARMOR_PROFILES_TRUE@ echo "# Site-specific additions and overrides for \ +-@WITH_APPARMOR_PROFILES_TRUE@ 'usr.lib.libvirt.virt-aa-helper'" \ +-@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" ++@WITH_APPARMOR_PROFILES_TRUE@ 'usr.libexec.virt-aa-helper'" \ ++@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" + + @WITH_APPARMOR_PROFILES_TRUE@uninstall-apparmor-local: +-@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" ++@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" + @WITH_APPARMOR_PROFILES_TRUE@ rmdir "$(APPARMOR_LOCAL_DIR)" || : + + $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ +diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am +index 5f2f4c8..d457cc6 100644 +--- a/src/security/Makefile.inc.am ++++ b/src/security/Makefile.inc.am +@@ -31,7 +31,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ + $(NULL) + + SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \ +- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ ++ security/apparmor/usr.libexec.virt-aa-helper.in \ + security/apparmor/usr.sbin.libvirtd.in \ + $(NULL) + +@@ -130,11 +130,11 @@ APPARMOR_LOCAL_DIR = "$(DESTDIR)$(apparmordir)/local" + install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) + $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" + echo "# Site-specific additions and overrides for \ +- 'usr.lib.libvirt.virt-aa-helper'" \ +- >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" ++ 'usr.libexec.virt-aa-helper'" \ ++ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" + + uninstall-apparmor-local: +- rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" ++ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" + rmdir "$(APPARMOR_LOCAL_DIR)" || : + + INSTALL_DATA_LOCAL += install-apparmor-local +diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu +index 80986ae..d550d8c 100644 +--- a/src/security/apparmor/libvirt-qemu ++++ b/src/security/apparmor/libvirt-qemu +@@ -88,6 +88,7 @@ + /usr/share/sgabios/** r, + /usr/share/slof/** r, + /usr/share/vgabios/** r, ++ /usr/share/seavgabios/** r, + + # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140) + /etc/pki/CA/ r, +diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.virt-aa-helper.in +similarity index 97% +rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +rename to src/security/apparmor/usr.libexec.virt-aa-helper.in +index dd18c8a..d06f9cb 100644 +--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ b/src/security/apparmor/usr.libexec.virt-aa-helper.in +@@ -69,5 +69,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { + /**.[iI][sS][oO] r, + /**/disk{,.*} r, + +- #include ++ #include + } diff --git a/app-emulation/libvirt/libvirt-6.5.0.ebuild b/app-emulation/libvirt/libvirt-6.5.0-r1.ebuild similarity index 99% rename from app-emulation/libvirt/libvirt-6.5.0.ebuild rename to app-emulation/libvirt/libvirt-6.5.0-r1.ebuild index f236af9bf3a..8f75ce01f35 100644 --- a/app-emulation/libvirt/libvirt-6.5.0.ebuild +++ b/app-emulation/libvirt/libvirt-6.5.0-r1.ebuild @@ -123,7 +123,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-6.1.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-6.5.0-fix-paths-for-apparmor.patch "${FILESDIR}"/${PN}-6.5.0-do-not-use-sysconfig.patch )