diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-25 06:01:10 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-25 06:01:10 +0000 |
commit | 104c9ec59b9fe42eed179ff221dbc936928edefc (patch) | |
tree | 59e270898b6fb0b74ea9545fdc05d87defc537f0 /pkgs/tools | |
parent | 680b13891d91d111be5d61c938c6f17b781df818 (diff) | |
parent | 32617aec9e2590aeb3a1ee36319614595cc0d6a1 (diff) | |
download | nixlib-104c9ec59b9fe42eed179ff221dbc936928edefc.tar nixlib-104c9ec59b9fe42eed179ff221dbc936928edefc.tar.gz nixlib-104c9ec59b9fe42eed179ff221dbc936928edefc.tar.bz2 nixlib-104c9ec59b9fe42eed179ff221dbc936928edefc.tar.lz nixlib-104c9ec59b9fe42eed179ff221dbc936928edefc.tar.xz nixlib-104c9ec59b9fe42eed179ff221dbc936928edefc.tar.zst nixlib-104c9ec59b9fe42eed179ff221dbc936928edefc.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/inetutils/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 0f31ef01cf22..e4eb2eeaac41 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/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=" ]; |