Hello community, here is the log from the commit of package net-tools for openSUSE:Factory checked in at Thu Jul 9 16:40:51 CEST 2009. -------- --- net-tools/net-tools.changes 2009-06-11 21:23:06.000000000 +0200 +++ net-tools/net-tools.changes 2009-07-07 20:52:38.000000000 +0200 @@ -1,0 +2,19 @@ +Tue Jul 7 20:50:38 CEST 2009 - ms@suse.de + +- disabled net-tools obsolete patch, no way to convince + people that it would be a good idea (bnc #492665) + +------------------------------------------------------------------- +Tue Jul 7 11:02:12 CEST 2009 - ms@suse.de + +- Programs from net-tools have modern equivalents: + arp -> ip neigh + ifconfig -> ip addr/ip link + ipmaddr -> ip maddr + iptunnel -> ip tunnel + netstat -> ss + route -> ip route + added patch to print an obsoletes warning on + stderr (bnc #492665) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- net-tools-1.60-obsolete.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-tools.spec ++++++ --- /var/tmp/diff_new_pack.kdKxbI/_old 2009-07-09 16:39:15.000000000 +0200 +++ /var/tmp/diff_new_pack.kdKxbI/_new 2009-07-09 16:39:15.000000000 +0200 @@ -28,7 +28,7 @@ Obsoletes: traceroute net_tool AutoReqProv: on Version: 1.60 -Release: 728 +Release: 729 Summary: Important Programs for Networking BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: net-tools-%{version}.tar.bz2 @@ -70,6 +70,7 @@ Patch35: net-tools-1.60-interface_mtu.diff Patch36: net-tools-1.60-printval-conversion.patch Patch37: traceroute-glibc210.diff +#Patch38: net-tools-1.60-obsolete.diff %description This package contains essential programs for network administration and @@ -125,6 +126,7 @@ %patch34 -p1 %patch35 -p1 %patch36 -p1 +#%patch38 -p1 %build make config @@ -178,219 +180,3 @@ %lang(pt_BR) %doc %_mandir/pt_BR/man*/* %changelog -* Thu Jun 11 2009 coolo@novell.com -- define we need GNU_SOURCE -* Thu May 07 2009 ms@suse.de -- fixed data type of third argument in printval function. - Also make sure the printf call in this function uses the - correct format sequence (bnc #501113) -* Wed Mar 25 2009 ms@suse.de -- increased field length for display of MTU value (bnc #486014) -* Thu Nov 20 2008 ms@suse.de -- don't show af_inet socket warning for netstat -i (bnc #430864) -* Thu Nov 06 2008 ms@suse.de -- really fixed SIOCSIFNETMASK ioctl from being called earlier - to SIOCSIFADDR (bnc #438983) -* Fri Oct 31 2008 ms@suse.de -- reverted last patch from IBM because it breaks standard - ifconfig usage as shown in bug (bnc #440580) -* Mon Oct 27 2008 ms@suse.de -- fixed ifconfig SIOCSIFNETMASK ioctl from being called earlier - to SIOCSIFADDR (bnc #438983) -* Thu Sep 25 2008 ms@suse.de -- really fixed netstat -ci, incomplete patch (bnc #424813) -* Wed Sep 10 2008 ms@suse.de -- fixed netstat -ci which prints the stats only on the first loop - on subsequent loops it says "no statistics available", even though - there was network traffic in between (bnc #424813) -* Tue Sep 02 2008 ms@suse.de -- update to traceroute 1.2 -* Mon Aug 11 2008 ms@suse.de -- added patch to allow monitoring of accepted connections queue - length for tcp listening sockets. This will work with - kernels >= 2.6.18. -* Mon May 05 2008 ms@suse.de -- added hint about option -s and -f to hostname (bnc #386686) -* Thu Mar 06 2008 ms@suse.de -- fixed length of interface field (bnc #367769) -* Tue Mar 04 2008 ms@suse.de -- added obsolete warning for ifconfig into man page (bnc #366477) -* Sun Feb 24 2008 crrodriguez@suse.de -- use find_lang macro -* Wed Jul 25 2007 ms@suse.de -- fixed locale names (#294148) -* Wed May 02 2007 ms@suse.de -- fixed trailing space for hostname -a and -i (#270314) -* Tue Sep 26 2006 ms@suse.de -- fixed stack overflow when using traceroute -q [n]>=10 (#200508) -* Mon Jul 24 2006 ms@suse.de -- fixed german translation for route -C (#194357) -* Thu Jul 20 2006 ms@suse.de -- replaced static HZ define to dynamic: - [#]ifndef HZ - [#]define HZ sysconf(_SC_CLK_TCK) - [#]endif -* Wed May 24 2006 schwab@suse.de -- Don't strip binaries. -* Wed May 17 2006 ms@suse.de -- added patch from Olaf Kirch. Do not display SCTP sockets - if /proc/net/sctp/eps couldn't be opened (#159686) -* Tue Mar 21 2006 okir@suse.de -- Display SCTP sockets correctly [#159686 - LTC22492] -* Mon Mar 20 2006 hvogel@suse.de -- fix netstat -p segfault [#159069] -* Mon Feb 20 2006 hvogel@suse.de -- fix netstat output not to bit-wrap [#149563] -* Mon Feb 06 2006 hvogel@suse.de -- add snmp counter overflow patch by ak [#148350] -* Wed Feb 01 2006 hvogel@suse.de -- fix arp causing unaligned access [#146422] - patch from Arthur D. Kepner -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Wed Jan 11 2006 mmj@suse.de -- Add patch from fedora to avoid stack smashing [#142461] -* Mon Dec 19 2005 mmj@suse.de -- Update to traceroute-1.0.4 -* Mon Dec 19 2005 mmj@suse.de -- Update to traceroute-1.0.3 -* Fri Dec 16 2005 mmj@suse.de -- Use ICMP6_DST_UNREACH_BEYONDSCOPE instead of - ICMP6_DST_UNREACH_NOTNEIGHBOR on newer glibc -* Tue Sep 27 2005 mmj@suse.de -- Fix strict aliasing issues -* Mon Aug 29 2005 mmj@suse.de -- Correct netstat.8 [#104487] -* Wed Jul 06 2005 mmj@suse.de -- Fix missing decl in nstrcmp.c -* Mon Jun 20 2005 mmj@suse.de -- compile with -fpie, link with -pie -- don't strip explicitly -* Mon Jun 13 2005 ro@suse.de -- include netinet/if_tr.h instead of linux/if_tr.h -* Wed Jan 05 2005 mmj@suse.de -- Fix --numeric-ports to not imply --numeric [#45609] -* Wed Dec 08 2004 mmj@suse.de -- Include linux/sockios.h to get the right ioctl [#48873]. This bug - is in mii-tool which is not included anymore, but better not risk - ever re-adding buggy stuff. -* Thu Dec 02 2004 mmj@suse.de -- Fix nameif segfault [#48749] -* Mon Aug 09 2004 mmj@suse.de -- Remove mii-tool everywhere [#43343] -* Fri Jul 30 2004 fdg@suse.de -- fixed the -ic option without destroying the ifconfig buffer - regarding to bug #42932 -* Mon May 24 2004 meissner@suse.de -- also print unsigned long longs (last patch updated). -* Mon May 24 2004 meissner@suse.de -- Always read 64bit values from /proc/net/dev, so we can - use 32bit userland to read from 64bit kernel. #40951/LTC#8726 -* Fri Mar 05 2004 hare@suse.de -- Fixed return values for non-existing interfaces in nameif. -* Thu Feb 26 2004 hare@suse.de -- Add -r option to nameif to allow renaming of - interfaces. -* Thu Jan 29 2004 hare@suse.de -- Cool. The last change effectively broke route(1). - -> replaced return; with break; -* Sun Jan 18 2004 mmj@suse.de -- Fix compound statement calls, and add a missing include -* Wed Oct 15 2003 mmj@suse.de -- Don't build as root -* Mon Oct 13 2003 mmj@suse.de -- Fix 32 vs. 64-bit programming mistakes [#32089] -* Mon Aug 18 2003 mmj@suse.de -- Fix from mmeissner for nstrcmp.c to handle alias interfaces, - even without standard names. (eth1:1 vs eth1:2, also - eth1:blubber vs eth1:1) [#28985] -* Mon Jul 14 2003 mmj@suse.de -- Add fix from okir for traceroute -S [#27573] -* Wed Jun 18 2003 ro@suse.de -- added non-en manpage directories to filelist -* Mon May 19 2003 mmj@suse.de -- Use a better and more tested nstrcmp.c [#26950] -* Wed May 14 2003 ro@suse.de -- fix build with 2.5 kernel includes -* Tue May 13 2003 mmj@suse.de -- Package man-pages in several languages -* Wed Mar 05 2003 mmj@suse.de -- Add missing xinetd file [#24676] -* Tue Nov 26 2002 mmj@suse.de -- Fix traceroute 6 segfault [#21975] -* Fri Nov 15 2002 okir@suse.de -- Upgraded to new traceroute to fix #20358 -* Mon Nov 11 2002 mmj@suse.de -- Fix multi string literals -* Thu Jul 25 2002 mmj@suse.de -- Added traceroute from Olaf Kirch, which is much more secure and - also IPv6 capable. -* Tue Apr 16 2002 mmj@suse.de -- Do not pack translated manpages. Should go to other package. -* Mon Mar 04 2002 mmj@suse.de -- unvolls�ndig -> unvollst�ndig in German locale. [Bug #14371] -* Wed Feb 06 2002 mmj@suse.de -- Removed yp and nis stuff from manpages. -* Sat Aug 25 2001 kukuk@suse.de -- Replace last patch by a newer one from ak@suse.de -* Mon Aug 20 2001 kukuk@suse.de -- Add fix for truncated IP addresses [Bug #9737] -* Wed Apr 25 2001 kukuk@suse.de -- Update to net-tools-1.60: - * lot of locale fixes - * IPv6 fixes - * use secure strcpy -* Tue Apr 17 2001 ro@suse.de -- added provides for net_tool -* Sun Mar 04 2001 bk@suse.de -- Update to 1.59(many fixes and improvements and new program nameif) -- enabled gettext support and added locales -- added ipmaddr and iptunnel tools -- enabled FDDI and HIPPI support -- use optimisation flags -- added international man pages -- spec file changes to make use of wildcards in the filelist -* Fri Oct 20 2000 kukuk@suse.de -- Rename from net_tool to net-tools -* Sun Jun 25 2000 bk@suse.de -- s390: removed not needed files -* Sat Jun 03 2000 kukuk@suse.de -- Update to 1.56 -* Thu May 25 2000 kukuk@suse.de -- Update to 1.55 (contains all fixes) -* Thu May 18 2000 kukuk@suse.de -- Add oh2bns patch (bug #2864) -* Wed Feb 09 2000 kukuk@suse.de -- Add ifconfig manual pages from Andi Kleen -* Wed Feb 02 2000 kukuk@suse.de -- Fix PPP initialisation -* Wed Feb 02 2000 kukuk@suse.de -- Update to 1.54, move /usr/man -> /usr/share/man -* Mon Jan 03 2000 kukuk@suse.de -- Enable IPv6 support -- Fix arp/ethers parsing -* Tue Oct 12 1999 garloff@suse.de -- gateways and targets of PtP routes (host flag) are hosts, not - networks. Change name lookup accordingly. -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Mon Aug 30 1999 kukuk@suse.de -- Update to 1.53, remove ypdomainname and nisdomainname -* Sat Jun 26 1999 kukuk@suse.de -- update from jurix to 1.52 -* Wed Mar 10 1999 ro@suse.de -- update to 1.50 -- included slattach and its manpage in filelist -* Wed Oct 28 1998 ro@suse.de -- update to 1.46 / removed incorporated changes from .dif -* Sat Sep 19 1998 ro@suse.de -- define _GNU_SOURCE where getopt_long is used -* Tue Sep 01 1998 ro@suse.de -- fixed problems with inluding own ipx.h under glibc -* Wed Jun 24 1998 ro@suse.de -- added include linux/timer.h before including linux/ip_fw.h -* Mon Oct 27 1997 ro@suse.de -- added ADD_LANG in Makefile to avoid error - whenever-whenever - florian@suse.de - new version 1.32-alpha - mv /sbin/arp /usr/sbin/arp ++++++ net-tools-1.60-obsolete.diff ++++++ Index: net-tools-1.60/arp.c =================================================================== --- arp.c +++ arp.c @@ -514,6 +514,10 @@ static void arp_disp(char *name, char *i printf(_("on %s\n"), dev); } +static void obsolescence_warning(void) +{ + fprintf(stderr,_("arp is obsolete: please use `ip neigh` instead.\n")); +} /* Display the contents of the ARP cache in the kernel. */ static int arp_show(char *name) @@ -601,6 +605,7 @@ static int arp_show(char *name) } } (void) fclose(fp); + obsolescence_warning(); return (0); } @@ -662,6 +667,8 @@ int main(int argc, char **argv) textdomain("net-tools"); #endif + obsolescence_warning(); + /* Initialize variables... */ if ((hw = get_hwtype(DFLT_HW)) == NULL) { fprintf(stderr, _("%s: hardware type not supported!\n"), DFLT_HW); Index: net-tools-1.60/ifconfig.c =================================================================== --- ifconfig.c +++ ifconfig.c @@ -225,6 +225,19 @@ static int set_netmask(int skfd, struct return 0; } +/* + * This is called twice on purpose. Once at the start of the program, + * so that users piping it into |less will see it on the first page + * (if there is lots of output), and once again at the end of the program, + * for users that do not pipe it into anything, seeing the last page + * (also with lots of output). + */ +static void obsolescence_warning(void) +{ + fprintf(stderr,_("ifconfig is obsolete: please use `ip addr` or `ip link`. " + "For statistics, use `ip -s link`.\n")); +} + int main(int argc, char **argv) { struct sockaddr sa, sa_netmask; @@ -253,6 +266,8 @@ int main(int argc, char **argv) textdomain("net-tools"); #endif + obsolescence_warning(); + /* Find any options. */ argc--; argv++; @@ -295,6 +310,8 @@ int main(int argc, char **argv) if (argc == 0) { int err = if_print((char *) NULL); (void) close(skfd); + if (err == 0) + obsolescence_warning(); exit(err < 0); } /* No. Fetch the interface name. */ @@ -987,6 +1004,9 @@ int main(int argc, char **argv) spp++; } + if (goterr == 0) + obsolescence_warning(); + return (goterr); } Index: net-tools-1.60/ipmaddr.c =================================================================== --- ipmaddr.c +++ ipmaddr.c @@ -396,6 +396,9 @@ int main(int argc, char **argv) textdomain("net-tools"); #endif + fprintf(stderr,_("Note: multicast address configuration should " + "be done through `ip maddr` instead.\n")); + basename = strrchr(argv[0], '/'); if (basename == NULL) basename = argv[0]; Index: net-tools-1.60/iptunnel.c =================================================================== --- iptunnel.c +++ iptunnel.c @@ -587,6 +587,9 @@ int main(int argc, char **argv) textdomain("net-tools"); #endif + fprintf(stderr,_("Note: tunnel configuration should " + "be done through `ip tunnel` instead.\n")); + basename = strrchr(argv[0], '/'); if (basename == NULL) basename = argv[0]; Index: net-tools-1.60/netstat.c =================================================================== --- netstat.c +++ netstat.c @@ -1989,6 +1989,34 @@ static void usage(void) exit(E_USAGE); } +static void netstat_obsolescence_warning(void) +{ + fprintf(stderr,_("netstat is obsolete: please use `ss` instead.\n")); +} + +static void route_obsolescence_warning(void) +{ + fprintf(stderr,_("`netstat -r` is obsolete: " + "please use `ip route` instead.\n")); +} + +static void stat_obsolescence_warning(void) +{ + fprintf(stderr,_("`netstat -i` is obsolete: " + "please use `ip -s link` instead.\n")); +} + +static void groups_obsolescence_warning(void) +{ + fprintf(stderr,_("`netstat -g` is obsolete: " + "please use `ip maddr` instead.\n")); +} + +static void masq_obsolescence_warning(void) +{ + fprintf(stderr,_("`netstat -M` is obsolete: " + "please use `conntrack -L` instead.\n")); +} int main (int argc, char *argv[]) { @@ -2152,6 +2180,7 @@ int main + flag_ax25 + flag_netrom + flag_igmp + flag_x25; if (flag_mas) { + masq_obsolescence_warning(); #if HAVE_FW_MASQUERADE && HAVE_AFINET #if MORE_THAN_ONE_MASQ_AF if (!afname[0]) @@ -2168,6 +2197,7 @@ int main ENOSUPP("netstat.c", "FW_MASQUERADE"); i = -1; #endif + masq_obsolescence_warning(); return (i); } @@ -2180,6 +2210,8 @@ int main if (flag_rou) { int options = 0; + route_obsolescence_warning(); + if (!afname[0]) strcpy(afname, DFLT_AF); @@ -2198,9 +2230,11 @@ int main break; sleep(1); } + route_obsolescence_warning(); return (i); } if (flag_int) { + stat_obsolescence_warning(); get_max_ifacename(flag_cacheof); for (;;) { i = iface_info(); @@ -2208,8 +2242,10 @@ int main break; sleep(1); } + stat_obsolescence_warning(); return (i); } + netstat_obsolescence_warning(); for (;;) { if (!flag_arg || flag_tcp || flag_udp || flag_sctp || flag_raw) { #if HAVE_AFINET @@ -2261,6 +2297,7 @@ int main } if (flag_igmp) { + groups_obsolescence_warning(); #if HAVE_AFINET6 printf( "IPv6/"); #endif @@ -2268,6 +2305,7 @@ int main printf( _("Interface RefCnt Group\n") ); printf( "--------------- ------ ---------------------\n" ); i = igmp_info(); + groups_obsolescence_warning(); if (i) return (i); } @@ -2340,5 +2378,6 @@ int main sleep(1); prg_cache_clear(); } + netstat_obsolescence_warning(); return (i); } Index: net-tools-1.60/route.c =================================================================== --- route.c +++ route.c @@ -102,6 +102,10 @@ static void version(void) exit(E_VERSION); } +static void obsolescence_warning(void) +{ + fprintf(stderr,_("route is obsolete: please use `ip route` instead.\n")); +} int main(int argc, char **argv) { @@ -128,6 +132,9 @@ int main(int argc, char **argv) bindtextdomain("net-tools", "/usr/share/locale"); textdomain("net-tools"); #endif + + obsolescence_warning(); + getroute_init(); /* Set up AF routing support */ setroute_init(); afname[0] = '\0'; @@ -218,9 +225,10 @@ int main(int argc, char **argv) if (!opt_fc) options |= FLAG_FIB; - if (what == RTACTION_SHOW) + if (what == RTACTION_SHOW) { i = route_info(afname, options); - else + obsolescence_warning(); + } else i = route_edit(what, afname, options, ++argv); if (i == E_OPTERR) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org