diff options
author | Tethys Svensson <freaken@freaken.dk> | 2020-08-09 15:05:34 +0200 |
---|---|---|
committer | Tethys Svensson <freaken@freaken.dk> | 2020-08-09 15:05:34 +0200 |
commit | 87af0f9871a22743f8466d6658481f1beb7378f4 (patch) | |
tree | 0455d0b744f5c3a391e124dc04e748d0a6c861eb /pkgs/os-specific/linux/busybox/default.nix | |
parent | a5d6a46776a2edebc558f2dd92845b592f18f155 (diff) | |
download | nixpkgs-87af0f9871a22743f8466d6658481f1beb7378f4.tar nixpkgs-87af0f9871a22743f8466d6658481f1beb7378f4.tar.gz nixpkgs-87af0f9871a22743f8466d6658481f1beb7378f4.tar.bz2 nixpkgs-87af0f9871a22743f8466d6658481f1beb7378f4.tar.lz nixpkgs-87af0f9871a22743f8466d6658481f1beb7378f4.tar.xz nixpkgs-87af0f9871a22743f8466d6658481f1beb7378f4.tar.zst nixpkgs-87af0f9871a22743f8466d6658481f1beb7378f4.zip |
busybox: Pull in upstream patch for CVE-2018-1000500
Diffstat (limited to 'pkgs/os-specific/linux/busybox/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 68fa2762aa6..728d2d49118 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -42,6 +42,9 @@ let in stdenv.mkDerivation rec { + # TODO: When bumping this version, please validate whether the wget patch is present upstream + # and remove the patch if it is. The patch should be present upstream for all versions 1.32.0+. + # See NixOs/nixpkgs#94722 for context. name = "busybox-1.31.1"; # Note to whoever is updating busybox: please verify that: @@ -58,6 +61,7 @@ stdenv.mkDerivation rec { patches = [ ./busybox-in-store.patch ./0001-Fix-build-with-glibc-2.31.patch + ./0001-wget-implement-TLS-verification-with-ENABLE_FEATURE_.patch ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; postPatch = "patchShebangs ."; |