public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matthias Maier" <tamiko@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/, app-emulation/libvirt/files/
Date: Mon,  5 Aug 2019 15:03:04 +0000 (UTC)	[thread overview]
Message-ID: <1565017366.fb5b10fb8f56c1fd2907f4ba2cfaf366ec861ba2.tamiko@gentoo> (raw)

commit:     fb5b10fb8f56c1fd2907f4ba2cfaf366ec861ba2
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  5 14:59:23 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> 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 <tamiko <AT> 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 <mprivozn@redhat.com>
-Date: Fri, 11 Jan 2019 09:41:06 +0100
-Subject: [PATCH] gentoo: fix paths for apparmor
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- 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 <tunables/global>
- 
--profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
-+profile virt-aa-helper /usr/libexec/virt-aa-helper {
-   #include <abstractions/base>
- 
-   # 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 <local/usr.lib.libvirt.virt-aa-helper>
-+  #include <local/usr.libexec.virt-aa-helper>
- }
-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
 )
 


             reply	other threads:[~2019-08-05 15:03 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-05 15:03 Matthias Maier [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-08  1:33 [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/, app-emulation/libvirt/files/ Sam James
2025-02-08  1:33 Sam James
2024-04-14  0:43 Sam James
2024-04-14  0:43 Sam James
2024-03-04 10:28 Sam James
2024-02-29  0:22 Sam James
2023-10-31 16:25 Matthias Maier
2023-06-21 21:48 Matthias Maier
2023-06-18  1:54 Matthias Maier
2023-06-10 16:59 Sam James
2022-09-23  1:06 Sam James
2022-08-03 18:21 Sam James
2022-03-02 17:36 Joonas Niilola
2022-02-21 23:14 Sam James
2022-01-04 16:33 Matthias Maier
2021-04-04 17:49 Matthias Maier
2020-12-07  8:53 Sergei Trofimovich
2020-11-10  0:34 Matthias Maier
2020-07-21 18:11 Marek Szuba
2020-04-06 17:46 Matthias Maier
2020-04-05 17:19 Matthias Maier
2020-03-15 21:14 Matthias Maier
2020-02-06 15:52 Matthias Maier
2020-02-03  3:07 Matthias Maier
2019-07-09 19:06 Matthias Maier
2019-07-09 18:54 Matthias Maier
2019-07-01 15:07 Matthias Maier
2019-07-01 14:27 Matthias Maier
2019-05-19 23:42 Matthias Maier
2019-03-17  7:27 Matthias Maier
2018-12-26  3:27 Matthias Maier
2018-08-19 19:08 Matthias Maier
2018-07-03 15:30 Matthias Maier
2018-06-29  4:50 Matthias Maier
2018-06-29  4:50 Matthias Maier
2018-03-23 14:16 Matthias Maier
2017-12-07 16:08 Matthias Maier
2017-09-01  2:01 Matthias Maier
2017-09-01  2:01 Matthias Maier
2017-05-06 18:27 Matthias Maier
2017-01-22 15:34 Matthias Maier
2016-07-09 15:10 Matthias Maier
2016-06-30 18:02 Matthias Maier
2016-05-01 19:15 Matthias Maier
2016-03-11  7:45 Matthias Maier
2016-01-07  8:18 Matthias Maier
2015-12-22 16:13 Matthias Maier
2015-10-05  6:32 Matthias Maier
2015-08-14  3:48 Matthias Maier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1565017366.fb5b10fb8f56c1fd2907f4ba2cfaf366ec861ba2.tamiko@gentoo \
    --to=tamiko@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox