diff --git a/libvirt-4.5.0-apparmor-add-missing-comma.patch b/libvirt-4.5.0-apparmor-add-missing-comma.patch new file mode 100644 index 0000000..27d8af8 --- /dev/null +++ b/libvirt-4.5.0-apparmor-add-missing-comma.patch @@ -0,0 +1,29 @@ +From 0b5caa0dc3e49c70d7138ea9414c03a3ca847bc3 Mon Sep 17 00:00:00 2001 +From: Michal Privoznik +Date: Wed, 4 Jul 2018 07:49:35 +0200 +Subject: [PATCH 1/1] apparmor: Fix forgotten comma at EOL + +The commit of 1fff379ff6e778 forgot comma at the end of the line +rendering the file invalid in syntax. + +Signed-off-by: Michal Privoznik +--- + examples/apparmor/usr.lib.libvirt.virt-aa-helper | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper +index e32402a..de94368 100644 +--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper ++++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper +@@ -50,7 +50,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { + @{HOME}/** r, + /var/lib/libvirt/images/ r, + /var/lib/libvirt/images/** r, +- /var/lib/nova/instances/_base/* r ++ /var/lib/nova/instances/_base/* r, + /{media,mnt,opt,srv}/** r, + # For virt-sandbox + /{,var/}run/libvirt/**/[sv]d[a-z] r, +-- +1.7.1 + diff --git a/libvirt.changes b/libvirt.changes index 756aa52..955bd60 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 3 09:31:55 UTC 2018 - antoine.belvire@opensuse.org + +- Fix apparmor failure at startup because of syntax error in + libvirt profile: + * Add libvirt-4.5.0-apparmor-add-missing-comma.patch (picked + from upstream). + ------------------------------------------------------------------- Thu Jul 5 16:25:57 UTC 2018 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index d874d0c..66d3fb1 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -335,6 +335,7 @@ Source6: libvirtd-relocation-server.xml Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches +Patch0: libvirt-4.5.0-apparmor-add-missing-comma.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -920,6 +921,7 @@ libvirt plugin for NSS for translating domain names into IP addresses. %prep %setup -q +%patch0 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1