diff --git a/fb327ac2-virtlockd-admin-socket.patch b/fb327ac2-virtlockd-admin-socket.patch new file mode 100644 index 0000000..15af471 --- /dev/null +++ b/fb327ac2-virtlockd-admin-socket.patch @@ -0,0 +1,29 @@ +commit fb327ac2c3d721b4002852c520d9f39a35183e0d +Author: Jim Fehlig +Date: Wed Mar 14 16:42:39 2018 -0600 + + lockd: fix typo in virtlockd-admin.socket + + Commit ce7ae55ea1 introduced a typo in virtlockd-admin socket file + + /usr/lib/systemd/system/virtlockd-admin.socket:7: Unknown lvalue + 'Server' in section 'Socket' + + Change 'Server' to 'Service'. + + Signed-off-by: Jim Fehlig + Reviewed-by: Erik Skultety + +Index: libvirt-4.1.0/src/locking/virtlockd-admin.socket.in +=================================================================== +--- libvirt-4.1.0.orig/src/locking/virtlockd-admin.socket.in ++++ libvirt-4.1.0/src/locking/virtlockd-admin.socket.in +@@ -4,7 +4,7 @@ Before=libvirtd.service + + [Socket] + ListenStream=@localstatedir@/run/libvirt/virtlockd-admin-sock +-Server=virtlockd.service ++Service=virtlockd.service + + [Install] + WantedBy=sockets.target diff --git a/libvirt.changes b/libvirt.changes index 25c94cb..dcd6fcb 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 15 15:44:28 UTC 2018 - jfehlig@suse.com + +- lockd: fix typo in virtlockd-admin.socket + fb327ac2-virtlockd-admin-socket.patch + bsc#1085386 + ------------------------------------------------------------------- Wed Mar 14 21:40:53 UTC 2018 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 2fb36a0..8db006a 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -333,6 +333,7 @@ Patch4: 06e7ebb6-rpc-invoke-dispatch-unlocked.patch Patch5: 86cae503-rpc-fix-pre-exec.patch Patch6: eefabb38-rpc-virtlockd-virtlogd-single-thread.patch Patch7: fbf31e1a-CVE-2018-1064.patch +Patch8: fb327ac2-virtlockd-admin-socket.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -946,6 +947,7 @@ popd %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1