No interface metric + man pages are already in utf-8.
Do not show interface metric in 'ifconfig', 'ifconfig -s' and 'netstat -i'. Spare place is used for interface name so trim_iface.patch is no longer needed. No need to convert man pages to utf-8 as upstream ship them in utf-8 now.
This commit is contained in:
parent
2c75ca1efb
commit
9dd485525d
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ net-tools-1.60.tar.bz2
|
|||||||
/net-tools-1.60.20120105git.tar.xz
|
/net-tools-1.60.20120105git.tar.xz
|
||||||
/net-tools-1.60.20120111git.tar.xz
|
/net-tools-1.60.20120111git.tar.xz
|
||||||
/net-tools-1.60.20120119git.tar.xz
|
/net-tools-1.60.20120119git.tar.xz
|
||||||
|
/net-tools-1.60.20120127git.tar.xz
|
||||||
|
@ -169,9 +169,9 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c
|
|||||||
}
|
}
|
||||||
if (flag_exp < 2) {
|
if (flag_exp < 2) {
|
||||||
ife_short = 1;
|
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 RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
|
||||||
+ if(!(count % 8))
|
+ if(!(count % 8))
|
||||||
+ 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 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) {
|
if (for_all_interfaces(do_if_print, &flag_all) < 0) {
|
||||||
|
@ -44,7 +44,7 @@ diff -up net-tools-1.60/netstat.c.interface net-tools-1.60/netstat.c
|
|||||||
if (skfd < 0) {
|
if (skfd < 0) {
|
||||||
if ((skfd = sockets_open(0)) < 0) {
|
if ((skfd = sockets_open(0)) < 0) {
|
||||||
@@ -1800,7 +1802,11 @@ static int iface_info(void)
|
@@ -1800,7 +1802,11 @@ static int iface_info(void)
|
||||||
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 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) {
|
- if (for_all_interfaces(do_if_print, &flag_all) < 0) {
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
diff -up net-tools-1.60/lib/interface.c.trim-iface net-tools-1.60/lib/interface.c
|
|
||||||
--- net-tools-1.60/lib/interface.c.trim-iface 2011-12-07 16:17:16.000000000 +0100
|
|
||||||
+++ net-tools-1.60/lib/interface.c 2011-12-07 16:17:37.137281523 +0100
|
|
||||||
@@ -638,7 +638,7 @@ int do_if_print(struct interface *ife, v
|
|
||||||
|
|
||||||
void ife_print_short(struct interface *ptr)
|
|
||||||
{
|
|
||||||
- printf("%-5.5s ", ptr->name);
|
|
||||||
+ printf("%-5s ", ptr->name);
|
|
||||||
printf("%5d %-2d ", ptr->mtu, ptr->metric);
|
|
||||||
/* If needed, display the interface statistics. */
|
|
||||||
if (ptr->statistics_valid) {
|
|
@ -1,9 +1,9 @@
|
|||||||
%global checkout 20120119git
|
%global checkout 20120127git
|
||||||
|
|
||||||
Summary: Basic networking tools
|
Summary: Basic networking tools
|
||||||
Name: net-tools
|
Name: net-tools
|
||||||
Version: 1.60
|
Version: 1.60
|
||||||
Release: 133.%{checkout}%{?dist}
|
Release: 134.%{checkout}%{?dist}
|
||||||
License: GPL+
|
License: GPL+
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
URL: http://net-tools.sourceforge.net
|
URL: http://net-tools.sourceforge.net
|
||||||
@ -41,20 +41,17 @@ Patch6: net-tools-1.60-duplicate-tcp.patch
|
|||||||
# don't report statistics for virtual devices (#143981)
|
# don't report statistics for virtual devices (#143981)
|
||||||
Patch7: net-tools-1.60-statalias.patch
|
Patch7: net-tools-1.60-statalias.patch
|
||||||
|
|
||||||
# don't trim interface names to 5 characters in 'netstat -i' or 'ifconfig -s' (#152457)
|
|
||||||
Patch8: net-tools-1.60-trim_iface.patch
|
|
||||||
|
|
||||||
# clear static buffers in interface.c by Ulrich Drepper (#176714)
|
# clear static buffers in interface.c by Ulrich Drepper (#176714)
|
||||||
Patch9: net-tools-1.60-interface_stack.patch
|
Patch8: net-tools-1.60-interface_stack.patch
|
||||||
|
|
||||||
# statistics for SCTP
|
# statistics for SCTP
|
||||||
Patch10: net-tools-1.60-sctp-statistics.patch
|
Patch9: net-tools-1.60-sctp-statistics.patch
|
||||||
|
|
||||||
# ifconfig crash when interface name is too long (#190703)
|
# ifconfig crash when interface name is too long (#190703)
|
||||||
Patch11: net-tools-1.60-ifconfig-long-iface-crasher.patch
|
Patch10: net-tools-1.60-ifconfig-long-iface-crasher.patch
|
||||||
|
|
||||||
# fixed tcp timers info in netstat (#466845)
|
# fixed tcp timers info in netstat (#466845)
|
||||||
Patch12: net-tools-1.60-netstat-probe.patch
|
Patch11: net-tools-1.60-netstat-probe.patch
|
||||||
|
|
||||||
BuildRequires: gettext, libselinux
|
BuildRequires: gettext, libselinux
|
||||||
BuildRequires: libselinux-devel
|
BuildRequires: libselinux-devel
|
||||||
@ -76,11 +73,10 @@ Most of them are obsolete. For replacement check iproute package.
|
|||||||
%patch5 -p1 -b .interface
|
%patch5 -p1 -b .interface
|
||||||
%patch6 -p1 -b .dup-tcp
|
%patch6 -p1 -b .dup-tcp
|
||||||
%patch7 -p1 -b .statalias
|
%patch7 -p1 -b .statalias
|
||||||
%patch8 -p1 -b .trim-iface
|
%patch8 -p1 -b .stack
|
||||||
%patch9 -p1 -b .stack
|
%patch9 -p1 -b .sctp
|
||||||
%patch10 -p1 -b .sctp
|
%patch10 -p1 -b .long_iface
|
||||||
%patch11 -p1 -b .long_iface
|
%patch11 -p1 -b .probe
|
||||||
%patch12 -p1 -b .probe
|
|
||||||
|
|
||||||
cp %SOURCE1 ./config.h
|
cp %SOURCE1 ./config.h
|
||||||
cp %SOURCE2 ./config.make
|
cp %SOURCE2 ./config.make
|
||||||
@ -95,18 +91,6 @@ cp %SOURCE8 ./man/en_US
|
|||||||
perl -pi -e "s|-O2||" Makefile
|
perl -pi -e "s|-O2||" Makefile
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
#man pages conversion to utf-8
|
|
||||||
#french
|
|
||||||
for file in arp.8 ethers.5 ifconfig.8 netstat.8 plipconfig.8 route.8 slattach.8; do
|
|
||||||
iconv -f ISO-8859-1 -t UTF-8 -o ${file}.new man/fr_FR/${file} && \
|
|
||||||
mv ${file}.new man/fr_FR/${file}
|
|
||||||
done
|
|
||||||
#portugal
|
|
||||||
for file in arp.8 ifconfig.8 netstat.8 route.8; do
|
|
||||||
iconv -f ISO-8859-1 -t UTF-8 -o ${file}.new man/pt_BR/${file} && \
|
|
||||||
mv ${file}.new man/pt_BR/${file}
|
|
||||||
done
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="$RPM_OPT_FLAGS $CFLAGS"
|
export CFLAGS="$RPM_OPT_FLAGS $CFLAGS"
|
||||||
|
|
||||||
@ -177,6 +161,11 @@ fi
|
|||||||
%attr(0644,root,root) %{_unitdir}/arp-ethers.service
|
%attr(0644,root,root) %{_unitdir}/arp-ethers.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 27 2012 Jiri Popelka <jpopelka@redhat.com> - 1.60-134.20120127git
|
||||||
|
- Do not show interface metric in 'ifconfig', 'ifconfig -s' and 'netstat -i'.
|
||||||
|
Spare place is used for interface name so trim_iface.patch is no longer needed.
|
||||||
|
- No need to convert man pages to utf-8 as upstream ship them in utf-8 now.
|
||||||
|
|
||||||
* Thu Jan 19 2012 Jiri Popelka <jpopelka@redhat.com> - 1.60-133.20120119git
|
* Thu Jan 19 2012 Jiri Popelka <jpopelka@redhat.com> - 1.60-133.20120119git
|
||||||
- SELinux patch merged upstream
|
- SELinux patch merged upstream
|
||||||
- several page fixes merged upstream
|
- several page fixes merged upstream
|
||||||
|
Loading…
Reference in New Issue
Block a user