From a3f985e4d8e317bfbc71c4e8eeac7278c38b1f63 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Feb 14 2014 11:44:28 +0000 Subject: import net-tools-2.0-0.17.20131004git.el7.src.rpm --- diff --git a/SOURCES/net-tools-sctp-quiet.patch b/SOURCES/net-tools-sctp-quiet.patch new file mode 100644 index 0000000..a17e064 --- /dev/null +++ b/SOURCES/net-tools-sctp-quiet.patch @@ -0,0 +1,33 @@ +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_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/SPECS/net-tools.spec b/SPECS/net-tools.spec index 89c7bb9..a469ad9 100644 --- a/SPECS/net-tools.spec +++ b/SPECS/net-tools.spec @@ -3,7 +3,7 @@ Summary: Basic networking tools Name: net-tools Version: 2.0 -Release: 0.13.%{checkout}%{?dist} +Release: 0.17.%{checkout}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://sourceforge.net/projects/net-tools/ @@ -53,6 +53,9 @@ Patch10: net-tools-netstat-probe.patch # use all interfaces instead of default (#1003875) Patch20: ether-wake-interfaces.patch +# make sctp quiet on systems without sctp (#1063906) +Patch21: net-tools-sctp-quiet.patch + BuildRequires: gettext, libselinux BuildRequires: libselinux-devel BuildRequires: systemd-units @@ -86,6 +89,7 @@ cp %SOURCE7 ./man/en_US cp %SOURCE8 ./man/en_US %patch20 -p1 -b .interfaces +%patch21 -p1 -b .sctp-quiet touch ./config.h @@ -162,6 +166,18 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir} %attr(0644,root,root) %{_unitdir}/arp-ethers.service %changelog +* Fri Feb 14 2014 Jaromír Končický - 2.0-0.17.20131004git +- remake sctp-quiet.patch (#1063906#c7) + +* Tue Feb 11 2014 Jaromír Končický - 2.0-0.20.20131119git +- make sctp quiet on systems without sctp (#1063906) + +* Fri Jan 24 2014 Daniel Mach - 2.0-0.15.20131004git +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 2.0-0.14.20131004git +- Mass rebuild 2013-12-27 + * Fri Oct 04 2013 Jiri Popelka - 2.0-0.13.20131004git - latest snapshot (#1013530) - remove %%ifarch alpha condition from %%prep