From 09351e78166b5e864197c4456ebae3f89dd0bed9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 Jan 2019 10:09:44 +0000 Subject: gentoo resync : 22.01.2019 --- app-emulation/libvirt/Manifest | 4 +- .../files/libvirt-5.0.0-do-not-use-sysconf.patch | 216 +++++++++++++++++++++ .../libvirt-5.0.0-fix-paths-for-apparmor.patch | 110 +++++++++++ app-emulation/libvirt/libvirt-9999.ebuild | 4 +- 4 files changed, 331 insertions(+), 3 deletions(-) create mode 100644 app-emulation/libvirt/files/libvirt-5.0.0-do-not-use-sysconf.patch create mode 100644 app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch (limited to 'app-emulation/libvirt') diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 8a57d14184ff..3a8a0901ed57 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -4,6 +4,8 @@ AUX libvirt-3.10.0-r2-fix_paths_for_apparmor.patch 2730 BLAKE2B ae92a37cdfb92986 AUX libvirt-4.10.0-fix_apparmor_rules.patch 665 BLAKE2B ce9a9715eda077ee8fd2cae37bb0e2b2339dfdfbc2f389287d11be43bdb098bb8304270c739507a57895cf02f5081b4b9e2a94518d81925c072725a09502170e SHA512 00007b29a5843cd6f272cc9d876cc4e4cdf2fee1cbf29009ff9a4c36c5758434052cff201dd0f3cc5c4c25782bc04ecdd84d89412b5370eb615cb1fcb06344f7 AUX libvirt-4.5.0-do_not_use_sysconf.patch 7417 BLAKE2B b1e6471a7b6a923a3ca4b630df3ddf31994d3492837e842fd0eb43f79757f2a39652345711719fd2b189116d533472d4e4298520b81838706264d371537d6947 SHA512 1362feb1d2ff3dbb1d5550152453c2fe7fbc4645356a866195601eb17a280af0106753d873285b307267b2c941c18d8db2b5a24d7916a49dfd6af3515217bfcc AUX libvirt-4.5.0-fix_typo_in_apparmor_rule.patch 556 BLAKE2B 78d99d6d1ae811e202ffdeb0f34e4b20d76d3b0ed90bdcb35fd79a1133e8cc88e237bbf22c5260cc6aecc7521470ad14807eaadcdf97ed38c0d77fc630d61d38 SHA512 d02a121c069c1661c2f3b5084e1ea260e6611ab9b209fc6575dcb08f68bf36175ab9d9ebb7d1cd2eb4cd707165fd8c4357ce5c036f4835df2d4af4c88964f934 +AUX libvirt-5.0.0-do-not-use-sysconf.patch 7333 BLAKE2B 3a23b047deb1388cb46f26a060bf9f601d9659e89881314bfef4beea121aaea73331993216637672ae0eaba5185d81205c1e1d63ea628173d30c6558f9990b7b SHA512 00dfcedf03de7a8070e19724b0ffc6a9ffc1697001946b7338183ee7d5e6757c1351e018f46311c43167714631f023c7e12a1e57523c2684e498dc1aec27277b +AUX libvirt-5.0.0-fix-paths-for-apparmor.patch 4274 BLAKE2B 886fd5bdf37e672e761bde9bc5b3e4902b174019bb8efda127f7a08cb6752b67745c10a3e3953063c746380bcf8243807fd6e9a154f48b7bd02c61e85e90325e SHA512 efe4c4c940d720c467f44f405ac4ca4d3867dee0a7e2fa2a7a4fbc263198089098c48d1207c30123b6a55f6ec6bee04f3edd3f23724af46bcb1343f87ca94de6 AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc AUX libvirt-guests.init-r2 5411 BLAKE2B a14ecc1bb7188dbbe3d0f82f301a73b876da2d82475cb38a503ed115e894bc59a0466daec5dd7665b3f0656c84ab58e2ba9f8f52eb54a4f8684094f951659fde SHA512 273bcc248ab659bb0cef12c03187f1445c00d2736912f3b54911137352a48b6fcdc2e0c76c56db984501acc4b9e8c0a4cf453a90947c5e525d0746ac9afa8505 AUX libvirt-guests.init-r3 5530 BLAKE2B 5de3e8577ded1401f6dca551c6098418e596287d43b1b90e133859bb9b74dff20b8518bc09853ccff7141e6baa52fc12c9b8d3e8f60b868b72b1993254fac5d9 SHA512 7aa4eac8c293c3063d9435a4ad1ea855f9fdd84eb0ed8cbf0779935f152aab380e2ee7eb9129b2f07147bfa4dd1eae4b836ccae295c35b63dbc767208dd11b0c @@ -19,5 +21,5 @@ DIST libvirt-4.9.0.tar.xz 14744184 BLAKE2B 03ddefc8f505c8688ad506b81ea9b37ee085e EBUILD libvirt-4.10.0.ebuild 9664 BLAKE2B 917ab8653ce95ed8321c30aa0ba55db9a1b35eea19fef22f3720d978549328c66ebe706188ab76535a93fbee28374c159670d1e21759af7ef68e1e2119b74231 SHA512 2197606640c27deaa98a5eed7436a18cdf0969b96455d3a5104fbbe3b31c0740878efb33d3f882d2fcc6f046d50536b2fe788c516308d71e2ff72d5388ec7321 EBUILD libvirt-4.5.0-r1.ebuild 9654 BLAKE2B 68f875b79a4e7af8674b87fd47dc7081b31c0d617444bfca5d0ebe1b0b10fa4ddfef1305110f3689591a6a5ef32ace833a28e854126369ea2896b3d894b9d230 SHA512 05ba73308bdcabcf8a3c179814519331bc3ac2e557ec383ce9beaa3f8657436a9358461d5e03271811d56ef570e80eaf8a781d54b9b583381a418429934053c5 EBUILD libvirt-4.9.0.ebuild 9605 BLAKE2B c191450fab9fdf673dc15bc308e4d7a1d8adfc7b90f3e6bd1683d35424c4755a56d75a18105f406724e062b9df98d39ccef4fbd64f05a80791b2f73006662b2e SHA512 151f0930d2500205e25753465910a4f5806fc102f536a6624b9d6de02806dfa592c2b4bc37a1f11481a50bb4b30c30955f21976d74a0a95b3ebbc424c057b3fe -EBUILD libvirt-9999.ebuild 9645 BLAKE2B 14276803066bc4d35132028332f8ccf68600950e46d5f4ce8a779808294335f22b1c45af09dd6c3276090677eda56bcdf90ce3238103225f257eed980f64e168 SHA512 e30e357f8c7586358bf13883e52fc4a3135885c99044bdf4f0bf7847ea55847e639931ec5ccd907bd30f037525d36c2bec2e7207a5e9e57149189edd6f4e086e +EBUILD libvirt-9999.ebuild 9641 BLAKE2B 782bc6ed905e1b9d09b102f04c726a0d216e26851cf415acaf2acda983f26764b677dc64ae9705b3583a0a803bb2e996cde755f27595811d1ff0bf221fb0a51b SHA512 d3fc92f9e733a56fde88b9c17c5e5deff26dc1dcc84411bdce90e85ba73d955aef6d11e10bcff35a951fb6273306f4e2c1e7ddce59ff4aaac8811337c82c08d8 MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed diff --git a/app-emulation/libvirt/files/libvirt-5.0.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.0.0-do-not-use-sysconf.patch new file mode 100644 index 000000000000..d4e37e4164a1 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-5.0.0-do-not-use-sysconf.patch @@ -0,0 +1,216 @@ +From 947ef7a44e94989f324e0d533499454d540fdef9 Mon Sep 17 00:00:00 2001 +Message-Id: <947ef7a44e94989f324e0d533499454d540fdef9.1547196492.git.mprivozn@redhat.com> +From: Michal Privoznik +Date: Tue, 26 Jun 2018 06:51:06 +0200 +Subject: [PATCH] gentoo: do not use sysconf + +Signed-off-by: Michal Privoznik +--- + src/Makefile.am | 29 ++++++----------------------- + src/locking/virtlockd.service.in | 3 +-- + src/logging/virtlogd.service.in | 3 +-- + src/remote/libvirtd.service.in | 3 +-- + tools/Makefile.am | 17 ++++------------- + tools/libvirt-guests.service.in | 2 +- + tools/libvirt-guests.sysconf | 7 +++++++ + 7 files changed, 21 insertions(+), 43 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index cd386297ed..52a63885d6 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -756,23 +756,6 @@ endif WITH_SETUID_RPC_CLIENT + + EXTRA_DIST += $(SYSCONF_FILES) + +-install-sysconfig: +- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig +- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ +- do \ +- tgt=`basename $$f`; \ +- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ +- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ +- done +- +-uninstall-sysconfig: +- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ +- do \ +- tgt=`basename $$f`; \ +- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ +- done +- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : +- + SYSVINIT_FILES_IN += \ + locking/virtlockd.init.in \ + $(NULL) +@@ -816,14 +799,14 @@ if WITH_LIBVIRTD + if LIBVIRT_INIT_SCRIPT_RED_HAT + initdir = $(sysconfdir)/rc.d/init.d + +-install-init:: $(SYSVINIT_FILES) install-sysconfig ++install-init:: $(SYSVINIT_FILES) + $(MKDIR_P) $(DESTDIR)$(initdir) + for f in $(SYSVINIT_FILES:%.init=%) ; \ + do \ + $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \ + done + +-uninstall-init:: uninstall-sysconfig ++uninstall-init:: + rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(initdir)/%) + rmdir $(DESTDIR)$(initdir) || : + +@@ -862,14 +845,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%)) + BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) + DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) + +-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig ++install-systemd: $(SYSTEMD_UNIT_FILES) + $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) + for f in $(SYSTEMD_UNIT_FILES); \ + do \ + $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ + done + +-uninstall-systemd: uninstall-sysconfig ++uninstall-systemd: + rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) + rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : + +@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES) + if WITH_LIBVIRTD + if LIBVIRT_INIT_SCRIPT_UPSTART + +-install-upstart: install-sysconfig ++install-upstart: + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d + for f in $(UPSTART_FILES:%.upstart=%); \ + do \ +@@ -893,7 +876,7 @@ install-upstart: install-sysconfig + $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ + done + +-uninstall-upstart: uninstall-sysconfig ++uninstall-upstart: + for f in $(UPSTART_FILES:%.upstart=%); \ + do \ + tgt=`basename $$f` ; \ +diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in +index 3c9d587032..2449b201d9 100644 +--- a/src/locking/virtlockd.service.in ++++ b/src/locking/virtlockd.service.in +@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) + Documentation=https://libvirt.org + + [Service] +-EnvironmentFile=-/etc/sysconfig/virtlockd +-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS ++ExecStart=@sbindir@/virtlockd + ExecReload=/bin/kill -USR1 $MAINPID + # Loosing the locks is a really bad thing that will + # cause the machine to be fenced (rebooted), so make +diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in +index 3d9ae36150..43736191d5 100644 +--- a/src/logging/virtlogd.service.in ++++ b/src/logging/virtlogd.service.in +@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) + Documentation=https://libvirt.org + + [Service] +-EnvironmentFile=-/etc/sysconfig/virtlogd +-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS ++ExecStart=@sbindir@/virtlogd + ExecReload=/bin/kill -USR1 $MAINPID + # Loosing the logs is a really bad thing that will + # cause the machine to be fenced (rebooted), so make +diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in +index 7f689e08a8..239beeced9 100644 +--- a/src/remote/libvirtd.service.in ++++ b/src/remote/libvirtd.service.in +@@ -22,8 +22,7 @@ Documentation=https://libvirt.org + + [Service] + Type=notify +-EnvironmentFile=-/etc/sysconfig/libvirtd +-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS ++ExecStart=@sbindir@/libvirtd + ExecReload=/bin/kill -HUP $MAINPID + KillMode=process + Restart=on-failure +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 613c9a77f0..224b511074 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -339,15 +339,6 @@ install-data-local: install-init install-systemd install-nss \ + uninstall-local: uninstall-init uninstall-systemd uninstall-nss \ + uninstall-bash-completion + +-install-sysconfig: +- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig +- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ +- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests +- +-uninstall-sysconfig: +- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests +- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: +- + EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in + + install-initscript: libvirt-guests.init +@@ -362,8 +353,8 @@ uninstall-initscript: + + if LIBVIRT_INIT_SCRIPT_RED_HAT + BUILT_SOURCES += libvirt-guests.init +-install-init: install-sysconfig install-initscript +-uninstall-init: uninstall-sysconfig uninstall-initscript ++install-init: install-initscript ++uninstall-init: uninstall-initscript + else ! LIBVIRT_INIT_SCRIPT_RED_HAT + install-init: + uninstall-init: +@@ -394,12 +385,12 @@ EXTRA_DIST += libvirt-guests.service.in + SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system + + if LIBVIRT_INIT_SCRIPT_SYSTEMD +-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh ++install-systemd: libvirt-guests.service libvirt-guests.sh + $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) + $(INSTALL_DATA) libvirt-guests.service \ + $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service + +-uninstall-systemd: uninstall-sysconfig ++uninstall-systemd: + rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service + rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: + +diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in +index 491ca62138..f0f417bffb 100644 +--- a/tools/libvirt-guests.service.in ++++ b/tools/libvirt-guests.service.in +@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) + Documentation=https://libvirt.org + + [Service] +-EnvironmentFile=-/etc/sysconfig/libvirt-guests ++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf + # Hack just call traditional service until we factor + # out the code + ExecStart=@libexecdir@/libvirt-guests.sh start +diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf +index 669b046507..45b0b9ea46 100644 +--- a/tools/libvirt-guests.sysconf ++++ b/tools/libvirt-guests.sysconf +@@ -1,3 +1,10 @@ ++# ++# Warning: This configuration file is only sourced by the systemd ++# libvirt-guests.service unit. The coresponding openrc facility is in ++# /etc/init.d/libvirtd and /etc/conf.d/libvirtd ++# ++ ++ + # URIs to check for running guests + # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' + #URIS=default +-- +2.19.2 + 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 new file mode 100644 index 000000000000..ca9f952a8234 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch @@ -0,0 +1,110 @@ +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 +@@ -33,7 +33,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { + 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, +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-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index c8b391fe4389..158a315e310e 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -124,9 +124,9 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-4.5.0-do_not_use_sysconf.patch + "${FILESDIR}"/${PN}-5.0.0-do-not-use-sysconf.patch "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch + "${FILESDIR}"/${PN}-5.0.0-fix-paths-for-apparmor.patch ) pkg_setup() { -- cgit v1.2.3