Merge #30851: util-linux: 2.30.2 -> 2.31

Includes a fix for CVE-2016-2779.
This commit is contained in:
Vladimír Čunát 2017-10-30 23:01:19 +01:00
commit 2d403e668c
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

@ -4,15 +4,15 @@
let let
version = lib.concatStringsSep "." ([ majorVersion ] version = lib.concatStringsSep "." ([ majorVersion ]
++ lib.optional (patchVersion != "") patchVersion); ++ lib.optional (patchVersion != "") patchVersion);
majorVersion = "2.30"; majorVersion = "2.31";
patchVersion = "2"; patchVersion = "";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "util-linux-${version}"; name = "util-linux-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
sha256 = "1p494mwd8v6p6mpmmjybkc7bz1qwp9x4cdi8hdvp2nwvkr4fanvv"; sha256 = "12nw108xjhm63sh2n5a0qs33vpvbvb6rln96l9j50p7wykf7rgpr";
}; };
patches = [ patches = [