Rediff patches

Dropped apparmor-Don-t-scrub-environment-of-virtlogd-process.patch: applied upstram
Dropped debian/libsystemd.patch: libsystemd-dev is not used anymore

debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch

@@ -39,7 +39,7 @@ index 88e08d2..bfbc8c9 100644
    </define>
  
 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 60a21a1..2a7aa98 100644
+index b69f428..9d71e30 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
 @@ -2144,11 +2144,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,

debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch

@@ -10,10 +10,10 @@ Closes: #663931
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/util/virutil.c b/src/util/virutil.c
-index d80d994..3b32865 100644
+index 170dd59..3451aa2 100644
 --- a/src/util/virutil.c
 +++ b/src/util/virutil.c
-@@ -1542,7 +1542,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
+@@ -1586,7 +1586,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
  void virFileWaitForDevices(void)
  {
  # ifdef UDEVADM

debian/patches/Skip-vircgrouptest.patch

@@ -9,7 +9,7 @@ without sysfs mounted.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index 322f6cb..3e2901b 100644
+index f55ef74..9f8bc76 100644
 --- a/tests/vircgrouptest.c
 +++ b/tests/vircgrouptest.c
 @@ -22,7 +22,7 @@

debian/patches/apparmor-Don-t-scrub-environment-of-virtlogd-process.patch

-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Sun, 5 Jun 2016 13:05:13 +0200
-Subject: apparmor: Don't scrub environment of virtlogd process
-
-otherwise we drop variables like XDG_RUNTIME_DIR with qemu:///session
-and libvirtd faild to find virtlogd's socket.
----
- examples/apparmor/usr.sbin.libvirtd | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
-index be4e1ef..30f6508 100644
---- a/examples/apparmor/usr.sbin.libvirtd
-+++ b/examples/apparmor/usr.sbin.libvirtd
-@@ -45,6 +45,7 @@
-   /bin/* PUx,
-   /sbin/* PUx,
-   /usr/bin/* PUx,
-+  /usr/sbin/virtlogd pix,
-   /usr/sbin/* PUx,
-   /lib/udev/scsi_id PUx,
-   /usr/{lib,lib64}/xen-common/bin/xen-toolstack PUx,

debian/patches/debian/Don-t-enable-default-network-on-boot.patch

@@ -9,10 +9,10 @@ to not interfere with existing network configurations
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 12b66c2..d49749a 100644
+index b91ff74..1a2268d 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -3092,8 +3092,7 @@ if WITH_NETWORK
+@@ -3107,8 +3107,7 @@ if WITH_NETWORK
  	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
  	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
@@ -23,10 +23,10 @@ index 12b66c2..d49749a 100644
  
  uninstall-local:: uninstall-init uninstall-systemd
 diff --git a/src/Makefile.in b/src/Makefile.in
-index d923b7a..4dadea7 100644
+index 64cd856..aa670be 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -11321,8 +11321,7 @@ install-data-local: install-init install-systemd
+@@ -11465,8 +11465,7 @@ install-data-local: install-init install-systemd
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
  @WITH_NETWORK_TRUE@	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \

debian/patches/debian/apparmor_profiles_local_include.patch

@@ -21,10 +21,10 @@ index 89b95f6..a992119 100644
 +  #include <local/usr.lib.libvirt.virt-aa-helper>
  }
 diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
-index 5d606e6..be4e1ef 100644
+index 23f70f5..30f6508 100644
 --- a/examples/apparmor/usr.sbin.libvirtd
 +++ b/examples/apparmor/usr.sbin.libvirtd
-@@ -66,4 +66,6 @@
+@@ -67,4 +67,6 @@
    # allow changing to our UUID-based named profiles
    change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
  

debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch

@@ -12,7 +12,7 @@ Closes: #517059
  5 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index fc9e1c6..60a21a1 100644
+index 79b25b3..b69f428 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
 @@ -2148,7 +2148,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,

debian/patches/debian/libsystemd.patch

-From: Michael Biebl <biebl@debian.org>
-Date: Tue, 11 Aug 2015 07:25:01 +0200
-Subject: libsystemd
-
-Use libsystemd instead of deprecated libsystemd-daemon
----
- m4/virt-systemd-daemon.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/m4/virt-systemd-daemon.m4 b/m4/virt-systemd-daemon.m4
-index 8516e41..c9708ec 100644
---- a/m4/virt-systemd-daemon.m4
-+++ b/m4/virt-systemd-daemon.m4
-@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
- dnl
- 
- AC_DEFUN([LIBVIRT_CHECK_SYSTEMD_DAEMON],[
--  LIBVIRT_CHECK_PKG([SYSTEMD_DAEMON], [libsystemd-daemon], [0.27.1])
-+  LIBVIRT_CHECK_PKG([SYSTEMD_DAEMON], [libsystemd], [209])
- 
-     old_CFLAGS="$CFLAGS"
-     old_LIBS="$LIBS"

debian/patches/debian/remove-RHism.diff.patch

@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 6844823..d4fe18f 100644
+index 601cb44..b28236d 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.

debian/patches/series

@@ -12,6 +12,4 @@ debian/Debianize-virtlockd.patch
 debian/Use-upstreams-polkit-rule.patch
 Allow-access-to-libnl-3-config-files.patch
 debian/apparmor_profiles_local_include.patch
-debian/libsystemd.patch
 virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
-apparmor-Don-t-scrub-environment-of-virtlogd-process.patch

debian/patches/virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch

@@ -24,7 +24,7 @@ index efb4873..9f996ab 100644
    # access PKI infrastructure
    /etc/pki/libvirt-vnc/** r,
 diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
-index 691bbdf..ecb9e12 100644
+index 9eafaee..a36a4ec 100644
 --- a/src/security/virt-aa-helper.c
 +++ b/src/security/virt-aa-helper.c
 @@ -512,6 +512,7 @@ valid_path(const char *path, const bool readonly)