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 C5B3A138334 for ; Mon, 5 Aug 2019 15:03:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED507E080E; Mon, 5 Aug 2019 15:03:07 +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 C08CDE080E for ; Mon, 5 Aug 2019 15:03:07 +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 63ABE34966C for ; Mon, 5 Aug 2019 15:03:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A2AF762 for ; Mon, 5 Aug 2019 15:03:04 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1565017366.fb5b10fb8f56c1fd2907f4ba2cfaf366ec861ba2.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/, app-emulation/libvirt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch app-emulation/libvirt/libvirt-5.2.0-r2.ebuild X-VCS-Directories: app-emulation/libvirt/ app-emulation/libvirt/files/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: fb5b10fb8f56c1fd2907f4ba2cfaf366ec861ba2 X-VCS-Branch: master Date: Mon, 5 Aug 2019 15:03: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: ba4ee111-9381-4519-b326-de17f5a27f71 X-Archives-Hash: 54fd4036d83cfcba07a0f7809b423001 commit: fb5b10fb8f56c1fd2907f4ba2cfaf366ec861ba2 Author: Matthias Maier gentoo org> AuthorDate: Mon Aug 5 14:59:23 2019 +0000 Commit: Matthias Maier gentoo org> CommitDate: Mon Aug 5 15:02:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb5b10fb app-emulation/libvirt: [QA] drop duplicate patches Package-Manager: Portage-2.3.70, Repoman-2.3.16 Signed-off-by: Matthias Maier gentoo.org> .../libvirt-5.0.0-fix-paths-for-apparmor.patch | 116 --------------------- app-emulation/libvirt/libvirt-5.2.0-r2.ebuild | 2 +- 2 files changed, 1 insertion(+), 117 deletions(-) diff --git a/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch deleted file mode 100644 index 866c6357b6e..00000000000 --- a/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 563706143779166624812b3faf498d869f5dd383 Mon Sep 17 00:00:00 2001 -Message-Id: <563706143779166624812b3faf498d869f5dd383.1547196492.git.mprivozn@redhat.com> -From: Michal Privoznik -Date: Fri, 11 Jan 2019 09:41:06 +0100 -Subject: [PATCH] gentoo: fix paths for apparmor - -Signed-off-by: Michal Privoznik ---- - src/security/Makefile.inc.am | 10 +++++----- - src/security/apparmor/libvirt-qemu | 2 ++ - ...bvirt.virt-aa-helper => usr.libexec.virt-aa-helper} | 4 ++-- - src/security/apparmor/usr.sbin.libvirtd | 6 ++++-- - 4 files changed, 13 insertions(+), 9 deletions(-) - rename src/security/apparmor/{usr.lib.libvirt.virt-aa-helper => usr.libexec.virt-aa-helper} (93%) - -diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am -index b24cdfd083..ae8e979b84 100644 ---- a/src/security/Makefile.inc.am -+++ b/src/security/Makefile.inc.am -@@ -36,7 +36,7 @@ EXTRA_DIST += \ - security/apparmor/TEMPLATE.lxc \ - security/apparmor/libvirt-qemu \ - security/apparmor/libvirt-lxc \ -- security/apparmor/usr.lib.libvirt.virt-aa-helper \ -+ security/apparmor/usr.libexec.virt-aa-helper \ - security/apparmor/usr.sbin.libvirtd \ - $(NULL) - -@@ -90,7 +90,7 @@ endif WITH_SECDRIVER_APPARMOR - if WITH_APPARMOR_PROFILES - apparmordir = $(sysconfdir)/apparmor.d/ - apparmor_DATA = \ -- security/apparmor/usr.lib.libvirt.virt-aa-helper \ -+ security/apparmor/usr.libexec.virt-aa-helper \ - security/apparmor/usr.sbin.libvirtd \ - $(NULL) - -@@ -110,11 +110,11 @@ APPARMOR_LOCAL_DIR = "$(DESTDIR)$(apparmordir)/local" - install-apparmor-local: - $(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 eaa5167525..9be50bbbe0 100644 ---- a/src/security/apparmor/libvirt-qemu -+++ b/src/security/apparmor/libvirt-qemu -@@ -87,6 +87,8 @@ - /usr/share/AAVMF/** r, - /usr/share/qemu-efi/** r, - /usr/share/slof/** r, -+ /usr/share/seavgabios/** r, -+ /usr/share/edk2-ovmf/** 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 b/src/security/apparmor/usr.libexec.virt-aa-helper -similarity index 93% -rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper -rename to src/security/apparmor/usr.libexec.virt-aa-helper -index de9436872c..99ab4ea527 100644 ---- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper -+++ b/src/security/apparmor/usr.libexec.virt-aa-helper -@@ -1,7 +1,7 @@ - # Last Modified: Mon Apr 5 15:10:27 2010 - #include - --profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { -+profile virt-aa-helper /usr/libexec/virt-aa-helper { - #include - - # needed for searching directories -@@ -36,7 +36,7 @@ - deny /dev/mapper/ r, - deny /dev/mapper/* r, - -- /usr/{lib,lib64}/libvirt/virt-aa-helper mr, -+ /usr/libexec/virt-aa-helper mr, - /{usr/,}sbin/apparmor_parser Ux, - - /etc/apparmor.d/libvirt/* r, -@@ -66,5 +66,5 @@ - /**.[iI][sS][oO] r, - /**/disk{,.*} r, - -- #include -+ #include - } -diff --git a/src/security/apparmor/usr.sbin.libvirtd b/src/security/apparmor/usr.sbin.libvirtd -index f0ffc53008..8a402bd6ec 100644 ---- a/src/security/apparmor/usr.sbin.libvirtd -+++ b/src/security/apparmor/usr.sbin.libvirtd -@@ -98,8 +98,10 @@ - audit deny /sys/kernel/security/apparmor/.* rwxl, - /sys/kernel/security/apparmor/profiles r, - /usr/{lib,lib64}/libvirt/* PUxr, -- /usr/{lib,lib64}/libvirt/libvirt_parthelper ix, -- /usr/{lib,lib64}/libvirt/libvirt_iohelper ix, -+ /usr/libexec/virt-aa-helper PUxr, -+ /usr/libexec/libvirt_lxc PUxr, -+ /usr/libexec/libvirt_parthelper ix, -+ /usr/libexec/libvirt_iohelper ix, - /etc/libvirt/hooks/** rmix, - /etc/xen/scripts/** rmix, - --- -2.19.2 diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild index e28616330c6..705b36815f3 100644 --- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild @@ -125,7 +125,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-5.2.0-do-not-use-sysconf.patch "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-5.0.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch "${FILESDIR}"/${PN}-5.2.0-md-clear.patch )