diff options
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/dnsmasq/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/networking/kea/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/networking/kea/dont-create-var.patch | 14 | ||||
-rw-r--r-- | pkgs/tools/networking/s4cmd/default.nix | 35 | ||||
-rw-r--r-- | pkgs/tools/networking/subfinder/default.nix | 29 | ||||
-rw-r--r-- | pkgs/tools/networking/subfinder/deps.nix | 48 |
6 files changed, 124 insertions, 24 deletions
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 6205934084e8..ebbe5a11b523 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -11,23 +11,13 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.78"; + name = "dnsmasq-2.79"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "0ar5h5v3kas2qx2wgy5iqin15gc4jhqrqs067xacgc3lii1rz549"; + sha256 = "07w6cw706yyahwvbvslhkrbjf2ynv567cgy9pal8bz8lrbsp9bbq"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-15107.patch"; - url = "http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=4fe6744a220eddd3f1749b40cac3dfc510787de6"; - sha256 = "0r8grhh1q46z8v6manx1vvfpf2vmchfzsg7l1djh63b1fy1mbjkk"; - # changelog does not apply cleanly but its safe to skip - excludes = [ "CHANGELOG" ]; - }) - ]; - preBuild = '' makeFlagsArray=("COPTS=${copts}") ''; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 67428664556a..f35ceeae8640 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "kea"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz"; - sha256 = "14f32lsdd1824cx9a4l4pfbhq1d4jik6l6hxd911ihi64nzwvpvf"; + sha256 = "0a0inchisrjry59z14w4ha210q2ffl31gjbhp5dgrbap6swyry60"; }; patches = [ ./dont-create-var.patch ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" - "--with-dhcp-pgsql=${postgresql}/bin/pg_config" - "--with-dhcp-mysql=${mysql.connector-c}/bin/mysql_config" + "--with-pgsql=${postgresql}/bin/pg_config" + "--with-mysql=${mysql.connector-c}/bin/mysql_config" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/kea/dont-create-var.patch b/pkgs/tools/networking/kea/dont-create-var.patch index 595942673c68..385113d160f6 100644 --- a/pkgs/tools/networking/kea/dont-create-var.patch +++ b/pkgs/tools/networking/kea/dont-create-var.patch @@ -1,8 +1,8 @@ diff --git a/Makefile.am b/Makefile.am -index 897be34..b146729 100644 +index 2c0733c..974bb5e 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -103,11 +103,6 @@ cppcheck: +@@ -135,11 +135,6 @@ cppcheck: --template '{file}:{line}: check_fail: {message} ({severity},{id})' \ src @@ -15,14 +15,12 @@ index 897be34..b146729 100644 EXTRA_DIST += tools/mk_cfgrpt.sh diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am -index 066b410..16d3135 100755 +index 564f623..7cea9f2 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am -@@ -210,7 +210,3 @@ EXTRA_DIST += database_backends.dox libdhcpsrv.dox - # Specification file - EXTRA_DIST += logging.spec +@@ -352,5 +352,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \ + parsers/simple_parser6.h + -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir) -- -- diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix new file mode 100644 index 000000000000..20f129357dff --- /dev/null +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -0,0 +1,35 @@ +{ stdenv, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "s4cmd"; + version = "2.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "14gfpnj4xa1sq3x3zd29drpzsygn998y32szwm069ma0w9jwjjz6"; + }; + + propagatedBuildInputs = with python3Packages; [ boto3 pytz ]; + + # The upstream package tries to install some bash shell completion scripts in /etc. + # Setuptools is bugged and doesn't handle --prefix properly: https://github.com/pypa/setuptools/issues/130 + patchPhase = '' + sed -i '/ data_files=/d' setup.py + sed -i 's|os.chmod("/etc.*|pass|' setup.py + ''; + + # Replace upstream's s4cmd wrapper script with the built-in Nix wrapper + postInstall = '' + ln -fs $out/bin/s4cmd.py $out/bin/s4cmd + ''; + + # Test suite requires an S3 bucket + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/bloomreach/s4cmd; + description = "Super S3 command line tool"; + license = licenses.asl20; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix new file mode 100644 index 000000000000..2a4cf3506df8 --- /dev/null +++ b/pkgs/tools/networking/subfinder/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "subfinder-git-${version}"; + version = "2018-07-15"; + + goPackagePath = "github.com/subfinder/subfinder"; + + src = fetchFromGitHub { + owner = "subfinder"; + repo = "subfinder"; + rev = "26596affed961c535676395f443acc5af95ac9e6"; + sha256 = "0m842jyrwlg4kaja1m3kca07jf20fxva0frg66b13zpsm8hdp10q"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Subdomain discovery tool"; + longDescription = '' + SubFinder is a subdomain discovery tool that discovers valid + subdomains for websites. Designed as a passive framework to be + useful for bug bounties and safe for penetration testing. + ''; + homepage = https://github.com/subfinder/subfinder; + license = licenses.mit; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/tools/networking/subfinder/deps.nix b/pkgs/tools/networking/subfinder/deps.nix new file mode 100644 index 000000000000..34095c814284 --- /dev/null +++ b/pkgs/tools/networking/subfinder/deps.nix @@ -0,0 +1,48 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/bogdanovich/dns_resolver"; + fetch = { + type = "git"; + url = "https://github.com/bogdanovich/dns_resolver"; + rev = "a8e42bc6a5b6c9a93be01ca204be7e17f7ba4cd2"; + sha256 = "0l1hgxxqafappw0y18sbkkk2vijclvf1b8x73b0nhi4r74wyib49"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "3e6e47bc11bc7f93f9e2f1c7bd6481ba4802808b"; + sha256 = "1vmsnv6r799z5lz5g9l2dh065m9003yfjb18w8n6c053hp8jvrfm"; + }; + } + { + goPackagePath = "github.com/subfinder/urlx"; + fetch = { + type = "git"; + url = "https://github.com/subfinder/urlx"; + rev = "8e731c8be06edbae81cab15937cd3c291c2a7680"; + sha256 = "11vrx1c0mq1h6lwpsvibd3386wy4kirzmmm8ibrlx2gj0h6pkkcb"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; + sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d0887baf81f4598189d4e12a37c6da86f0bba4d0"; + sha256 = "00dmz9a5d3myyb0256b33vf1bk8wv1khhh88kcvbmqsfd6x1n6p5"; + }; + } +] |