diff options
Diffstat (limited to 'package/net-tools/patches')
-rw-r--r-- | package/net-tools/patches/patch-Makefile | 36 | ||||
-rw-r--r-- | package/net-tools/patches/patch-Makefile.orig | 34 | ||||
-rw-r--r-- | package/net-tools/patches/patch-lib_Makefile | 11 | ||||
-rw-r--r-- | package/net-tools/patches/patch-lib_interface_c | 13 |
4 files changed, 94 insertions, 0 deletions
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) |