From aacc390769bd339c7d6b674ee8f3e3941a99f429 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 26 Jan 2016 02:58:17 +0100
Subject: [PATCH] ncat: Remove old package, available in nmap

---
 pkgs/tools/networking/ncat/default.nix        | 25 ------------
 pkgs/tools/networking/ncat/ncat-0.10rc3.patch | 38 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/release-small.nix              |  1 -
 pkgs/top-level/release.nix                    |  1 -
 5 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 pkgs/tools/networking/ncat/default.nix
 delete mode 100644 pkgs/tools/networking/ncat/ncat-0.10rc3.patch

diff --git a/pkgs/tools/networking/ncat/default.nix b/pkgs/tools/networking/ncat/default.nix
deleted file mode 100644
index 8f81e9284b60..000000000000
--- a/pkgs/tools/networking/ncat/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{stdenv, fetchurl, openssl}:
-
-stdenv.mkDerivation {
-  name = "ncat-0.10rc3";
-
-  src = fetchurl {
-    url = mirror://sourceforge/nmap-ncat/ncat-0.10rc3.tar.gz;
-    sha256 = "1yb26ipxwhqkfannji90jxi38k35fal4ffx0jm5clr1a1rndjjzb";
-  };
-
-  patches = [./ncat-0.10rc3.patch];
-
-  buildInputs = [openssl];
-
-  CFLAGS = "-g";
-
-  postInstall = ''
-    install -D ncat $out/bin/ncat
-    install -D docs/man/ncat.1 $out/man/ncat.1
-  '';
-
-  meta = {
-    description = "A netcat implementation with IPv6 support";
-  };
-}
diff --git a/pkgs/tools/networking/ncat/ncat-0.10rc3.patch b/pkgs/tools/networking/ncat/ncat-0.10rc3.patch
deleted file mode 100644
index ed4c93673aa6..000000000000
--- a/pkgs/tools/networking/ncat/ncat-0.10rc3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urN ncat-0.10rc3/ncat_main.c ncat-0.10rc3-fixed/ncat_main.c
---- ncat-0.10rc3/ncat_main.c	2006-01-10 03:29:08.000000000 +0300
-+++ ncat-0.10rc3-fixed/ncat_main.c	2007-07-09 09:58:58.000000000 +0400
-@@ -23,6 +23,7 @@
- {
-     struct sockaddr_in ss;
-     struct sockaddr_in6 ss6;
-+    struct sockaddr_storage sst;
-     
-     struct conn_state cs;
- 
-@@ -271,7 +272,7 @@
- 	}
- 
- 	/* resolve hostname */
--	if (!resolve(argv[optind], (struct sockaddr_storage *) &ss)) {
-+	if (!resolve(argv[optind], (struct sockaddr_storage *) &sst)) {
- 	    /* host failed to resolve :( */
- 	    fprintf(stderr,
- 		    "%s: Could not resolve target hostname %s. QUITTING.\n",
-@@ -297,6 +298,8 @@
- 
- 	/* IPv6 connect() */
- 	if (oipv == 6) {
-+            memcpy(&ss6,&sst,sizeof(ss6));
-+	
- 	    ss6.sin6_family = AF_INET6;
- 	    ss_len = sizeof(struct sockaddr_in6);
- 
-@@ -329,6 +332,8 @@
- 	}
- 	/* IPv4 connect() - default. */
- 	else {
-+            memcpy(&ss,&sst,sizeof(ss)); 
-+
- 	    ss.sin_family = AF_INET;
- 	    ss_len = sizeof(struct sockaddr_in);
- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd9ef8d47f3c..06011dcd4bbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2400,8 +2400,6 @@ let
 
   nc6 = callPackage ../tools/networking/nc6 { };
 
-  ncat = callPackage ../tools/networking/ncat { };
-
   ncftp = callPackage ../tools/networking/ncftp { };
 
   ncompress = callPackage ../tools/compression/ncompress { };
@@ -15950,6 +15948,7 @@ aliases = with self; rec {
   midoriWrapper = midori; # added 2015-01
   mlt-qt5 = qt5.mlt;  # added 2015-12-19
   multipath_tools = multipath-tools;  # added 2016-01-21
+  ncat = nmap;  # added 2016-01-26
   nfsUtils = nfs-utils;  # added 2014-12-06
   phonon_qt5 = qt5.phonon;  # added 2015-12-19
   phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer;  # added 2015-12-19
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index fc428a73743b..409213e09e64 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -112,7 +112,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
   mpg321 = linux;
   mutt = linux;
   mysql = linux;
-  ncat = linux;
   netcat = all;
   nfs-utils = linux;
   nix = all;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index a555dcbf4fa3..1eff71f673f0 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -165,7 +165,6 @@ let
       mupen64plus = linux;
       mutt = linux;
       nano = allBut cygwin;
-      ncat = linux;
       netcat = all;
       nss_ldap = linux;
       nssmdns = linux;