From 38cdf8505c6a07def10b1f8359116cef1baca58c Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Jan 17 2018 10:19:57 +0000
Subject: New version

  Resolves: rhbz#1531526
Dropped dont-redefine-memcpyset patch (upstreamed) and stdint
  patch (not needed)

---

diff --git a/netsniff-ng-0.6.3-dont-redefine-memcpyset.patch b/netsniff-ng-0.6.3-dont-redefine-memcpyset.patch
deleted file mode 100644
index 6267378..0000000
--- a/netsniff-ng-0.6.3-dont-redefine-memcpyset.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From f232545c215022de5be5e0b37e0c7130962cc5d0 Mon Sep 17 00:00:00 2001
-From: Tobias Klauser <tklauser@distanz.ch>
-Date: Fri, 12 May 2017 18:13:31 +0200
-Subject: [PATCH] built_in: don't redefine memcpy/memset
-
-Redefining memset/memcpy causes problems when building with fortified
-headers on Alpine Linux. Instead of uncoditionally defining these,
-explicitely use fmemcpy/fmemset in performance critical paths and
-otherwise let the compiler decide about optimizations.
-
-Fixes #173
-Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
----
- built_in.h | 6 ------
- csum.h     | 6 +++---
- link.c     | 1 +
- 3 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/built_in.h b/built_in.h
-index bb247461..da04dbd3 100644
---- a/built_in.h
-+++ b/built_in.h
-@@ -322,12 +322,6 @@ static inline u64 cpu_to_le64(u64 val)
- #define be32_to_cpu	cpu_to_be32
- #define be16_to_cpu	cpu_to_be16
- 
--#undef memset
--#undef memcpy
--
--#define memset		fmemset
--#define memcpy		fmemcpy
--
- #if defined(__amd64__) || defined(__x86_64__) || defined(__AMD64__) || \
-     defined(_M_X64) || defined(__amd64)
- # define CO_IN_CACHE_SHIFT		7
-diff --git a/csum.h b/csum.h
-index de76755e..96211c5e 100644
---- a/csum.h
-+++ b/csum.h
-@@ -182,10 +182,10 @@ static inline uint16_t p6_csum(const struct ip6_hdr *ip6, const uint8_t *data,
- 		uint8_t proto;
- 	} __packed ph;
- 
--	memcpy(&ph.src, ip6->ip6_src.s6_addr, sizeof(ph.src));
--	memcpy(&ph.dst, ip6->ip6_dst.s6_addr, sizeof(ph.dst));
-+	fmemcpy(&ph.src, ip6->ip6_src.s6_addr, sizeof(ph.src));
-+	fmemcpy(&ph.dst, ip6->ip6_dst.s6_addr, sizeof(ph.dst));
- 	ph.len = htons(len);
--	memset(&ph.mbz, 0, sizeof(ph.mbz));
-+	fmemset(&ph.mbz, 0, sizeof(ph.mbz));
- 	ph.proto = next_proto;
- 
- 	vec[0].ptr = (const uint8_t *) (void *) &ph;
-diff --git a/link.c b/link.c
-index 56b839b4..72f513f7 100644
---- a/link.c
-+++ b/link.c
-@@ -1,6 +1,7 @@
- #include <sys/types.h>
- #include <sys/ioctl.h>
- #include <linux/sockios.h>
-+#include <string.h>
- #include <unistd.h>
- #include <errno.h>
- 
diff --git a/netsniff-ng-0.6.3-stdint.patch b/netsniff-ng-0.6.3-stdint.patch
deleted file mode 100644
index 427cd1d..0000000
--- a/netsniff-ng-0.6.3-stdint.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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")
diff --git a/netsniff-ng.spec b/netsniff-ng.spec
index a94380d..3c73923 100644
--- a/netsniff-ng.spec
+++ b/netsniff-ng.spec
@@ -1,15 +1,11 @@
 Name:		netsniff-ng
-Version:	0.6.3
-Release:	5%{?dist}
+Version:	0.6.4
+Release:	1%{?dist}
 Summary:	Packet sniffing beast
 Group:		Applications/Internet
 License:	GPLv2
 URL:		http://netsniff-ng.org/
 Source0:	http://www.netsniff-ng.org/pub/netsniff-ng/netsniff-ng-%{version}.tar.xz
-# Patch was taken from upstream:
-# https://github.com/netsniff-ng/netsniff-ng/commit/f232545c215022de5be5e0b37e0c7130962cc5d0
-Patch0:		netsniff-ng-0.6.3-dont-redefine-memcpyset.patch
-Patch1:		netsniff-ng-0.6.3-stdint.patch
 BuildRequires:	ncurses-devel GeoIP-devel libnetfilter_conntrack-devel
 BuildRequires:	userspace-rcu-devel libnl3-devel libcli-devel flex bison
 BuildRequires:	perl-podlators zlib-devel libpcap-devel libnet-devel
@@ -36,8 +32,6 @@ netsniff-ng toolkit currently consists of the following utilities:
 
 %prep
 %setup -q
-%patch0 -p1 -b .dont-redefine-memcpyset
-%patch1 -p1 -b .stdint
 
 %build
 export NACL_INC_DIR=$(pkg-config --variable=includedir libsodium )/sodium
@@ -60,6 +54,12 @@ make install PREFIX=%{_prefix} ETCDIR=%{_sysconfdir} DESTDIR="%{buildroot}"
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jan 17 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 0.6.4-1
+- New version
+  Resolves: rhbz#1531526
+- Dropped dont-redefine-memcpyset patch (upstreamed) and stdint
+  patch (not needed)
+
 * Mon Oct 02 2017 Remi Collet <remi@fedoraproject.org> - 0.6.3-5
 - rebuild for libsodium
 
diff --git a/sources b/sources
index 2258653..a97433c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (netsniff-ng-0.6.3.tar.xz) = e55b15b307008de5654ac9edde2af033bf92a485e811f85f8a0072e3dd91e4792d5e8d8e09fcc654fbbca39678a7b315095987856829289bf8b99da4cea6c412
+SHA512 (netsniff-ng-0.6.4.tar.xz) = 486810826bbe6af739b880fcf4d889768f1df772e179bbc6b54a2cac7a3b907d866f9a232db06f49f136a0a1456b50b709799613f90360e266ccd4bf83839a56