From a362d9c65d28f3b3f982e9a08a21bf8744d15f5e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Jul 2021 17:28:27 +0200 Subject: gnu: libvirt: Update to 7.5.0 [fixes CVE-2021-3631]. * gnu/packages/virtualization.scm (libvirt): Update to 7.5.0. [arguments]: Add a new 'skip-directory-confusion phase. Remove obsolete 'no-polkit-magic phase. --- gnu/packages/virtualization.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index f144671709..90dbbf3334 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1072,14 +1072,14 @@ (define-public lxcfs (define-public libvirt (package (name "libvirt") - (version "7.3.0") + (version "7.5.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 - (base32 "1gn13mfwbdhp31pkzvrba7avz84yc9f1ik9f3ympa51hq22vpg97")) + (base32 "15987ihnsjvcgi11dzcf1k3zp1si2d4wcxj0r0i30brc0d4pn44h")) (patches (search-patches "libvirt-add-install-prefix.patch")))) (build-system meson-build-system) (arguments @@ -1100,6 +1100,12 @@ (define-public libvirt #:meson ,meson-0.55 #:phases (modify-phases %standard-phases + (add-after 'unpack 'skip-directory-confusion + (lambda _ + ;; Don't try to install an (unused) /var outside of the store. + (substitute* "scripts/meson-install-dirs.py" + (("destdir = .*") + "destdir = '/tmp'")))) (add-before 'configure 'disable-broken-tests (lambda _ (let ((tests (list "commandtest" ; hangs idly @@ -1107,13 +1113,7 @@ (define-public libvirt "virnetsockettest"))) ; tries to network (substitute* "tests/meson.build" (((format #f ".*'name': '(~a)'.*" (string-join tests "|"))) - "")) - #t))) - (add-before 'install 'no-polkit-magic - ;; Meson ‘magically’ invokes pkexec, which fails (not setuid). - (lambda _ - (setenv "PKEXEC_UID" "something") - #t))))) + "")))))))) (inputs `(("libxml2" ,libxml2) ("eudev" ,eudev) -- cgit v1.2.3 From 61ccd756e5ff73b2f8dc3449df537f1c5adb5872 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Jul 2021 18:47:16 +0200 Subject: gnu: libvirt: Support ZFS. * gnu/packages/virtualization.scm (inputs): Add zfs. --- gnu/packages/virtualization.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 90dbbf3334..278ed20f53 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -59,6 +59,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages figlet) + #:use-module (gnu packages file-systems) #:use-module (gnu packages firmware) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) @@ -1137,7 +1138,8 @@ (define-public libvirt ("ebtables" ,ebtables) ("parted" ,parted) ("iproute" ,iproute) - ("iptables" ,iptables))) + ("iptables" ,iptables) + ("zfs" ,zfs))) (native-inputs `(("bash-completion" ,bash-completion) ("gettext" ,gettext-minimal) -- cgit v1.2.3 From 063477ba407746529fc65782ee35341c575e3647 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Jul 2021 18:48:16 +0200 Subject: gnu: libvirt: Support ACLs. * gnu/packages/virtualization.scm (inputs): Add acl. --- gnu/packages/virtualization.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 278ed20f53..72daa69a08 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -38,6 +38,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages) + #:use-module (gnu packages acl) #:use-module (gnu packages admin) #:use-module (gnu packages assembly) #:use-module (gnu packages attr) @@ -1116,7 +1117,8 @@ (define-public libvirt (((format #f ".*'name': '(~a)'.*" (string-join tests "|"))) "")))))))) (inputs - `(("libxml2" ,libxml2) + `(("acl" ,acl) + ("libxml2" ,libxml2) ("eudev" ,eudev) ("libpciaccess" ,libpciaccess) ("gnutls" ,gnutls) -- cgit v1.2.3 From bdc0a9e0ae972bcf4f989db43d8283275e8f54b9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Jul 2021 18:48:45 +0200 Subject: gnu: libvirt: Support extended attributes. * gnu/packages/virtualization.scm (inputs): Add attr. --- gnu/packages/virtualization.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 72daa69a08..97099ea791 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1118,6 +1118,7 @@ (define-public libvirt "")))))))) (inputs `(("acl" ,acl) + ("attr" ,attr) ("libxml2" ,libxml2) ("eudev" ,eudev) ("libpciaccess" ,libpciaccess) -- cgit v1.2.3 From 1099073c00b04b34158dd22b81ac259ad462c6e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Jul 2021 18:49:14 +0200 Subject: gnu: libvirt: Support FUSE. * gnu/packages/virtualization.scm (inputs): Add fuse. --- gnu/packages/virtualization.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 97099ea791..f3c91f0661 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1119,6 +1119,7 @@ (define-public libvirt (inputs `(("acl" ,acl) ("attr" ,attr) + ("fuse" ,fuse) ("libxml2" ,libxml2) ("eudev" ,eudev) ("libpciaccess" ,libpciaccess) -- cgit v1.2.3 From eb72b3d940286f2c2f360b5525a74b6017648c04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Jul 2021 01:09:51 +0200 Subject: gnu: libvirt: Work around broken SASL option. * gnu/packages/virtualization.scm (libvirt)[arguments]: Add "-Ddriver_remote=enabled" to #:configure-flags. --- gnu/packages/virtualization.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index f3c91f0661..5b3a002af6 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1092,6 +1092,9 @@ (define-public libvirt "-Dstorage_disk=enabled" "-Dstorage_dir=enabled" "-Dpolkit=enabled" + ;; XXX The default, but required to make -Dsasl ‘stick’. + ;; See + "-Ddriver_remote=enabled" "-Dnls=enabled" ;translations (string-append "-Ddocdir=" (assoc-ref %outputs "out") "/share/doc/" ,name "-" ,version) -- cgit v1.2.3 From 3fb6c96106df85ba47f8fea34b224071bd75a1b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Jul 2021 13:44:05 +0200 Subject: Revert "gnu: libvirt: Support ZFS." This reverts commit 61ccd756e5ff73b2f8dc3449df537f1c5adb5872. --- gnu/packages/virtualization.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5b3a002af6..1bbcb46b99 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -60,7 +60,6 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages figlet) - #:use-module (gnu packages file-systems) #:use-module (gnu packages firmware) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) @@ -1145,8 +1144,7 @@ (define-public libvirt ("ebtables" ,ebtables) ("parted" ,parted) ("iproute" ,iproute) - ("iptables" ,iptables) - ("zfs" ,zfs))) + ("iptables" ,iptables))) (native-inputs `(("bash-completion" ,bash-completion) ("gettext" ,gettext-minimal) -- cgit v1.2.3