Re: [PR PATCH] [Updated] libvirt: fix control socket path

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 726 bytes --]

There is an updated pull request by the-eater against master on the void-packages repository

https://github.com/the-eater/neo-void-packages fix/libvirt/socket-path
https://github.com/void-linux/void-packages/pull/14274

libvirt: fix control socket path
If you use unix control sockets instead of TCP the path of the socket will be incorrectly build and you'll get errors like:

```
Failed to bind socket to 'libvirt//var/run/libvirt/-sock': No such file or directory
```

Included patch fixes that. is also send to upstream but idk how this ancient system of patches via mailing lists work tbh, so don't know if it came through

A patch file from https://github.com/void-linux/void-packages/pull/14274.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/libvirt/socket-path-14274.patch --]
[-- Type: text/x-diff, Size: 2111 bytes --]

From 4b21fbecfe62a219797432da0ca9638a8bb9396e Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Fri, 6 Sep 2019 23:38:17 +0200
Subject: [PATCH] libvirt: fix control socket path

---
 .../patches/socket-url-arguments.patch        | 22 +++++++++++++++++++
 srcpkgs/libvirt/template                      |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libvirt/patches/socket-url-arguments.patch

diff --git a/srcpkgs/libvirt/patches/socket-url-arguments.patch b/srcpkgs/libvirt/patches/socket-url-arguments.patch
new file mode 100644
index 00000000000..a734bfd29f3
--- /dev/null
+++ b/srcpkgs/libvirt/patches/socket-url-arguments.patch
@@ -0,0 +1,22 @@
+diff --git src/remote/remote_daemon.c src/remote/remote_daemon.c
+index 546328b24d..5d64397062 100644
+--- src/remote/remote_daemon.c
++++ src/remote/remote_daemon.c
+@@ -226,14 +226,14 @@ daemonUnixSocketPaths(struct daemonConfig *config,
+ 
+     if (config->unix_sock_dir) {
+         if (virAsprintf(sockfile, "%s/%s-sock",
+-                        SOCK_PREFIX, config->unix_sock_dir) < 0)
++                        config->unix_sock_dir, SOCK_PREFIX) < 0)
+             goto cleanup;
+ 
+         if (privileged) {
+             if (virAsprintf(rosockfile, "%s/%s-sock-ro",
+-                            SOCK_PREFIX, config->unix_sock_dir) < 0 ||
++                            config->unix_sock_dir, SOCK_PREFIX) < 0 ||
+                 virAsprintf(admsockfile, "%s/%s-admin-sock",
+-                            SOCK_PREFIX, config->unix_sock_dir) < 0)
++                            config->unix_sock_dir, SOCK_PREFIX) < 0)
+                 goto cleanup;
+         }
+     } else {
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 123b9ee6a4a..0e7f8df0e1c 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
 version=5.7.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-hal --with-storage-lvm --with-qemu
  --with-qemu-user=libvirt --with-qemu-group=libvirt --without-netcf