Remove support for IPV6 with libc5 and glibc 2.0

Makefile

@@ -44,14 +44,12 @@ PROGS	+= mii-tool
 endif
 
 # Compiler and Linker Options
-# You may need to uncomment and edit these if you are using libc5 and IPv6.
 CFLAGS ?= -O2 -g
 CFLAGS += -Wall
 CFLAGS += -fno-strict-aliasing # code needs a lot of work before strict aliasing is safe
 CPPFLAGS += -D_GNU_SOURCE
 # Turn on transparent support for LFS
 CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-RESLIB = # -L/usr/inet6/lib -linet6
 
 ifeq ($(HAVE_AFDECnet),1)
 DNLIB = -ldnet
@@ -160,19 +158,19 @@ subdirs:	libdir
 		@for i in $(SUBDIRS:$(NET_LIB_PATH)/=); do $(MAKE) -C $$i || exit $$? ; done
 
 ifconfig:	$(NET_LIB) ifconfig.o
-		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ifconfig.o $(NLIB) $(RESLIB)
+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ifconfig.o $(NLIB)
 
 nameif:		$(NET_LIB) nameif.o
-		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ nameif.o $(NLIB) $(RESLIB)
+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ nameif.o $(NLIB)
 
 hostname:	hostname.o
 		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(DNLIB)
 
 route:		$(NET_LIB) route.o
-		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(NLIB) $(RESLIB)
+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(NLIB)
 
 arp:		$(NET_LIB) arp.o
-		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ arp.o $(NLIB) $(RESLIB)
+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ arp.o $(NLIB)
 
 rarp:		$(NET_LIB) rarp.o
 		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ rarp.o $(NLIB)
@@ -184,16 +182,16 @@ plipconfig:	$(NET_LIB) plipconfig.o
 		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ plipconfig.o $(NLIB)
 
 netstat:	$(NET_LIB) netstat.o statistics.o
-		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ netstat.o statistics.o $(NLIB) $(RESLIB) $(SELIB)
+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ netstat.o statistics.o $(NLIB) $(SELIB)
 
 iptunnel:	$(NET_LIB) iptunnel.o
-		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ iptunnel.o $(NLIB) $(RESLIB)
+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ iptunnel.o $(NLIB)
 
 ipmaddr:	$(NET_LIB) ipmaddr.o
-		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ipmaddr.o $(NLIB) $(RESLIB)
+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ipmaddr.o $(NLIB)
 
 mii-tool:	$(NET_LIB) mii-tool.o
-		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB) $(RESLIB)
+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB)
 
 installbin:
 	@echo

README

@@ -20,8 +20,6 @@ Contents:
 
    README		This file.
 
-   README.ipv6		Notes for people hacking IPv6.
-
    INSTALLING		Installation instructions.
 
    COPYING		Your free copy of the GNU General Public License.

README.ipv6

-Notes for IPv6
---------------
-
-If you are using libc5, you may need to edit the Makefile so that
-libinet6 is linked in and your IPv6 include files are found in the
-right place.  The definitions in question are at about line 91.  You may
-also find that the header files provided with inet6-apps are not exactly
-what net-tools expects.  This is not a bug in net-tools as such and will
-not be fixed in future releases (though if anybody would like to contribute
-a patch I would be happy to add a pointer to it here.)  If you have the
-option you might consider changing to glibc instead (see below) in which
-case you can use the header files supplied with the C library.
-
-If you use glibc, you should ensure that you have version 2.1 or later
-installed.  The 2.1 release is available from
-<ftp://sourceware.cygnus.com/pub/glibc among> other places.  With this
-version of the C library there should be no need to edit the Makefile
-or apply any patches to net-tools.
-
-Version 2.0 of glibc has no support for IPv6; patches did exist at one
-point but they are now seriously outdated.  Instead you should upgrade
-to glibc 2.1.
-
-BUGS
-----
-
-"ifconfig eth0 add ..." does not currently auto-load the IPv6 module.
-

lib/inet6_gr.c

@@ -23,9 +23,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
-#ifndef __GLIBC__
-#include <netinet6/ipv6_route.h>	/* glibc doesn't have this */
-#endif
 #include "version.h"
 #include "net-support.h"
 #include "pathnames.h"

lib/inet6_sr.c

@@ -28,11 +28,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
-#ifdef __GLIBC__
 #include <net/route.h>
-#else
-#include <netinet6/ipv6_route.h>	/* glibc does not have this */
-#endif
 #include "version.h"
 #include "net-support.h"
 #include "pathnames.h"