diff options
| author | Angus Trau <me@angus.ws> | 2021-07-25 16:00:04 +1000 |
|---|---|---|
| committer | Angus Trau <me@angus.ws> | 2021-07-25 16:00:04 +1000 |
| commit | 63fbf319d2b8cd931dd4ca4ecf1e1f811754876a (patch) | |
| tree | addc1fcd762b6edce857483e10ed03a2bffc6a2a | |
| parent | 2129356a6405cc342e860d87623d3823e8ee3b8c (diff) | |
| download | nixpkgs-63fbf319d2b8cd931dd4ca4ecf1e1f811754876a.tar nixpkgs-63fbf319d2b8cd931dd4ca4ecf1e1f811754876a.tar.gz nixpkgs-63fbf319d2b8cd931dd4ca4ecf1e1f811754876a.tar.bz2 nixpkgs-63fbf319d2b8cd931dd4ca4ecf1e1f811754876a.tar.lz nixpkgs-63fbf319d2b8cd931dd4ca4ecf1e1f811754876a.tar.xz nixpkgs-63fbf319d2b8cd931dd4ca4ecf1e1f811754876a.tar.zst nixpkgs-63fbf319d2b8cd931dd4ca4ecf1e1f811754876a.zip | |
nttcp: init at 1.47
| -rw-r--r-- | pkgs/tools/networking/nttcp/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/tools/networking/nttcp/format-security.patch | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 41 insertions, 0 deletions
diff --git a/pkgs/tools/networking/nttcp/default.nix b/pkgs/tools/networking/nttcp/default.nix new file mode 100644 index 00000000000..8979c5fd2ac --- /dev/null +++ b/pkgs/tools/networking/nttcp/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchurl, ... }: + +stdenv.mkDerivation rec { + pname = "nttcp"; + version = "1.47"; + + src = fetchurl { + url = "http://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz"; + sha256 = "1bl17dsd53lbpjdqfmpgpd7dms6d2w3scpg7ki7qgfjhs8sarq50"; + }; + + patches = [ + # Fix format string compiler error + ./format-security.patch + ]; + + makeFlags = [ + "prefix=${placeholder "out"}" + ]; + + meta = with lib; { + description = "New test TCP program"; + license = licenses.unfree; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/networking/nttcp/format-security.patch b/pkgs/tools/networking/nttcp/format-security.patch new file mode 100644 index 00000000000..f0a60457768 --- /dev/null +++ b/pkgs/tools/networking/nttcp/format-security.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' nttcp-1.47/nttcp.c nttcp-1.47.new/nttcp.c +--- nttcp-1.47/nttcp.c 2000-12-18 05:16:54.000000000 -0500 ++++ nttcp-1.47.new/nttcp.c 2012-01-30 23:44:02.260501225 -0500 +@@ -372,7 +372,7 @@ + #define Message(x) fMessage(stdout, x) + + void Exit(char *s, int ret) { +- syslog(LOG_DEBUG, s); ++ syslog(LOG_DEBUG, "%s", s); + fMessage(stderr,s); + exit(ret); + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea4..3f4f0160a4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7519,6 +7519,8 @@ in numlockx = callPackage ../tools/X11/numlockx { }; + nttcp = callPackage ../tools/networking/nttcp { }; + nuttcp = callPackage ../tools/networking/nuttcp { }; nssmdns = callPackage ../tools/networking/nss-mdns { }; |