From 99941edd01950b18b289df248f2028da2c45bf47 Mon Sep 17 00:00:00 2001 From: Zdenek Prikryl Date: Thu, 10 Jul 2008 08:33:33 +0000 Subject: [PATCH] fixed man pages for arp (#446195) fixed netstat --interfaces option (#446187) fixed clearing flags in ifconfig (#450252) --- net-tools-1.60-a-option.patch | 44 +++++++++++++++++++++++++++++++++ net-tools-1.60-clear-flag.patch | 38 ++++++++++++++++++++++++++++ net-tools-1.60-i-option.patch | 11 +++++++++ net-tools.spec | 13 +++++++++- 4 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 net-tools-1.60-a-option.patch create mode 100644 net-tools-1.60-clear-flag.patch create mode 100644 net-tools-1.60-i-option.patch diff --git a/net-tools-1.60-a-option.patch b/net-tools-1.60-a-option.patch new file mode 100644 index 0000000..b17db8d --- /dev/null +++ b/net-tools-1.60-a-option.patch @@ -0,0 +1,44 @@ +--- net-tools-1.60/man/de_DE/arp.8.a-option 2008-07-08 16:35:08.000000000 +0200 ++++ net-tools-1.60/man/de_DE/arp.8 2008-07-08 16:35:35.000000000 +0200 +@@ -77,7 +77,7 @@ Andere m\(:ogliche Werte sind Netzwerkst + and + .RB "NET/ROM (" netrom ")." + .TP +-.B "\-a [Rechnername], \-\-display [Rechnername]" ++.B "\-a [Rechnername], \-\-all [Rechnername]" + Zeigt die Eintr\(:age der angegebenen Rechner an. Wird kein + .B hostname + Argument verwendet, so werden alle Eintr\(:age aufgelistet. +--- net-tools-1.60/man/en_US/arp.8.a-option 2008-07-08 16:35:41.000000000 +0200 ++++ net-tools-1.60/man/en_US/arp.8 2008-07-08 16:35:48.000000000 +0200 +@@ -76,7 +76,7 @@ Other values might include network techn + and + .RB "NET/ROM (" netrom ")." + .TP +-.B "\-a [hostname], \-\-display [hostname]" ++.B "\-a [hostname], \-\-all [hostname]" + Shows the entries of the specified hosts. If the + .B hostname + parameter is not used, +--- net-tools-1.60/man/fr_FR/arp.8.a-option 2008-07-08 16:35:53.000000000 +0200 ++++ net-tools-1.60/man/fr_FR/arp.8 2008-07-08 16:36:03.000000000 +0200 +@@ -81,7 +81,7 @@ D'autres valeurs doivent correspondre à + and + .RB "NET/ROM (" netrom ")." + .TP +-.B "\-a [nom_d_hôte], \-\-display [nom_d_hôte]" ++.B "\-a [nom_d_hôte], \-\-all [nom_d_hôte]" + Affiche les entrées concernant l'hôte spécifié. Si le paramètre + .B nom_d_hôte + n'est pas utilisé, +--- net-tools-1.60/man/pt_BR/arp.8.a-option 2008-07-08 16:38:13.000000000 +0200 ++++ net-tools-1.60/man/pt_BR/arp.8 2008-07-08 16:38:20.000000000 +0200 +@@ -77,7 +77,7 @@ Outros valores podem incluir tecnologias + e + .RB "NET/ROM (" netrom ")." + .TP +-.B "\-a [máquina], \-\-display [máquina]" ++.B "\-a [máquina], \-\-all [máquina]" + Mostra as entradas das máquinas especificadas. Se o parâmetro + .B máquina + não for usado, diff --git a/net-tools-1.60-clear-flag.patch b/net-tools-1.60-clear-flag.patch new file mode 100644 index 0000000..b8f3c59 --- /dev/null +++ b/net-tools-1.60-clear-flag.patch @@ -0,0 +1,38 @@ +--- net-tools-1.60/ifconfig.c.clear-flag 2008-07-08 11:21:33.000000000 +0200 ++++ net-tools-1.60/ifconfig.c 2008-07-08 11:22:55.000000000 +0200 +@@ -465,7 +465,7 @@ int main(int argc, char **argv) + } + if (!strcmp(*spp, "-allmulti")) { + goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI); +- if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) ++ if (test_flag(ifr.ifr_name, IFF_ALLMULTI) > 0) + fprintf(stderr, _("Warning: Interface %s still in ALLMULTI mode.\n"), ifr.ifr_name); + spp++; + continue; +@@ -488,7 +488,7 @@ int main(int argc, char **argv) + } + if (!strcmp(*spp, "-dynamic")) { + goterr |= clr_flag(ifr.ifr_name, IFF_DYNAMIC); +- if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) ++ if (test_flag(ifr.ifr_name, IFF_DYNAMIC) > 0) + fprintf(stderr, _("Warning: Interface %s still in DYNAMIC mode.\n"), ifr.ifr_name); + spp++; + continue; +@@ -547,7 +547,7 @@ int main(int argc, char **argv) + + if (!strcmp(*spp, "-broadcast")) { + goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST); +- if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) ++ if (test_flag(ifr.ifr_name, IFF_BROADCAST) > 0) + fprintf(stderr, _("Warning: Interface %s still in BROADCAST mode.\n"), ifr.ifr_name); + spp++; + continue; +@@ -676,7 +676,7 @@ int main(int argc, char **argv) + } + if (!strcmp(*spp, "-pointopoint")) { + goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT); +- if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) ++ if (test_flag(ifr.ifr_name, IFF_POINTOPOINT) > 0) + fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name); + spp++; + continue; diff --git a/net-tools-1.60-i-option.patch b/net-tools-1.60-i-option.patch new file mode 100644 index 0000000..11d9c53 --- /dev/null +++ b/net-tools-1.60-i-option.patch @@ -0,0 +1,11 @@ +--- net-tools-1.60/netstat.c.i-option 2008-07-08 10:22:51.000000000 +0200 ++++ net-tools-1.60/netstat.c 2008-07-08 10:22:56.000000000 +0200 +@@ -2084,7 +2084,7 @@ int main + { + AFTRANS_OPTS, + {"version", 0, 0, 'V'}, +- {"interfaces", 2, 0, 'I'}, ++ {"interface", 2, 0, 'I'}, + {"interfaces", 0, 0, 'i'}, + {"help", 0, 0, 'h'}, + {"route", 0, 0, 'r'}, diff --git a/net-tools.spec b/net-tools.spec index 6df371a..b93cd9b 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -3,7 +3,7 @@ Summary: Basic networking tools Name: net-tools Version: 1.60 -Release: 88%{?dist} +Release: 89%{?dist} License: GPL+ Group: System Environment/Base URL: http://www.tazenda.demon.co.uk/phil/net-tools/ @@ -77,6 +77,9 @@ Patch63: net-tools-1.60-netplugd_init.patch Patch64: net-tools-1.60-ec_hw_null.patch Patch65: net-tools-1.60-statistics_buffer.patch Patch66: net-tools-1.60-sctp-addrs.patch +Patch67: net-tools-1.60-i-option.patch +Patch68: net-tools-1.60-a-option.patch +Patch69: net-tools-1.60-clear-flag.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig @@ -154,6 +157,9 @@ ifconfig, netstat, route, and others. %patch64 -p1 %patch65 -p1 -b .buffer %patch66 -p1 -b .sctp-addrs +%patch67 -p1 -b .i-option +%patch68 -p1 -b .a-option +%patch69 -p1 -b .clear-flag cp %SOURCE2 ./config.h cp %SOURCE3 ./config.make @@ -269,6 +275,11 @@ exit 0 %{_sysconfdir}/rc.d/init.d/netplugd %changelog +* Thu Jul 10 2008 Zdenek Prikryl - 1.60-89 +- fixed man pages for arp (#446195) +- fixed netstat --interfaces option (#446187) +- fixed clearing flags in ifconfig (#450252) + * Tue Jul 8 2008 Radek Vokál - 1.60-88 - netstat displays correct sctp statistics (#445535)