diff options
author | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
---|---|---|
committer | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
commit | 3de6e5be50124834f9d0adfc299295e9e6e30c08 (patch) | |
tree | 31c4c7003ca554e75fa7ead8242f00922a92b25f /pkgs/tools/networking | |
parent | 132571454c8162cdefe9e94613137d6a13b950b7 (diff) | |
parent | df27c35e9a0515146eb7db07e11af59e520214a6 (diff) | |
download | nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.gz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.bz2 nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.lz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.xz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.zst nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.zip |
Merge branch 'master' into staging
Conflicts: pkgs/applications/misc/navit/default.nix pkgs/applications/networking/mailreaders/alpine/default.nix pkgs/applications/networking/mailreaders/realpine/default.nix pkgs/development/compilers/ghc/head.nix pkgs/development/libraries/openssl/default.nix pkgs/games/liquidwar/default.nix pkgs/games/spring/springlobby.nix pkgs/os-specific/linux/kernel/perf.nix pkgs/servers/sip/freeswitch/default.nix pkgs/tools/archivers/cromfs/default.nix pkgs/tools/graphics/plotutils/default.nix
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/argus-clients/default.nix | 41 | ||||
-rw-r--r-- | pkgs/tools/networking/argus/default.nix | 46 | ||||
-rw-r--r-- | pkgs/tools/networking/dhcpcd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/ferm/default.nix | 38 |
4 files changed, 127 insertions, 2 deletions
diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix new file mode 100644 index 000000000000..fe30a1eab826 --- /dev/null +++ b/pkgs/tools/networking/argus-clients/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, pkgconfig, perl }: + +stdenv.mkDerivation rec { + pname = "argus-clients"; + version = "3.0.8.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://qosient.com/argus/src/${name}.tar.gz"; + sha256 = "1c9vj6ma00gqq9h92fg71sxcsjzz912166sdg90ahvnmvmh3l1rj"; + }; + + patchPhase = '' + for file in ./examples/*/*.pl; do + substituteInPlace $file \ + --subst-var-by PERLBIN ${perl}/bin/perl + done + ''; + + configureFlags = "--with-perl=${perl}/bin/perl"; + + buildInputs = [ libpcap pkgconfig bison cyrus_sasl tcp_wrappers flex ]; + + meta = with stdenv.lib; { + description = "Clients for ARGUS"; + longDescription = ''Clients for Audit Record Generation and + Utilization System (ARGUS). The Argus Project is focused on developing all + aspects of large scale network situtational awareness derived from + network activity audit. Argus, itself, is next-generation network + flow technology, processing packets, either on the wire or in + captures, into advanced network flow data. The data, its models, + formats, and attributes are designed to support Network + Operations, Performance and Security Management. If you need to + know what is going on in your network, right now or historically, + you will find Argus a useful tool. ''; + homepage = http://qosient.com/argus; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix new file mode 100644 index 000000000000..673f98e2f3ad --- /dev/null +++ b/pkgs/tools/networking/argus/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, + pkgconfig, procps, which, wget, lsof, net_snmp, bash, perl }: + +stdenv.mkDerivation rec { + pname = "argus"; + version = "3.0.8.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://qosient.com/argus/src/${name}.tar.gz"; + sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna"; + }; + + buildInputs = [ libpcap pkgconfig bison cyrus_sasl tcp_wrappers flex ]; + propagatedBuildInputs = [ procps which wget lsof net_snmp ]; + + patchPhase = '' + substituteInPlace events/argus-extip.pl \ + --subst-var-by PERLBIN ${perl}/bin/perl + substituteInPlace events/argus-lsof.pl \ + --replace "\`which lsof\`" "\"${lsof}/bin/lsof\"" \ + --subst-var-by PERLBIN ${perl}/bin/perl + substituteInPlace events/argus-vmstat.sh \ + --replace vm_stat ${procps}/bin/vmstat + substituteInPlace events/argus-snmp.sh \ + --replace /usr/bin/snmpget ${net_snmp}/bin/snmpget \ + --replace /usr/bin/snmpwalk ${net_snmp}/bin/snmpwalk + ''; + + meta = with stdenv.lib; { + description = "Audit Record Generation and Utilization System for networks"; + longDescription = ''The Argus Project is focused on developing all + aspects of large scale network situtational awareness derived from + network activity audit. Argus, itself, is next-generation network + flow technology, processing packets, either on the wire or in + captures, into advanced network flow data. The data, its models, + formats, and attributes are designed to support Network + Operations, Performance and Security Management. If you need to + know what is going on in your network, right now or historically, + you will find Argus a useful tool. ''; + homepage = http://qosient.com/argus; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 578fe6ea4f7a..766e7505f273 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.10.1"; + name = "dhcpcd-6.11.3"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "0yxfx3r6ik47rsv1f8q7siw0vas6jcsrbjpaqnx0nn707f6byji8"; + sha256 = "01lv4a7ls55iv9f9gkh6vswqmbpqkdzj4d8ayq4dcir9vz215gas"; }; buildInputs = [ pkgconfig udev ]; diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix new file mode 100644 index 000000000000..f4cf387ecc52 --- /dev/null +++ b/pkgs/tools/networking/ferm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables }: + +stdenv.mkDerivation rec { + version = "2.3"; + name = "ferm-${version}"; + + src = fetchurl { + url = "http://ferm.foo-projects.org/download/${version}/ferm-${version}.tar.gz"; + sha256 = "0jx63fhjw5y1ahgdbn4hgd7sq6clxl80dr8a2hkryibfbwz3vs4x"; + }; + + buildInputs = [ perl ipset ebtables iptables makeWrapper ]; + preConfigure = '' + substituteInPlace config.mk --replace "PERL = /usr/bin/perl" "PERL = ${perl}/bin/perl" + substituteInPlace config.mk --replace "PREFIX = /usr" "PREFIX = $out" + ''; + postInstall = '' + rm -r $out/lib/systemd + for i in "$out/sbin/"*; do + wrapProgram "$i" --prefix PATH : "${iptables}/bin:${ipset}/bin:${ebtables}/bin" + done + ''; + + meta = { + homepage = http://ferm.foo-projects.org/; + description = "Tool to maintain complex firewalls"; + longDescription = '' + ferm is a tool to maintain complex firewalls, without having the trouble to + rewrite the complex rules over and over again. ferm allows the entire + firewall rule set to be stored in a separate file, and to be loaded with one + command. The firewall configuration resembles structured programming-like + language, which can contain levels and lists. + ''; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [mic92]; + platforms = stdenv.lib.platforms.linux; + }; +} |