From a648b7bff8e1635eaa1f26c30882089b7fbe7a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jarom=C3=ADr=20Kon=C4=8Dick=C3=BD?= <jkoncick@redhat.com>
Date: Fri, 14 Feb 2014 12:42:09 +0100
Subject: [PATCH] remake sctp-quiet.patch (#1063906#c7)

---
 net-tools-sctp-quiet.patch | 31 ++++++++++++++++++++++++++-----
 net-tools.spec             |  5 ++++-
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/net-tools-sctp-quiet.patch b/net-tools-sctp-quiet.patch
index 13deed2..a17e064 100644
--- a/net-tools-sctp-quiet.patch
+++ b/net-tools-sctp-quiet.patch
@@ -1,12 +1,33 @@
-diff -up net-tools-1.60/netstat.c.sctp-quiet net-tools-1.60/netstat.c
---- net-tools-1.60/netstat.c.sctp-quiet	2008-01-14 13:49:43.000000000 +0100
-+++ net-tools-1.60/netstat.c	2008-01-14 13:49:43.000000000 +0100
-@@ -2308,7 +2308,7 @@ int main
+diff --git a/netstat.c b/netstat.c
+index 911d0c3..d6037a0 100644
+--- a/netstat.c
++++ b/netstat.c
+@@ -167,6 +167,7 @@ int flag_exp = 1;
+ int flag_wide= 0;
+ int flag_prg = 0;
+ int flag_arg = 0;
++int flag_noprot = 0;
+ int flag_ver = 0;
+ int flag_l2cap = 0;
+ int flag_rfcomm = 0;
+@@ -181,9 +182,9 @@ FILE *procinfo;
+       perror((file));					\
+       return -1;					\
+     }							\
+-    if (flag_arg || flag_ver)				\
++    if (!flag_noprot && (flag_arg || flag_ver))		\
+       ESYSNOT("netstat", (name));			\
+-    if (flag_arg)					\
++    if (!flag_noprot && flag_arg)			\
+       rc = 1;						\
+   } else {						\
+     do {						\
+@@ -2308,7 +2309,7 @@ int main
  
      if ((flag_inet || flag_inet6 || flag_sta) &&
          !(flag_tcp || flag_sctp || flag_udp || flag_udplite || flag_raw))
 -	   flag_tcp = flag_sctp = flag_udp = flag_udplite = flag_raw = 1;
-+	   flag_tcp = flag_udp = flag_udplite = flag_raw = 1;
++	   flag_noprot = flag_tcp = flag_sctp = flag_udp = flag_udplite = flag_raw = 1;
  
      if ((flag_tcp || flag_sctp || flag_udp || flag_udplite || flag_raw || flag_igmp) &&
          !(flag_inet || flag_inet6))
diff --git a/net-tools.spec b/net-tools.spec
index 81ae937..1df9aef 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -3,7 +3,7 @@
 Summary: Basic networking tools
 Name: net-tools
 Version: 2.0
-Release: 0.20.%{checkout}%{?dist}
+Release: 0.21.%{checkout}%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/net-tools/
@@ -166,6 +166,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir}
 %attr(0644,root,root)   %{_unitdir}/arp-ethers.service
 
 %changelog
+* Fri Feb 14 2014 Jaromír Končický <jkoncick@redhat.com> - 2.0-0.21.20131119git
+- remake sctp-quiet.patch (#1063906#c7)
+
 * Tue Feb 11 2014 Jaromír Končický <jkoncick@redhat.com> - 2.0-0.20.20131119git
 - make sctp quiet on systems without sctp (#1063906)