diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/tools/networking/inetutils/default.nix | |
parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/networking/inetutils/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/networking/inetutils/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/tools/networking/inetutils/default.nix b/nixpkgs/pkgs/tools/networking/inetutils/default.nix index 0f31ef01cf22..e4eb2eeaac41 100644 --- a/nixpkgs/pkgs/tools/networking/inetutils/default.nix +++ b/nixpkgs/pkgs/tools/networking/inetutils/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, fetchurl, ncurses, perl, help2man +{ stdenv +, lib +, fetchurl +, fetchpatch +, ncurses +, perl +, help2man , apparmorRulesFromClosure , libxcrypt }: @@ -17,6 +23,11 @@ stdenv.mkDerivation rec { patches = [ # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch + (fetchpatch { + name = "CVE-2023-40303.patch"; + url = "https://git.savannah.gnu.org/cgit/inetutils.git/patch/?id=e4e65c03f4c11292a3e40ef72ca3f194c8bffdd6"; + hash = "sha256-I5skN537owfpFpAZr4vDKPHuERI6+oq5/hFW2RQeUxI="; + }) ]; strictDeps = true; @@ -40,9 +51,7 @@ stdenv.mkDerivation rec { "--disable-rexec" ] ++ lib.optional stdenv.isDarwin "--disable-servers"; - # Test fails with "UNIX socket name too long", probably because our - # $TMPDIR is too long. - doCheck = false; + doCheck = true; installFlags = [ "SUIDMODE=" ]; |