diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2020-03-15 15:58:45 -0500 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2020-03-15 16:13:50 -0500 |
| commit | 2eeb5170c72bbd6d358bab542a332dd577fa4b12 (patch) | |
| tree | c4300eaf08220cf50215eb8b178735349bc7ce24 /app-emulation/libvirt/files/libvirt-6.1.0-fix-paths-for-apparmor.patch | |
| parent | dev-util/bsdiff: Fix CVE-2014-9862 (diff) | |
| download | gentoo-2eeb5170c72bbd6d358bab542a332dd577fa4b12.tar.gz gentoo-2eeb5170c72bbd6d358bab542a332dd577fa4b12.tar.bz2 gentoo-2eeb5170c72bbd6d358bab542a332dd577fa4b12.zip | |
app-emulation/libvirt: version bump to 6.1.0
Closes: https://bugs.gentoo.org/712452
Closes: https://github.com/gentoo/gentoo/pull/14972
Co-authored-by: Vjaceslavs Klimovs <vklimovs@gmail.com>
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'app-emulation/libvirt/files/libvirt-6.1.0-fix-paths-for-apparmor.patch')
| -rw-r--r-- | app-emulation/libvirt/files/libvirt-6.1.0-fix-paths-for-apparmor.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/app-emulation/libvirt/files/libvirt-6.1.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-6.1.0-fix-paths-for-apparmor.patch new file mode 100644 index 000000000000..02592ea4a5c3 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-6.1.0-fix-paths-for-apparmor.patch @@ -0,0 +1,70 @@ +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/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 <local/usr.lib.libvirt.virt-aa-helper> ++ #include <local/usr.libexec.virt-aa-helper> + } |