Hello community, here is the log from the commit of package net-tools for openSUSE:Factory checked in at 2015-05-30 12:32:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/net-tools (Old) and /work/SRC/openSUSE:Factory/.net-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "net-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/net-tools/net-tools.changes 2013-04-17 07:41:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.net-tools.new/net-tools.changes 2015-05-30 12:32:41.000000000 +0200 @@ -1,0 +2,27 @@ +Tue May 26 15:09:57 UTC 2015 - [email protected] + +- Added patches to past change log entry + +------------------------------------------------------------------- +Sun Mar 29 00:41:21 UTC 2015 - [email protected] + +- ipmaddr and iptunnel are obsolete too, move them to subpackage. + (Superseded by `ip maddr` and `ip tunnel`) +- remove redundant %clean section + +------------------------------------------------------------------- +Thu Apr 10 12:33:41 UTC 2014 - [email protected] + +- Move arp, ifconfig, netstat and route to a -deprecated subpackage + (fate#317196, fate#317197) +- Drop the rarp tool, which has been broken since kernel 2.3 + +------------------------------------------------------------------- +Thu Jul 25 14:41:14 CEST 2013 - [email protected] + +- ported plipconfig patches from SLE base (bnc #831310) + - net-tools-1.60-plipconfig-ecode.patch + - net-tools-1.60-plipconfig-manpage.patch + - net-tools-1.60-plipconfig-usage.patch + +------------------------------------------------------------------- New: ---- net-tools-1.60-plipconfig-ecode.patch net-tools-1.60-plipconfig-manpage.patch net-tools-1.60-plipconfig-usage.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-tools.spec ++++++ --- /var/tmp/diff_new_pack.RaNafs/_old 2015-05-30 12:32:43.000000000 +0200 +++ /var/tmp/diff_new_pack.RaNafs/_new 2015-05-30 12:32:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package net-tools # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -78,6 +78,9 @@ Patch47: net-tools-1.60-hostname-ipv6.patch Patch48: net-tools-1.60-dont-trim-foreign-addr6.diff Patch49: net-tools-1.60-cs_CZ.bnc715580.diff +Patch50: net-tools-1.60-plipconfig-usage.patch +Patch51: net-tools-1.60-plipconfig-manpage.patch +Patch52: net-tools-1.60-plipconfig-ecode.patch %description This package contains essential programs for network administration and @@ -93,6 +96,18 @@ Peter Tobias <[email protected]> Olaf Kirch <[email protected]> +%package deprecated +Summary: Deprecated Networking Utilities +Group: Productivity/Networking/Other + +%description deprecated +This package contains the arp, ifconfig, netstat and route utilities, +which have been replaced by tools from the iproute2 package: + * arp -> ip [-r] neigh + * ifconfig -> ip a + * netstat -> ss [-r] + * route -> ip r + %prep %setup -q cp %{S:3} lib/ @@ -141,6 +156,9 @@ %patch47 %patch48 %patch49 +%patch50 -p1 +%patch51 -p1 +%patch52 -p1 cp %{S:4} . cp %{S:5} ./man/en_US @@ -165,7 +183,7 @@ %ifarch s390 plipconfig slattach \ %endif - nisdomainname ypdomainname mii-tool + nisdomainname ypdomainname mii-tool rarp do rm -f $RPM_BUILD_ROOT/*bin/$tool rm -f $RPM_BUILD_ROOT/%{_mandir}/man*/$tool.* @@ -175,8 +193,20 @@ mv $RPM_BUILD_ROOT/%{_mandir}/fr_FR $RPM_BUILD_ROOT/%{_mandir}/fr %find_lang %{name} --all-name --with-man -%clean -rm -rf $RPM_BUILD_ROOT +# generate the filelist for net-tools-deprecated +echo '%%defattr(-,root,root)' >deprecated.list +for tool in arp ifconfig ipmaddr iptunnel netstat route; do + for dir in bin sbin; do + if test -x $RPM_BUILD_ROOT/$dir/$tool; then + break + fi + done + echo /$dir/$tool >>deprecated.list + find $RPM_BUILD_ROOT/%_mandir -name "$tool.*"\ + -printf '%_mandir/%%P*\n' >>deprecated.list +done +cat deprecated.list +sed 's/^/%%exclude /' deprecated.list >>%name.lang %files -f %{name}.lang %defattr(-,root,root) @@ -185,4 +215,6 @@ %_mandir/man*/* %config(noreplace) /etc/xinetd.d/netstat +%files deprecated -f deprecated.list + %changelog ++++++ net-tools-1.60-plipconfig-ecode.patch ++++++ --- net-tools-1.60/plipconfig.c.org 2012-01-09 11:44:28.000000000 +0100 +++ net-tools-1.60/plipconfig.c 2012-01-09 11:53:30.000000000 +0100 @@ -62,7 +62,6 @@ { fprintf(stderr, _("Usage: plipconfig interface [nibble NN] [trigger NN]\n")); fprintf(stderr, _(" plipconfig [-V] [--version] [-h] [--help]\n")); - exit(-1); } void print_plip(void) @@ -91,17 +90,22 @@ while (argv[0] && *argv[0] == '-') { if (!strcmp(*argv, "-V") || !strcmp(*argv, "--version")) version(); - else if (!strcmp(*argv, "-h") || !strcmp(*argv, "--help")) + else if (!strcmp(*argv, "-h") || !strcmp(*argv, "--help")) { usage(); + exit(0); + } else { usage(); + exit(-1); } argv++; argc--; } - if (argc == 0) + if (argc == 0) { usage(); + exit(-1); + } spp = argv; strncpy(ifr.ifr_name, *spp++, IFNAMSIZ); @@ -119,20 +123,25 @@ } while (*spp != (char *) NULL) { if (!strcmp(*spp, "nibble")) { - if (*++spp == NULL) + if (*++spp == NULL) { usage(); + exit(-1); + } plip->nibble = atoi(*spp); spp++; continue; } if (!strcmp(*spp, "trigger")) { - if (*++spp == NULL) + if (*++spp == NULL) { usage(); + exit(-1); + } plip->trigger = atoi(*spp); spp++; continue; } usage(); + exit(-1); } plip->pcmd = PLIP_SET_TIMEOUT; ++++++ net-tools-1.60-plipconfig-manpage.patch ++++++ --- net-tools-1.60/man/en_US/plipconfig.8.org 2011-04-13 10:03:35.135247120 +0530 +++ net-tools-1.60/man/en_US/plipconfig.8 2011-04-13 10:25:55.615256803 +0530 @@ -2,9 +2,9 @@ .SH NAME plipconfig \- fine tune PLIP device parameters .SH SYNOPSIS -.B "plipconfig interface" +.B "plipconfig interface [nibble NN] [trigger NN]" .br -.B "plipconfig interface [nibble NN] [trigger NN] [unit NN]" +.B "plipconfig [-V] [--version] [-h] [--help]" .SH DESCRIPTION .B Plipconfig is used to (hopefully) improve PLIP performance by changing the default ++++++ net-tools-1.60-plipconfig-usage.patch ++++++ --- net-tools-1.60/plipconfig.c.org 2011-07-21 04:35:23.000000000 -0400 +++ net-tools-1.60/plipconfig.c 2011-07-21 04:35:38.000000000 -0400 @@ -43,9 +43,6 @@ #include "net-support.h" #include "version.h" -int opt_a = 0; -int opt_i = 0; -int opt_v = 0; int skfd = -1; struct ifreq ifr; @@ -63,9 +60,8 @@ static void version(void) void usage(void) { - fprintf(stderr, _("Usage: plipconfig [-a] [-i] [-v] interface\n")); - fprintf(stderr, _(" [nibble NN] [trigger NN]\n")); - fprintf(stderr, _(" plipconfig -V | --version\n")); + fprintf(stderr, _("Usage: plipconfig interface [nibble NN] [trigger NN]\n")); + fprintf(stderr, _(" plipconfig [-V] [--version] [-h] [--help]\n")); exit(-1); } @@ -93,12 +89,13 @@ int main(int argc, char **argv) argc--; argv++; while (argv[0] && *argv[0] == '-') { - if (!strcmp(*argv, "-a")) - opt_a = 1; - if (!strcmp(*argv, "-v")) - opt_v = 1; if (!strcmp(*argv, "-V") || !strcmp(*argv, "--version")) version(); + else if (!strcmp(*argv, "-h") || !strcmp(*argv, "--help")) + usage(); + else { + usage(); + } argv++; argc--; }
