From 749dc3d3cb7ed9bd2dc17a7f80f1f9675b595317 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrangé Date: Sep 20 2019 09:14:22 +0000 Subject: Fix systemd socket activation with TLS socket --- diff --git a/0001-remote-fix-registration-of-TLS-socket.patch b/0001-remote-fix-registration-of-TLS-socket.patch new file mode 100644 index 0000000..607701e --- /dev/null +++ b/0001-remote-fix-registration-of-TLS-socket.patch @@ -0,0 +1,30 @@ +From 522b3d2b24d0f7ac78dad442c990d4e34db0eaf2 Mon Sep 17 00:00:00 2001 +From: Michael Chapman +Date: Tue, 17 Sep 2019 17:03:57 +1000 +Subject: [PATCH] remote: fix registration of TLS socket +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reviewed-by: Daniel P. Berrangé +Signed-off-by: Michael Chapman +--- + src/remote/remote_daemon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c +index 966f3da2d0..7195ac9218 100644 +--- a/src/remote/remote_daemon.c ++++ b/src/remote/remote_daemon.c +@@ -505,7 +505,7 @@ daemonSetupNetworking(virNetServerPtr srv, + config->max_client_requests) < 0) + goto cleanup; + +- if (((ipsock && config->listen_tls) || (act && virSystemdActivationHasName(act, "ip-tls")))) { ++ if (((ipsock && config->listen_tls) || (act && virSystemdActivationHasName(act, DAEMON_NAME "-tls.socket")))) { + virNetTLSContextPtr ctxt = NULL; + + if (config->ca_file || +-- +2.21.0 + diff --git a/libvirt.spec b/libvirt.spec index 1de8543..481fbb3 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -216,7 +216,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 5.7.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -225,6 +225,9 @@ URL: https://libvirt.org/ %endif Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz +# Fix systemd socket activation with TLS socket +Patch0001: 0001-remote-fix-registration-of-TLS-socket.patch + Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} @@ -2000,6 +2003,9 @@ exit 0 %changelog +* Fri Sep 20 2019 Daniel P. Berrangé - 5.7.0-2 +- Fix systemd socket activation with TLS socket + * Tue Sep 03 2019 Cole Robinson - 5.7.0-1 - Update to version 5.7.0