diff --git a/netsniff-ng-0.6.4-trafgen-fix-stdin.patch b/netsniff-ng-0.6.4-trafgen-fix-stdin.patch deleted file mode 100644 index 8a7b944..0000000 --- a/netsniff-ng-0.6.4-trafgen-fix-stdin.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ba5f7aecf33d62670f20021b4bc3679e6c50e6fc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= -Date: Sat, 20 Oct 2018 22:35:28 +0200 -Subject: [PATCH] trafgen: fixed '--in -' to work again with STDIN -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This has been broken by commit 4e47fd021a6945aa626eaef4446c5b547d8c2a85. - -Signed-off-by: Jaroslav Škarvada ---- - trafgen_parser.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/trafgen_parser.y b/trafgen_parser.y -index 7fffdd9..53723dd 100644 ---- a/trafgen_parser.y -+++ b/trafgen_parser.y -@@ -1513,7 +1513,7 @@ void compile_packets(char *file, bool verbose, unsigned int cpu, - char tmp_file[128]; - int ret = -1; - -- if (access(file, R_OK)) { -+ if (strncmp("-", file, strlen("-")) && access(file, R_OK)) { - fprintf(stderr, "Cannot access %s: %s!\n", file, strerror(errno)); - die(); - } --- -2.14.4 - diff --git a/netsniff-ng.spec b/netsniff-ng.spec index bdb86af..f24143d 100644 --- a/netsniff-ng.spec +++ b/netsniff-ng.spec @@ -1,6 +1,6 @@ Name: netsniff-ng -Version: 0.6.4 -Release: 6%{?dist} +Version: 0.6.6 +Release: 1%{?dist} Summary: Packet sniffing beast License: GPLv2 URL: http://netsniff-ng.org/ @@ -12,8 +12,6 @@ BuildRequires: libsodium-devel # rhbz#1111779, this should be probably dropped in f23 or later Provides: mausezahn = 0.40-9 Obsoletes: mausezahn < 0.40-9 -# https://github.com/netsniff-ng/netsniff-ng/pull/199 -Patch0: netsniff-ng-0.6.4-trafgen-fix-stdin.patch %description netsniff-ng is a high performance Linux network sniffer for packet inspection. @@ -33,7 +31,6 @@ netsniff-ng toolkit currently consists of the following utilities: %prep %setup -q -%patch0 -p1 -b .trafgen-fix-stdin %build export NACL_INC_DIR=$(pkg-config --variable=includedir libsodium )/sodium @@ -55,6 +52,11 @@ make install PREFIX=%{_prefix} ETCDIR=%{_sysconfdir} DESTDIR="%{buildroot}" %{_mandir}/man8/* %changelog +* Tue Jul 16 2019 Jaroslav Škarvada - 0.6.6-1 +- New version + Resolves: rhbz#1708176 +- Dropped trafgen-fix-stdin patch (upstreamed) + * Fri Feb 01 2019 Fedora Release Engineering - 0.6.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index a97433c..22a00e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (netsniff-ng-0.6.4.tar.xz) = 486810826bbe6af739b880fcf4d889768f1df772e179bbc6b54a2cac7a3b907d866f9a232db06f49f136a0a1456b50b709799613f90360e266ccd4bf83839a56 +SHA512 (netsniff-ng-0.6.6.tar.xz) = f6d158e61c5be72506e2732e82e3863b24115abcb4642c5998b7225475c07d8566ff124f6e204e5a1919a57aef1d34ebf234076c16d99299847f8204777eb834