diff -Nru libvirt-6.0.0/debian/changelog libvirt-6.0.0/debian/changelog --- libvirt-6.0.0/debian/changelog 2020-04-18 03:59:21.000000000 +0000 +++ libvirt-6.0.0/debian/changelog 2020-05-26 08:54:38.000000000 +0000 @@ -1,3 +1,9 @@ +libvirt (6.0.0-0ubuntu9~ppa1) groovy; urgency=medium + + * Experimental build for LP: 1677398 around virDomainDiskTranslateSourcePool + + -- Christian Ehrhardt Tue, 26 May 2020 10:54:38 +0200 + libvirt (6.0.0-0ubuntu8) focal; urgency=medium * d/control, d/rules: Disable rbd and zfs on riscv64 where they are diff -Nru libvirt-6.0.0/debian/patches/lp-1677398-pool-experiment libvirt-6.0.0/debian/patches/lp-1677398-pool-experiment --- libvirt-6.0.0/debian/patches/lp-1677398-pool-experiment 1970-01-01 00:00:00.000000000 +0000 +++ libvirt-6.0.0/debian/patches/lp-1677398-pool-experiment 2020-05-26 08:52:43.000000000 +0000 @@ -0,0 +1,23 @@ +Description: Evolving and experimenting with a community contribution + Try to translate pools in virt-aa-helper +Forwarded: no (experimenta for now) +Author: Christian Ehrhardt +Origin: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1677398/comments/25 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1677398 +Last-Update: 2020-05-26 +--- a/src/security/virt-aa-helper.c ++++ b/src/security/virt-aa-helper.c +@@ -944,8 +944,13 @@ get_files(vahControl * ctl) + #endif + + for (i = 0; i < ctl->def->ndisks; i++) { ++ sleep(2); ++ + virDomainDiskDefPtr disk = ctl->def->disks[i]; + ++ if (virDomainDiskTranslateSourcePool(disk) < 0) ++ continue; ++ + if (!virDomainDiskGetSource(disk)) + continue; + /* XXX - if we knew the qemu user:group here we could send it in diff -Nru libvirt-6.0.0/debian/patches/series libvirt-6.0.0/debian/patches/series --- libvirt-6.0.0/debian/patches/series 2020-04-16 07:47:29.000000000 +0000 +++ libvirt-6.0.0/debian/patches/series 2020-05-26 08:46:49.000000000 +0000 @@ -80,3 +80,4 @@ ubuntu/lp-1868528-util-virhostcpu-Fail-when-fetching-CPU-Stats-for-inv.patch ubuntu-aa/lp-1871354-apparmor-avoid-denials-on-libpmem-initialization.patch ubuntu/CVE-CVE-2020-10701-api-disallow-virDomainAgentSetResponseTimeout-on-rea.patch +lp-1677398-pool-experiment diff -Nru libvirt-6.0.0/debian/rules libvirt-6.0.0/debian/rules --- libvirt-6.0.0/debian/rules 2020-04-17 06:11:50.000000000 +0000 +++ libvirt-6.0.0/debian/rules 2020-05-26 08:53:40.000000000 +0000 @@ -9,6 +9,7 @@ # hardening option, that would break libvirt build time self-testing. # Therefore let dpkg-buildflag strip that option if present. export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions +export DEB_CFFLAGS_MAINT_APPEND = -O0 ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux)) ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))