Added RPM packaging stuff.

Various small makefile tweaks.
Released as 1.48

Makefile

@@ -73,13 +73,13 @@
 # BASEDIR = /mnt
 
 # path to the net-lib support library. Default: lib
-NET-LIB-PATH = lib
-NET-LIB-NAME = support
+NET_LIB_PATH = lib
+NET_LIB_NAME = net-tools
 
 PROGS	= ifconfig hostname arp netstat route rarp 
 
 # Compiler and Linker Options
-# You may need to uncomment and edit these if you are using libc5.
+# You may need to uncomment and edit these if you are using libc5 and IPv6.
 COPTS = -D_GNU_SOURCE -O2 -Wall -g # -I/usr/inet6/include
 LOPTS = 
 RESLIB = # -L/usr/inet6/lib -linet6
@@ -91,23 +91,23 @@ RELEASE	   = 1.48
 
 .EXPORT_ALL_VARIABLES:
 
-ifeq ("$(NET-LIB-PATH)","lib2")
+ifeq ("$(NET_LIB_PATH)","lib2")
 TOPDIR   = ..
 else
 TOPDIR  := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
 endif
 
-NET-LIB = $(NET-LIB-PATH)/lib$(NET-LIB-NAME).a
+NET-LIB = $(NET_LIB_PATH)/lib$(NET_LIB_NAME).a
 
-CFLAGS	= $(COPTS) -I. -I./include/ -I$(NET-LIB-PATH)
-LDFLAGS	= $(LOPTS) -L$(NET-LIB-PATH)
+CFLAGS	= $(COPTS) -I. -I./include/ -I$(NET_LIB_PATH)
+LDFLAGS	= $(LOPTS) -L$(NET_LIB_PATH)
 
-SUBDIRS	= man/ $(NET-LIB-PATH)/
+SUBDIRS	= man/ $(NET_LIB_PATH)/
 
 CC	= gcc
 LD	= gcc
 
-NLIB	= -l$(NET-LIB-NAME)
+NLIB	= -l$(NET_LIB_NAME)
 
 MDEFINES = COPTS='$(COPTS)' LOPTS='$(LOPTS)' TOPDIR='$(TOPDIR)'
 
@@ -156,7 +156,7 @@ $(NET-LIB):	config.h version.h intl.h libdir
 i18n.h:		i18ndir
 
 libdir:
-		@$(MAKE) -C $(NET-LIB-PATH) $(MDEFINES)
+		@$(MAKE) -C $(NET_LIB_PATH) $(MDEFINES)
 
 i18ndir:
 		@$(MAKE) -C po

README

@@ -28,7 +28,19 @@ Contents:
                           Notes
                           -----
 
-This is net-tools 1.46.  Notable changes since 1.45 include:
+This is net-tools 1.48.  Notable changes since 1.47 include:
+
+ - Many bugs have been fixed.
+
+Notable changes since 1.46 include:
+
+ - Support for interface aliases with recent kernels is improved.
+ - Ifconfig et al can now auto-detect which address families are supported
+   on your system.  This avoids triggering kmod requests for all missing
+   protocols whenever ifconfig runs.
+ - Support for extended SLIP options has been added
+
+Notable changes since 1.45 include:
 
  - The internationalisation support has been reworked (see below)
  - Support for extra hardware types has been added.
@@ -65,4 +77,4 @@ may be more touchy.  Feel free to send patches if you have problems.
 
 Phil Blundell
 philb@gnu.org
-1st September 1998
+11th November 1998

RPM/README

+This directory contains some files that may be of use to people who want
+to build a net-tools RPM.
+

RPM/net-tools-1.45-config.patch

+diff -C 2 -P net-tools/config.h net-tools-new/config.h
+*** net-tools/config.h	Wed Dec 31 18:00:00 1969
+--- net-tools-new/config.h	Fri Feb 27 20:21:30 1998
+***************
+*** 0 ****
+--- 1,40 ----
++ /*
++ * 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
++ *
++ * Version:	Generated from "config.in 1.04 (96-04-24)"
++ */
++ 
++ /* 
++  * 
++  * Protocol Families.
++  * 
++  */
++ #define HAVE_AFUNIX 1
++ #define HAVE_AFINET 1
++ #define HAVE_AFINET6 0
++ #define HAVE_AFIPX 1
++ #define HAVE_AFATALK 1
++ #define HAVE_AFAX25 1
++ #define HAVE_AFNETROM 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_HWTR 1
++ #define HAVE_HWAX25 1
++ #define HAVE_HWNETROM 1
++ #define HAVE_HWFR 1
++ #define HAVE_HWSIT 0

RPM/net-tools.spec

+Summary: Basic Networking Tools
+Name: net-tools
+Version: 1.48
+Release: 1
+Copyright: GPL
+Group: Networking/Admin
+Source: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.gz
+Patch0: net-tools-1.45-config.patch
+BuildRoot: /var/tmp/%{name}-root
+
+%description
+This is a collection of the basic tools necessary for setting up networking
+on a Linux machine. It includes ifconfig, route, netstat, rarp, and
+some other minor tools.
+
+%prep
+%setup  -q
+%patch0 -p1 -b .config
+
+%build
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/bin
+mkdir -p $RPM_BUILD_ROOT/sbin
+mkdir -p $RPM_BUILD_ROOT/usr/man/man1
+mkdir -p $RPM_BUILD_ROOT/usr/man/man5
+mkdir -p $RPM_BUILD_ROOT/usr/man/man8
+
+make BASEDIR=$RPM_BUILD_ROOT install
+
+( cd $RPM_BUILD_ROOT/sbin
+  strip arp ifconfig rarp route
+  cd ../bin
+  strip hostname netstat
+) 
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+/sbin/arp
+/sbin/ifconfig
+/sbin/rarp
+/sbin/route
+/bin/domainname
+/bin/dnsdomainname
+/bin/hostname
+/bin/netstat
+/bin/nisdomainname
+/bin/ypdomainname
+/usr/man/man[158]/*
+/usr/man/pt_BR/man[18]/*
+/usr/man/fr_FR/man[18]/*
+/usr/share/locale/*/LC_MESSAGES/net-tools.mo
+
+%changelog
+* Thu Nov 26 1998 Phil Blundell <pb@nexus.co.uk>
+- update to 1.48.
+
+* Thu Nov 12 1998 Jeff Johnson <jbj@redhat.com>
+- update to 1.47.
+
+* Wed Sep  2 1998 Jeff Johnson <jbj@redhat.com>
+- update to 1.46
+
+* Thu Jul  9 1998 Jeff Johnson <jbj@redhat.com>
+- build root
+- include ethers.5
+
+* Thu Jun 11 1998 Aron Griffis <agriffis@coat.com>
+- upgraded to 1.45
+- patched hostname.c to initialize buffer
+- patched ax25.c to use kernel headers
+
+* Fri May 01 1998 Prospector System <bugs@redhat.com>
+- translations modified for de, fr, tr
+
+* Fri Feb 27 1998 Jason Spangler <jasons@usemail.com>
+- added config patch
+
+* Fri Feb 27 1998 Jason Spangler <jasons@usemail.com>
+- changed to net-tools 1.432
+- removed old glibc 2.1 patch
+ 
+* Wed Oct 22 1997 Erik Troan <ewt@redhat.com>
+- added extra patches for glibc 2.1
+
+* Tue Oct 21 1997 Erik Troan <ewt@redhat.com>
+- included complete set of network protocols (some were removed for
+  initial glibc work)
+
+* Wed Sep 03 1997 Erik Troan <ewt@redhat.com>
+- updated glibc patch for glibc 2.0.5
+
+* Thu Jun 19 1997 Erik Troan <ewt@redhat.com>
+- built against glibc
+- updated to 1.33

lib/Makefile

@@ -23,30 +23,31 @@ AFSROBJS = inet_sr.o inet6_sr.o netrom_sr.o ipx_sr.o setroute.o
 ACTOBJS  = slip_ac.o ppp_ac.o activate.o
 VARIA	 = getargs.o masq_info.o proc.o util.o nstrcmp.o
 
-OBJS	= $(VARIA) $(AFOBJS) $(HWOBJS) \
-		$(AFGROBJS) $(AFSROBJS) $(ACTOBJS)
+OBJS	= $(sort $(VARIA) $(AFOBJS) $(HWOBJS) \
+		$(AFGROBJS) $(AFSROBJS) $(ACTOBJS))
 
 
 # This can be overwritten by the TOPLEVEL Makefile
 TOPDIR=..
-COPTS = -O2 -Wall #-DDEBUG
-LOPTS = -s
+CFLAGS += -I$(TOPDIR) -fPIC
+SONAME=libnet-tools.so.0
 
-CFLAGS  = $(COPTS) -I. -I$(TOPDIR) -I$(TOPDIR)/include
-LDFLAGS = $(LOPTS)
+.SUFFIXES: .a .so
 
-all:	libsupport.a
+all:	lib$(NET_LIB_NAME).a # lib$(NET_LIB_NAME).so
 
-libsupport.a:	Makefile $(TOPDIR)/config.h $(OBJS)
-			@echo Building libsupport.a
-			@rm -f libsupport.a
-			@ar rcs libsupport.a $(OBJS)
-			@ranlib libsupport.a
+lib$(NET_LIB_NAME).a:	Makefile $(TOPDIR)/config.h $(OBJS)
+			@echo Building $@
+			@rm -f $@
+			@ar rcs $@ $(OBJS)
+
+.a.so:;
+	$(CC) -o $@ -shared -Wl,--whole-archive -Wl,--soname -Wl,$(SONAME) -nostdlib -nostartfiles $<
 
 clean:
 		rm -f *.o *~ *.orig
 
 clobber:	clean
-		rm -f *.a
+		rm -f *.a *.so
 
 # End of lib/Makefile.