diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-06-20 02:01:38 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-06-20 03:45:47 +0200 |
| commit | eb8c14751a3532898e7941ee43a271d8739a6a21 (patch) | |
| tree | 203c6ba27d976680c6306a008ea6a5939f02fedc /pkgs/os-specific/linux/lxc | |
| parent | a7210764eb29e0fb5f15d46e1f732a500e9ed832 (diff) | |
| download | nixpkgs-eb8c14751a3532898e7941ee43a271d8739a6a21.tar nixpkgs-eb8c14751a3532898e7941ee43a271d8739a6a21.tar.gz nixpkgs-eb8c14751a3532898e7941ee43a271d8739a6a21.tar.bz2 nixpkgs-eb8c14751a3532898e7941ee43a271d8739a6a21.tar.lz nixpkgs-eb8c14751a3532898e7941ee43a271d8739a6a21.tar.xz nixpkgs-eb8c14751a3532898e7941ee43a271d8739a6a21.tar.zst nixpkgs-eb8c14751a3532898e7941ee43a271d8739a6a21.zip | |
lxc: 2.0.7 -> 2.0.8
Diffstat (limited to 'pkgs/os-specific/linux/lxc')
| -rw-r--r-- | pkgs/os-specific/linux/lxc/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index bab7038aa47..1d432f9bbd9 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "0paz0lgb9dzpgahysad1cr6gz54l6xyhqdx6dzw2kh3fy1sw028w"; + sha256 = "15449r56rqg3487kzsnfvz0w4p5ajrq0krcsdh6c9r6g0ark93hd"; }; nativeBuildInputs = [ @@ -29,13 +29,12 @@ stdenv.mkDerivation rec { patches = [ ./support-db2x.patch - (fetchurl { - name = "CVE-2017-5985.patch"; - url = "https://github.com/lxc/lxc/commit/d512bd5efb0e407eba350c4e649c464a65b712a3.patch"; - sha256 = "0v1rhlfviadsxj2wmbl7nqb64p6y2bxm9y43sc44jg3k6mkr0r5c"; - }) ]; + postPatch = '' + sed -i '/chmod u+s/d' src/lxc/Makefile.am + ''; + XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; # FIXME @@ -81,7 +80,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://lxc.sourceforge.net"; + homepage = "https://linuxcontainers.org/"; description = "Userspace tools for Linux Containers, a lightweight virtualization system"; license = licenses.lgpl21Plus; |