summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Weinelt <mweinelt@users.noreply.github.com>2021-09-05 14:12:17 +0200
committerGitHub <noreply@github.com>2021-09-05 14:12:17 +0200
commitfdf3828d6b9ee99db507d6fcf9cb08f20721511e (patch)
tree9cc07be605c0f78eb3080429f525a8f551e5d5ed
parentMerge #136753: linux: only configure IDE to "no" pre-5.14 (diff)
parentinetutils: add patch for CVE-2021-40491 (diff)
downloadnixpkgs-fdf3828d6b9ee99db507d6fcf9cb08f20721511e.tar.gz
Merge pull request #136724 from risicle/ris-inetutils-CVE-2021-40491-r21.05
[21.05] inetutils: add patch for CVE-2021-40491
-rw-r--r--pkgs/tools/networking/inetutils/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index 285031aaca52..317be059d6ab 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, ncurses, perl, help2man
+{ stdenv, lib, fetchurl, fetchpatch, ncurses, perl, help2man
, apparmorRulesFromClosure
}:
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
outputs = ["out" "apparmor"];
patches = [
+ (fetchpatch {
+ name = "CVE-2021-40491.patch";
+ url = "https://git.savannah.gnu.org/cgit/inetutils.git/patch/?id=58cb043b190fd04effdaea7c9403416b436e50dd";
+ excludes = [ "NEWS" ];
+ sha256 = "0001ij7493x14f05zfjk11x1x0363sbbxh08nnfv226pmbaxzbkn";
+ })
./whois-Update-Canadian-TLD-server.patch
./service-name.patch
# https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3