net-tools: update to 2.10, add it to standard linux tool setup

package/net-tools/Makefile

@@ -4,22 +4,18 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		net-tools
-PKG_VERSION:=		1.60
-PKG_RELEASE:=		2
-PKG_HASH:=		7ae4dd6d44d6715f18e10559ffd270511b6e55a8900ca54fbebafe0ae6cf7d7b
-PKG_DESCR:=		arp networking tool
+PKG_VERSION:=		2.10
+PKG_RELEASE:=		1
+PKG_HASH:=		b262435a5241e89bfa51c3cabd5133753952f7a7b7b93f32e08cb9d96f580d69
+PKG_DESCR:=		networking tools
 PKG_SECTION:=		net/misc
 PKG_URL:=		http://net-tools.sourceforge.net/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=net-tools/}
+PKG_SITES:=		https://sourceforge.net/projects/net-tools/files/
 PKG_NOPARALLEL:=	1
 
-PKG_SUBPKGS:=		ARP
-
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,ARP,arp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NET_TOOLS,net-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
@@ -27,9 +23,9 @@ INSTALL_STYLE:=		manual
 do-configure:
 	$(CP) ./files/config.* $(WRKBUILD)/
 
-arp-install:
-	$(INSTALL_DIR) $(IDIR_ARP)/sbin
-	$(INSTALL_BIN) $(WRKBUILD)/arp \
-		$(IDIR_ARP)/sbin
+net-tools-install:
+	$(INSTALL_DIR) $(IDIR_NET_TOOLS)/sbin
+	$(INSTALL_BIN) $(WRKBUILD)/{arp,ifconfig,route,hostname} \
+		$(IDIR_NET_TOOLS)/sbin
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/net-tools/files/config.make

@@ -1,7 +1,7 @@
 # I18N=0
 HAVE_AFUNIX=1
 HAVE_AFINET=1
-# HAVE_AFINET6=0
+HAVE_AFINET6=1
 # HAVE_AFIPX=0
 # HAVE_AFATALK=0
 # HAVE_AFAX25=0
@@ -33,3 +33,5 @@ HAVE_HWTUNNEL=1
 # HAVE_FW_MASQUERADE=0
 # HAVE_IP_TOOLS=0
 # HAVE_MII=0
+HAVE_HOSTNAME_TOOLS=1
+HAVE_ARP_TOOLS=1

package/net-tools/patches/patch-Makefile

@@ -1,36 +0,0 @@
---- net-tools-1.60.orig/Makefile	2001-04-15 16:34:31.000000000 +0200
-+++ net-tools-1.60/Makefile	2011-11-15 11:30:52.379769328 +0100
-@@ -76,7 +76,7 @@
- NET_LIB_PATH = lib
- NET_LIB_NAME = net-tools
- 
--PROGS	:= ifconfig hostname arp netstat route rarp slattach plipconfig nameif
-+PROGS	:= arp 
- 
- -include config.make
- ifeq ($(HAVE_IP_TOOLS),1)
-@@ -113,8 +113,10 @@ endif
- 
- NET_LIB = $(NET_LIB_PATH)/lib$(NET_LIB_NAME).a
- 
--CFLAGS	= $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH)
--LDFLAGS	= $(LOPTS) -L$(NET_LIB_PATH)
-+CFLAGS ?=
-+CFLAGS	+= $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH)
-+LDFLAGS ?=
-+LDFLAGS	+= $(LOPTS) -L$(NET_LIB_PATH) 
- 
- SUBDIRS	= man/ $(NET_LIB_PATH)/
- 
-@@ -160,11 +162,6 @@ dist: 		clobber
- 
- 
- config.h: 	config.in Makefile 
--		@echo "Configuring the Linux net-tools (NET-3 Base Utilities)..." ; echo
--		@if [ config.status -nt config.in ]; \
--			then ./configure.sh config.status; \
--		   else ./configure.sh config.in; \
--		 fi
- 
- 
- version.h:	Makefile

package/net-tools/patches/patch-lib_Makefile

@@ -1,11 +0,0 @@
---- net-tools-1.60.orig/lib/Makefile	2000-10-28 12:59:42.000000000 +0200
-+++ net-tools-1.60/lib/Makefile	2011-11-15 11:26:55.563763329 +0100
-@@ -19,7 +19,7 @@
- HWOBJS	 = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o
- AFOBJS	 = unix.o inet.o inet6.o ax25.o ipx.o ddp.o ipx.o netrom.o af.o rose.o econet.o x25.o
- AFGROBJS = inet_gr.o inet6_gr.o ipx_gr.o ddp_gr.o netrom_gr.o ax25_gr.o rose_gr.o getroute.o x25_gr.o
--AFSROBJS = inet_sr.o inet6_sr.o netrom_sr.o ipx_sr.o setroute.o x25_sr.o
-+#AFSROBJS = inet_sr.o inet6_sr.o netrom_sr.o ipx_sr.o setroute.o x25_sr.o
- ACTOBJS  = slip_ac.o ppp_ac.o activate.o
- VARIA	 = getargs.o masq_info.o proc.o util.o nstrcmp.o interface.o sockets.o
- 

package/net-tools/patches/patch-lib_inet_c

@@ -1,11 +0,0 @@
---- net-tools-1.60.orig/lib/inet.c	2000-05-22 23:27:13.000000000 +0200
-+++ net-tools-1.60/lib/inet.c	2013-12-27 18:00:30.000000000 +0100
-@@ -224,7 +224,7 @@ static int INET_rresolve(char *name, siz
- 
- static void INET_reserror(char *text)
- {
--    herror(text);
-+    perror(text);
- }
- 
- 

package/net-tools/patches/patch-lib_interface_c

@@ -1,13 +0,0 @@
---- net-tools-1.60.orig/lib/interface.c	2001-02-10 20:31:15.000000000 +0100
-+++ net-tools-1.60/lib/interface.c	2011-11-15 11:18:11.955750067 +0100
-@@ -663,8 +663,10 @@ void ife_print_long(struct interface *pt
- 
-     hf = ptr->type;
- 
-+#if 0
-     if (hf == ARPHRD_CSLIP || hf == ARPHRD_CSLIP6)
- 	can_compress = 1;
-+#endif
- 
-     hw = get_hwntype(hf);
-     if (hw == NULL)

target/config/Config.in.runtime

@@ -107,6 +107,7 @@ config ADK_RUNTIME_BASE_COREUTILS
 	select ADK_PACKAGE_UTIL_LINUX
 	select ADK_PACKAGE_PROCPS_NG
 	select ADK_PACKAGE_IP
+	select ADK_PACKAGE_NET_TOOLS
 
 config ADK_RUNTIME_BASE_NONE
 	bool "Use no base tools"