diff options
| author | Will Dietz <github@wdtz.org> | 2016-12-16 04:32:28 -0600 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-12-16 11:32:28 +0100 |
| commit | be24f1d364cf678150b03c90bca58147d15d6311 (patch) | |
| tree | 93e44be5063d89f25a38f98cc0b2970e549ce330 /pkgs/os-specific/linux/musl | |
| parent | f3108c5bd2d2a3059d5c5deb6eb0d8dfeb5b96fa (diff) | |
| download | nixpkgs-be24f1d364cf678150b03c90bca58147d15d6311.tar nixpkgs-be24f1d364cf678150b03c90bca58147d15d6311.tar.gz nixpkgs-be24f1d364cf678150b03c90bca58147d15d6311.tar.bz2 nixpkgs-be24f1d364cf678150b03c90bca58147d15d6311.tar.lz nixpkgs-be24f1d364cf678150b03c90bca58147d15d6311.tar.xz nixpkgs-be24f1d364cf678150b03c90bca58147d15d6311.tar.zst nixpkgs-be24f1d364cf678150b03c90bca58147d15d6311.zip | |
musl: 1.1.11 -> 1.1.15, add security patch. (#21023)
Diffstat (limited to 'pkgs/os-specific/linux/musl')
| -rw-r--r-- | pkgs/os-specific/linux/musl/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index ae0c7703de6..dd12a18dc82 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.11"; + version = "1.1.15"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "0grmmah3d9wajii26010plpinv3cbiq3kfqsblgn84kv3fjnv7mv"; + sha256 = "1ymhxkskivzph0q34zadwfglc5gyahqajm7chqqn2zraxv3lgr4p"; }; enableParallelBuilding = true; @@ -22,6 +22,15 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--enable-static" + "--disable-gcc-wrapper" + ]; + + patches = [ + # CVE-2016-8859: http://www.openwall.com/lists/oss-security/2016/10/19/1 + (fetchpatch { + url = "https://git.musl-libc.org/cgit/musl/patch/?id=c3edc06d1e1360f3570db9155d6b318ae0d0f0f7"; + sha256 = "15ih0aj27lz4sgq8r5jndc3qy5gz3ciraavrqpp0vw8h5wjcsb9v"; + }) ]; dontDisableStatic = true; |