From b381fc19ee627875969c27116529452a948ce7c1 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Sep 10 2013 10:40:21 +0000
Subject: latest snapshot


---

diff --git a/.gitignore b/.gitignore
index 434c5a0..2ef56ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ net-tools-1.60.tar.bz2
 /net-tools-2.0.20130109git.tar.xz
 /net-tools-2.0.20130425git.tar.xz
 /net-tools-2.0.20130607git.tar.xz
+/net-tools-2.0.20130910git.tar.xz
diff --git a/net-tools-cycle.patch b/net-tools-cycle.patch
index 4de519c..a70408b 100644
--- a/net-tools-cycle.patch
+++ b/net-tools-cycle.patch
@@ -1,6 +1,6 @@
 diff -up net-tools-2.0/lib/interface.c.cycle net-tools-2.0/lib/interface.c
---- net-tools-2.0/lib/interface.c.cycle	2013-05-23 05:27:34.000000000 +0200
-+++ net-tools-2.0/lib/interface.c	2013-06-07 11:55:07.966208687 +0200
+--- net-tools-2.0/lib/interface.c.cycle	2013-08-30 14:30:25.000000000 +0200
++++ net-tools-2.0/lib/interface.c	2013-09-10 12:31:03.930309225 +0200
 @@ -93,6 +93,7 @@ int if_list_all = 0;	/* do we have reque
  static struct interface *int_list, *int_last;
  
@@ -68,8 +68,8 @@ diff -up net-tools-2.0/lib/interface.c.cycle net-tools-2.0/lib/interface.c
  int if_readlist(void)
  {
 diff -up net-tools-2.0/man/en_US/netstat.8.cycle net-tools-2.0/man/en_US/netstat.8
---- net-tools-2.0/man/en_US/netstat.8.cycle	2013-05-23 05:27:34.000000000 +0200
-+++ net-tools-2.0/man/en_US/netstat.8	2013-06-07 11:48:06.168552352 +0200
+--- net-tools-2.0/man/en_US/netstat.8.cycle	2013-08-30 14:30:25.000000000 +0200
++++ net-tools-2.0/man/en_US/netstat.8	2013-09-10 12:31:03.930309225 +0200
 @@ -33,6 +33,7 @@ netstat \- Print network connections, ro
  .RB [ \-\-verbose | \-v ]
  .RB [ \-\-continuous | \-c]
@@ -129,8 +129,8 @@ diff -up net-tools-2.0/man/en_US/netstat.8.cycle net-tools-2.0/man/en_US/netstat
  .SH OUTPUT
  .P
 diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c
---- net-tools-2.0/netstat.c.cycle	2013-05-23 05:27:34.000000000 +0200
-+++ net-tools-2.0/netstat.c	2013-06-07 11:54:22.615796530 +0200
+--- net-tools-2.0/netstat.c.cycle	2013-08-30 14:30:25.000000000 +0200
++++ net-tools-2.0/netstat.c	2013-09-10 12:32:32.460124531 +0200
 @@ -115,9 +115,9 @@
  #endif
  
@@ -143,7 +143,7 @@ diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c
  void inittab6(void);
  
  typedef enum {
-@@ -343,10 +343,10 @@ static void prg_cache_clear(void)
+@@ -341,10 +341,10 @@ static void prg_cache_clear(void)
      prg_cache_loaded = 0;
  }
  
@@ -231,7 +231,7 @@ diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c
  	ENOSUPP("netstat", "FW_MASQUERADE");
 @@ -2085,17 +2095,18 @@ int main
          if (!afname[0])
-             strcpy(afname, DFLT_AF);
+             safe_strncpy(afname, DFLT_AF, sizeof(afname));
  
 +        for (;;) {
          if (!strcmp(afname, "inet")) {
@@ -291,8 +291,8 @@ diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c
      }
      return (i);
 diff -up net-tools-2.0/statistics.c.cycle net-tools-2.0/statistics.c
---- net-tools-2.0/statistics.c.cycle	2013-05-23 05:27:34.000000000 +0200
-+++ net-tools-2.0/statistics.c	2013-06-07 11:49:35.234451789 +0200
+--- net-tools-2.0/statistics.c.cycle	2013-08-30 14:30:25.000000000 +0200
++++ net-tools-2.0/statistics.c	2013-09-10 12:31:03.932309198 +0200
 @@ -502,7 +502,7 @@ void process6_fd(FILE *f)
  
  }
diff --git a/net-tools-inet6-lookup.patch b/net-tools-inet6-lookup.patch
index 000cf95..21b9c37 100644
--- a/net-tools-inet6-lookup.patch
+++ b/net-tools-inet6-lookup.patch
@@ -56,42 +56,4 @@ diff -up net-tools-2.0/lib/inet6_gr.c.inet6-lookup net-tools-2.0/lib/inet6_gr.c
 +		 inet6_aftype.sprint((struct sockaddr *) &snaddr6, numeric));
  
  	/* Decode the flags. */
- 
-diff -up net-tools-2.0/lib/inet6_sr.c.inet6-lookup net-tools-2.0/lib/inet6_sr.c
---- net-tools-2.0/lib/inet6_sr.c.inet6-lookup	2013-05-23 05:27:34.000000000 +0200
-+++ net-tools-2.0/lib/inet6_sr.c	2013-06-07 11:56:33.464094279 +0200
-@@ -32,6 +32,7 @@
- #include "net-support.h"
- #include "pathnames.h"
- #include "intl.h"
-+#include "util.h"
- #include "net-features.h"
- 
- 
-@@ -63,7 +64,7 @@ static int INET6_setroute(int action, in
-     if (*args == NULL)
- 	return (usage());
- 
--    strcpy(target, *args++);
-+    safe_strncpy(target, *args++, sizeof(target));
-     if (!strcmp(target, "default")) {
-         prefix_len = 0;
- 	memset(&sa6, 0, sizeof(sa6));
-@@ -112,7 +113,7 @@ static int INET6_setroute(int action, in
- 		return (usage());
- 	    if (rt.rtmsg_flags & RTF_GATEWAY)
- 		return (usage());
--	    strcpy(gateway, *args);
-+	    safe_strncpy(gateway, *args, sizeof(gateway));
- 	    if (inet6_aftype.input(1, gateway,
- 				   (struct sockaddr *) &sa6) < 0) {
- 		inet6_aftype.herror(gateway);
-@@ -152,7 +153,7 @@ static int INET6_setroute(int action, in
-     }
-     if (devname) {
- 	memset(&ifr, 0, sizeof(ifr));
--	strcpy(ifr.ifr_name, devname);
-+	safe_strncpy(ifr.ifr_name, devname, sizeof(ifr.ifr_name));
- 
- 	if (ioctl(skfd, SIOGIFINDEX, &ifr) < 0) {
- 	    perror("SIOGIFINDEX");
+
diff --git a/net-tools-ipx.patch b/net-tools-ipx.patch
index 692d53e..ec78145 100644
--- a/net-tools-ipx.patch
+++ b/net-tools-ipx.patch
@@ -1,19 +1,19 @@
 diff -up net-tools-2.0/lib/ipx_gr.c.ipx net-tools-2.0/lib/ipx_gr.c
---- net-tools-2.0/lib/ipx_gr.c.ipx	2012-10-01 07:40:47.000000000 +0200
-+++ net-tools-2.0/lib/ipx_gr.c	2012-10-04 11:27:39.011998824 +0200
-@@ -71,7 +71,7 @@ int IPX_rprint(int options)
+--- net-tools-2.0/lib/ipx_gr.c.ipx	2013-09-10 12:33:52.494047907 +0200
++++ net-tools-2.0/lib/ipx_gr.c	2013-09-10 12:34:28.531561603 +0200
+@@ -72,7 +72,7 @@ int IPX_rprint(int options)
  	    continue;
  
  	/* Fetch and resolve the Destination */
 -	(void) ap->input(5, net, &sa);
 +	(void) ap->input(1, net, &sa);
- 	strcpy(net, ap->sprint(&sa, numeric));
+ 	safe_strncpy(net, ap->sprint(&sa, numeric), sizeof(net));
  
  	/* Fetch and resolve the Router Net */
 diff -up net-tools-2.0/netstat.c.ipx net-tools-2.0/netstat.c
---- net-tools-2.0/netstat.c.ipx	2012-10-04 11:27:39.008998860 +0200
-+++ net-tools-2.0/netstat.c	2012-10-04 11:27:39.012998812 +0200
-@@ -1647,13 +1647,13 @@ static int ipx_info(void)
+--- net-tools-2.0/netstat.c.ipx	2013-09-10 12:33:52.491047948 +0200
++++ net-tools-2.0/netstat.c	2013-09-10 12:33:52.495047894 +0200
+@@ -1643,13 +1643,13 @@ static int ipx_info(void)
  	}
  
  	/* Fetch and resolve the Source */
diff --git a/net-tools.spec b/net-tools.spec
index 83db148..612b84e 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -1,9 +1,9 @@
-%global checkout 20130607git
+%global checkout 20130910git
 
 Summary: Basic networking tools
 Name: net-tools
 Version: 2.0
-Release: 0.11.%{checkout}%{?dist}
+Release: 0.12.%{checkout}%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/net-tools/
@@ -170,6 +170,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir}
 %attr(0644,root,root)   %{_unitdir}/arp-ethers.service
 
 %changelog
+* Tue Sep 10 2013 Jiri Popelka <jpopelka@redhat.com> - 2.0-0.12.20130910git
+- latest snapshot
+
 * Wed Sep 04 2013 Jiri Popelka <jpopelka@redhat.com> - 2.0-0.11.20130607git
 - amend ether-wake-interfaces.patch
 
diff --git a/sources b/sources
index c0c8e26..95b39a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5247edb863e78a12f0326e6f77231c34  net-tools-2.0.20130607git.tar.xz
+76422813e587dc82da0183bfb814d584  net-tools-2.0.20130910git.tar.xz