From dfb12618f521126664fdc9095d4231f95c5d0631 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 12 May 2019 06:29:39 -0700
Subject: [PATCH] netsniff-ng: 0.6.5 -> 0.6.6 (#61342)

* netsniff-ng: 0.6.5 -> 0.6.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/netsniff-ng/versions

* netsniff-ng: drop glibc patch
It has been fixed upstream
+ cleanup build inputs
+ perl not needed to build anymore
---
 pkgs/tools/networking/netsniff-ng/default.nix | 22 ++++++++---------
 .../networking/netsniff-ng/glibc-2.26.patch   | 24 -------------------
 2 files changed, 11 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/tools/networking/netsniff-ng/glibc-2.26.patch

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 8bebe973522..062d6e2d0a9 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -1,24 +1,24 @@
 { stdenv, fetchFromGitHub, makeWrapper, bison, flex, geoip, geolite-legacy
 , libcli, libnet, libnetfilter_conntrack, libnl, libpcap, libsodium
-, liburcu, ncurses, perl, pkgconfig, zlib }:
+, liburcu, ncurses, pkgconfig, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "netsniff-ng-${version}";
-  version = "0.6.5";
+  pname = "netsniff-ng";
+  version = "0.6.6";
 
   # Upstream recommends and supports git
   src = fetchFromGitHub rec {
-    repo = "netsniff-ng";
-    owner = repo;
+    repo = pname;
+    owner = pname;
     rev = "v${version}";
-    sha256 = "0bcbdiik69g6jnravkkid8gxw2akg01i372msc5x1w9fh9wh2phw";
+    sha256 = "0spp8dl4i5xcqfbqxxcpdf3gwcmyf4ywl1dd79w6gzbr07p894p5";
   };
 
-  patches = [ ./glibc-2.26.patch ];
-
-  buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl
-    libnetfilter_conntrack libpcap libsodium liburcu ncurses perl
-    pkgconfig zlib makeWrapper ];
+  nativeBuildInputs = [ pkgconfig makeWrapper bison flex ];
+  buildInputs = [
+    geoip geolite-legacy libcli libnet libnl
+    libnetfilter_conntrack libpcap libsodium liburcu ncurses zlib
+  ];
 
   # ./configure is not autoGNU but some home-brewn magic
   configurePhase = ''
diff --git a/pkgs/tools/networking/netsniff-ng/glibc-2.26.patch b/pkgs/tools/networking/netsniff-ng/glibc-2.26.patch
deleted file mode 100644
index 2ee7b478e9b..00000000000
--- a/pkgs/tools/networking/netsniff-ng/glibc-2.26.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/built_in.h b/built_in.h
-index da04dbd..7acc183 100644
---- a/built_in.h
-+++ b/built_in.h
-@@ -10,6 +10,7 @@
- #include <endian.h>
- #include <byteswap.h>
- #include <asm/byteorder.h>
-+#include <string.h>
- 
- typedef uint64_t	u64;
- typedef uint32_t	u32;
-diff --git a/staging/tools.c b/staging/tools.c
-index 9d2d1be..909b059 100644
---- a/staging/tools.c
-+++ b/staging/tools.c
-@@ -55,6 +55,7 @@
- ////////////////////////////////////////////////////////////////////////////////////////////
- 
- #include "mz.h"
-+#include <stdint.h>
- 
- #define CMP_INT(a, b) ((a) < (b) ? -1 : (a) > (b))
- #define IPV6_MAX_RANGE_LEN strlen("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff-ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128")