From 9634070fcad53ea09a68f90d947f64b507d38343 Mon Sep 17 00:00:00 2001 From: Zdenek Prikryl Date: Tue, 15 Jul 2008 12:30:02 +0000 Subject: [PATCH] Patche are applicable with --fuz=0 --- net-tools-1.60-bitkeeper.patch | 2 +- net-tools-1.60-duplicate-tcp.patch | 4 ++-- net-tools-1.60-ifconfig-long-iface-crasher.patch | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net-tools-1.60-bitkeeper.patch b/net-tools-1.60-bitkeeper.patch index 6871304..85676b8 100644 --- a/net-tools-1.60-bitkeeper.patch +++ b/net-tools-1.60-bitkeeper.patch @@ -2,7 +2,7 @@ +++ net-tools-1.60/netplug-1.2.9/Makefile 2005-01-10 11:38:01.796744224 +0100 @@ -24,10 +24,12 @@ install $(install_opts) -m 755 scripts/rc.netplugd $(initdir)/netplugd - install -C $(install_opts) -m 444 man/man8/netplugd.8 $(mandir)/man8 + install $(install_opts) -m 444 man/man8/netplugd.8 $(mandir)/man8 -bk_root := $(shell bk root) +#bk_root := $(shell bk root) diff --git a/net-tools-1.60-duplicate-tcp.patch b/net-tools-1.60-duplicate-tcp.patch index 316ac65..1b6f3b0 100644 --- a/net-tools-1.60-duplicate-tcp.patch +++ b/net-tools-1.60-duplicate-tcp.patch @@ -184,9 +184,9 @@ if (state == TCP_LISTEN) { time_len = 0; retr = 0L; -@@ -1849,6 +2014,7 @@ +@@ -1880,6 +2045,7 @@ break; - sleep(1); + sleep(reptimer); prg_cache_clear(); + tcp_node_hash_clear(); } diff --git a/net-tools-1.60-ifconfig-long-iface-crasher.patch b/net-tools-1.60-ifconfig-long-iface-crasher.patch index eaf2c5e..87fcc5d 100644 --- a/net-tools-1.60-ifconfig-long-iface-crasher.patch +++ b/net-tools-1.60-ifconfig-long-iface-crasher.patch @@ -3,13 +3,13 @@ diff -Naurp net-tools-1.60-ifconfig-new/lib/interface.c net-tools-1.60-ifconfig/ +++ net-tools-1.60-ifconfig/lib/interface.c 2006-03-23 09:58:45.000000000 +0100 @@ -203,6 +203,7 @@ out: - static char *get_name(char *name, char *p) + static char *get_name(char **namep, char *p) { + int count = 0; while (isspace(*p)) p++; - while (*p) { -@@ -211,8 +212,13 @@ static char *get_name(char *name, char * + char *name = *namep = p; +@@ -211,8 +212,13 @@ static char *get_name(char **namep, char if (*p == ':') { /* could be an alias */ char *dot = p, *dotname = name; *name++ = *p++; @@ -24,7 +24,7 @@ diff -Naurp net-tools-1.60-ifconfig-new/lib/interface.c net-tools-1.60-ifconfig/ if (*p != ':') { /* it wasn't, backup */ p = dot; name = dotname; -@@ -223,6 +229,9 @@ static char *get_name(char *name, char * +@@ -223,6 +229,9 @@ static char *get_name(char **namep, char break; } *name++ = *p++;