diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index ce81c1b2e8c2..8431b1823e13 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -3,14 +3,14 @@ , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng }: -let version = "1.1.2"; in +let version = "1.1.4"; in stdenv.mkDerivation { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; - md5 = "1835bbfa492099bce12e2934870e5611"; + sha256 = "13yr9g1dk1bzzlm9h93kmavncyg6svjv3rjrv43ccl3sc37za42r"; }; buildInputs = @@ -19,9 +19,6 @@ stdenv.mkDerivation { libcap_ng ]; - # see http://www.mail-archive.com/libvir-list@redhat.com/msg83693.html - patches = [ ./securtyfs_userns.patch ]; - preConfigure = '' PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:$PATH diff --git a/pkgs/development/libraries/libvirt/securtyfs_userns.patch b/pkgs/development/libraries/libvirt/securtyfs_userns.patch deleted file mode 100644 index 2723334f94af..000000000000 --- a/pkgs/development/libraries/libvirt/securtyfs_userns.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/lxc/lxc_container.c -+++ b/src/lxc/lxc_container.c -@@ -750,7 +750,7 @@ err: - } - - --static int lxcContainerMountBasicFS(void) -+static int lxcContainerMountBasicFS(bool userns_enabled) - { - const struct { - const char *src; -@@ -801,6 +801,9 @@ static int lxcContainerMountBasicFS(void) - continue; - #endif - -+ if (STREQ(mnts[i].src, "securityfs") && userns_enabled) -+ continue; -+ - if (virFileMakePath(mnts[i].dst) < 0) { - virReportSystemError(errno, - _("Failed to mkdir %s"), -@@ -1530,7 +1533,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, - goto cleanup; - - /* Mounts the core /proc, /sys, etc filesystems */ -- if (lxcContainerMountBasicFS() < 0) -+ if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0) - goto cleanup; - - /* Mounts /proc/meminfo etc sysinfo */