[net-tools] No interface metric + man pages are already in utf-8.

Fri Jan 27 09:18:25 UTC 2012

commit 9dd485525d3edec0719259ec98dbbf23343e107b
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Jan 27 10:13:18 2012 +0100

    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.

 .gitignore                      |    1 +
 net-tools-1.60-cycle.patch      |    4 +-
 net-tools-1.60-interface.patch  |    2 +-
 net-tools-1.60-trim_iface.patch |   12 -----------
 net-tools.spec                  |   41 ++++++++++++++------------------------
 sources                         |    2 +-
 6 files changed, 20 insertions(+), 42 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index d9c8fcc..3ddd8ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ net-tools-1.60.tar.bz2
 /net-tools-1.60.20120105git.tar.xz
 /net-tools-1.60.20120111git.tar.xz
 /net-tools-1.60.20120119git.tar.xz
+/net-tools-1.60.20120127git.tar.xz
diff --git a/net-tools-1.60-cycle.patch b/net-tools-1.60-cycle.patch
index cc3a681..4834d39 100644
--- a/net-tools-1.60-cycle.patch
+++ b/net-tools-1.60-cycle.patch
@@ -169,9 +169,9 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c
      }
      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    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
 +	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) {
diff --git a/net-tools-1.60-interface.patch b/net-tools-1.60-interface.patch
index 8bc15d0..b3c051f 100644
--- a/net-tools-1.60-interface.patch
+++ b/net-tools-1.60-interface.patch
@@ -44,7 +44,7 @@ diff -up net-tools-1.60/netstat.c.interface net-tools-1.60/netstat.c
      if (skfd < 0) {
  	if ((skfd = sockets_open(0)) < 0) {
 @@ -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) {
diff --git a/net-tools.spec b/net-tools.spec
index 636c3cc..78f1910 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -1,9 +1,9 @@
-%global checkout 20120119git
+%global checkout 20120127git
 
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 133.%{checkout}%{?dist}
+Release: 134.%{checkout}%{?dist}
 License: GPL+
 Group: System Environment/Base
 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)
 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)
-Patch9: net-tools-1.60-interface_stack.patch
+Patch8: net-tools-1.60-interface_stack.patch
 
 # 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)
-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)
-Patch12: net-tools-1.60-netstat-probe.patch
+Patch11: net-tools-1.60-netstat-probe.patch
 
 BuildRequires: gettext, libselinux
 BuildRequires: libselinux-devel
@@ -76,11 +73,10 @@ Most of them are obsolete. For replacement check iproute package.
 %patch5 -p1 -b .interface
 %patch6 -p1 -b .dup-tcp
 %patch7 -p1 -b .statalias
-%patch8 -p1 -b .trim-iface
-%patch9 -p1 -b .stack
-%patch10 -p1 -b .sctp
-%patch11 -p1 -b .long_iface
-%patch12 -p1 -b .probe
+%patch8 -p1 -b .stack
+%patch9 -p1 -b .sctp
+%patch10 -p1 -b .long_iface
+%patch11 -p1 -b .probe
 
 cp %SOURCE1 ./config.h
 cp %SOURCE2 ./config.make
@@ -95,18 +91,6 @@ cp %SOURCE8 ./man/en_US
 perl -pi -e "s|-O2||" Makefile
 %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
 export CFLAGS="$RPM_OPT_FLAGS $CFLAGS"
 
@@ -177,6 +161,11 @@ fi
 %attr(0644,root,root)   %{_unitdir}/arp-ethers.service
 
 %changelog
+* Fri Jan 27 2012 Jiri Popelka <jpopelka at 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 at redhat.com> - 1.60-133.20120119git
 - SELinux patch merged upstream
 - several page fixes merged upstream
diff --git a/sources b/sources
index dfb2c1e..a8594d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5438dfa85e7a92b2561e00ad3af67dc  net-tools-1.60.20120119git.tar.xz
+b5c2722293da4c5e7c50cac56bbd597b  net-tools-1.60.20120127git.tar.xz
