rpms/iproute/devel iproute.spec, 1.83, 1.84 iproute2-2.6.25-xfrmsegfault.patch, 1.1, 1.2

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26523

Modified Files:
	iproute.spec iproute2-2.6.25-xfrmsegfault.patch 
Log Message:
Change the patch a little.



Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- iproute.spec	3 Jul 2008 14:28:50 -0000	1.83
+++ iproute.spec	4 Jul 2008 12:44:07 -0000	1.84
@@ -115,7 +115,7 @@
 
 %changelog
 * Thu Jul  3 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.25-3
-- 49933 fix segfault after non-existent combination of commands
+- 449933 fix segfault after non-existent combination of commands
 
 * Wed May 14 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.25-2
 - allow replay setting, solve also 444724

iproute2-2.6.25-xfrmsegfault.patch:

Index: iproute2-2.6.25-xfrmsegfault.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-2.6.25-xfrmsegfault.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iproute2-2.6.25-xfrmsegfault.patch	3 Jul 2008 14:28:50 -0000	1.1
+++ iproute2-2.6.25-xfrmsegfault.patch	4 Jul 2008 12:44:07 -0000	1.2
@@ -1,13 +1,15 @@
-diff -up iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.oprava iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c
---- iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.oprava	2008-07-03 16:00:13.000000000 +0200
-+++ iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c	2008-07-03 16:08:43.000000000 +0200
-@@ -162,7 +162,8 @@ static int xfrm_algo_parse(struct xfrm_a
+diff -up iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.seg iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c
+--- iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.seg	2008-07-04 13:22:13.000000000 +0200
++++ iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c	2008-07-04 13:30:51.000000000 +0200
+@@ -162,8 +162,9 @@ static int xfrm_algo_parse(struct xfrm_a
  		if (len > 0) {
  			if (len > max)
  				invarg("\"ALGOKEY\" makes buffer overflow\n", key);
 -
+-			strncpy(buf, key, len);
 +			else
 +				invarg("\"ALGOKEY\" is invalid", key);
- 			strncpy(buf, key, len);
++			/* strncpy(buf, key, len); */
  		}
  	}
+