Merge branch 'master' of git+ssh://openadk.org/git/openadk

7 files changed, 239 insertions, 0 deletions

diff --git a/package/net-tools/Makefile b/package/net-tools/Makefile
new file mode 100644
index 000000000..15f084a70
--- /dev/null
+++ b/package/net-tools/Makefile
@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		net-tools
+PKG_VERSION:=		1.60
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		888774accab40217dde927e21979c165
+PKG_DESCR:=		Linux net-tools
+PKG_SECTION:=		net
+PKG_URL:=		http://net-tools.sourceforge.net/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=net-tools/}
+PKG_NOPARALLEL:=	1
+
+PKG_SUBPKGS:=		ARP
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,ARP,arp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
+TARGET_LDFLAGS+=	-lssp
+
+do-configure:
+	$(CP) ./files/config.* $(WRKBUILD)/
+
+arp-install:
+	$(INSTALL_DIR) $(IDIR_ARP)/sbin
+	$(INSTALL_BIN) $(WRKBUILD)/arp \
+		$(IDIR_ARP)/sbin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/net-tools/files/config.h b/package/net-tools/files/config.h
new file mode 100644
index 000000000..32181ecc9
--- /dev/null
+++ b/package/net-tools/files/config.h
@@ -0,0 +1,74 @@
+/*
+* 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 0
+
+/* 
+ * 
+ * Protocol Families.
+ * 
+ */
+#define HAVE_AFUNIX 1
+#define HAVE_AFINET 1
+#define HAVE_AFINET6 0
+#define HAVE_AFIPX 0
+#define HAVE_AFATALK 0
+#define HAVE_AFAX25 0
+#define HAVE_AFNETROM 0
+#define HAVE_AFROSE 0
+#define HAVE_AFX25 0
+#define HAVE_AFECONET 0
+#define HAVE_AFDECnet 0
+#define HAVE_AFASH 0
+
+/* 
+ * 
+ * Device Hardware types.
+ * 
+ */
+#define HAVE_HWETHER 1
+#define HAVE_HWARC 0
+#define HAVE_HWSLIP 0
+#define HAVE_HWPPP 1
+#define HAVE_HWTUNNEL 1
+#define HAVE_HWSTRIP 0
+#define HAVE_HWTR 0
+#define HAVE_HWAX25 0
+#define HAVE_HWROSE 0
+#define HAVE_HWNETROM 0
+#define HAVE_HWX25 0
+#define HAVE_HWFR 0
+#define HAVE_HWSIT 0
+#define HAVE_HWFDDI 0
+#define HAVE_HWHIPPI 0
+#define HAVE_HWASH 0
+#define HAVE_HWHDLCLAPB 0
+#define HAVE_HWIRDA 0
+#define HAVE_HWEC 0
+
+/* 
+ * 
+ * Other Features.
+ * 
+ */
+#define HAVE_FW_MASQUERADE 0
+#define HAVE_IP_TOOLS 0
+#define HAVE_MII 0
diff --git a/package/net-tools/files/config.make b/package/net-tools/files/config.make
new file mode 100644
index 000000000..9af6d743c
--- /dev/null
+++ b/package/net-tools/files/config.make
@@ -0,0 +1,35 @@
+# I18N=0
+HAVE_AFUNIX=1
+HAVE_AFINET=1
+# HAVE_AFINET6=0
+# HAVE_AFIPX=0
+# HAVE_AFATALK=0
+# HAVE_AFAX25=0
+# HAVE_AFNETROM=0
+# HAVE_AFROSE=0
+# HAVE_AFX25=0
+# HAVE_AFECONET=0
+# HAVE_AFDECnet=0
+# HAVE_AFASH=0
+HAVE_HWETHER=1
+# HAVE_HWARC=0
+# HAVE_HWSLIP=0
+HAVE_HWPPP=1
+HAVE_HWTUNNEL=1
+# HAVE_HWSTRIP=0
+# HAVE_HWTR=0
+# HAVE_HWAX25=0
+# HAVE_HWROSE=0
+# HAVE_HWNETROM=0
+# HAVE_HWX25=0
+# HAVE_HWFR=0
+# HAVE_HWSIT=0
+# HAVE_HWFDDI=0
+# HAVE_HWHIPPI=0
+# HAVE_HWASH=0
+# HAVE_HWHDLCLAPB=0
+# HAVE_HWIRDA=0
+# HAVE_HWEC=0
+# HAVE_FW_MASQUERADE=0
+# HAVE_IP_TOOLS=0
+# HAVE_MII=0
diff --git a/package/net-tools/patches/patch-Makefile b/package/net-tools/patches/patch-Makefile
new file mode 100644
index 000000000..9a27f7e64
--- /dev/null
+++ b/package/net-tools/patches/patch-Makefile
@@ -0,0 +1,36 @@
+--- 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
diff --git a/package/net-tools/patches/patch-Makefile.orig b/package/net-tools/patches/patch-Makefile.orig
new file mode 100644
index 000000000..31c4b8ba3
--- /dev/null
+++ b/package/net-tools/patches/patch-Makefile.orig
@@ -0,0 +1,34 @@
+--- net-tools-1.60.orig/Makefile	2001-04-15 16:34:31.000000000 +0200
++++ net-tools-1.60/Makefile	2011-11-15 11:30:19.227768488 +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,7 +113,9 @@ endif
+ 
+ NET_LIB = $(NET_LIB_PATH)/lib$(NET_LIB_NAME).a
+ 
+-CFLAGS	= $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH)
++CFLAGS ?=
++CFLAGS	+= $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH)
++LDFLAGS ?= -lssp
+ 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
diff --git a/package/net-tools/patches/patch-lib_Makefile b/package/net-tools/patches/patch-lib_Makefile
new file mode 100644
index 000000000..e51a639f0
--- /dev/null
+++ b/package/net-tools/patches/patch-lib_Makefile
@@ -0,0 +1,11 @@
+--- 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
+ 
diff --git a/package/net-tools/patches/patch-lib_interface_c b/package/net-tools/patches/patch-lib_interface_c
new file mode 100644
index 000000000..782643df1
--- /dev/null
+++ b/package/net-tools/patches/patch-lib_interface_c
@@ -0,0 +1,13 @@
+--- 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)