From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] libvirt: fix control socket path
Date: Fri, 06 Sep 2019 23:44:14 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14274@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 721 bytes --]
There is a new 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 6ca97eac7556a98f3650b925ee0c0bc82ba37d31 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
next reply other threads:[~2019-09-06 21:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-06 21:44 voidlinux-github [this message]
2019-09-07 8:39 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-07 8:39 ` voidlinux-github
2019-09-07 8:41 ` voidlinux-github
2019-09-07 8:46 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-07 8:46 ` voidlinux-github
2019-09-07 12:59 ` voidlinux-github
2019-09-08 8:59 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14274@inbox.vuxu.org \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).