From 4650985dd0e898b82e0d2ec225931297d4fadccf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 31 Jan 2018 20:30:04 +0000 Subject: gentoo resync : 31.01.2018 --- .../libvirt-3.10.0-fix_paths_for_apparmor.patch | 118 --------------------- .../libvirt-3.10.0-r2-fix_paths_for_apparmor.patch | 77 ++++++++++++++ .../libvirt-4.0.0-bash_completion_bugfixes.patch | 42 ++++++++ 3 files changed, 119 insertions(+), 118 deletions(-) delete mode 100644 app-emulation/libvirt/files/libvirt-3.10.0-fix_paths_for_apparmor.patch create mode 100644 app-emulation/libvirt/files/libvirt-3.10.0-r2-fix_paths_for_apparmor.patch create mode 100644 app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch (limited to 'app-emulation/libvirt/files') diff --git a/app-emulation/libvirt/files/libvirt-3.10.0-fix_paths_for_apparmor.patch b/app-emulation/libvirt/files/libvirt-3.10.0-fix_paths_for_apparmor.patch deleted file mode 100644 index 0e386c1e00b0..000000000000 --- a/app-emulation/libvirt/files/libvirt-3.10.0-fix_paths_for_apparmor.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a/examples/Makefile.am b/examples/Makefile.am -index ef2f79d..d8cdb9b 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -23,7 +23,7 @@ EXTRA_DIST = \ - apparmor/TEMPLATE.lxc \ - apparmor/libvirt-qemu \ - apparmor/libvirt-lxc \ -- apparmor/usr.lib.libvirt.virt-aa-helper \ -+ apparmor/usr.libexec.virt-aa-helper \ - apparmor/usr.sbin.libvirtd \ - lxcconvert/virt-lxc-convert \ - polkit/libvirt-acl.rules \ -@@ -70,7 +70,7 @@ admin_logging_SOURCES = admin/logging.c - if WITH_APPARMOR_PROFILES - apparmordir = $(sysconfdir)/apparmor.d/ - apparmor_DATA = \ -- apparmor/usr.lib.libvirt.virt-aa-helper \ -+ apparmor/usr.libexec.virt-aa-helper \ - apparmor/usr.sbin.libvirtd \ - $(NULL) - -diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu -index d4fad85..0b22009 100644 ---- a/examples/apparmor/libvirt-qemu -+++ b/examples/apparmor/libvirt-qemu -@@ -86,6 +86,8 @@ - /usr/share/AAVMF/** r, - /usr/share/qemu-efi/** r, - /usr/share/slof/** r, -+ /usr/share/seavgabios/** r, -+ /usr/share/edk2-ovmf/** r, - - # access PKI infrastructure - /etc/pki/libvirt-vnc/** r, -diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper -deleted file mode 100644 -index bd6181d..0000000 ---- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper -+++ /dev/null -@@ -1,60 +0,0 @@ --# Last Modified: Mon Apr 5 15:10:27 2010 --#include -- --profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { -- #include -- -- # needed for searching directories -- capability dac_override, -- capability dac_read_search, -- -- # needed for when disk is on a network filesystem -- network inet, -- network inet6, -- -- deny @{PROC}/[0-9]*/mounts r, -- @{PROC}/[0-9]*/net/psched r, -- owner @{PROC}/[0-9]*/status r, -- @{PROC}/filesystems r, -- -- /etc/libnl-3/classid r, -- -- # for hostdev -- /sys/devices/ r, -- /sys/devices/** r, -- deny /dev/sd* r, -- deny /dev/vd* r, -- deny /dev/dm-* r, -- deny /dev/drbd[0-9]* r, -- deny /dev/dasd* r, -- deny /dev/nvme* r, -- deny /dev/zd[0-9]* r, -- deny /dev/mapper/ r, -- deny /dev/mapper/* r, -- -- /usr/{lib,lib64}/libvirt/virt-aa-helper mr, -- /{usr/,}sbin/apparmor_parser Ux, -- -- /etc/apparmor.d/libvirt/* r, -- /etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw, -- -- # for backingstore -- allow access to non-hidden files in @{HOME} as well -- # as storage pools -- audit deny @{HOME}/.* mrwkl, -- audit deny @{HOME}/.*/ rw, -- audit deny @{HOME}/.*/** mrwkl, -- audit deny @{HOME}/bin/ rw, -- audit deny @{HOME}/bin/** mrwkl, -- @{HOME}/ r, -- @{HOME}/** r, -- /var/lib/libvirt/images/ r, -- /var/lib/libvirt/images/** r, -- /{media,mnt,opt,srv}/** r, -- -- /**.img r, -- /**.qcow{,2} r, -- /**.qed r, -- /**.vmdk r, -- /**.[iI][sS][oO] r, -- /**/disk{,.*} r, --} -diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd -index 8d61d15..656a559 100644 ---- a/examples/apparmor/usr.sbin.libvirtd -+++ b/examples/apparmor/usr.sbin.libvirtd -@@ -84,8 +84,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, - diff --git a/app-emulation/libvirt/files/libvirt-3.10.0-r2-fix_paths_for_apparmor.patch b/app-emulation/libvirt/files/libvirt-3.10.0-r2-fix_paths_for_apparmor.patch new file mode 100644 index 000000000000..f1360ae4e4e9 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-3.10.0-r2-fix_paths_for_apparmor.patch @@ -0,0 +1,77 @@ +diff --git a/examples/Makefile.am b/examples/Makefile.am +index ef2f79db3..d8cdb9b3f 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -23,7 +23,7 @@ EXTRA_DIST = \ + apparmor/TEMPLATE.lxc \ + apparmor/libvirt-qemu \ + apparmor/libvirt-lxc \ +- apparmor/usr.lib.libvirt.virt-aa-helper \ ++ apparmor/usr.libexec.virt-aa-helper \ + apparmor/usr.sbin.libvirtd \ + lxcconvert/virt-lxc-convert \ + polkit/libvirt-acl.rules \ +@@ -70,7 +70,7 @@ admin_logging_SOURCES = admin/logging.c + if WITH_APPARMOR_PROFILES + apparmordir = $(sysconfdir)/apparmor.d/ + apparmor_DATA = \ +- apparmor/usr.lib.libvirt.virt-aa-helper \ ++ apparmor/usr.libexec.virt-aa-helper \ + apparmor/usr.sbin.libvirtd \ + $(NULL) + +diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu +index d4fad85a1..0b22009e5 100644 +--- a/examples/apparmor/libvirt-qemu ++++ b/examples/apparmor/libvirt-qemu +@@ -86,6 +86,8 @@ + /usr/share/AAVMF/** r, + /usr/share/qemu-efi/** r, + /usr/share/slof/** r, ++ /usr/share/seavgabios/** r, ++ /usr/share/edk2-ovmf/** r, + + # access PKI infrastructure + /etc/pki/libvirt-vnc/** r, +diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.libexec.virt-aa-helper +similarity index 92% +rename from examples/apparmor/usr.lib.libvirt.virt-aa-helper +rename to examples/apparmor/usr.libexec.virt-aa-helper +index bd6181d00..4086f140a 100644 +--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper ++++ b/examples/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 +@@ -32,7 +32,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/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd +index 8d61d154e..656a5595b 100644 +--- a/examples/apparmor/usr.sbin.libvirtd ++++ b/examples/apparmor/usr.sbin.libvirtd +@@ -84,8 +84,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, + diff --git a/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch b/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch new file mode 100644 index 000000000000..65894ed4e1d8 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch @@ -0,0 +1,42 @@ +https://www.redhat.com/archives/libvir-list/2018-January/msg00903.html +https://www.redhat.com/archives/libvir-list/2018-January/msg00904.html + +diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c +index e216d9076..e3b8234b4 100644 +--- a/tools/virsh-completer.c ++++ b/tools/virsh-completer.c +@@ -45,18 +45,11 @@ virshDomainNameCompleter(vshControl *ctl, + + virCheckFlags(VIR_CONNECT_LIST_DOMAINS_ACTIVE | + VIR_CONNECT_LIST_DOMAINS_INACTIVE | ++ VIR_CONNECT_LIST_DOMAINS_OTHER | ++ VIR_CONNECT_LIST_DOMAINS_PAUSED | + VIR_CONNECT_LIST_DOMAINS_PERSISTENT | +- VIR_CONNECT_LIST_DOMAINS_TRANSIENT | + VIR_CONNECT_LIST_DOMAINS_RUNNING | +- VIR_CONNECT_LIST_DOMAINS_PAUSED | +- VIR_CONNECT_LIST_DOMAINS_SHUTOFF | +- VIR_CONNECT_LIST_DOMAINS_OTHER | +- VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE | +- VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE | +- VIR_CONNECT_LIST_DOMAINS_AUTOSTART | +- VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART | +- VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT | +- VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT, ++ VIR_CONNECT_LIST_DOMAINS_SHUTOFF, + NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) +diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c +index 0f329d6d7..5a0e0c1b2 100644 +--- a/tools/virsh-domain.c ++++ b/tools/virsh-domain.c +@@ -1037,7 +1037,7 @@ static const vshCmdInfo info_autostart[] = { + }; + + static const vshCmdOptDef opts_autostart[] = { +- VIRSH_COMMON_OPT_DOMAIN_FULL(0), ++ VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_PERSISTENT), + {.name = "disable", + .type = VSH_OT_BOOL, + .help = N_("disable autostarting") -- cgit v1.2.3