From 0449518afbf2f34c8ae40c15713edfcef4536179 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 29 Sep 2019 21:21:21 -0500 Subject: [PATCH 1/3] zeek: 2.5.5 -> 3.0.0 --- .../networking/ids/bro/default.nix | 24 -------------- .../networking/ids/zeek/default.nix | 31 +++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 ++-- 4 files changed, 34 insertions(+), 28 deletions(-) delete mode 100644 pkgs/applications/networking/ids/bro/default.nix create mode 100644 pkgs/applications/networking/ids/zeek/default.nix diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix deleted file mode 100644 index f90457ba937..00000000000 --- a/pkgs/applications/networking/ids/bro/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl -, geoip, gperftools, python, swig }: - -stdenv.mkDerivation rec { - name = "bro-2.5.5"; - - src = fetchurl { - url = "https://www.bro.org/downloads/${name}.tar.gz"; - sha256 = "1kvkiq8jjsqryry9jd4vw45pbfb46jly988mq62mv4sd1fqsxwhq"; - }; - - nativeBuildInputs = [ cmake flex bison file ]; - buildInputs = [ openssl libpcap perl zlib curl geoip gperftools python swig ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Powerful network analysis framework much different from a typical IDS"; - homepage = https://www.bro.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix new file mode 100644 index 00000000000..885b05adfb9 --- /dev/null +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl +, libmaxminddb, gperftools, python, swig, rocksdb }: + +stdenv.mkDerivation rec { + pname = "zeek"; + version = "3.0.0"; + + src = fetchurl { + url = "https://www.zeek.org/downloads/zeek-${version}.tar.gz"; + sha256 = "16pz5fh0z1hmvhn8pxqmdm5a9d8mqrp4gxpxkaywnaqk2h598lmm"; + }; + + nativeBuildInputs = [ cmake flex bison file ]; + buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig rocksdb ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}" + "-DENABLE_PERFTOOLS=true" + "-DINSTALL_AUX_TOOLS=true" + ]; + + meta = with stdenv.lib; { + description = "Powerful network analysis framework much different from a typical IDS"; + homepage = "https://www.zeek.org"; + license = licenses.bsd3; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7c6cdb8b1a3..a6b4c2db0f8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -48,6 +48,7 @@ mapAliases ({ bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 bridge_utils = bridge-utils; # added 2015-02-20 + bro = zeek; # added 2019-09-29 btrfsProgs = btrfs-progs; # added 2016-01-03 bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f63b316752f..0ea8a48229f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1198,10 +1198,6 @@ in brltty = callPackage ../tools/misc/brltty { }; - bro = callPackage ../applications/networking/ids/bro { - openssl = openssl_1_0_2; - }; - brook = callPackage ../tools/networking/brook { }; broot = callPackage ../tools/misc/broot { }; @@ -2842,6 +2838,8 @@ in zabbixctl = callPackage ../tools/misc/zabbixctl { }; + zeek = callPackage ../applications/networking/ids/zeek { }; + zzuf = callPackage ../tools/security/zzuf { }; ### DEVELOPMENT / EMSCRIPTEN From 80e262e85ad6dd5d29cb6ca7e99bc980886c8274 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 2 Oct 2019 03:00:00 -0500 Subject: [PATCH 2/3] zeek: add marsam as maintainer --- pkgs/applications/networking/ids/zeek/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 885b05adfb9..22bfa4d9bc9 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Powerful network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; license = licenses.bsd3; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub marsam ]; platforms = platforms.unix; }; } From 7ed57e7c700d6fbed261a9b612decd00bad3fe01 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 2 Oct 2019 04:00:00 -0500 Subject: [PATCH 3/3] zeek: add tobim as maintainer --- pkgs/applications/networking/ids/zeek/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 22bfa4d9bc9..b087a6c3ae3 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Powerful network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; license = licenses.bsd3; - maintainers = with maintainers; [ pSub marsam ]; + maintainers = with maintainers; [ pSub marsam tobim ]; platforms = platforms.unix; }; }