diff options
author | William A. Kennington III <william@wkennington.com> | 2015-10-02 12:42:23 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-10-02 12:42:23 -0700 |
commit | f61176c5396ed513f3d399f73f38ab78a066667f (patch) | |
tree | 80b19d8098b5a1d93c8bca057438b5d0ed35f704 /pkgs/applications/networking | |
parent | a27ca029ee2b39e04d7d2a516a7228f4b62067fb (diff) | |
parent | 2ef6508c7f187e1b8433f9936b98b79bee6ed31c (diff) | |
download | nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.tar nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.tar.gz nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.tar.bz2 nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.tar.lz nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.tar.xz nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.tar.zst nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.zip |
Merge pull request #9543 from NixOS/staging.post-15.06
Collection of core package updates with breaking changes
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/ids/daq/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/ids/snort/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/networking/iptraf-ng/default.nix | 44 |
3 files changed, 58 insertions, 4 deletions
diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index c4a82966238a..9339bfef6e03 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, bison, libpcap}: +{stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: stdenv.mkDerivation rec { name = "daq-2.0.5"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0vdwb0r9kdlgj4g0i0swafbc7qik0zmks17mhqji8cl7hpdva13p"; }; - buildInputs = [ flex bison libpcap ]; + buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue]; + + configureFlags = "--enable-nfq-module=yes --with-dnet-includes=${libdnet}/includes --with-dnet-libraries=${libdnet}/lib"; meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index ea7e09626994..62c784a7fb79 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: +{stdenv, makeWrapper, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: stdenv.mkDerivation rec { version = "2.9.7.2"; @@ -10,7 +10,15 @@ stdenv.mkDerivation rec { sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv"; }; - buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; + buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ]; + + enableParallelBuilding = true; + + configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine"; + + postInstall = '' + wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq" + ''; meta = { description = "Network intrusion prevention and detection system (IDS/IPS)"; diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/applications/networking/iptraf-ng/default.nix new file mode 100644 index 000000000000..368d78a36f90 --- /dev/null +++ b/pkgs/applications/networking/iptraf-ng/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + version = "1.1.4"; + name = "iptraf-ng-${version}"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${name}.tar.gz"; + sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r"; + }; + + buildInputs = [ ncurses ]; + + configurePhase = '' + ./configure --prefix=$out/usr --sysconfdir=$out/etc \ + --localstatedir=$out/var --sbindir=$out/bin + ''; + + meta = { + description = "A console-based network monitoring utility (fork of iptraf)"; + longDescription = '' + IPTraf-ng is a console-based network monitoring utility. IPTraf-ng + gathers data like TCP connection packet and byte counts, interface + statistics and activity indicators, TCP/UDP traffic breakdowns, and LAN + station packet and byte counts. IPTraf-ng features include an IP traffic + monitor which shows TCP flag information, packet and byte counts, ICMP + details, OSPF packet types, and oversized IP packet warnings; interface + statistics showing IP, TCP, UDP, ICMP, non-IP and other IP packet counts, + IP checksum errors, interface activity and packet size counts; a TCP and + UDP service monitor showing counts of incoming and outgoing packets for + common TCP and UDP application ports, a LAN statistics module that + discovers active hosts and displays statistics about their activity; TCP, + UDP and other protocol display filters so you can view just the traffic + you want; logging; support for Ethernet, FDDI, ISDN, SLIP, PPP, and + loopback interfaces; and utilization of the built-in raw socket interface + of the Linux kernel, so it can be used on a wide variety of supported + network cards. + ''; + homepage = https://fedorahosted.org/iptraf-ng/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} |