new file mode 100644

@@ -0,0 +1,86 @@

+Originaly By: Zack Winkles <winkie AT linuxfromscratch DOT org>

+Submitted By: Jim Gifford <jim AT linuxfromscratch DOT org>

+Date: 2004-06-23

+Initial Package Version: 1.60

+Origin: N/A

+Upstream Status: N/A

+Description: Fix some occurrences of syntax that GCC 3.4 doesn't like.

+ 

+diff -Naur net-tools-1.60.orig/hostname.c net-tools-1.60/hostname.c

+--- net-tools-1.60.orig/hostname.c	2001-04-08 17:04:23.000000000 +0000

+@@ -78,6 +78,7 @@

+             fprintf(stderr, _("%s: name too long\n"), program_name);

+             break;

+         default:

++	    ((void)0);

+         }

+ 	exit(1);

+     }

+@@ -98,6 +99,7 @@

+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);

+ 	    break;

+ 	default:

++	    ((void)0);

+ 	}

+ 	exit(1);

+     };

+@@ -117,6 +119,7 @@

+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);

+ 	    break;

+ 	default:

++	    ((void)0);

+ 	}

+ 	exit(1);

+     };

+@@ -174,6 +177,7 @@

+ 	printf("%s\n", hp->h_name);

+ 	break;

+     default:

++	((void)0);

+     }

+ }

+ 

+diff -Naur net-tools-1.60.orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c

+--- net-tools-1.60.orig/lib/inet_sr.c	2000-02-20 21:46:45.000000000 +0000

+@@ -105,6 +105,7 @@

+     case 2:

+        isnet = 0; break;

+     default:

++       ((void)0);

+     }

+ 

+     /* Fill in the other fields. */

+diff -Naur net-tools-1.60.orig/mii-tool.c net-tools-1.60/mii-tool.c

+--- net-tools-1.60.orig/mii-tool.c	2000-05-21 14:31:17.000000000 +0000

+@@ -379,17 +379,17 @@

+ /*--------------------------------------------------------------------*/

+ 

+ const char *usage =

+-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]

+-       -V, --version               display version information

+-       -v, --verbose               more verbose output

+-       -R, --reset                 reset MII to poweron state

+-       -r, --restart               restart autonegotiation

+-       -w, --watch                 monitor for link status changes

+-       -l, --log                   with -w, write events to syslog

+-       -A, --advertise=media,...   advertise only specified media

+-       -F, --force=media           force specified media technology

+-media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,

+-       (to advertise both HD and FD) 100baseTx, 10baseT\n";

++"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"

++"       -V, --version               display version information\n"

++"       -v, --verbose               more verbose output\n"

++"       -R, --reset                 reset MII to poweron state\n"

++"       -r, --restart               restart autonegotiation\n"

++"       -w, --watch                 monitor for link status changes\n"

++"       -l, --log                   with -w, write events to syslog\n"

++"       -A, --advertise=media,...   advertise only specified media\n"

++"       -F, --force=media           force specified media technology\n"

++"media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n"

++"       (to advertise both HD and FD) 100baseTx, 10baseT\n";

+ 

+ int main(int argc, char **argv)

+ {

new file mode 100644

@@ -0,0 +1,51 @@

+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)

+Date: 2004-06-24

+Initial Package Version: 2.6

+Origin: Gentoo and Self

+Upstream Status: N/A

+Description: Fixes Compile Issues with the 2.6 Kernel

+ 

+

+diff -Naur net-tools-1.60.orig/hostname.c net-tools-1.60/hostname.c

+--- net-tools-1.60.orig/hostname.c	2001-04-08 17:04:23.000000000 +0000

+@@ -42,10 +42,16 @@

+ #include "config.h"

+ #include "version.h"

+ #include "../intl.h"

++#include <linux/version.h>

+ 

+ #if HAVE_AFDECnet

++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)

+ #include <netdnet/dn.h>

+ #endif

++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)

++#include <linux/dn.h>

++#endif

++#endif

+ 

+ char *Release = RELEASE, *Version = "hostname 1.100 (2001-04-14)";

+ 

+diff -Naur net-tools-1.60.orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c

+--- net-tools-1.60.orig/lib/x25_sr.c	2000-05-20 13:38:10.000000000 +0000

+@@ -22,6 +22,7 @@

+ #include <sys/socket.h>

+ #include <sys/ioctl.h>

+ #include <linux/x25.h>

++#include <linux/version.h>

+ #include <ctype.h>

+ #include <errno.h>

+ #include <netdb.h>

+@@ -77,7 +78,11 @@

+   rt.sigdigits=sigdigits;

+ 

+   /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */

++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)

+   memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));

++#else

++  memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));

++#endif

+ 

+   while (*args) {

+ 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {

new file mode 100644

@@ -0,0 +1,27 @@

+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>

+Date:                    2004-08-27

+Initial Package Version: 1.60

+Upstream Status:         N/A (package is unmaintained)

+Origin:                  From Fedora Core (submitted to LFS-Hackers by Kevin White)

+Description:             Fixes mii-tool when compiled using Linux-2.6.x

+

+$LastChangedBy: randy $

+$Date: 2004-08-27 21:04:05 -0600 (Fri, 27 Aug 2004) $

+

+--- net-tools-1.60/include/mii.h.bar	Tue Jul 31 11:49:39 2001

+@@ -11,11 +11,9 @@

+ 

+ /* network interface ioctl's for MII commands */

+ #ifndef SIOCGMIIPHY

+-#define SIOCGMIIPHY (SIOCDEVPRIVATE)	/* Read from current PHY */

+-#define SIOCGMIIREG (SIOCDEVPRIVATE+1) 	/* Read any PHY register */

+-#define SIOCSMIIREG (SIOCDEVPRIVATE+2) 	/* Write any PHY register */

+-#define SIOCGPARAMS (SIOCDEVPRIVATE+3) 	/* Read operational parameters */

+-#define SIOCSPARAMS (SIOCDEVPRIVATE+4) 	/* Set operational parameters */

++#define SIOCGMIIPHY 0x8947 	/* Read from current PHY */

++#define SIOCGMIIREG 0x8948 	/* Read any PHY register */

++#define SIOCSMIIREG 0x8949 	/* Write any PHY register */

+ #endif

+ 

+ #include <linux/types.h>

new file mode 100644

@@ -0,0 +1,53 @@

+Summary:	Networking Tools

+Name:		net-tools

+Version:	1.60

+Release:	1%{?dist}

+License:	GPLv2+

+URL:		http://net-tools.sourceforge.net

+Group:		System Environment/Base

+Vendor:		VMware, Inc.

+Distribution: 	Photon

+Source0:	http://www.tazenda.demon.co.uk/phil/net-tools/%{name}-%{version}.tar.bz2

+%define sha1 net-tools=944fb70641505d5d1139dba3aeb81ba124574b83

+Patch0: 	http://www.linuxfromscratch.org/patches/blfs/6.3/net-tools-1.60-gcc34-3.patch

+Patch1:		http://www.linuxfromscratch.org/patches/blfs/6.3/net-tools-1.60-kernel_headers-2.patch

+Patch2:		http://www.linuxfromscratch.org/patches/blfs/6.3/net-tools-1.60-mii_ioctl-1.patch

+%description

+The Net-tools package is a collection of programs for controlling the network subsystem of the Linux kernel. 

+%prep

+%setup -q

+%patch0 -p1

+%patch1 -p1

+%patch2 -p1

+%build

+yes "" | make config

+sed -i -e 's|HAVE_IP_TOOLS 0|HAVE_IP_TOOLS 1|g' \

+       -e 's|HAVE_MII 0|HAVE_MII 1|g' config.h

+sed -i -e 's|#define HAVE_HWSTRIP 1|#define HAVE_HWSTRIP 0|g' \

+       -e 's|#define HAVE_HWTR 1|#define HAVE_HWTR 0|g' config.h

+sed -i -e 's|# HAVE_IP_TOOLS=0|HAVE_IP_TOOLS=1|g' \

+       -e 's|# HAVE_MII=0|HAVE_MII=1|g' config.make

+make %{?_smp_mflags}

+%install

+make BASEDIR=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} install

+rm %{buildroot}/bin/hostname

+rm %{buildroot}/bin/dnsdomainname

+rm %{buildroot}/usr/share/man/man1/dnsdomainname.1

+rm %{buildroot}/usr/share/man/man1/hostname.1

+%check

+make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

+%post	-p /sbin/ldconfig

+%postun	-p /sbin/ldconfig

+%clean

+rm -rf %{buildroot}/*

+%files

+%defattr(-,root,root)

+/bin/*

+/sbin/*

+%{_mandir}/man1/*

+%{_mandir}/man5/*

+%{_mandir}/man8/*

+

+%changelog

+*	Mon Jul 13 2015 Divya Thaluru <dthaluru@vmware.com> 1.60-1

+-	Initial build.	First version