From 3c3ede970e253a7141148989ad3b9da21dafec9b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 17 Jan 2015 15:31:41 +0100 Subject: [PATCH 1/6] netsniff-ng: don't work around tput now that we have ncurses --- pkgs/tools/networking/netsniff-ng/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 0fa4e2db229..1f10e3c94d4 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { # ./configure is not autoGNU but some home-brewn magic preConfigure = "patchShebangs configure"; - postConfigure = "substituteInPlace Makefile --replace ' tput ' ' true '"; # FIXME: missing nacl/libcli and a *working* libnetfilter_conntrack # The following tools will be missing: curvetun flowtop mausezahn From 4d6c69d9bf5520364695bcc1c9f4009427a2c9bf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 17 Jan 2015 15:48:54 +0100 Subject: [PATCH 2/6] Add libcli 1.9.7: emulate a Cisco-telnet-style command line --- pkgs/development/libraries/libcli/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/libcli/default.nix diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix new file mode 100644 index 00000000000..d85b0d0dff9 --- /dev/null +++ b/pkgs/development/libraries/libcli/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "1.9.7"; + name = "libcli-${version}"; + + src = fetchurl { + url = "https://github.com/dparrish/libcli/archive/v${version}.tar.gz"; + sha256 = "0v4867jbach5zd1nq0sspq5q95vvbpnljzm2yf64k8a4w2vadpbx"; + }; + + enableParallelBuilding = true; + + makeFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + description = "Emulate a Cisco-style telnet command-line interface"; + homepage = http://sites.dparrish.com/libcli; + license = with licenses; lgpl21Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24462e6cb10..cbd81733ee4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5831,6 +5831,8 @@ let libchop = callPackage ../development/libraries/libchop { }; + libcli = callPackage ../development/libraries/libcli { }; + libcm = callPackage ../development/libraries/libcm { }; inherit (gnome3) libcroco; From 5d143fae585a2198ac5fec9322f22b5ddff8ae25 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 17 Jan 2015 15:50:55 +0100 Subject: [PATCH 3/6] netsniff-ng: enable "mausezahn" tool --- pkgs/tools/networking/netsniff-ng/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 1f10e3c94d4..b7d9cada259 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, bison, flex, geoip, libnet, libnetfilter_conntrack, libnl -, libpcap, liburcu, ncurses, perl, pkgconfig, which, zlib }: +{ stdenv, fetchFromGitHub, bison, flex, geoip, libcli, libnet +, libnetfilter_conntrack, libnl, libpcap, liburcu, ncurses, perl, pkgconfig +, which, zlib }: stdenv.mkDerivation rec { version = "0.5.9-rc4-40-g5107740"; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { # FIXME: missing nacl/libcli and a *working* libnetfilter_conntrack # The following tools will be missing: curvetun flowtop mausezahn - buildInputs = [ bison flex geoip libnet libnl libnetfilter_conntrack + buildInputs = [ bison flex geoip libcli libnet libnl libnetfilter_conntrack libpcap liburcu ncurses perl pkgconfig which zlib ]; enableParallelBuilding = true; From 6b957783a5ebce405cd7934c63254537b26bb5db Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 17 Jan 2015 18:38:56 +0100 Subject: [PATCH 4/6] libnetfilter_conntrack: propagate buildInput libnfnetlink --- pkgs/development/libraries/libnetfilter_conntrack/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index da32903c94e..f6908cd514c 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0zcwjav1qgr7ikmvfmy7g3nc7s1kj4j4939d18mpyha9mwy4mv6r"; }; - buildInputs = [ pkgconfig libnfnetlink libmnl ]; + buildInputs = [ pkgconfig libmnl ]; + propagatedBuildInputs = [ libnfnetlink ]; meta = { description = "Userspace library providing an API to the in-kernel connection tracking state table"; @@ -22,5 +23,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; + maintainers = stdenv.lib.maintainers.nckx; }; } From b37e3f6233ca1c02d64154ecf3c3ce6533d4449e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 17 Jan 2015 16:17:55 +0100 Subject: [PATCH 5/6] netsniff-ng: flowtop is now included --- pkgs/tools/networking/netsniff-ng/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index b7d9cada259..0c63a32ae16 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { # ./configure is not autoGNU but some home-brewn magic preConfigure = "patchShebangs configure"; - # FIXME: missing nacl/libcli and a *working* libnetfilter_conntrack - # The following tools will be missing: curvetun flowtop mausezahn + # FIXME: add missing nacl to build curvetun buildInputs = [ bison flex geoip libcli libnet libnl libnetfilter_conntrack libpcap liburcu ncurses perl pkgconfig which zlib ]; From 96812d6adc093106bf975555a1a6c092be63f2ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 17 Jan 2015 16:46:23 +0100 Subject: [PATCH 6/6] netsniff-ng: use libsodium to build curvetun --- pkgs/tools/networking/netsniff-ng/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 0c63a32ae16..e9a0157b123 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, bison, flex, geoip, libcli, libnet -, libnetfilter_conntrack, libnl, libpcap, liburcu, ncurses, perl, pkgconfig -, which, zlib }: +, libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl +, pkgconfig, which, zlib }: stdenv.mkDerivation rec { version = "0.5.9-rc4-40-g5107740"; @@ -13,12 +13,14 @@ stdenv.mkDerivation rec { sha256 = "1z3b7pa5rhz37dhfb1riy1j9lg917bs4z7clqbxm1hzi1x2ln988"; }; - # ./configure is not autoGNU but some home-brewn magic - preConfigure = "patchShebangs configure"; - - # FIXME: add missing nacl to build curvetun buildInputs = [ bison flex geoip libcli libnet libnl libnetfilter_conntrack - libpcap liburcu ncurses perl pkgconfig which zlib ]; + libpcap libsodium liburcu ncurses perl pkgconfig which zlib ]; + + # ./configure is not autoGNU but some home-brewn magic + configurePhase = '' + patchShebangs configure + NACL_INC_DIR=${libsodium}/include/sodium NACL_LIB=sodium ./configure + ''; enableParallelBuilding = true;