From 9a2b366bb9594c4bf27fefe6c1e2cd2f25ad6bac Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 09:09:12 +0000 Subject: auto-import net-tools-1.60-3msdw.2 from net-tools-1.60-3msdw.2.src.rpm --- diff --git a/net-tools-1.60-virtualname.patch b/net-tools-1.60-virtualname.patch new file mode 100644 index 0000000..f56f171 --- /dev/null +++ b/net-tools-1.60-virtualname.patch @@ -0,0 +1,24 @@ +diff -uNr net-tools-1.60/lib/interface.c net-tools-1.60-2/lib/interface.c +--- net-tools-1.60/lib/interface.c Sat Feb 10 14:31:15 2001 ++++ net-tools-1.60-2/lib/interface.c Thu Jul 18 13:15:37 2002 +@@ -579,7 +579,7 @@ + + void ife_print_short(struct interface *ptr) + { +- printf("%-5.5s ", ptr->name); ++ printf("%-9.8s ", ptr->name); + printf("%5d %3d", ptr->mtu, ptr->metric); + /* If needed, display the interface statistics. */ + if (ptr->statistics_valid) { +diff -uNr net-tools-1.60/netstat.c net-tools-1.60-2/netstat.c +--- net-tools-1.60/netstat.c Sun Apr 15 10:41:17 2001 ++++ net-tools-1.60-2/netstat.c Thu Jul 18 12:48:33 2002 +@@ -1449,7 +1449,7 @@ + } + if (flag_exp < 2) { + ife_short = 1; +- printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); ++ printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); + } + + if (for_all_interfaces(do_if_print, &flag_all) < 0) { diff --git a/net-tools.spec b/net-tools.spec index fc701ec..e5c7668 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -1,7 +1,7 @@ Summary: Basic networking tools. Name: net-tools Version: 1.60 -Release: 3 +Release: 3msdw.2 Copyright: GPL Group: System Environment/Base Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2 @@ -10,6 +10,7 @@ Source2: net-tools-%{version}-config.make Source3: ether-wake.c Patch4: net-tools-1.57-bug22040.patch Patch5: net-tools-1.60-miiioctl.patch +Patch6: net-tools-1.60-virtualname.patch BuildRoot: %{_tmppath}/%{name}-root %description @@ -20,7 +21,7 @@ ifconfig, netstat, route, and others. %setup -q %patch4 -p 1 -b .bug22040 %patch5 -p 1 -b .miiioctl - +%patch6 -p 1 cp %SOURCE1 ./config.h cp %SOURCE2 ./config.make cp %SOURCE3 .