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

auto-import changelog data from net-tools-1.60-33.src.rpm

Browse Source 
Mon Aug 30 2004 Radek Vokal <rvokal@redhat.com> 1.60-33
- Added patch for SI units by Tom "spot" Callaway <tcallawa@redhat.com>
    #118006
This commit is contained in:
cvsdist 2004-09-09 09:13:59 +00:00
parent a9401523bf
commit e5681241cb
2 changed files with 86 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
net-tools-1.60-siunits.patch Normal file
View File

@ -0,0 +1,80 @@
--- net-tools-1.60/lib/interface.c.siunits 2004-03-14 12:11:22.000000000 -0600
+++ net-tools-1.60/lib/interface.c 2004-03-14 12:27:31.990679464 -0600
@@ -262,7 +262,7 @@
&ife->stats.tx_compressed);
break;
case 2:
- sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu",
+ sscanf(bp, "%Lu %llu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu",
&ife->stats.rx_bytes,
&ife->stats.rx_packets,
&ife->stats.rx_errors,
@@ -280,7 +280,7 @@
ife->stats.rx_multicast = 0;
break;
case 1:
- sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu",
+ sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu",
&ife->stats.rx_packets,
&ife->stats.rx_errors,
&ife->stats.rx_dropped,
@@ -675,8 +675,8 @@
int hf;
int can_compress = 0;
unsigned long long rx, tx, short_rx, short_tx;
- char Rext[5]="b";
- char Text[5]="b";
+ const char *Rext = "b";
+ const char *Text = "b";
#if HAVE_AFIPX
static struct aftype *ipxtype = NULL;
@@ -882,10 +882,44 @@
tx = ptr->stats.tx_bytes;
short_rx = rx * 10;
short_tx = tx * 10;
- if (rx > 1048576) { short_rx /= 1048576; strcpy(Rext, "Mb"); }
- else if (rx > 1024) { short_rx /= 1024; strcpy(Rext, "Kb"); }
- if (tx > 1048576) { short_tx /= 1048576; strcpy(Text, "Mb"); }
- else if (tx > 1024) { short_tx /= 1024; strcpy(Text, "Kb"); }
+ if (rx > 1152921504606846976ull) {
+ short_rx /= 1152921504606846976ull;
+ Rext = "EiB";
+ } else if (rx > 1125899906842624ull) {
+ short_rx /= 1125899906842624ull;
+ Rext = "PiB";
+ } else if (rx > 1099511627776ull) {
+ short_rx /= 1099511627776ull;
+ Rext = "TiB";
+ } else if (rx > 1073741824ull) {
+ short_rx /= 1073741824ull;
+ Rext = "GiB";
+ } else if (rx > 1048576) {
+ short_rx /= 1048576;
+ Rext = "MiB";
+ } else if (rx > 1024) {
+ short_rx /= 1024;
+ Rext = "KiB";
+ }
+ if (tx > 1152921504606846976ull) {
+ short_tx /= 1152921504606846976ull;
+ Text = "EiB";
+ } else if (tx > 1125899906842624ull) {
+ short_tx /= 1125899906842624ull;
+ Text = "PiB";
+ } else if (tx > 1099511627776ull) {
+ short_tx /= 1099511627776ull;
+ Text = "TiB";
+ } else if (tx > 1073741824ull) {
+ short_tx /= 1073741824ull;
+ Text = "GiB";
+ } else if (tx > 1048576) {
+ short_tx /= 1048576;
+ Text = "MiB";
+ } else if (tx > 1024) {
+ short_tx /= 1024;
+ Text = "KiB";
+ }
printf(" ");
printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"),

7
net-tools.spec
View File

@ -3,7 +3,7 @@
Summary: Basic networking tools.
Name: net-tools
Version: 1.60
Release: 32
Release: 33
License: GPL
Group: System Environment/Base
Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
@ -29,6 +29,7 @@ Patch15: net-tools-1.60-overflow.patch
Patch16: net-tools-1.60-execshield.patch
Patch17: netplug-1.2.7-compiler.patch
Patch18: netplug-1.2.7-installopts.patch
Patch19: net-tools-1.60-siunits.patch
BuildRoot: %{_tmppath}/%{name}-root
Requires(post,preun): chkconfig
BuildRequires: gettext
@ -57,6 +58,7 @@ ifconfig, netstat, route, and others.
%patch16 -p1 -b .execshield
%patch17 -p1 -b .compiler
%patch18 -p1 -b .installopts
%patch19 -p1 -b .siunits
cp %SOURCE2 ./config.h
cp %SOURCE3 ./config.make
@ -129,6 +131,9 @@ exit 0
%{_sysconfdir}/rc.d/init.d/netplugd
%changelog
* Mon Aug 30 2004 Radek Vokal <rvokal@redhat.com> 1.60-33
- Added patch for SI units by Tom "spot" Callaway <tcallawa@redhat.com> #118006
* Tue Aug 17 2004 Phil Knirsch <pknirsch@redhat.com> 1.60-32
- Fix installopts for netplug.