diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-09-22 18:31:56 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-09-22 18:31:56 +0200 |
| commit | 7bff759fac26f1312d08e78bb0f654139b96e798 (patch) | |
| tree | 06667a122322d925261f6a7c032f4cfd962d28d8 /pkgs/applications/networking/ids | |
| parent | c24b9331e038e49199abf887e966bd0c6b7b96a0 (diff) | |
| parent | e3607652b6dd8cba9d1501cbf44b975a7b159cfa (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/networking/ids')
| -rw-r--r-- | pkgs/applications/networking/ids/zeek/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/networking/ids/zeek/script.nix | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 7a6d82cd28eb6..a6189da7ee3e4 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -14,9 +14,10 @@ , swig , gettext , fetchpatch +, coreutils }: let - preConfigure = (import ./script.nix); + preConfigure = (import ./script.nix {inherit coreutils;}); in stdenv.mkDerivation rec { pname = "zeek"; diff --git a/pkgs/applications/networking/ids/zeek/script.nix b/pkgs/applications/networking/ids/zeek/script.nix index 10a2d11a14890..4c8bbcf22c032 100644 --- a/pkgs/applications/networking/ids/zeek/script.nix +++ b/pkgs/applications/networking/ids/zeek/script.nix @@ -1,4 +1,10 @@ +{coreutils}: '' + sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/base/frameworks/logging/writers/ascii.zeek + sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/policy/misc/trim-trace-file.zeek + sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/actions/pp-alarms.zeek + sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/main.zeek + sed -i "1i##! test dpd" $PWD/scripts/base/frameworks/dpd/__load__.zeek sed -i "1i##! test x509" $PWD/scripts/base/files/x509/__load__.zeek sed -i "1i##! test files-extract" $PWD/scripts/base/files/extract/__load__.zeek @@ -32,6 +38,7 @@ sed -i "1i##! test dns" $PWD/scripts/base/protocols/dns/__load__.zeek sed -i "1i##! test ftp" $PWD/scripts/base/protocols/ftp/__load__.zeek sed -i "1i##! test http" $PWD/scripts/base/protocols/http/__load__.zeek + sed -i "1i##! test tunnels" $PWD/scripts/base/protocols/tunnels/__load__.zeek sed -i "1i##! test imap" $PWD/scripts/base/protocols/imap/__load__.zeek sed -i "1i##! test irc" $PWD/scripts/base/protocols/irc/__load__.zeek sed -i "1i##! test krb" $PWD/scripts/base/protocols/krb/__load__.zeek |