rpms/net-tools/devel net-tools-1.60-bitkeeper.patch, 1.2, 1.3 net-tools-1.60-duplicate-tcp.patch, 1.2, 1.3 net-tools-1.60-ifconfig-long-iface-crasher.patch, 1.1, 1.2

[Zdenek Prikryl (zprikryl)]

Author: zprikryl

Update of /cvs/extras/rpms/net-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8905

Modified Files:
	net-tools-1.60-bitkeeper.patch 
	net-tools-1.60-duplicate-tcp.patch 
	net-tools-1.60-ifconfig-long-iface-crasher.patch 
Log Message:
Patche are applicable with --fuz=0


net-tools-1.60-bitkeeper.patch:

Index: net-tools-1.60-bitkeeper.patch
===================================================================
RCS file: /cvs/extras/rpms/net-tools/devel/net-tools-1.60-bitkeeper.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- net-tools-1.60-bitkeeper.patch	7 Feb 2005 10:46:11 -0000	1.2
+++ net-tools-1.60-bitkeeper.patch	15 Jul 2008 12:30:02 -0000	1.3
@@ -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)

net-tools-1.60-duplicate-tcp.patch:

Index: net-tools-1.60-duplicate-tcp.patch
===================================================================
RCS file: /cvs/extras/rpms/net-tools/devel/net-tools-1.60-duplicate-tcp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- net-tools-1.60-duplicate-tcp.patch	26 Apr 2005 09:54:30 -0000	1.2
+++ net-tools-1.60-duplicate-tcp.patch	15 Jul 2008 12:30:02 -0000	1.3
@@ -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();
      }

net-tools-1.60-ifconfig-long-iface-crasher.patch:

Index: net-tools-1.60-ifconfig-long-iface-crasher.patch
===================================================================
RCS file: /cvs/extras/rpms/net-tools/devel/net-tools-1.60-ifconfig-long-iface-crasher.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- net-tools-1.60-ifconfig-long-iface-crasher.patch	9 May 2006 09:27:14 -0000	1.1
+++ net-tools-1.60-ifconfig-long-iface-crasher.patch	15 Jul 2008 12:30:02 -0000	1.2
@@ -3,13 +3,13 @@
 +++ 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 @@
  	    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++;