From 26773687e155a68ecafb8a333a660f7e339347ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Mar 2023 16:46:01 +0200 Subject: [PATCH 1/4] ndpi: add changelog to meta --- pkgs/development/libraries/ndpi/default.nix | 27 ++++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index b798320c6913..a3b247d08ca9 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -1,13 +1,14 @@ { lib , stdenv -, fetchFromGitHub -, which , autoconf , automake -, libtool -, libpcap +, fetchFromGitHub , json_c -, pkg-config }: +, libpcap +, libtool +, pkg-config +, which +}: stdenv.mkDerivation rec { pname = "ndpi"; @@ -16,16 +17,23 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; - rev = version; - sha256 = "sha256-ZWWuyPGl+hbrfXdtPvCBqMReuJ4FiGx+qiI7qCz6wtQ="; + rev = "refs/tags/${version}"; + hash = "sha256-ZWWuyPGl+hbrfXdtPvCBqMReuJ4FiGx+qiI7qCz6wtQ="; }; configureScript = "./autogen.sh"; - nativeBuildInputs = [ which autoconf automake libtool pkg-config ]; + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + which + ]; + buildInputs = [ - libpcap json_c + libpcap ]; meta = with lib; { @@ -34,6 +42,7 @@ stdenv.mkDerivation rec { nDPI is a library for deep-packet inspection based on OpenDPI. ''; homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/"; + changelog = "https://github.com/ntop/nDPI/blob/${version}/CHANGELOG.md"; license = with licenses; [ lgpl3Plus bsd3 ]; maintainers = with maintainers; [ takikawa ]; mainProgram = "ndpiReader"; From a9c29a7af72e8f7ea1f193a52d60431a9a1aed09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Mar 2023 16:47:26 +0200 Subject: [PATCH 2/4] ndpi: 4.2 -> 4.6 Diff: https://github.com/ntop/nDPI/compare/refs/tags/4.2...4.6 Changelog: https://github.com/ntop/nDPI/blob/4.6/CHANGELOG.md --- pkgs/development/libraries/ndpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index a3b247d08ca9..d9d8f5895a2d 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ndpi"; - version = "4.2"; + version = "4.6"; src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; rev = "refs/tags/${version}"; - hash = "sha256-ZWWuyPGl+hbrfXdtPvCBqMReuJ4FiGx+qiI7qCz6wtQ="; + hash = "sha256-S0lVh5FZewPbYG/1ikI2RroCSC7OI8Xmfeq73hYCHnY="; }; configureScript = "./autogen.sh"; From 0d88b0dac68abc0e9ebc4fb36a6fecbe818d3c5f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Mar 2023 22:25:36 +0200 Subject: [PATCH 3/4] ntopng: add changelog to meta --- pkgs/tools/networking/ntopng/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index d5700c42534c..73944732aa44 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "High-speed web-based traffic analysis and flow collection tool"; homepage = "http://www.ntop.org/products/ntop/"; + changelog = "https://github.com/ntop/ntopng/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; From 31cb9b08409ea3d4c0fc0eaaaa2af600bc8eb9fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Mar 2023 22:29:35 +0200 Subject: [PATCH 4/4] ntopng: 5.2.1 -> 5.6 Changelog: https://github.com/ntop/ntopng/blob/5.6/CHANGELOG.md --- pkgs/tools/networking/ntopng/default.nix | 79 ++++++++++++++++++------ 1 file changed, 59 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 73944732aa44..c1feb3126d7d 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,38 +1,77 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, autoreconfHook -, zeromq, ndpi, json_c, openssl, libpcap, libcap, curl, libmaxminddb -, rrdtool, sqlite, libmysqlclient, expat, net-snmp +{ lib +, stdenv +, autoreconfHook +, curl +, expat +, fetchFromGitHub +, git +, json_c +, libcap +, libmaxminddb +, libmysqlclient +, libpcap +, libsodium +, ndpi +, net-snmp +, openssl +, pkg-config +, rdkafka +, gtest +, rrdtool +, hiredis +, sqlite +, which +, zeromq }: stdenv.mkDerivation rec { pname = "ntopng"; - version = "5.2.1"; + version = "5.6"; src = fetchFromGitHub { owner = "ntop"; repo = "ntopng"; - rev = version; - sha256 = "sha256-FeRERSq8F3HEelUCkA6pgNNcP94xrWy6EbJgk+cEdqc="; + rev = "refs/tags/${version}"; + hash = "sha256-iGqrS0AneKYwGMEpbKy9if8bnaEu6aEV+QaH+JrF9xs="; }; - patches = [ - (fetchpatch { - url = "https://github.com/ntop/ntopng/commit/0aa580e1a45f248fffe6d11729ce40571f08e187.patch"; - sha256 = "sha256-xqEVwfGgkNS+akbJnLZsVvEQdp9GxxUen8VkFomtcPI="; - }) + preConfigure = '' + substituteInPlace Makefile.in \ + --replace "/bin/rm" "rm" + ''; + + nativeBuildInputs = [ + autoreconfHook + git + pkg-config + which ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ - zeromq ndpi json_c openssl libpcap curl libmaxminddb rrdtool sqlite - libmysqlclient expat net-snmp libcap + curl + expat + json_c + libcap + libmaxminddb + libmysqlclient + libpcap + gtest + hiredis + libsodium + net-snmp + openssl + rdkafka + rrdtool + sqlite + zeromq ]; autoreconfPhase = "bash autogen.sh"; - preConfigure = '' - substituteInPlace Makefile.in --replace "/bin/rm" "rm" - ''; + configureFlags = [ + "--with-ndpi-includes=${ndpi}/include/ndpi" + "--with-ndpi-static-lib=${ndpi}/lib/" + ]; preBuild = '' sed -e "s|\(#define CONST_BIN_DIR \).*|\1\"$out/bin\"|g" \ @@ -44,10 +83,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "High-speed web-based traffic analysis and flow collection tool"; - homepage = "http://www.ntop.org/products/ntop/"; + homepage = "https://www.ntop.org/products/traffic-analysis/ntop/"; changelog = "https://github.com/ntop/ntopng/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; }