rpms/net-tools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

remake sctp-quiet.patch (#1063906#c7)

Browse Source
This commit is contained in:
Jaromír Končický 2014-02-14 12:42:09 +01:00
parent 7d106d3ca7
commit a648b7bff8
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
net-tools-sctp-quiet.patch
View File

@ -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))

5
net-tools.spec
View File

@ -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)