开源软件构建与测试

_service:extract_file:net-tools.spec Deleted

@@ -1,126 +0,0 @@
-Name:          net-tools
-Version:       2.10
-Release:       1
-Summary:       Important Programs for Networking
-License:       GPLv2+
-URL:           https://sourceforge.net/projects/net-tools/
-source0:       https://sourceforge.net/projects/net-tools/files/%{name}-%{version}.tar.xz
-Source1:       net-tools-config.h
-Source2:       net-tools-config.make
-Source3:       ether-wake.c
-Source4:       ether-wake.8
-Source5:       mii-diag.c
-Source6:       mii-diag.8
-Source7:       iptunnel.8
-Source8:       ipmaddr.8
-Source9:       arp-ethers.service
-
-Patch1:        backport-net-tools-cycle.patch
-Patch2:        backport-net-tools-man.patch
-Patch3:        backport-ether-wake-interfaces.patch
-
-BuildRequires: bluez-libs-devel gettext, libselinux libselinux-devel systemd gcc
-%{?systemd_requires}
-
-%description
-This package contains programs for network administration and maintenance.
-Most of the utilities formerly contained in this package (netstat, arp,
-ifconfig, rarp, route) are obsoleted by the tools from iproute2 package (ip, ss)
-and have been moved to net-tools-deprecated.
-
-%package_help
-
-%prep
-%setup -q
-cp %SOURCE1 ./config.h
-cp %SOURCE2 ./config.make
-cp %SOURCE3 .
-cp %SOURCE4 ./man/en_US
-cp %SOURCE5 .
-cp %SOURCE6 ./man/en_US
-cp %SOURCE7 ./man/en_US
-cp %SOURCE8 ./man/en_US
-%patch1 -p1 -b .cycle
-%patch2 -p1 -b .man
-%patch3 -p1 -b .interfaces
-touch ./config.h
-
-%build
-export CFLAGS="${RPM_OPT_FLAGS} -fpie"
-export LDFLAGS="${RPM_LD_FLAGS} -pie -Wl,-z,now"
-make
-make ether-wake
-gcc ${RPM_OPT_FLAGS} ${RPM_LD_FLAGS} -o mii-diag mii-diag.c
-
-%install
-mv man/de_DE man/de
-mv man/fr_FR man/fr
-mv man/pt_BR man/pt
-make BASEDIR=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} install
-cp %{buildroot}%{_bindir}/ifconfig %{buildroot}%{_sbindir}
-rm -f %{buildroot}%{_bindir}/ifconfig
-cp %{buildroot}%{_bindir}/route %{buildroot}%{_sbindir}
-rm -f %{buildroot}%{_bindir}/route
-cp -p  ether-wake %{buildroot}%{_sbindir}
-chmod 755 %{buildroot}%{_sbindir}/ether-wake
-cp -p  mii-diag %{buildroot}%{_sbindir}
-chmod 755 %{buildroot}%{_sbindir}/mii-diag
-mkdir -p %{buildroot}%{_unitdir}
-cp %{SOURCE9} %{buildroot}%{_unitdir}
-chmod 644 %{buildroot}%{_unitdir}/arp-ethers.service
-touch %{buildroot}%{_unitdir}/arp-ethers.service
-
-%post
-%systemd_post arp-ethers.service
-
-%files
-%defattr(-,root,root)
-%license COPYING
-%{_bindir}/netstat
-%{_prefix}/lib/systemd/system/arp-ethers.service
-%{_sbindir}/*
-%{_datadir}/locale/*
-%exclude %{_sbindir}/rarp
-
-%files help
-%defattr(-,root,root)
-%{_mandir}/de/man5/*.gz
-%{_mandir}/de/man8/*.gz
-%{_mandir}/fr/man5/*.gz
-%{_mandir}/fr/man8/*.gz
-%{_mandir}/man5/ethers.5.gz
-%{_mandir}/man8/*.gz
-%{_mandir}/pt/man8/*.gz
-
-%exclude %{_mandir}/man8/rarp.8*
-%exclude %{_mandir}/de/man8/rarp.8*
-%exclude %{_mandir}/fr/man8/rarp.8*
-%exclude %{_mandir}/pt/man8/rarp.8*
-%exclude %{_mandir}/de/man1
-%exclude %{_mandir}/fr/man1
-%exclude %{_mandir}/man1
-%exclude %{_mandir}/pt/man1
-%exclude %{_mandir}/pt/man5
-
-%changelog
-* Tue Dec 07 2021 gaihuiying<gaihuiying1@huawei.com> - 2.10-1
-- Type:requirement
-- ID:NA
-- SUG:NA
-- DESC:update net-tools to 2.10
-
-* Wed Sep 2 2020 zengwefeng<zwfeng@huawei.com> - 2.0-0.55
-- Type:NA
-- ID:NA
-- SUG:NA
-- DESC:add yaml file
-
-* Tue Dec 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.0-0.54
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:optimization the spec
-
-* Wed Sep 11 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.0-0.53
-- Package init
-

_service:tar_scm:net-tools.spec Added

@@ -0,0 +1,142 @@
+Name:          net-tools
+Version:       2.10
+Release:       3
+Summary:       Important Programs for Networking
+License:       GPLv2+
+URL:           https://sourceforge.net/projects/net-tools/
+source0:       https://sourceforge.net/projects/net-tools/files/%{name}-%{version}.tar.xz
+Source1:       net-tools-config.h
+Source2:       net-tools-config.make
+Source3:       ether-wake.c
+Source4:       ether-wake.8
+Source5:       mii-diag.c
+Source6:       mii-diag.8
+Source7:       iptunnel.8
+Source8:       ipmaddr.8
+Source9:       arp-ethers.service
+
+Patch1:        backport-net-tools-cycle.patch
+Patch2:        backport-net-tools-man.patch
+Patch3:        backport-ether-wake-interfaces.patch
+Patch4:        backport-interface-change-pointopoint-short-flag-from-P-to-p.patch
+Patch5:        fix-ifconfig-display-error-when-the-length-of-interface-name-is-15.patch
+
+BuildRequires: bluez-libs-devel gettext, libselinux libselinux-devel systemd gcc
+%{?systemd_requires}
+
+%description
+This package contains programs for network administration and maintenance.
+Most of the utilities formerly contained in this package (netstat, arp,
+ifconfig, rarp, route) are obsoleted by the tools from iproute2 package (ip, ss)
+and have been moved to net-tools-deprecated.
+
+%package_help
+
+%prep
+%setup -q
+cp %SOURCE1 ./config.h
+cp %SOURCE2 ./config.make
+cp %SOURCE3 .
+cp %SOURCE4 ./man/en_US
+cp %SOURCE5 .
+cp %SOURCE6 ./man/en_US
+cp %SOURCE7 ./man/en_US
+cp %SOURCE8 ./man/en_US
+%patch1 -p1 -b .cycle
+%patch2 -p1 -b .man
+%patch3 -p1 -b .interfaces
+%patch4 -p1
+%patch5 -p1
+touch ./config.h
+
+%build
+export CFLAGS="${RPM_OPT_FLAGS} -fpie"
+export LDFLAGS="${RPM_LD_FLAGS} -pie -Wl,-z,now"
+make
+make ether-wake
+gcc ${RPM_OPT_FLAGS} ${RPM_LD_FLAGS} -o mii-diag mii-diag.c
+
+%install
+mv man/de_DE man/de
+mv man/fr_FR man/fr
+mv man/pt_BR man/pt
+make BASEDIR=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} install
+cp %{buildroot}%{_bindir}/ifconfig %{buildroot}%{_sbindir}
+rm -f %{buildroot}%{_bindir}/ifconfig
+cp %{buildroot}%{_bindir}/route %{buildroot}%{_sbindir}
+rm -f %{buildroot}%{_bindir}/route
+cp -p  ether-wake %{buildroot}%{_sbindir}
+chmod 755 %{buildroot}%{_sbindir}/ether-wake
+cp -p  mii-diag %{buildroot}%{_sbindir}
+chmod 755 %{buildroot}%{_sbindir}/mii-diag
+mkdir -p %{buildroot}%{_unitdir}
+cp %{SOURCE9} %{buildroot}%{_unitdir}
+chmod 644 %{buildroot}%{_unitdir}/arp-ethers.service
+touch %{buildroot}%{_unitdir}/arp-ethers.service
+
+%post
+%systemd_post arp-ethers.service
+
+%files
+%defattr(-,root,root)
+%license COPYING
+%{_bindir}/netstat
+%{_prefix}/lib/systemd/system/arp-ethers.service
+%{_sbindir}/*
+%{_datadir}/locale/*
+%exclude %{_sbindir}/rarp
+
+%files help
+%defattr(-,root,root)
+%{_mandir}/de/man5/*.gz
+%{_mandir}/de/man8/*.gz
+%{_mandir}/fr/man5/*.gz
+%{_mandir}/fr/man8/*.gz
+%{_mandir}/man5/ethers.5.gz
+%{_mandir}/man8/*.gz
+%{_mandir}/pt/man8/*.gz
+
+%exclude %{_mandir}/man8/rarp.8*
+%exclude %{_mandir}/de/man8/rarp.8*
+%exclude %{_mandir}/fr/man8/rarp.8*
+%exclude %{_mandir}/pt/man8/rarp.8*
+%exclude %{_mandir}/de/man1
+%exclude %{_mandir}/fr/man1
+%exclude %{_mandir}/man1
+%exclude %{_mandir}/pt/man1
+%exclude %{_mandir}/pt/man5
+
+%changelog
+* Mon Dec 19 2022 eaglegai <eaglegai@163.com> - 2.10-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix ifconfig display error when the length of interface name is 15
+
+* Thu Oct 20 2022 konglidong <konglidong@uniontech.com> - 2.10-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:interface: change pointopoint short flag from P to p
+
+* Tue Dec 07 2021 gaihuiying<gaihuiying1@huawei.com> - 2.10-1
+- Type:requirement
+- ID:NA
+- SUG:NA
+- DESC:update net-tools to 2.10
+
+* Wed Sep 2 2020 zengwefeng<zwfeng@huawei.com> - 2.0-0.55
+- Type:NA
+- ID:NA
+- SUG:NA
+- DESC:add yaml file
+
+* Tue Dec 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.0-0.54
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:optimization the spec
+
+* Wed Sep 11 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.0-0.53
+- Package init
+

_service:extract_file:backport-ether-wake-interfaces.patch Deleted

@@ -1,178 +0,0 @@
-diff -up net-tools-2.0/ether-wake.c.interfaces net-tools-2.0/ether-wake.c
---- net-tools-2.0/ether-wake.c.interfaces	2015-09-15 18:02:18.595968129 +0200
-+++ net-tools-2.0/ether-wake.c	2015-09-15 18:02:18.607968095 +0200
-@@ -22,7 +22,7 @@ static char usage_msg =
- "	Options:\n"
- "		-b	Send wake-up packet to the broadcast address.\n"
- "		-D	Increase the debug level.\n"
--"		-i ifname	Use interface IFNAME instead of the default 'eth0'.\n"
-+"		-i ifname	Use interface ifname instead of sending a wake packet to all interfaces.\n"
- "		-p <pw>		Append the four or six byte password PW to the packet.\n"
- "					A password is only required for a few adapter types.\n"
- "					The password may be specified in ethernet hex format\n"
-@@ -89,6 +89,9 @@ static char usage_msg =
- #include <netdb.h>
- #include <netinet/ether.h>
- 
-+#include "interface.h"
-+#include "sockets.h"
-+
- /* Grrr, no consistency between include versions.
-    Enable this if setsockopt() isn't declared with your library. */
- #if 0
-@@ -110,20 +113,29 @@ static int get_dest_addr(const char *arg
- static int get_fill(unsigned char *pkt, struct ether_addr *eaddr);
- static int get_wol_pw(const char *optarg);
- 
-+typedef struct {
-+	int s;
-+	int verbose;
-+	int pktsize;
-+} if_info;
-+
-+static int send_wol_packet(char *ifname, int s, int verbose, int pktsize);
-+
-+static int do_wake(struct interface *ife, void *cookie) {
-+	if_info *info = (if_info *)cookie;
-+	send_wol_packet(ife->name, info->s, info->verbose, info->pktsize);
-+	return 0;
-+}
-+
- int main(int argc, char *argv)
- {
--	char *ifname = "eth0";
--	int one = 1;				/* True, for socket options. */
-+	char *ifname = NULL;
- 	int s;						/* Raw socket */
- 	int errflag = 0, verbose = 0, do_version = 0;
- 	int perm_failure = 0;
--	int i, c, pktsize;
--#if defined(PF_PACKET)
--	struct sockaddr_ll whereto;
--#else
--	struct sockaddr whereto;	/* who to wake up */
--#endif
-+	int c, pktsize;
- 	struct ether_addr eaddr;
-+	if_info info;
- 
- 	while ((c = getopt(argc, argv, "bDi:p:uvV")) != -1)
- 		switch (c) {
-@@ -131,7 +143,7 @@ int main(int argc, char *argv)
- 		case 'D': debug++;			break;
- 		case 'i': ifname = optarg;	break;
- 		case 'p': get_wol_pw(optarg); break;
--		case 'u': printf(usage_msg); return 0;
-+		case 'u': printf("%s",usage_msg); return 0;
- 		case 'v': verbose++;		break;
- 		case 'V': do_version++;		break;
- 		case '?':
-@@ -140,7 +152,7 @@ int main(int argc, char *argv)
- 	if (verbose || do_version)
- 		printf("%s\n", version_msg);
- 	if (errflag) {
--		fprintf(stderr, brief_usage_msg);
-+		fprintf(stderr,"%s", brief_usage_msg);
- 		return 3;
- 	}
- 
-@@ -177,13 +189,45 @@ int main(int argc, char *argv)
- 
- 	pktsize = get_fill(outpack, &eaddr);
- 
-+	if (ifname == NULL) {
-+		info.s = s;
-+		info.verbose = verbose;
-+		info.pktsize = pktsize;
-+
-+		/* Create a channel to the NET kernel. */
-+		if ((sockets_open(0)) < 0) {
-+			perror("socket");
-+			exit(1);
-+		}
-+
-+		return for_all_interfaces(do_wake, &info);
-+	}
-+
-+	return send_wol_packet(ifname, s, verbose, pktsize);
-+}
-+
-+/* Send a Wake-On-LAN (WOL) "Magic Packet" to Interface IFNAME using
-+   Socket S with a packet size PKTSIZE.  VERBOSE implies
-+   verbosity.  */
-+
-+static int send_wol_packet(char *ifname, int s, int verbose, int pktsize)
-+{
-+	int i;
-+	int one = 1;				/* True, for socket options. */
-+#if defined(PF_PACKET)
-+	struct sockaddr_ll whereto;
-+#else
-+	struct sockaddr whereto;	/* who to wake up */
-+#endif
-+
- 	/* Fill in the source address, if possible.
- 	   The code to retrieve the local station address is Linux specific. */
- 	if (! opt_no_src_addr) {
- 		struct ifreq if_hwaddr;
--		unsigned char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data;
-+		const char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data;
- 
--		strcpy(if_hwaddr.ifr_name, ifname);
-+		strncpy(if_hwaddr.ifr_name, ifname, IFNAMSIZ);
-+		if_hwaddr.ifr_nameIFNAMSIZ-1 = '\0';
- 		if (ioctl(s, SIOCGIFHWADDR, &if_hwaddr) < 0) {
- 			fprintf(stderr, "SIOCGIFHWADDR on %s failed: %s\n", ifname,
- 					strerror(errno));
-@@ -220,7 +264,8 @@ int main(int argc, char *argv)
- #if defined(PF_PACKET)
- 	{
- 		struct ifreq ifr;
--		strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-+		strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-+		ifr.ifr_nameIFNAMSIZ-1 = '\0';
- 		if (ioctl(s, SIOCGIFINDEX, &ifr) == -1) {
- 			fprintf(stderr, "SIOCGIFINDEX on %s failed: %s\n", ifname,
- 					strerror(errno));
-@@ -240,11 +285,14 @@ int main(int argc, char *argv)
- 	strcpy(whereto.sa_data, ifname);
- #endif
- 
-+	char senderrmsgIFNAMSIZ+16 = "'";
-+	strcat(senderrmsg, ifname);
-+	strcat(senderrmsg, "', sendto");
- 	if ((i = sendto(s, outpack, pktsize, 0, (struct sockaddr *)&whereto,
- 					sizeof(whereto))) < 0)
--		perror("sendto");
-+		perror(senderrmsg);
- 	else if (debug)
--		printf("Sendto worked ! %d.\n", i);
-+		printf("'%s', Sendto worked ! %d.\n", ifname, i);
- 
- #ifdef USE_SEND
- 	if (bind(s, (struct sockaddr *)&whereto, sizeof(whereto)) < 0)
-diff -up net-tools-2.0/Makefile.interfaces net-tools-2.0/Makefile
---- net-tools-2.0/Makefile.interfaces	2015-09-15 18:02:18.608968093 +0200
-+++ net-tools-2.0/Makefile	2015-09-15 18:04:06.273668275 +0200
-@@ -193,6 +193,9 @@ ipmaddr:	$(NET_LIB) ipmaddr.o
- mii-tool:	$(NET_LIB) mii-tool.o
- 		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB) $(LDLIBS)
- 
-+ether-wake:	$(NET_LIB) ether-wake.o
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o ether-wake ether-wake.o $(NLIB) $(LDLIBS)
-+
- installbin:
- 	@echo
- 	@echo "######################################################"
-diff -up net-tools-2.0/man/en_US/ether-wake.8.interfaces net-tools-2.0/man/en_US/ether-wake.8
---- net-tools-2.0/man/en_US/ether-wake.8.interfaces	2015-09-15 18:02:18.597968123 +0200
-+++ net-tools-2.0/man/en_US/ether-wake.8	2015-09-15 18:02:18.608968093 +0200
-@@ -49,7 +49,7 @@ Send the wake-up packet to the broadcast
- Increase the Debug Level.
- .TP
- .B \-i ifname
--Use interface ifname instead of the default "eth0".
-+Use interface ifname instead of sending a wake packet to all interfaces.
- .TP
- .B \-p passwd
- Append a four or six byte password to the packet. Only a few adapters

_service:extract_file:backport-net-tools-cycle.patch Deleted

@@ -1,676 +0,0 @@
-diff -up net-tools-2.10/lib/interface.c.cycle net-tools-2.10/lib/interface.c
---- net-tools-2.10/lib/interface.c.cycle	2016-02-15 16:54:18.000000000 +0100
-+++ net-tools-2.10/lib/interface.c	2016-03-30 09:58:18.247891588 +0200
-@@ -93,6 +93,7 @@ int if_list_all = 0;	/* do we have reque
- static struct interface *int_list, *int_last;
- 
- static int if_readlist_proc(const char *);
-+static int if_readlist_rep(const char *, struct interface *);
- 
- static struct interface *if_cache_add(const char *name)
- {
-@@ -138,11 +139,14 @@ struct interface *lookup_interface(const
- int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie)
- {
-     struct interface *ife;
-+    int err;
- 
-     if (!if_list_all && (if_readlist() < 0))
- 	return -1;
-     for (ife = int_list; ife; ife = ife->next) {
--	int err = doit(ife, cookie);
-+	if_readlist_rep(ife->name, ife);
-+	err = doit(ife, cookie);
-+
- 	if (err)
- 	    return err;
-     }
-@@ -210,16 +214,24 @@ out:
-     return err;
- }
- 
--static const char *get_name(char *name, const char *p)
-+static const char *get_name(char **namep, const char *p)
- {
-+    int count = 0;
-     while (isspace(*p))
- 	p++;
-+    char *name = *namep = p;
-     while (*p) {
- 	if (isspace(*p))
- 	    break;
- 	if (*p == ':') {	/* could be an alias */
- 		const char *dot = p++;
-- 		while (*p && isdigit(*p)) p++;
-+		count++;
-+		while (*p && isdigit(*p)) {
-+		    p++;
-+		    count++;
-+		    if (count == (IFNAMSIZ-1))
-+			break;
-+		}
- 		if (*p == ':') {
- 			/* Yes it is, backup and copy it. */
- 			p = dot;
-@@ -235,6 +247,9 @@ static const char *get_name(char *name,
- 	    break;
- 	}
- 	*name++ = *p++;
-+	count++;
-+	if (count == (IFNAMSIZ-1))
-+    	      break;
-     }
-     *name++ = '\0';
-     return p;
-@@ -316,9 +331,10 @@ static int get_dev_fields(const char *bp
- static int if_readlist_proc(const char *target)
- {
-     FILE *fh;
--    char buf512;
-     struct interface *ife;
-     int err;
-+    char *line = NULL;
-+    size_t linelen = 0;  
- 
-     fh = fopen(_PATH_PROCNET_DEV, "r");
-     if (!fh) {
-@@ -326,10 +342,11 @@ static int if_readlist_proc(const char *
- 			_PATH_PROCNET_DEV, strerror(errno));
- 		return -2;
- 	}
--    if (fgets(buf, sizeof buf, fh))
--		/* eat line */;
--    if (fgets(buf, sizeof buf, fh))
--		/* eat line */;
-+    if (getline(&line, &linelen, fh) == -1 /* eat line */
-+	|| getline(&line, &linelen, fh) == -1) { /* eat line */
-+		err = -1;
-+		goto out;
-+	}
- 
- #if 0				/* pretty, but can't cope with missing fields */
-     fmt = proc_gen_fmt(_PATH_PROCNET_DEV, 1, fh,
-@@ -354,14 +371,14 @@ static int if_readlist_proc(const char *
-     if (!fmt)
- 	return -1;
- #else
--    procnetdev_vsn = procnetdev_version(buf);
-+    procnetdev_vsn = procnetdev_version(line);
- #endif
- 
-     err = 0;
--    while (fgets(buf, sizeof buf, fh)) {
-+    while (getline(&line, &linelen, fh) != -1) {
- 	const char *s;
--	char nameIFNAMSIZ;
--	s = get_name(name, buf);
-+	char *name;
-+	s = get_name(&name, line);    
- 	ife = if_cache_add(name);
- 	get_dev_fields(s, ife);
- 	ife->statistics_valid = 1;
-@@ -376,6 +393,51 @@ static int if_readlist_proc(const char *
- #if 0
-     free(fmt);
- #endif
-+  out:
-+    free(line);
-+    fclose(fh);
-+    return err;
-+}
-+
-+static int if_readlist_rep(const char *target, struct interface *ife)
-+{
-+    FILE *fh;
-+    int err;
-+    char *line = NULL;
-+    size_t linelen = 0;
-+
-+    fh = fopen(_PATH_PROCNET_DEV, "r");
-+    if (!fh) {
-+		fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"),
-+			_PATH_PROCNET_DEV, strerror(errno)); 
-+		return if_readconf();
-+	}
-+    if (getline(&line, &linelen, fh) == -1 /* eat line */
-+	|| getline(&line, &linelen, fh) == -1) { /* eat line */
-+		err = -1;
-+		goto out;
-+	}
-+
-+    procnetdev_vsn = procnetdev_version(line);
-+
-+    err = 0;
-+    while (getline(&line, &linelen, fh) != -1) {
-+	char *s, *name;
-+	s = get_name(&name, line);    
-+	get_dev_fields(s, ife);
-+	if (target && !strcmp(target,name))
-+	{
-+		ife->statistics_valid = 1;
-+		break;
-+	}
-+    }
-+    if (ferror(fh)) {
-+	perror(_PATH_PROCNET_DEV);
-+	err = -1;
-+    }
-+
-+  out:
-+    free(line);
-     fclose(fh);
-     return err;
- }
-diff -up net-tools-2.10/man/en_US/netstat.8.cycle net-tools-2.10/man/en_US/netstat.8
---- net-tools-2.10/man/en_US/netstat.8.cycle	2016-02-15 16:54:18.000000000 +0100
-+++ net-tools-2.10/man/en_US/netstat.8	2016-03-30 09:58:18.241891637 +0200
-@@ -36,6 +36,7 @@ netstat \- Print network connections, ro
- .RB  \-\-verbose | \-v 
- .RB  \-\-continuous | \-c
- .RB  \-\-wide | \-W 
-+.RB delay
- .P
- .B netstat 
- .RB { \-\-route | \-r }
-@@ -45,22 +46,25 @@ netstat \- Print network connections, ro
- .RB  \-\-numeric | \-n 
- .RB  \-\-numeric\-hosts " " \-\-numeric\-ports " " \-\-numeric\-users 
- .RB  \-\-continuous | \-c 
-+.RB delay
- .P
- .B netstat
--.RB { \-\-interfaces | \-i }
-+.RB { \-\-interfaces | \-I | \-i }
- .RB  \-\-all | \-a 
--.RB  \-\-extend | \-e   \-\-extend | \-e 
-+.RB  \-\-extend | \-e  
- .RB  \-\-verbose | \-v 
- .RB  \-\-program | \-p 
- .RB  \-\-numeric | \-n 
- .RB  \-\-numeric-hosts " " \-\-numeric-ports " " \-\-numeric-users 
- .RB  \-\-continuous | \-c 
-+.RB delay
- .P
- .B netstat
- .RB { \-\-groups | \-g }
- .RB  \-\-numeric | \-n 
- .RB  \-\-numeric\-hosts " " \-\-numeric\-ports " " \-\-numeric\-users 
- .RB  \-\-continuous | \-c 
-+.RB delay

_service:extract_file:backport-net-tools-man.patch Deleted

@@ -1,147 +0,0 @@
-diff -up net-tools-2.0/man/en_US/arp.8.man net-tools-2.0/man/en_US/arp.8
---- net-tools-2.0/man/en_US/arp.8.man	2014-04-26 02:45:16.000000000 +0200
-+++ net-tools-2.0/man/en_US/arp.8	2014-07-07 14:51:31.378459439 +0200
-@@ -63,6 +63,10 @@ arp \- manipulate the system ARP cache
- .B \-f
- .RI  filename 
- 
-+.SH NOTE
-+.P
-+This program is obsolete. For replacement check \fBip neigh\fR.
-+
- .SH DESCRIPTION
- .B Arp
- manipulates or displays the kernel's IPv4 network neighbour cache. It can add
-@@ -219,9 +223,6 @@ published proxy ARP entries and permanen
- .I /etc/ethers
- .SH SEE ALSO
- .BR ethers (5),
--.BR rarp (8),
--.BR route (8),
--.BR ifconfig (8),
--.BR netstat (8)
-+.BR ip (8)
- .SH AUTHORS
- Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net\-tools@lina.inka.de>.
-diff -up net-tools-2.0/man/en_US/ethers.5.man net-tools-2.0/man/en_US/ethers.5
---- net-tools-2.0/man/en_US/ethers.5.man	2014-04-26 02:45:16.000000000 +0200
-+++ net-tools-2.0/man/en_US/ethers.5	2014-07-07 14:51:31.378459439 +0200
-@@ -26,6 +26,3 @@ can be resolved by DNS or a dot separate
- 08:00:20:00:61:CA  pal
- .SH FILES
- /etc/ethers
--.SH "SEE ALSO"
--.BR arp (8),
--.BR rarp (8)
-diff -up net-tools-2.0/man/en_US/ifconfig.8.man net-tools-2.0/man/en_US/ifconfig.8
---- net-tools-2.0/man/en_US/ifconfig.8.man	2014-04-26 02:45:16.000000000 +0200
-+++ net-tools-2.0/man/en_US/ifconfig.8	2014-07-07 14:51:31.379459422 +0200
-@@ -5,6 +5,13 @@ ifconfig \- configure a network interfac
- .B "ifconfig -v -a -s interface"
- .br
- .B "ifconfig -v interface aftype options | address ..."
-+
-+.SH NOTE
-+.P 
-+This program is obsolete!
-+For replacement check \fBip addr\fR and \fBip link\fR.
-+For statistics use \fBip -s link\fR.
-+
- .SH DESCRIPTION
- .B Ifconfig
- is used to configure the kernel-resident network interfaces.  It is
-@@ -222,13 +229,8 @@ package to display link layer informatio
- While appletalk DDP and IPX addresses will be displayed they cannot be
- altered by this command.
- .SH SEE ALSO
--.BR route (8),
--.BR netstat (8),
--.BR arp (8),
--.BR rarp (8),
--.BR iptables (8),
--.BR ifup (8),
--.BR interfaces (5)
-+.BR ip (8),
-+.BR iptables (8)
- .br
- http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples
- .SH AUTHORS
-diff -up net-tools-2.0/man/en_US/mii-tool.8.man net-tools-2.0/man/en_US/mii-tool.8
---- net-tools-2.0/man/en_US/mii-tool.8.man	2014-04-26 02:45:16.000000000 +0200
-+++ net-tools-2.0/man/en_US/mii-tool.8	2014-07-07 14:51:31.379459422 +0200
-@@ -18,6 +18,10 @@ mii\-tool \- view, manipulate media-inde
- \fB\-p\fR, \fB\-\-phy=\fIaddr\fR
- .RI "interface\ ..."
- 
-+.SH NOTE
-+.P 
-+This program is obsolete. For replacement check \fBethtool\fB.
-+
- .SH DESCRIPTION
- This utility checks or sets the status of a network interface's Media
- Independent Interface (MII) unit.  Most fast ethernet adapters use an
-@@ -93,6 +97,9 @@ SIOCGMIIPHY on 'eth?' failed: Operation
- The interface in question does not support MII queries. Most likely, it does not have 
- MII transceivers, at all.
- 
-+.SH SEE ALSO
-+ethtool(8)
-+
- .SH AUTHORS
- David Hinds \- dhinds@pcmcia.sourceforge.org
- .br
-diff -up net-tools-2.0/man/en_US/nameif.8.man net-tools-2.0/man/en_US/nameif.8
---- net-tools-2.0/man/en_US/nameif.8.man	2014-04-26 02:45:16.000000000 +0200
-+++ net-tools-2.0/man/en_US/nameif.8	2014-07-07 14:51:31.379459422 +0200
-@@ -5,6 +5,12 @@ nameif \- name network interfaces based
- .B "nameif \-c configfile \-s"
- .br
- .B "nameif \-c configfile \-s {interface macaddress}"
-+
-+.SH NOTE
-+.P 
-+This program is obsolete. For replacement check \fBip link\fR.
-+This functionality is also much better provided by udev methods.
-+
- .SH DESCRIPTION
- .B nameif 
- renames network interfaces based on mac addresses. When no arguments are
-@@ -31,5 +37,10 @@ should be run before the interface is up
- 
- .SH FILES
- /etc/mactab
-+
-+.SH SEE ALSO
-+.BR ip(8),
-+.BR udev(7)
-+
- .SH BUGS
- Only works for Ethernet currently.
-diff -up net-tools-2.0/man/en_US/route.8.man net-tools-2.0/man/en_US/route.8
---- net-tools-2.0/man/en_US/route.8.man	2014-04-26 02:45:16.000000000 +0200
-+++ net-tools-2.0/man/en_US/route.8	2014-07-07 14:52:58.766977905 +0200
-@@ -57,6 +57,11 @@ family
- .RB  \-\-version 
- .RB  \-h 
- .RB  \-\-help 
-+
-+.SH NOTE
-+.P 
-+This program is obsolete. For replacement check \fBip route\fR.
-+
- .SH DESCRIPTION
- .B Route
- manipulates the kernel's IP routing tables.  Its primary use is to set
-@@ -330,11 +335,6 @@ Whether or not the hardware address for
- .LP
- .SH "SEE ALSO"
- .BR ethers (5),
--.BR arp (8),
--.BR rarp (8),
--.BR route (8),
--.BR ifconfig (8),
--.BR netstat (8)
- .LP
- .SH HISTORY
- .B Route
-

_service:tar_scm:backport-ether-wake-interfaces.patch Added

@@ -0,0 +1,178 @@
+diff -up net-tools-2.0/ether-wake.c.interfaces net-tools-2.0/ether-wake.c
+--- net-tools-2.0/ether-wake.c.interfaces	2015-09-15 18:02:18.595968129 +0200
++++ net-tools-2.0/ether-wake.c	2015-09-15 18:02:18.607968095 +0200
+@@ -22,7 +22,7 @@ static char usage_msg =
+ "	Options:\n"
+ "		-b	Send wake-up packet to the broadcast address.\n"
+ "		-D	Increase the debug level.\n"
+-"		-i ifname	Use interface IFNAME instead of the default 'eth0'.\n"
++"		-i ifname	Use interface ifname instead of sending a wake packet to all interfaces.\n"
+ "		-p <pw>		Append the four or six byte password PW to the packet.\n"
+ "					A password is only required for a few adapter types.\n"
+ "					The password may be specified in ethernet hex format\n"
+@@ -89,6 +89,9 @@ static char usage_msg =
+ #include <netdb.h>
+ #include <netinet/ether.h>
+ 
++#include "interface.h"
++#include "sockets.h"
++
+ /* Grrr, no consistency between include versions.
+    Enable this if setsockopt() isn't declared with your library. */
+ #if 0
+@@ -110,20 +113,29 @@ static int get_dest_addr(const char *arg
+ static int get_fill(unsigned char *pkt, struct ether_addr *eaddr);
+ static int get_wol_pw(const char *optarg);
+ 
++typedef struct {
++	int s;
++	int verbose;
++	int pktsize;
++} if_info;
++
++static int send_wol_packet(char *ifname, int s, int verbose, int pktsize);
++
++static int do_wake(struct interface *ife, void *cookie) {
++	if_info *info = (if_info *)cookie;
++	send_wol_packet(ife->name, info->s, info->verbose, info->pktsize);
++	return 0;
++}
++
+ int main(int argc, char *argv)
+ {
+-	char *ifname = "eth0";
+-	int one = 1;				/* True, for socket options. */
++	char *ifname = NULL;
+ 	int s;						/* Raw socket */
+ 	int errflag = 0, verbose = 0, do_version = 0;
+ 	int perm_failure = 0;
+-	int i, c, pktsize;
+-#if defined(PF_PACKET)
+-	struct sockaddr_ll whereto;
+-#else
+-	struct sockaddr whereto;	/* who to wake up */
+-#endif
++	int c, pktsize;
+ 	struct ether_addr eaddr;
++	if_info info;
+ 
+ 	while ((c = getopt(argc, argv, "bDi:p:uvV")) != -1)
+ 		switch (c) {
+@@ -131,7 +143,7 @@ int main(int argc, char *argv)
+ 		case 'D': debug++;			break;
+ 		case 'i': ifname = optarg;	break;
+ 		case 'p': get_wol_pw(optarg); break;
+-		case 'u': printf(usage_msg); return 0;
++		case 'u': printf("%s",usage_msg); return 0;
+ 		case 'v': verbose++;		break;
+ 		case 'V': do_version++;		break;
+ 		case '?':
+@@ -140,7 +152,7 @@ int main(int argc, char *argv)
+ 	if (verbose || do_version)
+ 		printf("%s\n", version_msg);
+ 	if (errflag) {
+-		fprintf(stderr, brief_usage_msg);
++		fprintf(stderr,"%s", brief_usage_msg);
+ 		return 3;
+ 	}
+ 
+@@ -177,13 +189,45 @@ int main(int argc, char *argv)
+ 
+ 	pktsize = get_fill(outpack, &eaddr);
+ 
++	if (ifname == NULL) {
++		info.s = s;
++		info.verbose = verbose;
++		info.pktsize = pktsize;
++
++		/* Create a channel to the NET kernel. */
++		if ((sockets_open(0)) < 0) {
++			perror("socket");
++			exit(1);
++		}
++
++		return for_all_interfaces(do_wake, &info);
++	}
++
++	return send_wol_packet(ifname, s, verbose, pktsize);
++}
++
++/* Send a Wake-On-LAN (WOL) "Magic Packet" to Interface IFNAME using
++   Socket S with a packet size PKTSIZE.  VERBOSE implies
++   verbosity.  */
++
++static int send_wol_packet(char *ifname, int s, int verbose, int pktsize)
++{
++	int i;
++	int one = 1;				/* True, for socket options. */
++#if defined(PF_PACKET)
++	struct sockaddr_ll whereto;
++#else
++	struct sockaddr whereto;	/* who to wake up */
++#endif
++
+ 	/* Fill in the source address, if possible.
+ 	   The code to retrieve the local station address is Linux specific. */
+ 	if (! opt_no_src_addr) {
+ 		struct ifreq if_hwaddr;
+-		unsigned char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data;
++		const char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data;
+ 
+-		strcpy(if_hwaddr.ifr_name, ifname);
++		strncpy(if_hwaddr.ifr_name, ifname, IFNAMSIZ);
++		if_hwaddr.ifr_nameIFNAMSIZ-1 = '\0';
+ 		if (ioctl(s, SIOCGIFHWADDR, &if_hwaddr) < 0) {
+ 			fprintf(stderr, "SIOCGIFHWADDR on %s failed: %s\n", ifname,
+ 					strerror(errno));
+@@ -220,7 +264,8 @@ int main(int argc, char *argv)
+ #if defined(PF_PACKET)
+ 	{
+ 		struct ifreq ifr;
+-		strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
++		strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
++		ifr.ifr_nameIFNAMSIZ-1 = '\0';
+ 		if (ioctl(s, SIOCGIFINDEX, &ifr) == -1) {
+ 			fprintf(stderr, "SIOCGIFINDEX on %s failed: %s\n", ifname,
+ 					strerror(errno));
+@@ -240,11 +285,14 @@ int main(int argc, char *argv)
+ 	strcpy(whereto.sa_data, ifname);
+ #endif
+ 
++	char senderrmsgIFNAMSIZ+16 = "'";
++	strcat(senderrmsg, ifname);
++	strcat(senderrmsg, "', sendto");
+ 	if ((i = sendto(s, outpack, pktsize, 0, (struct sockaddr *)&whereto,
+ 					sizeof(whereto))) < 0)
+-		perror("sendto");
++		perror(senderrmsg);
+ 	else if (debug)
+-		printf("Sendto worked ! %d.\n", i);
++		printf("'%s', Sendto worked ! %d.\n", ifname, i);
+ 
+ #ifdef USE_SEND
+ 	if (bind(s, (struct sockaddr *)&whereto, sizeof(whereto)) < 0)
+diff -up net-tools-2.0/Makefile.interfaces net-tools-2.0/Makefile
+--- net-tools-2.0/Makefile.interfaces	2015-09-15 18:02:18.608968093 +0200
++++ net-tools-2.0/Makefile	2015-09-15 18:04:06.273668275 +0200
+@@ -193,6 +193,9 @@ ipmaddr:	$(NET_LIB) ipmaddr.o
+ mii-tool:	$(NET_LIB) mii-tool.o
+ 		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB) $(LDLIBS)
+ 
++ether-wake:	$(NET_LIB) ether-wake.o
++		$(CC) $(CFLAGS) $(LDFLAGS) -o ether-wake ether-wake.o $(NLIB) $(LDLIBS)
++
+ installbin:
+ 	@echo
+ 	@echo "######################################################"
+diff -up net-tools-2.0/man/en_US/ether-wake.8.interfaces net-tools-2.0/man/en_US/ether-wake.8
+--- net-tools-2.0/man/en_US/ether-wake.8.interfaces	2015-09-15 18:02:18.597968123 +0200
++++ net-tools-2.0/man/en_US/ether-wake.8	2015-09-15 18:02:18.608968093 +0200
+@@ -49,7 +49,7 @@ Send the wake-up packet to the broadcast
+ Increase the Debug Level.
+ .TP
+ .B \-i ifname
+-Use interface ifname instead of the default "eth0".
++Use interface ifname instead of sending a wake packet to all interfaces.
+ .TP
+ .B \-p passwd
+ Append a four or six byte password to the packet. Only a few adapters

_service:tar_scm:backport-interface-change-pointopoint-short-flag-from-P-to-p.patch Added

_service:tar_scm:backport-net-tools-cycle.patch Added

@@ -0,0 +1,676 @@
+diff -up net-tools-2.10/lib/interface.c.cycle net-tools-2.10/lib/interface.c
+--- net-tools-2.10/lib/interface.c.cycle	2016-02-15 16:54:18.000000000 +0100
++++ net-tools-2.10/lib/interface.c	2016-03-30 09:58:18.247891588 +0200
+@@ -93,6 +93,7 @@ int if_list_all = 0;	/* do we have reque
+ static struct interface *int_list, *int_last;
+ 
+ static int if_readlist_proc(const char *);
++static int if_readlist_rep(const char *, struct interface *);
+ 
+ static struct interface *if_cache_add(const char *name)
+ {
+@@ -138,11 +139,14 @@ struct interface *lookup_interface(const
+ int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie)
+ {
+     struct interface *ife;
++    int err;
+ 
+     if (!if_list_all && (if_readlist() < 0))
+ 	return -1;
+     for (ife = int_list; ife; ife = ife->next) {
+-	int err = doit(ife, cookie);
++	if_readlist_rep(ife->name, ife);
++	err = doit(ife, cookie);
++
+ 	if (err)
+ 	    return err;
+     }
+@@ -210,16 +214,24 @@ out:
+     return err;
+ }
+ 
+-static const char *get_name(char *name, const char *p)
++static const char *get_name(char **namep, const char *p)
+ {
++    int count = 0;
+     while (isspace(*p))
+ 	p++;
++    char *name = *namep = p;
+     while (*p) {
+ 	if (isspace(*p))
+ 	    break;
+ 	if (*p == ':') {	/* could be an alias */
+ 		const char *dot = p++;
+- 		while (*p && isdigit(*p)) p++;
++		count++;
++		while (*p && isdigit(*p)) {
++		    p++;
++		    count++;
++		    if (count == (IFNAMSIZ-1))
++			break;
++		}
+ 		if (*p == ':') {
+ 			/* Yes it is, backup and copy it. */
+ 			p = dot;
+@@ -235,6 +247,9 @@ static const char *get_name(char *name,
+ 	    break;
+ 	}
+ 	*name++ = *p++;
++	count++;
++	if (count == (IFNAMSIZ-1))
++    	      break;
+     }
+     *name++ = '\0';
+     return p;
+@@ -316,9 +331,10 @@ static int get_dev_fields(const char *bp
+ static int if_readlist_proc(const char *target)
+ {
+     FILE *fh;
+-    char buf512;
+     struct interface *ife;
+     int err;
++    char *line = NULL;
++    size_t linelen = 0;  
+ 
+     fh = fopen(_PATH_PROCNET_DEV, "r");
+     if (!fh) {
+@@ -326,10 +342,11 @@ static int if_readlist_proc(const char *
+ 			_PATH_PROCNET_DEV, strerror(errno));
+ 		return -2;
+ 	}
+-    if (fgets(buf, sizeof buf, fh))
+-		/* eat line */;
+-    if (fgets(buf, sizeof buf, fh))
+-		/* eat line */;
++    if (getline(&line, &linelen, fh) == -1 /* eat line */
++	|| getline(&line, &linelen, fh) == -1) { /* eat line */
++		err = -1;
++		goto out;
++	}
+ 
+ #if 0				/* pretty, but can't cope with missing fields */
+     fmt = proc_gen_fmt(_PATH_PROCNET_DEV, 1, fh,
+@@ -354,14 +371,14 @@ static int if_readlist_proc(const char *
+     if (!fmt)
+ 	return -1;
+ #else
+-    procnetdev_vsn = procnetdev_version(buf);
++    procnetdev_vsn = procnetdev_version(line);
+ #endif
+ 
+     err = 0;
+-    while (fgets(buf, sizeof buf, fh)) {
++    while (getline(&line, &linelen, fh) != -1) {
+ 	const char *s;
+-	char nameIFNAMSIZ;
+-	s = get_name(name, buf);
++	char *name;
++	s = get_name(&name, line);    
+ 	ife = if_cache_add(name);
+ 	get_dev_fields(s, ife);
+ 	ife->statistics_valid = 1;
+@@ -376,6 +393,51 @@ static int if_readlist_proc(const char *
+ #if 0
+     free(fmt);
+ #endif
++  out:
++    free(line);
++    fclose(fh);
++    return err;
++}
++
++static int if_readlist_rep(const char *target, struct interface *ife)
++{
++    FILE *fh;
++    int err;
++    char *line = NULL;
++    size_t linelen = 0;
++
++    fh = fopen(_PATH_PROCNET_DEV, "r");
++    if (!fh) {
++		fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"),
++			_PATH_PROCNET_DEV, strerror(errno)); 
++		return if_readconf();
++	}
++    if (getline(&line, &linelen, fh) == -1 /* eat line */
++	|| getline(&line, &linelen, fh) == -1) { /* eat line */
++		err = -1;
++		goto out;
++	}
++
++    procnetdev_vsn = procnetdev_version(line);
++
++    err = 0;
++    while (getline(&line, &linelen, fh) != -1) {
++	char *s, *name;
++	s = get_name(&name, line);    
++	get_dev_fields(s, ife);
++	if (target && !strcmp(target,name))
++	{
++		ife->statistics_valid = 1;
++		break;
++	}
++    }
++    if (ferror(fh)) {
++	perror(_PATH_PROCNET_DEV);
++	err = -1;
++    }
++
++  out:
++    free(line);
+     fclose(fh);
+     return err;
+ }
+diff -up net-tools-2.10/man/en_US/netstat.8.cycle net-tools-2.10/man/en_US/netstat.8
+--- net-tools-2.10/man/en_US/netstat.8.cycle	2016-02-15 16:54:18.000000000 +0100
++++ net-tools-2.10/man/en_US/netstat.8	2016-03-30 09:58:18.241891637 +0200
+@@ -36,6 +36,7 @@ netstat \- Print network connections, ro
+ .RB  \-\-verbose | \-v 
+ .RB  \-\-continuous | \-c
+ .RB  \-\-wide | \-W 
++.RB delay
+ .P
+ .B netstat 
+ .RB { \-\-route | \-r }
+@@ -45,22 +46,25 @@ netstat \- Print network connections, ro
+ .RB  \-\-numeric | \-n 
+ .RB  \-\-numeric\-hosts " " \-\-numeric\-ports " " \-\-numeric\-users 
+ .RB  \-\-continuous | \-c 
++.RB delay
+ .P
+ .B netstat
+-.RB { \-\-interfaces | \-i }
++.RB { \-\-interfaces | \-I | \-i }
+ .RB  \-\-all | \-a 
+-.RB  \-\-extend | \-e   \-\-extend | \-e 
++.RB  \-\-extend | \-e  
+ .RB  \-\-verbose | \-v 
+ .RB  \-\-program | \-p 
+ .RB  \-\-numeric | \-n 
+ .RB  \-\-numeric-hosts " " \-\-numeric-ports " " \-\-numeric-users 
+ .RB  \-\-continuous | \-c 
++.RB delay
+ .P
+ .B netstat
+ .RB { \-\-groups | \-g }
+ .RB  \-\-numeric | \-n 
+ .RB  \-\-numeric\-hosts " " \-\-numeric\-ports " " \-\-numeric\-users 
+ .RB  \-\-continuous | \-c 
++.RB delay

_service:tar_scm:backport-net-tools-man.patch Added

@@ -0,0 +1,147 @@
+diff -up net-tools-2.0/man/en_US/arp.8.man net-tools-2.0/man/en_US/arp.8
+--- net-tools-2.0/man/en_US/arp.8.man	2014-04-26 02:45:16.000000000 +0200
++++ net-tools-2.0/man/en_US/arp.8	2014-07-07 14:51:31.378459439 +0200
+@@ -63,6 +63,10 @@ arp \- manipulate the system ARP cache
+ .B \-f
+ .RI  filename 
+ 
++.SH NOTE
++.P
++This program is obsolete. For replacement check \fBip neigh\fR.
++
+ .SH DESCRIPTION
+ .B Arp
+ manipulates or displays the kernel's IPv4 network neighbour cache. It can add
+@@ -219,9 +223,6 @@ published proxy ARP entries and permanen
+ .I /etc/ethers
+ .SH SEE ALSO
+ .BR ethers (5),
+-.BR rarp (8),
+-.BR route (8),
+-.BR ifconfig (8),
+-.BR netstat (8)
++.BR ip (8)
+ .SH AUTHORS
+ Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net\-tools@lina.inka.de>.
+diff -up net-tools-2.0/man/en_US/ethers.5.man net-tools-2.0/man/en_US/ethers.5
+--- net-tools-2.0/man/en_US/ethers.5.man	2014-04-26 02:45:16.000000000 +0200
++++ net-tools-2.0/man/en_US/ethers.5	2014-07-07 14:51:31.378459439 +0200
+@@ -26,6 +26,3 @@ can be resolved by DNS or a dot separate
+ 08:00:20:00:61:CA  pal
+ .SH FILES
+ /etc/ethers
+-.SH "SEE ALSO"
+-.BR arp (8),
+-.BR rarp (8)
+diff -up net-tools-2.0/man/en_US/ifconfig.8.man net-tools-2.0/man/en_US/ifconfig.8
+--- net-tools-2.0/man/en_US/ifconfig.8.man	2014-04-26 02:45:16.000000000 +0200
++++ net-tools-2.0/man/en_US/ifconfig.8	2014-07-07 14:51:31.379459422 +0200
+@@ -5,6 +5,13 @@ ifconfig \- configure a network interfac
+ .B "ifconfig -v -a -s interface"
+ .br
+ .B "ifconfig -v interface aftype options | address ..."
++
++.SH NOTE
++.P 
++This program is obsolete!
++For replacement check \fBip addr\fR and \fBip link\fR.
++For statistics use \fBip -s link\fR.
++
+ .SH DESCRIPTION
+ .B Ifconfig
+ is used to configure the kernel-resident network interfaces.  It is
+@@ -222,13 +229,8 @@ package to display link layer informatio
+ While appletalk DDP and IPX addresses will be displayed they cannot be
+ altered by this command.
+ .SH SEE ALSO
+-.BR route (8),
+-.BR netstat (8),
+-.BR arp (8),
+-.BR rarp (8),
+-.BR iptables (8),
+-.BR ifup (8),
+-.BR interfaces (5)
++.BR ip (8),
++.BR iptables (8)
+ .br
+ http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples
+ .SH AUTHORS
+diff -up net-tools-2.0/man/en_US/mii-tool.8.man net-tools-2.0/man/en_US/mii-tool.8
+--- net-tools-2.0/man/en_US/mii-tool.8.man	2014-04-26 02:45:16.000000000 +0200
++++ net-tools-2.0/man/en_US/mii-tool.8	2014-07-07 14:51:31.379459422 +0200
+@@ -18,6 +18,10 @@ mii\-tool \- view, manipulate media-inde
+ \fB\-p\fR, \fB\-\-phy=\fIaddr\fR
+ .RI "interface\ ..."
+ 
++.SH NOTE
++.P 
++This program is obsolete. For replacement check \fBethtool\fB.
++
+ .SH DESCRIPTION
+ This utility checks or sets the status of a network interface's Media
+ Independent Interface (MII) unit.  Most fast ethernet adapters use an
+@@ -93,6 +97,9 @@ SIOCGMIIPHY on 'eth?' failed: Operation
+ The interface in question does not support MII queries. Most likely, it does not have 
+ MII transceivers, at all.
+ 
++.SH SEE ALSO
++ethtool(8)
++
+ .SH AUTHORS
+ David Hinds \- dhinds@pcmcia.sourceforge.org
+ .br
+diff -up net-tools-2.0/man/en_US/nameif.8.man net-tools-2.0/man/en_US/nameif.8
+--- net-tools-2.0/man/en_US/nameif.8.man	2014-04-26 02:45:16.000000000 +0200
++++ net-tools-2.0/man/en_US/nameif.8	2014-07-07 14:51:31.379459422 +0200
+@@ -5,6 +5,12 @@ nameif \- name network interfaces based
+ .B "nameif \-c configfile \-s"
+ .br
+ .B "nameif \-c configfile \-s {interface macaddress}"
++
++.SH NOTE
++.P 
++This program is obsolete. For replacement check \fBip link\fR.
++This functionality is also much better provided by udev methods.
++
+ .SH DESCRIPTION
+ .B nameif 
+ renames network interfaces based on mac addresses. When no arguments are
+@@ -31,5 +37,10 @@ should be run before the interface is up
+ 
+ .SH FILES
+ /etc/mactab
++
++.SH SEE ALSO
++.BR ip(8),
++.BR udev(7)
++
+ .SH BUGS
+ Only works for Ethernet currently.
+diff -up net-tools-2.0/man/en_US/route.8.man net-tools-2.0/man/en_US/route.8
+--- net-tools-2.0/man/en_US/route.8.man	2014-04-26 02:45:16.000000000 +0200
++++ net-tools-2.0/man/en_US/route.8	2014-07-07 14:52:58.766977905 +0200
+@@ -57,6 +57,11 @@ family
+ .RB  \-\-version 
+ .RB  \-h 
+ .RB  \-\-help 
++
++.SH NOTE
++.P 
++This program is obsolete. For replacement check \fBip route\fR.
++
+ .SH DESCRIPTION
+ .B Route
+ manipulates the kernel's IP routing tables.  Its primary use is to set
+@@ -330,11 +335,6 @@ Whether or not the hardware address for
+ .LP
+ .SH "SEE ALSO"
+ .BR ethers (5),
+-.BR arp (8),
+-.BR rarp (8),
+-.BR route (8),
+-.BR ifconfig (8),
+-.BR netstat (8)
+ .LP
+ .SH HISTORY
+ .B Route
+

_service:tar_scm:fix-ifconfig-display-error-when-the-length-of-interface-name-is-15.patch Added

_service Changed

_service:extract_file:arp-ethers.service Deleted

_service:extract_file:ether-wake.8 Deleted

@@ -1,81 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ETHER-WAKE 8 "March 31, 2003" "Scyld"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ether-wake \- A tool to send a Wake-On-LAN "Magic Packet"
-.SH SYNOPSIS
-.B ether-wake
-.RI  options  " Host-ID"
-.SH DESCRIPTION
-This manual page documents the usage of the
-.B ether-wake
-command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
-.\" respectively.
-\fBether-wake\fP is a program that generates and transmits a Wake-On-LAN 
-(WOL) "Magic Packet", used for restarting machines that have been
-soft-powered-down (ACPI D3-warm state). It generates the standard
-AMD Magic Packet format, optionally with a password included.  The
-single required parameter is a station (MAC) address or a host ID that can
-be translated to a MAC address by an
-.BR ethers (5)
-database specified in
-.BR nsswitch.conf (5)
-.
-.SH OPTIONS
-\fBether-wake\fP needs a single dash (´-´) in front of options.
-A summary of options is included below.
-.TP
-.B \-b
-Send the wake-up packet to the broadcast address.
-.TP
-.B \-D
-Increase the Debug Level.
-.TP
-.B \-i ifname
-Use interface ifname instead of the default "eth0".
-.TP
-.B \-p passwd
-Append a four or six byte password to the packet. Only a few adapters
-need or support this. A six byte password may be specified in Ethernet hex
-format (00:22:44:66:88:aa) or four byte dotted decimal (192.168.1.1) format.
-A four byte password must use the dotted decimal format.
-
-.TP
-.B \-V
-Show the program version information.
-
-.SH EXIT STATUS
-This program returns 0 on success.
-A permission failures (e.g. run as a non-root user) results in an exit
-status of 2.  Unrecognized or invalid parameters result in an exit
-status of 3.  Failure to retrieve network interface information or send
-a packet will result in an exit status of 1.
-
-.SH SEE ALSO
-.BR arp (8).
-.br
-.SH SECURITY
-On some non-Linux systems dropping root capability allows the process to be
-dumped, traced or debugged.
-If someone traces this program, they get control of a raw socket.
-Linux handles this safely, but beware when porting this program.
-.SH AUTHOR
-The ether-wake program was written by Donald Becker at Scyld Computing
-Corporation for use with the Scyld(\*(Tm) Beowulf System.

_service:extract_file:ether-wake.c Deleted

@@ -1,392 +0,0 @@
-/* ether-wake.c: Send a magic packet to wake up sleeping machines. */
-
-static char version_msg =
-"ether-wake.c: v1.09 11/12/2003 Donald Becker, http://www.scyld.com/";
-static char brief_usage_msg =
-"usage: ether-wake -i <ifname> -p aa:bb:cc:dd:ee:ff 00:11:22:33:44:55\n"
-"   Use '-u' to see the complete set of options.\n";
-static char usage_msg =
-"usage: ether-wake -i <ifname> -p aa:bb:cc:dd:ee:ff 00:11:22:33:44:55\n"
-"\n"
-"	This program generates and transmits a Wake-On-LAN (WOL)\n"
-"	\"Magic Packet\", used for restarting machines that have been\n"
-"	soft-powered-down (ACPI D3-warm state).\n"
-"	It currently generates the standard AMD Magic Packet format, with\n"
-"	an optional password appended.\n"
-"\n"
-"	The single required parameter is the Ethernet MAC (station) address\n"
-"	of the machine to wake or a host ID with known NSS 'ethers' entry.\n"
-"	The MAC address may be found with the 'arp' program while the target\n"
-"	machine is awake.\n"
-"\n"
-"	Options:\n"
-"		-b	Send wake-up packet to the broadcast address.\n"
-"		-D	Increase the debug level.\n"
-"		-i ifname	Use interface IFNAME instead of the default 'eth0'.\n"
-"		-p <pw>		Append the four or six byte password PW to the packet.\n"
-"					A password is only required for a few adapter types.\n"
-"					The password may be specified in ethernet hex format\n"
-"					or dotted decimal (Internet address)\n"
-"		-p 00:22:44:66:88:aa\n"
-"		-p 192.168.1.1\n";
-
-/*
-	This program generates and transmits a Wake-On-LAN (WOL) "Magic Packet",
-	used for restarting machines that have been soft-powered-down
-	(ACPI D3-warm state).  It currently generates the standard AMD Magic Packet
-	format, with an optional password appended.
-
-	This software may be used and distributed according to the terms
-	of the GNU Public License, incorporated herein by reference.
-	Contact the author for use under other terms.
-
-	This source file was originally part of the network tricks package, and
-	is now distributed to support the Scyld Beowulf system.
-	Copyright 1999-2003 Donald Becker and Scyld Computing Corporation.
-
-	The author may be reached as becker@scyld, or C/O
-	 Scyld Computing Corporation
-	 914 Bay Ridge Road, Suite 220
-	 Annapolis MD 21403
-
-  Notes:
-  On some systems dropping root capability allows the process to be
-  dumped, traced or debugged.
-  If someone traces this program, they get control of a raw socket.
-  Linux handles this safely, but beware when porting this program.
-
-  An alternative to needing 'root' is using a UDP broadcast socket, however
-  doing so only works with adapters configured for unicast+broadcast Rx
-  filter.  That configuration consumes more power.
-*/
-&#xc;
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-
-#if 0							/* Only exists on some versions. */
-#include <ioctls.h>
-#endif
-
-#include <sys/socket.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <linux/if.h>
-
-#include <features.h>
-#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
-#include <netpacket/packet.h>
-#include <net/ethernet.h>
-#else
-#include <asm/types.h>
-#include <linux/if_packet.h>
-#include <linux/if_ether.h>
-#endif
-#include <netdb.h>
-#include <netinet/ether.h>
-
-/* Grrr, no consistency between include versions.
-   Enable this if setsockopt() isn't declared with your library. */
-#if 0
-extern int setsockopt __P ((int __fd, int __level, int __optname,
-							__ptr_t __optval, int __optlen));
-#else				/* New, correct head files.  */
-#include <sys/socket.h>
-#endif
-
-u_char outpack1000;
-int outpack_sz = 0;
-int debug = 0;
-u_char wol_passwd6;
-int wol_passwd_sz = 0;
-
-static int opt_no_src_addr = 0, opt_broadcast = 0;
-
-static int get_dest_addr(const char *arg, struct ether_addr *eaddr);
-static int get_fill(unsigned char *pkt, struct ether_addr *eaddr);
-static int get_wol_pw(const char *optarg);
-
-int main(int argc, char *argv)
-{
-	char *ifname = "eth0";
-	int one = 1;				/* True, for socket options. */
-	int s;						/* Raw socket */
-	int errflag = 0, verbose = 0, do_version = 0;
-	int perm_failure = 0;
-	int i, c, pktsize;
-#if defined(PF_PACKET)
-	struct sockaddr_ll whereto;
-#else
-	struct sockaddr whereto;	/* who to wake up */
-#endif
-	struct ether_addr eaddr;
-
-	while ((c = getopt(argc, argv, "bDi:p:uvV")) != -1)
-		switch (c) {
-		case 'b': opt_broadcast++;	break;
-		case 'D': debug++;			break;
-		case 'i': ifname = optarg;	break;
-		case 'p': get_wol_pw(optarg); break;
-		case 'u': printf(usage_msg); return 0;
-		case 'v': verbose++;		break;
-		case 'V': do_version++;		break;
-		case '?':
-			errflag++;
-		}
-	if (verbose || do_version)
-		printf("%s\n", version_msg);
-	if (errflag) {
-		fprintf(stderr, brief_usage_msg);
-		return 3;
-	}
-
-	if (optind == argc) {
-		fprintf(stderr, "Specify the Ethernet address as 00:11:22:33:44:55.\n");
-		return 3;
-	}
-
-	/* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to
-	   work as non-root, but we need SOCK_PACKET to specify the Ethernet
-	   destination address. */
-#if defined(PF_PACKET)
-	s = socket(PF_PACKET, SOCK_RAW, 0);
-#else
-	s = socket(AF_INET, SOCK_PACKET, SOCK_PACKET);
-#endif
-	if (s < 0) {
-		if (errno == EPERM)
-			fprintf(stderr, "ether-wake: This program must be run as root.\n");
-		else
-			perror("ether-wake: socket");
-		perm_failure++;
-	}
-	/* Don't revert if debugging allows a normal user to get the raw socket. */
-	setuid(getuid());
-
-	/* We look up the station address before reporting failure so that
-	   errors may be reported even when run as a normal user.
-	*/
-	if (get_dest_addr(argvoptind, &eaddr) != 0)
-		return 3;
-	if (perm_failure && ! debug)
-		return 2;
-
-	pktsize = get_fill(outpack, &eaddr);
-
-	/* Fill in the source address, if possible.
-	   The code to retrieve the local station address is Linux specific. */
-	if (! opt_no_src_addr) {
-		struct ifreq if_hwaddr;
-		unsigned char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data;
-
-		strcpy(if_hwaddr.ifr_name, ifname);
-		if (ioctl(s, SIOCGIFHWADDR, &if_hwaddr) < 0) {
-			fprintf(stderr, "SIOCGIFHWADDR on %s failed: %s\n", ifname,
-					strerror(errno));
-			/* Magic packets still work if our source address is bogus, but
-			   we fail just to be anal. */
-			return 1;
-		}
-		memcpy(outpack+6, if_hwaddr.ifr_hwaddr.sa_data, 6);
-
-		if (verbose) {
-			printf("The hardware address (SIOCGIFHWADDR) of %s is type %d  "
-				   "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", ifname,
-				   if_hwaddr.ifr_hwaddr.sa_family, hwaddr0, hwaddr1,

_service:extract_file:ipmaddr.8 Deleted

_service:extract_file:iptunnel.8 Deleted

_service:extract_file:mii-diag.8 Deleted

@@ -1,160 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" $Revision: 1.1 $ $Date: 2003/09/06 17:20:17 $
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH MII-DIAG 8 "September 9, 2003" "Scyld Beowulf\tm"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-mii-diag \- Network adapter control and monitoring
-.SH SYNOPSIS
-.B mii-diag
-.RI  options  <interface>
-.SH DESCRIPTION
-This manual page documents briefly the
-.B mii-diag
-network adapter control and monitoring command.
-Addition documentation is available from http://scyld.com/diag/index.html.
-
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
-.\" respectively.
-.PP
-This \fBmii-diag\fP command configures, controls and monitors the
-transceiver management registers for network interfaces, and configures
-driver operational parameters.  For transceiver control \fBmii-diag\fP
-uses the Media Independent Interface (MII) standard (thus the command name).
-It also has additional Linux-specific controls to communicate parameters
-such as message enable settings and buffer sizes to the underlying device
-driver.
-.PP
-The MII standard defines registers that control and report network
-transceiver capabilities, link settings and errors.  Examples are link
-speed, duplex, capabilities advertised to the link partner, status LED
-indications and link error counters.
-
-.SH OPTIONS
-The \fBmii-diag\fP command supports both single character and long
-option names.  Short options use a single dash (´-´) in front of the option
-character.  For options without parameters, multiple options may be
-concatenated after a single dash.  Long options are prefixed by two
-dashes (´--´), and may be abbreviated with a unique prefix.
-A long option may take a parameter of the form --arg=param or --arg param.
-
-.PP
-A summary of options is as follows.
-
-.TP
-.B \-A, --advertise <speed|setting>
-.BR
-.B \-F, --fixed-speed <speed|setting>
-
-Speed is one of: 100baseT4, 100baseTx, 100baseTx-FD, 100baseTx-HD, 10baseT,
-10baseT-FD, 10baseT-HD.  For more precise control an explicit numeric
-register setting is also allowed.
-
-
-.TP
-.B \-a, \--all-interfaces
-Show the status of all interfaces.  This option is not recommended with
-any other option, especially ones that change settings.
-
-.TP
-.B \-s,\--status
-Return exit status 2 if there is no link beat.
-
-.TP
-.B \-D
-Increase the debugging level.  This may be used to understand the
-actions the command is taking.
-
-.TP
-.B \-g, \--read-parameters
-Show driver-specific parameters.
-
-.TP
-.B \-G, \--set-parameters value,value...
-Set driver-specific parameters.
-Set a adapter-specific parameters.
-Parameters are comma separated, with missing elements retaining the
-existing value.
-
-.TP
-.B \-v
-Increase the verbosity level.  Additional "-v" options increase the
-level further.
-
-.TP
-.B \-V
-Show the program version information.
-
-.TP
-.B \-w, \--watch
-Continuously monitor the transceiver and report changes.
-
-.TP
-.B \-?
-Emit usage information.
-
-.SH DESCRIPTION
-
-.PP
-Calling the command with just the interface name
-produces extensive output describing the transceiver
-capabilities, configuration and current status.
-
-.PP
-The '--monitor' option allows scripting link beat changes.
-.PP
-This option is similar to --watch, but with lower overhead and simplified
-output.  It polls the interface only once a second and the output format
-is a single line per link change with three fixed words
-  <unknown|down||negotiating|up> <STATUS> <PARTNER-CAP>
-.PP
-Example output:  mii-diag --monitor eth0
-   down         0x7809 0x0000
-   negotiating  0x7829 0x45e1
-   up           0x782d 0x45e1
-   down         0x7809 0x0000
-
-.PP
-This may be used as
-  mii-diag --monitor eth0 |
-    while read linkstatus bmsr linkpar; do
-     case $linkstatus in
-        up)   ifup eth0 ;;
-        down) ifdown eth0 ;;
-     esac
-    done
-
-.PP
-It may be useful to shorten the DHCP client daemon timeout if it does
-not receive an address by adding the following setting to
-/etc/sysconfig/network:
-DHCPCDARGS="-t 3"
-
-.SH SEE ALSO
-.BR ether-wake (8), net-diag (8), mii-tool (8).
-.br
-Addition documentation is available from http://scyld.com/diag/index.html.
-
-.SH KNOWN BUGS
-The --all-interfaces option is quirky.  There are very few settings that
-are usefully applied to all interfaces.
-
-.SH AUTHOR
-The manual pages, diagnostic commands, and many of the underlying Linux
-network drivers were written by Donald Becker for the Scyld
-Beowulf(\*(Tm) cluster system.
-

_service:extract_file:mii-diag.c Deleted

@@ -1,653 +0,0 @@
-/* Mode: C;
- * mii-diag.c: Examine and set the MII registers of a network interfaces.
-
-	Usage:	mii-diag -vw interface.
-
-	This program reads and writes the Media Independent Interface (MII)
-	management registers on network transceivers.  The registers control
-	and report network link settings and errors.  Examples are link speed,
-	duplex, capabilities advertised to the link partner, status LED
-	indications and link error counters.
-
-	Notes:
-	The compile-command is at the end of this source file.
-	This program works with drivers that implement MII ioctl() calls.
-
-	Written/copyright 1997-2003 by Donald Becker <becker@scyld.com>
-
-	This program is free software; you can redistribute it
-	and/or modify it under the terms of the GNU General Public
-	License as published by the Free Software Foundation.
-
-	The author may be reached as becker@scyld.com, or C/O
-	 Scyld Computing Corporation
-	 914 Bay Ridge Road, Suite 220
-	 Annapolis MD 21403
-
-	References
-	http://scyld.com/expert/mii-status.html
-	http://scyld.com/expert/NWay.html
-	http://www.national.com/pf/DP/DP83840.html
-*/
-
-static char version =
-"mii-diag.c:v2.11 3/21/2005 Donald Becker (becker@scyld.com)\n"
-" http://www.scyld.com/diag/index.html\n";
-
-static const char usage_msg =
-"Usage: %s --help -aDfrRvVw -AF <speed+duplex> --watch <interface>\n";
-static const char long_usage_msg =
-"Usage: %s -aDfrRvVw -AF <speed+duplex> --watch <interface>\n\
-\n\
-  This program configures and monitors the transceiver management registers\n\
-  for network interfaces.  It uses the Media Independent Interface (MII)\n\
-  standard with additional Linux-specific controls to communicate with the\n\
-  underlying device driver.  The MII registers control and report network\n\
-  link settings and errors.  Examples are link speed, duplex, capabilities\n\
-  advertised to the link partner, status LED indications and link error\n\
-  counters.\n\
-\n\
-   The common usage is\n\
-      mii-diag eth0\n\
-\n\
- Frequently used options are\n\
-   -A  --advertise <speed|setting>\n\
-   -F  --fixed-speed <speed>\n\
-	Speed is one of: 100baseT4, 100baseTx, 100baseTx-FD, 100baseTx-HD,\n\
-	                 10baseT, 10baseT-FD, 10baseT-HD\n\
-   -s  --status     Return exit status 2 if there is no link beat.\n\
-\n\
- Less frequently used options are\n\
-   -a  --all-interfaces  Show the status all interfaces\n\
-              (Not recommended with options that change settings.)\n\
-   -D  --debug\n\
-   -g  --read-parameters 	Get driver-specific parameters.\n\
-   -G  --set-parameters PARMS	Set driver-specific parameters.\n\
-       Parameters are comma separated, missing parameters retain\n\
-       their previous values.\n\
-   -M  --msg-level LEVEL 	Set the driver message bit map.\n\
-   -p  --phy ADDR		Set the PHY (MII address) to report.\n\
-   -r  --restart	Restart the link autonegotiation.\n\
-   -R  --reset		Reset the transceiver.\n\
-   -v  --verbose	Report each action taken.\n\
-   -V  --version	Emit version information.\n\
-   -w  --watch		Continuously monitor the transceiver and report changes.\n\
-\n\
-   This command returns success (zero) if the interface information can be\n\
-   read.  If the --status option is passed, a zero return means that the\n\
-   interface has link beat.\n\
-";
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#ifdef use_linux_libc5
-#include <linux/if_arp.h>
-#include <linux/if_ether.h>
-#endif
-
-typedef u_int32_t u32;
-typedef u_int16_t u16;
-typedef u_int8_t u8;
-
-#if defined(SIOCGPARAMS)  && SIOCGPARAMS != SIOCDEVPRIVATE+3
-#error Changed definition for SIOCGPARAMS
-#else
-#define SIOCGPARAMS (SIOCDEVPRIVATE+3) 		/* Read operational parameters. */
-#define SIOCSPARAMS (SIOCDEVPRIVATE+4) 		/* Set operational parameters. */
-#endif
-
-const char shortopts = "aA:C:DfF:gG:hmM:p:rRsvVw?";
-struct option longopts = {
- /* { name  has_arg  *flag  val } */
-    {"all-interfaces", 0, 0, 'a'},	/* Show all interfaces. */
-	{"advertise",	1, 0, 'A'},		/* Change the capabilities advertised. */
-	{"BMCR",		1, 0, 'C'},		/* Set the control register. */
-    {"debug",       0, 0, 'D'},		/* Increase the debug level. */
-    {"force",       0, 0, 'f'},		/* Force the operation. */
-    {"fixed-speed", 1, 0, 'F'},		/* Fixed speed name. */
-    {"read-parameters", 0, 0, 'g'}, /* Show general settings values. */
-    {"set-parameters",  1, 0, 'G'},	/* Write general settings values. */
-    {"help", 		0, 0, 'h'},		/* Print a long usage message. */
-    {"monitor",		0, 0, 'm'},		/* Monitor status register. */
-    {"msg-level",	1, 0, 'M'},		/* Set the driver message level. */
-    {"phy",			1, 0, 'p'},		/* Set the PHY (MII address) to report. */
-    {"restart",		0, 0, 'r'},		/* Restart the link negotiation */
-    {"reset",		0, 0, 'R'},		/* Reset the transceiver. */
-    {"status",		0, 0, 's'},		/* Non-zero exit status w/ no link beat. */
-    {"verbose", 	0, 0, 'v'},		/* Report each action taken.  */
-    {"version", 	0, 0, 'V'},		/* Emit version information.  */
-    {"watch", 		0, 0, 'w'},		/* Constantly monitor the port.  */
-    {"error", 		0, 0, '?'},		/* Return the error message. */
-    { 0, 0, 0, 0 }
-};
-
-/* Usually in libmii.c, but trivial substitions are below. */
-extern int  show_mii_details(long ioaddr, int phy_id);
-extern void monitor_mii(long ioaddr, int phy_id);
-int  show_mii_details(long ioaddr, int phy_id) __attribute__((weak));
-void monitor_mii(long ioaddr, int phy_id) __attribute__((weak));
-
-
-/* Command-line flags. */
-unsigned int opt_a = 0,					/* Show-all-interfaces flag. */
-	opt_f = 0,					/* Force the operation. */
-	opt_g = 0,
-	opt_G = 0,
-	verbose = 0,				/* Verbose flag. */
-	debug = 0,
-	opt_version = 0,
-	opt_restart = 0,
-	opt_reset = 0,
-	opt_status = 0,
-	opt_watch = 0;
-static int msg_level = -1;
-static int set_BMCR = -1;
-static int nway_advertise = 0;
-static int fixed_speed = -1;
-static int override_phy = -1;
-char *opt_G_string = NULL;
-
-/* Internal values. */
-int new_ioctl_nums;
-int skfd = -1;					/* AF_INET socket for ioctl() calls.	*/
-struct ifreq ifr;
-
-int do_one_xcvr(int skfd);
-int show_basic_mii(long ioaddr, int phy_id);
-int mdio_read(int skfd, int phy_id, int location);
-void mdio_write(int skfd, int phy_id, int location, int value);
-static int parse_advertise(const char *capabilities);
-static void monitor_status(long ioaddr, int phy_id);
-
-
-int
-main(int argc, char **argv)
-{
-	int c, errflag = 0;
-	char **spp, *ifname;
-    char *progname = rindex(argv0, '/') ? rindex(argv0, '/')+1 : argv0;
-
-	while ((c = getopt_long(argc, argv, shortopts, longopts, 0)) != EOF)
-		switch (c) {
-		case 'a': opt_a++; break;
-		case 'A': nway_advertise |= parse_advertise(optarg);
-			if (nway_advertise == -1) errflag++;
-			break;
-		case 'C': set_BMCR = strtoul(optarg, NULL, 16); break;
-		case 'D': debug++;			break;
-		case 'f': opt_f++; break;
-		case 'F': fixed_speed = parse_advertise(optarg);
-			if (fixed_speed == -1) errflag++;
-			break;
-		case 'g': opt_g++; break;
-		case 'G': opt_G++; opt_G_string = strdup(optarg); break;
-		case 'm': opt_watch++; opt_status++; break;
-		case 'M': msg_level = strtoul(optarg, NULL, 0); break;
-		case 'h': fprintf(stderr, long_usage_msg, progname); return 0;
-		case 'p': override_phy = atoi(optarg); break;
-		case 'r': opt_restart++;	break;
-		case 'R': opt_reset++;		break;

_service:extract_file:net-tools-2.10.tar.xz Deleted

_service:extract_file:net-tools-config.h Deleted

@@ -1,83 +0,0 @@
-/*
-* config.h	Automatically generated configuration includefile
-*
-* NET-TOOLS	A collection of programs that form the base set of the
-*		NET-3 Networking Distribution for the LINUX operating
-*		system.
-*
-*		DO  NOT  EDIT  DIRECTLY
-*
-*/
-
-/* 
- * 
- * Internationalization
- * 
- * The net-tools package has currently been translated to French,
- * German and Brazilian Portugese.  Other translations are, of
- * course, welcome.  Answer `n' here if you have no support for
- * internationalization on your system.
- * 
- */
-#define I18N 1
-
-/* 
- * 
- * Protocol Families.
- * 
- */
-#define HAVE_AFUNIX 1
-#define HAVE_AFINET 1
-#define HAVE_AFINET6 1
-#define HAVE_AFIPX 1
-#define HAVE_AFATALK 1
-#define HAVE_AFAX25 1
-#define HAVE_AFNETROM 1
-#define HAVE_AFROSE 1
-#define HAVE_AFX25 1
-#define HAVE_AFECONET 0
-#define HAVE_AFDECnet 0
-#define HAVE_AFASH 1
-#define HAVE_AFBLUETOOTH 1
-
-/* 
- * 
- * Device Hardware types.
- * 
- */
-#define HAVE_HWETHER 1
-#define HAVE_HWARC 1
-#define HAVE_HWSLIP 1
-#define HAVE_HWPPP 1
-#define HAVE_HWTUNNEL 1
-#define HAVE_HWSTRIP 0
-#define HAVE_HWTR 0
-#define HAVE_HWAX25 1
-#define HAVE_HWROSE 1
-#define HAVE_HWNETROM 1
-#define HAVE_HWX25 1
-#define HAVE_HWFR 1
-#define HAVE_HWSIT 1
-#define HAVE_HWFDDI 1
-#define HAVE_HWHIPPI 1
-#define HAVE_HWASH 1
-#define HAVE_HWHDLCLAPB 1
-#define HAVE_HWIRDA 1
-#define HAVE_HWEC 0
-#define HAVE_HWEUI64 1
-#define HAVE_HWIB 1
-
-/* 
- * 
- * Other Features.
- * 
- */
-#define HAVE_FW_MASQUERADE 1
-#define HAVE_ARP_TOOLS 1
-#define HAVE_HOSTNAME_TOOLS 0
-#define HAVE_HOSTNAME_SYMLINKS 0
-#define HAVE_IP_TOOLS 1
-#define HAVE_MII 1
-#define HAVE_PLIP_TOOLS 1
-#define HAVE_SERIAL_TOOLS 1
-#define HAVE_SELINUX 1

_service:extract_file:net-tools-config.make Deleted

_service:extract_file:net-tools.yaml Deleted

_service:tar_scm:arp-ethers.service Added

_service:tar_scm:ether-wake.8 Added

@@ -0,0 +1,81 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ETHER-WAKE 8 "March 31, 2003" "Scyld"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+ether-wake \- A tool to send a Wake-On-LAN "Magic Packet"
+.SH SYNOPSIS
+.B ether-wake
+.RI  options  " Host-ID"
+.SH DESCRIPTION
+This manual page documents the usage of the
+.B ether-wake
+command.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
+.\" respectively.
+\fBether-wake\fP is a program that generates and transmits a Wake-On-LAN 
+(WOL) "Magic Packet", used for restarting machines that have been
+soft-powered-down (ACPI D3-warm state). It generates the standard
+AMD Magic Packet format, optionally with a password included.  The
+single required parameter is a station (MAC) address or a host ID that can
+be translated to a MAC address by an
+.BR ethers (5)
+database specified in
+.BR nsswitch.conf (5)
+.
+.SH OPTIONS
+\fBether-wake\fP needs a single dash (´-´) in front of options.
+A summary of options is included below.
+.TP
+.B \-b
+Send the wake-up packet to the broadcast address.
+.TP
+.B \-D
+Increase the Debug Level.
+.TP
+.B \-i ifname
+Use interface ifname instead of the default "eth0".
+.TP
+.B \-p passwd
+Append a four or six byte password to the packet. Only a few adapters
+need or support this. A six byte password may be specified in Ethernet hex
+format (00:22:44:66:88:aa) or four byte dotted decimal (192.168.1.1) format.
+A four byte password must use the dotted decimal format.
+
+.TP
+.B \-V
+Show the program version information.
+
+.SH EXIT STATUS
+This program returns 0 on success.
+A permission failures (e.g. run as a non-root user) results in an exit
+status of 2.  Unrecognized or invalid parameters result in an exit
+status of 3.  Failure to retrieve network interface information or send
+a packet will result in an exit status of 1.
+
+.SH SEE ALSO
+.BR arp (8).
+.br
+.SH SECURITY
+On some non-Linux systems dropping root capability allows the process to be
+dumped, traced or debugged.
+If someone traces this program, they get control of a raw socket.
+Linux handles this safely, but beware when porting this program.
+.SH AUTHOR
+The ether-wake program was written by Donald Becker at Scyld Computing
+Corporation for use with the Scyld(\*(Tm) Beowulf System.

_service:tar_scm:ether-wake.c Added

@@ -0,0 +1,392 @@
+/* ether-wake.c: Send a magic packet to wake up sleeping machines. */
+
+static char version_msg =
+"ether-wake.c: v1.09 11/12/2003 Donald Becker, http://www.scyld.com/";
+static char brief_usage_msg =
+"usage: ether-wake -i <ifname> -p aa:bb:cc:dd:ee:ff 00:11:22:33:44:55\n"
+"   Use '-u' to see the complete set of options.\n";
+static char usage_msg =
+"usage: ether-wake -i <ifname> -p aa:bb:cc:dd:ee:ff 00:11:22:33:44:55\n"
+"\n"
+"	This program generates and transmits a Wake-On-LAN (WOL)\n"
+"	\"Magic Packet\", used for restarting machines that have been\n"
+"	soft-powered-down (ACPI D3-warm state).\n"
+"	It currently generates the standard AMD Magic Packet format, with\n"
+"	an optional password appended.\n"
+"\n"
+"	The single required parameter is the Ethernet MAC (station) address\n"
+"	of the machine to wake or a host ID with known NSS 'ethers' entry.\n"
+"	The MAC address may be found with the 'arp' program while the target\n"
+"	machine is awake.\n"
+"\n"
+"	Options:\n"
+"		-b	Send wake-up packet to the broadcast address.\n"
+"		-D	Increase the debug level.\n"
+"		-i ifname	Use interface IFNAME instead of the default 'eth0'.\n"
+"		-p <pw>		Append the four or six byte password PW to the packet.\n"
+"					A password is only required for a few adapter types.\n"
+"					The password may be specified in ethernet hex format\n"
+"					or dotted decimal (Internet address)\n"
+"		-p 00:22:44:66:88:aa\n"
+"		-p 192.168.1.1\n";
+
+/*
+	This program generates and transmits a Wake-On-LAN (WOL) "Magic Packet",
+	used for restarting machines that have been soft-powered-down
+	(ACPI D3-warm state).  It currently generates the standard AMD Magic Packet
+	format, with an optional password appended.
+
+	This software may be used and distributed according to the terms
+	of the GNU Public License, incorporated herein by reference.
+	Contact the author for use under other terms.
+
+	This source file was originally part of the network tricks package, and
+	is now distributed to support the Scyld Beowulf system.
+	Copyright 1999-2003 Donald Becker and Scyld Computing Corporation.
+
+	The author may be reached as becker@scyld, or C/O
+	 Scyld Computing Corporation
+	 914 Bay Ridge Road, Suite 220
+	 Annapolis MD 21403
+
+  Notes:
+  On some systems dropping root capability allows the process to be
+  dumped, traced or debugged.
+  If someone traces this program, they get control of a raw socket.
+  Linux handles this safely, but beware when porting this program.
+
+  An alternative to needing 'root' is using a UDP broadcast socket, however
+  doing so only works with adapters configured for unicast+broadcast Rx
+  filter.  That configuration consumes more power.
+*/
+&#xc;
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <ctype.h>
+#include <string.h>
+
+#if 0							/* Only exists on some versions. */
+#include <ioctls.h>
+#endif
+
+#include <sys/socket.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <linux/if.h>
+
+#include <features.h>
+#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
+#include <netpacket/packet.h>
+#include <net/ethernet.h>
+#else
+#include <asm/types.h>
+#include <linux/if_packet.h>
+#include <linux/if_ether.h>
+#endif
+#include <netdb.h>
+#include <netinet/ether.h>
+
+/* Grrr, no consistency between include versions.
+   Enable this if setsockopt() isn't declared with your library. */
+#if 0
+extern int setsockopt __P ((int __fd, int __level, int __optname,
+							__ptr_t __optval, int __optlen));
+#else				/* New, correct head files.  */
+#include <sys/socket.h>
+#endif
+
+u_char outpack1000;
+int outpack_sz = 0;
+int debug = 0;
+u_char wol_passwd6;
+int wol_passwd_sz = 0;
+
+static int opt_no_src_addr = 0, opt_broadcast = 0;
+
+static int get_dest_addr(const char *arg, struct ether_addr *eaddr);
+static int get_fill(unsigned char *pkt, struct ether_addr *eaddr);
+static int get_wol_pw(const char *optarg);
+
+int main(int argc, char *argv)
+{
+	char *ifname = "eth0";
+	int one = 1;				/* True, for socket options. */
+	int s;						/* Raw socket */
+	int errflag = 0, verbose = 0, do_version = 0;
+	int perm_failure = 0;
+	int i, c, pktsize;
+#if defined(PF_PACKET)
+	struct sockaddr_ll whereto;
+#else
+	struct sockaddr whereto;	/* who to wake up */
+#endif
+	struct ether_addr eaddr;
+
+	while ((c = getopt(argc, argv, "bDi:p:uvV")) != -1)
+		switch (c) {
+		case 'b': opt_broadcast++;	break;
+		case 'D': debug++;			break;
+		case 'i': ifname = optarg;	break;
+		case 'p': get_wol_pw(optarg); break;
+		case 'u': printf(usage_msg); return 0;
+		case 'v': verbose++;		break;
+		case 'V': do_version++;		break;
+		case '?':
+			errflag++;
+		}
+	if (verbose || do_version)
+		printf("%s\n", version_msg);
+	if (errflag) {
+		fprintf(stderr, brief_usage_msg);
+		return 3;
+	}
+
+	if (optind == argc) {
+		fprintf(stderr, "Specify the Ethernet address as 00:11:22:33:44:55.\n");
+		return 3;
+	}
+
+	/* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to
+	   work as non-root, but we need SOCK_PACKET to specify the Ethernet
+	   destination address. */
+#if defined(PF_PACKET)
+	s = socket(PF_PACKET, SOCK_RAW, 0);
+#else
+	s = socket(AF_INET, SOCK_PACKET, SOCK_PACKET);
+#endif
+	if (s < 0) {
+		if (errno == EPERM)
+			fprintf(stderr, "ether-wake: This program must be run as root.\n");
+		else
+			perror("ether-wake: socket");
+		perm_failure++;
+	}
+	/* Don't revert if debugging allows a normal user to get the raw socket. */
+	setuid(getuid());
+
+	/* We look up the station address before reporting failure so that
+	   errors may be reported even when run as a normal user.
+	*/
+	if (get_dest_addr(argvoptind, &eaddr) != 0)
+		return 3;
+	if (perm_failure && ! debug)
+		return 2;
+
+	pktsize = get_fill(outpack, &eaddr);
+
+	/* Fill in the source address, if possible.
+	   The code to retrieve the local station address is Linux specific. */
+	if (! opt_no_src_addr) {
+		struct ifreq if_hwaddr;
+		unsigned char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data;
+
+		strcpy(if_hwaddr.ifr_name, ifname);
+		if (ioctl(s, SIOCGIFHWADDR, &if_hwaddr) < 0) {
+			fprintf(stderr, "SIOCGIFHWADDR on %s failed: %s\n", ifname,
+					strerror(errno));
+			/* Magic packets still work if our source address is bogus, but
+			   we fail just to be anal. */
+			return 1;
+		}
+		memcpy(outpack+6, if_hwaddr.ifr_hwaddr.sa_data, 6);
+
+		if (verbose) {
+			printf("The hardware address (SIOCGIFHWADDR) of %s is type %d  "
+				   "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", ifname,
+				   if_hwaddr.ifr_hwaddr.sa_family, hwaddr0, hwaddr1,

_service:tar_scm:ipmaddr.8 Added

_service:tar_scm:iptunnel.8 Added

_service:tar_scm:mii-diag.8 Added

@@ -0,0 +1,160 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" $Revision: 1.1 $ $Date: 2003/09/06 17:20:17 $
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH MII-DIAG 8 "September 9, 2003" "Scyld Beowulf\tm"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+mii-diag \- Network adapter control and monitoring
+.SH SYNOPSIS
+.B mii-diag
+.RI  options  <interface>
+.SH DESCRIPTION
+This manual page documents briefly the
+.B mii-diag
+network adapter control and monitoring command.
+Addition documentation is available from http://scyld.com/diag/index.html.
+
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
+.\" respectively.
+.PP
+This \fBmii-diag\fP command configures, controls and monitors the
+transceiver management registers for network interfaces, and configures
+driver operational parameters.  For transceiver control \fBmii-diag\fP
+uses the Media Independent Interface (MII) standard (thus the command name).
+It also has additional Linux-specific controls to communicate parameters
+such as message enable settings and buffer sizes to the underlying device
+driver.
+.PP
+The MII standard defines registers that control and report network
+transceiver capabilities, link settings and errors.  Examples are link
+speed, duplex, capabilities advertised to the link partner, status LED
+indications and link error counters.
+
+.SH OPTIONS
+The \fBmii-diag\fP command supports both single character and long
+option names.  Short options use a single dash (´-´) in front of the option
+character.  For options without parameters, multiple options may be
+concatenated after a single dash.  Long options are prefixed by two
+dashes (´--´), and may be abbreviated with a unique prefix.
+A long option may take a parameter of the form --arg=param or --arg param.
+
+.PP
+A summary of options is as follows.
+
+.TP
+.B \-A, --advertise <speed|setting>
+.BR
+.B \-F, --fixed-speed <speed|setting>
+
+Speed is one of: 100baseT4, 100baseTx, 100baseTx-FD, 100baseTx-HD, 10baseT,
+10baseT-FD, 10baseT-HD.  For more precise control an explicit numeric
+register setting is also allowed.
+
+
+.TP
+.B \-a, \--all-interfaces
+Show the status of all interfaces.  This option is not recommended with
+any other option, especially ones that change settings.
+
+.TP
+.B \-s,\--status
+Return exit status 2 if there is no link beat.
+
+.TP
+.B \-D
+Increase the debugging level.  This may be used to understand the
+actions the command is taking.
+
+.TP
+.B \-g, \--read-parameters
+Show driver-specific parameters.
+
+.TP
+.B \-G, \--set-parameters value,value...
+Set driver-specific parameters.
+Set a adapter-specific parameters.
+Parameters are comma separated, with missing elements retaining the
+existing value.
+
+.TP
+.B \-v
+Increase the verbosity level.  Additional "-v" options increase the
+level further.
+
+.TP
+.B \-V
+Show the program version information.
+
+.TP
+.B \-w, \--watch
+Continuously monitor the transceiver and report changes.
+
+.TP
+.B \-?
+Emit usage information.
+
+.SH DESCRIPTION
+
+.PP
+Calling the command with just the interface name
+produces extensive output describing the transceiver
+capabilities, configuration and current status.
+
+.PP
+The '--monitor' option allows scripting link beat changes.
+.PP
+This option is similar to --watch, but with lower overhead and simplified
+output.  It polls the interface only once a second and the output format
+is a single line per link change with three fixed words
+  <unknown|down||negotiating|up> <STATUS> <PARTNER-CAP>
+.PP
+Example output:  mii-diag --monitor eth0
+   down         0x7809 0x0000
+   negotiating  0x7829 0x45e1
+   up           0x782d 0x45e1
+   down         0x7809 0x0000
+
+.PP
+This may be used as
+  mii-diag --monitor eth0 |
+    while read linkstatus bmsr linkpar; do
+     case $linkstatus in
+        up)   ifup eth0 ;;
+        down) ifdown eth0 ;;
+     esac
+    done
+
+.PP
+It may be useful to shorten the DHCP client daemon timeout if it does
+not receive an address by adding the following setting to
+/etc/sysconfig/network:
+DHCPCDARGS="-t 3"
+
+.SH SEE ALSO
+.BR ether-wake (8), net-diag (8), mii-tool (8).
+.br
+Addition documentation is available from http://scyld.com/diag/index.html.
+
+.SH KNOWN BUGS
+The --all-interfaces option is quirky.  There are very few settings that
+are usefully applied to all interfaces.
+
+.SH AUTHOR
+The manual pages, diagnostic commands, and many of the underlying Linux
+network drivers were written by Donald Becker for the Scyld
+Beowulf(\*(Tm) cluster system.
+

_service:tar_scm:mii-diag.c Added

@@ -0,0 +1,653 @@
+/* Mode: C;
+ * mii-diag.c: Examine and set the MII registers of a network interfaces.
+
+	Usage:	mii-diag -vw interface.
+
+	This program reads and writes the Media Independent Interface (MII)
+	management registers on network transceivers.  The registers control
+	and report network link settings and errors.  Examples are link speed,
+	duplex, capabilities advertised to the link partner, status LED
+	indications and link error counters.
+
+	Notes:
+	The compile-command is at the end of this source file.
+	This program works with drivers that implement MII ioctl() calls.
+
+	Written/copyright 1997-2003 by Donald Becker <becker@scyld.com>
+
+	This program is free software; you can redistribute it
+	and/or modify it under the terms of the GNU General Public
+	License as published by the Free Software Foundation.
+
+	The author may be reached as becker@scyld.com, or C/O
+	 Scyld Computing Corporation
+	 914 Bay Ridge Road, Suite 220
+	 Annapolis MD 21403
+
+	References
+	http://scyld.com/expert/mii-status.html
+	http://scyld.com/expert/NWay.html
+	http://www.national.com/pf/DP/DP83840.html
+*/
+
+static char version =
+"mii-diag.c:v2.11 3/21/2005 Donald Becker (becker@scyld.com)\n"
+" http://www.scyld.com/diag/index.html\n";
+
+static const char usage_msg =
+"Usage: %s --help -aDfrRvVw -AF <speed+duplex> --watch <interface>\n";
+static const char long_usage_msg =
+"Usage: %s -aDfrRvVw -AF <speed+duplex> --watch <interface>\n\
+\n\
+  This program configures and monitors the transceiver management registers\n\
+  for network interfaces.  It uses the Media Independent Interface (MII)\n\
+  standard with additional Linux-specific controls to communicate with the\n\
+  underlying device driver.  The MII registers control and report network\n\
+  link settings and errors.  Examples are link speed, duplex, capabilities\n\
+  advertised to the link partner, status LED indications and link error\n\
+  counters.\n\
+\n\
+   The common usage is\n\
+      mii-diag eth0\n\
+\n\
+ Frequently used options are\n\
+   -A  --advertise <speed|setting>\n\
+   -F  --fixed-speed <speed>\n\
+	Speed is one of: 100baseT4, 100baseTx, 100baseTx-FD, 100baseTx-HD,\n\
+	                 10baseT, 10baseT-FD, 10baseT-HD\n\
+   -s  --status     Return exit status 2 if there is no link beat.\n\
+\n\
+ Less frequently used options are\n\
+   -a  --all-interfaces  Show the status all interfaces\n\
+              (Not recommended with options that change settings.)\n\
+   -D  --debug\n\
+   -g  --read-parameters 	Get driver-specific parameters.\n\
+   -G  --set-parameters PARMS	Set driver-specific parameters.\n\
+       Parameters are comma separated, missing parameters retain\n\
+       their previous values.\n\
+   -M  --msg-level LEVEL 	Set the driver message bit map.\n\
+   -p  --phy ADDR		Set the PHY (MII address) to report.\n\
+   -r  --restart	Restart the link autonegotiation.\n\
+   -R  --reset		Reset the transceiver.\n\
+   -v  --verbose	Report each action taken.\n\
+   -V  --version	Emit version information.\n\
+   -w  --watch		Continuously monitor the transceiver and report changes.\n\
+\n\
+   This command returns success (zero) if the interface information can be\n\
+   read.  If the --status option is passed, a zero return means that the\n\
+   interface has link beat.\n\
+";
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
+#ifdef use_linux_libc5
+#include <linux/if_arp.h>
+#include <linux/if_ether.h>
+#endif
+
+typedef u_int32_t u32;
+typedef u_int16_t u16;
+typedef u_int8_t u8;
+
+#if defined(SIOCGPARAMS)  && SIOCGPARAMS != SIOCDEVPRIVATE+3
+#error Changed definition for SIOCGPARAMS
+#else
+#define SIOCGPARAMS (SIOCDEVPRIVATE+3) 		/* Read operational parameters. */
+#define SIOCSPARAMS (SIOCDEVPRIVATE+4) 		/* Set operational parameters. */
+#endif
+
+const char shortopts = "aA:C:DfF:gG:hmM:p:rRsvVw?";
+struct option longopts = {
+ /* { name  has_arg  *flag  val } */
+    {"all-interfaces", 0, 0, 'a'},	/* Show all interfaces. */
+	{"advertise",	1, 0, 'A'},		/* Change the capabilities advertised. */
+	{"BMCR",		1, 0, 'C'},		/* Set the control register. */
+    {"debug",       0, 0, 'D'},		/* Increase the debug level. */
+    {"force",       0, 0, 'f'},		/* Force the operation. */
+    {"fixed-speed", 1, 0, 'F'},		/* Fixed speed name. */
+    {"read-parameters", 0, 0, 'g'}, /* Show general settings values. */
+    {"set-parameters",  1, 0, 'G'},	/* Write general settings values. */
+    {"help", 		0, 0, 'h'},		/* Print a long usage message. */
+    {"monitor",		0, 0, 'm'},		/* Monitor status register. */
+    {"msg-level",	1, 0, 'M'},		/* Set the driver message level. */
+    {"phy",			1, 0, 'p'},		/* Set the PHY (MII address) to report. */
+    {"restart",		0, 0, 'r'},		/* Restart the link negotiation */
+    {"reset",		0, 0, 'R'},		/* Reset the transceiver. */
+    {"status",		0, 0, 's'},		/* Non-zero exit status w/ no link beat. */
+    {"verbose", 	0, 0, 'v'},		/* Report each action taken.  */
+    {"version", 	0, 0, 'V'},		/* Emit version information.  */
+    {"watch", 		0, 0, 'w'},		/* Constantly monitor the port.  */
+    {"error", 		0, 0, '?'},		/* Return the error message. */
+    { 0, 0, 0, 0 }
+};
+
+/* Usually in libmii.c, but trivial substitions are below. */
+extern int  show_mii_details(long ioaddr, int phy_id);
+extern void monitor_mii(long ioaddr, int phy_id);
+int  show_mii_details(long ioaddr, int phy_id) __attribute__((weak));
+void monitor_mii(long ioaddr, int phy_id) __attribute__((weak));
+
+
+/* Command-line flags. */
+unsigned int opt_a = 0,					/* Show-all-interfaces flag. */
+	opt_f = 0,					/* Force the operation. */
+	opt_g = 0,
+	opt_G = 0,
+	verbose = 0,				/* Verbose flag. */
+	debug = 0,
+	opt_version = 0,
+	opt_restart = 0,
+	opt_reset = 0,
+	opt_status = 0,
+	opt_watch = 0;
+static int msg_level = -1;
+static int set_BMCR = -1;
+static int nway_advertise = 0;
+static int fixed_speed = -1;
+static int override_phy = -1;
+char *opt_G_string = NULL;
+
+/* Internal values. */
+int new_ioctl_nums;
+int skfd = -1;					/* AF_INET socket for ioctl() calls.	*/
+struct ifreq ifr;
+
+int do_one_xcvr(int skfd);
+int show_basic_mii(long ioaddr, int phy_id);
+int mdio_read(int skfd, int phy_id, int location);
+void mdio_write(int skfd, int phy_id, int location, int value);
+static int parse_advertise(const char *capabilities);
+static void monitor_status(long ioaddr, int phy_id);
+
+
+int
+main(int argc, char **argv)
+{
+	int c, errflag = 0;
+	char **spp, *ifname;
+    char *progname = rindex(argv0, '/') ? rindex(argv0, '/')+1 : argv0;
+
+	while ((c = getopt_long(argc, argv, shortopts, longopts, 0)) != EOF)
+		switch (c) {
+		case 'a': opt_a++; break;
+		case 'A': nway_advertise |= parse_advertise(optarg);
+			if (nway_advertise == -1) errflag++;
+			break;
+		case 'C': set_BMCR = strtoul(optarg, NULL, 16); break;
+		case 'D': debug++;			break;
+		case 'f': opt_f++; break;
+		case 'F': fixed_speed = parse_advertise(optarg);
+			if (fixed_speed == -1) errflag++;
+			break;
+		case 'g': opt_g++; break;
+		case 'G': opt_G++; opt_G_string = strdup(optarg); break;
+		case 'm': opt_watch++; opt_status++; break;
+		case 'M': msg_level = strtoul(optarg, NULL, 0); break;
+		case 'h': fprintf(stderr, long_usage_msg, progname); return 0;
+		case 'p': override_phy = atoi(optarg); break;
+		case 'r': opt_restart++;	break;
+		case 'R': opt_reset++;		break;

_service:tar_scm:net-tools-1639451338.d952bf6.tar -> _service:tar_scm:net-tools-2.10.tar.xz Changed

_service:tar_scm:net-tools-config.h Added

@@ -0,0 +1,83 @@
+/*
+* config.h	Automatically generated configuration includefile
+*
+* NET-TOOLS	A collection of programs that form the base set of the
+*		NET-3 Networking Distribution for the LINUX operating
+*		system.
+*
+*		DO  NOT  EDIT  DIRECTLY
+*
+*/
+
+/* 
+ * 
+ * Internationalization
+ * 
+ * The net-tools package has currently been translated to French,
+ * German and Brazilian Portugese.  Other translations are, of
+ * course, welcome.  Answer `n' here if you have no support for
+ * internationalization on your system.
+ * 
+ */
+#define I18N 1
+
+/* 
+ * 
+ * Protocol Families.
+ * 
+ */
+#define HAVE_AFUNIX 1
+#define HAVE_AFINET 1
+#define HAVE_AFINET6 1
+#define HAVE_AFIPX 1
+#define HAVE_AFATALK 1
+#define HAVE_AFAX25 1
+#define HAVE_AFNETROM 1
+#define HAVE_AFROSE 1
+#define HAVE_AFX25 1
+#define HAVE_AFECONET 0
+#define HAVE_AFDECnet 0
+#define HAVE_AFASH 1
+#define HAVE_AFBLUETOOTH 1
+
+/* 
+ * 
+ * Device Hardware types.
+ * 
+ */
+#define HAVE_HWETHER 1
+#define HAVE_HWARC 1
+#define HAVE_HWSLIP 1
+#define HAVE_HWPPP 1
+#define HAVE_HWTUNNEL 1
+#define HAVE_HWSTRIP 0
+#define HAVE_HWTR 0
+#define HAVE_HWAX25 1
+#define HAVE_HWROSE 1
+#define HAVE_HWNETROM 1
+#define HAVE_HWX25 1
+#define HAVE_HWFR 1
+#define HAVE_HWSIT 1
+#define HAVE_HWFDDI 1
+#define HAVE_HWHIPPI 1
+#define HAVE_HWASH 1
+#define HAVE_HWHDLCLAPB 1
+#define HAVE_HWIRDA 1
+#define HAVE_HWEC 0
+#define HAVE_HWEUI64 1
+#define HAVE_HWIB 1
+
+/* 
+ * 
+ * Other Features.
+ * 
+ */
+#define HAVE_FW_MASQUERADE 1
+#define HAVE_ARP_TOOLS 1
+#define HAVE_HOSTNAME_TOOLS 0
+#define HAVE_HOSTNAME_SYMLINKS 0
+#define HAVE_IP_TOOLS 1
+#define HAVE_MII 1
+#define HAVE_PLIP_TOOLS 1
+#define HAVE_SERIAL_TOOLS 1
+#define HAVE_SELINUX 1

_service:tar_scm:net-tools-config.make Added

_service:tar_scm:net-tools.yaml Added

Changes of Revision 2