debian/changelog

+libvirt (5.6.0-2) unstable; urgency=medium
+
+  * Team upload.
+
+  * [4dcbe93] Revert "Disable libvirtd socket activation" (Closes: #935883)
+  * [b464de1] Add libvirtd sockets handling
+
+ -- Andrea Bolognani <eof@kiyuko.org>  Wed, 28 Aug 2019 19:39:00 +0200
+
 libvirt (5.6.0-1) unstable; urgency=medium
 
   * Team upload.

debian/patches/debian/Disable-libvirtd-socket-activation.patch

-From: Andrea Bolognani <eof@kiyuko.org>
-Date: Sat, 24 Aug 2019 18:00:00 +0200
-Subject: debian: Disable libvirtd socket activation
-
-It's currently broken upstream.
----
- src/remote/libvirtd.service.in | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
-index 143dd7f..0fc50dc 100644
---- a/src/remote/libvirtd.service.in
-+++ b/src/remote/libvirtd.service.in
-@@ -2,9 +2,6 @@
- Description=Virtualization daemon
- Requires=virtlogd.socket
- Requires=virtlockd.socket
--Requires=libvirtd.socket
--Requires=libvirtd-ro.socket
--Requires=libvirtd-admin.socket
- Wants=systemd-machined.service
- Before=libvirt-guests.service
- After=network.target
-@@ -44,5 +41,3 @@ TasksMax=32768
- WantedBy=multi-user.target
- Also=virtlockd.socket
- Also=virtlogd.socket
--Also=libvirtd.socket
--Also=libvirtd-ro.socket

debian/patches/series

@@ -17,5 +17,4 @@ debian/Prefer-sbin-over-usr-sbin.patch
 Include-etc-pki-qemu-in-apparmor.patch
 virt-aa-helper-Fix-AppArmor-profile.patch
 virt-aa-helper-Actually-fix-AppArmor-profile.patch
-debian/Disable-libvirtd-socket-activation.patch
 apparmor-Allow-run-pygrub.patch

debian/rules

@@ -139,6 +139,9 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
         $(NULL)
 
 LIBVIRT_SYSTEM_SERVICES = \
+	libvirtd.socket \
+	libvirtd-ro.socket \
+	libvirtd-admin.socket \
 	libvirt-guests.service \
 	virtlogd.socket \
 	virtlogd-admin.socket \
@@ -188,10 +191,6 @@ override_dh_install-arch:
 	cp debian/polkit/60-libvirt.pkla \
 	    debian/libvirt-daemon-system/var/lib/polkit-1/localauthority/10-vendor.d/
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
-	# Socket activation for libvirtd is currently broken. Fixes are being
-	# worked on upstream, but until they are in place it's much better for
-	# us to pretend the feature doesn't exist at all
-	rm -f debian/tmp/usr/lib/systemd/system/libvirtd*.socket
 	# Linux supports more nice things:
 	dh_install -p libvirt-daemon-system usr/lib/systemd/system lib/systemd/
 	dh_install -p libvirt-daemon-system usr/lib/libvirt/virt-aa-helper