rpms/ipsec-tools/devel ipsec-tools-0.7.1-dpd-fixes.patch, 1.1, 1.2 ipsec-tools.spec, 1.60, 1.61

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/ipsec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9010

Modified Files:
	ipsec-tools-0.7.1-dpd-fixes.patch ipsec-tools.spec 
Log Message:
* Mon Nov 10 2008 Tomas Mraz <tmraz at redhat.com> - 0.7.1-6
- fix patch porting error in the dpd-fixes patch (#470575)


ipsec-tools-0.7.1-dpd-fixes.patch:

Index: ipsec-tools-0.7.1-dpd-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools-0.7.1-dpd-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipsec-tools-0.7.1-dpd-fixes.patch	17 Oct 2008 16:23:52 -0000	1.1
+++ ipsec-tools-0.7.1-dpd-fixes.patch	10 Nov 2008 12:03:31 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up ipsec-tools-0.7.1/src/racoon/isakmp_inf.c.dpd-fixes ipsec-tools-0.7.1/src/racoon/isakmp_inf.c
---- ipsec-tools-0.7.1/src/racoon/isakmp_inf.c.dpd-fixes	2008-10-17 14:18:44.000000000 +0200
-+++ ipsec-tools-0.7.1/src/racoon/isakmp_inf.c	2008-10-17 18:04:07.000000000 +0200
+--- ipsec-tools-0.7.1/src/racoon/isakmp_inf.c.dpd-fixes	2008-11-10 12:56:46.000000000 +0100
++++ ipsec-tools-0.7.1/src/racoon/isakmp_inf.c	2008-11-10 12:56:46.000000000 +0100
 @@ -1202,7 +1202,7 @@ purge_ipsec_spi(dst0, proto, spi, n)
  
  		/* don't delete inbound SAs at the moment */
@@ -11,8 +11,8 @@
  			continue;
  		}
 diff -up ipsec-tools-0.7.1/src/racoon/pfkey.c.dpd-fixes ipsec-tools-0.7.1/src/racoon/pfkey.c
---- ipsec-tools-0.7.1/src/racoon/pfkey.c.dpd-fixes	2008-10-17 14:18:44.000000000 +0200
-+++ ipsec-tools-0.7.1/src/racoon/pfkey.c	2008-10-17 18:17:16.000000000 +0200
+--- ipsec-tools-0.7.1/src/racoon/pfkey.c.dpd-fixes	2008-11-10 12:56:46.000000000 +0100
++++ ipsec-tools-0.7.1/src/racoon/pfkey.c	2008-11-10 12:57:45.000000000 +0100
 @@ -902,13 +902,19 @@ pk_sendgetspi(iph2)
  	/* for mobile IPv6 */
  	if (proxy && iph2->src_id && iph2->dst_id &&
@@ -191,16 +191,20 @@
  			return -1;
  		}
  #endif
-@@ -1488,6 +1527,8 @@ pk_sendadd(iph2)
+@@ -1487,8 +1526,11 @@ pk_sendadd(iph2)
+ 				pr->head->authtype,
  				&sa_args.e_type, &sa_args.e_keylen,
  				&sa_args.a_type, &sa_args.a_keylen, 
- 				&sa_args.flags) < 0)
+-				&sa_args.flags) < 0)
++				&sa_args.flags) < 0) {
 +			racoon_free(sa_args.src);
 +			racoon_free(sa_args.dst);
  			return -1;
++		}
  
  #if 0
-@@ -1539,6 +1580,8 @@ pk_sendadd(iph2)
+ 		sa_args.l_bytes = iph2->approval->lifebyte * 1024,
+@@ -1539,6 +1581,8 @@ pk_sendadd(iph2)
  			plog(LLV_ERROR, LOCATION, NULL,
  				"libipsec failed send add (%s)\n",
  				ipsec_strerror());
@@ -209,7 +213,7 @@
  			return -1;
  		}
  
-@@ -1566,6 +1609,8 @@ pk_sendadd(iph2)
+@@ -1566,6 +1610,8 @@ pk_sendadd(iph2)
  			sa_args.satype, sa_args.spi, sa_args.mode));
  	}
  	iph2->sa_count = sa_sent;
@@ -219,8 +223,8 @@
  }
  
 diff -up ipsec-tools-0.7.1/src/racoon/isakmp.c.dpd-fixes ipsec-tools-0.7.1/src/racoon/isakmp.c
---- ipsec-tools-0.7.1/src/racoon/isakmp.c.dpd-fixes	2008-10-17 14:34:15.000000000 +0200
-+++ ipsec-tools-0.7.1/src/racoon/isakmp.c	2008-10-17 17:58:44.000000000 +0200
+--- ipsec-tools-0.7.1/src/racoon/isakmp.c.dpd-fixes	2008-11-10 12:56:46.000000000 +0100
++++ ipsec-tools-0.7.1/src/racoon/isakmp.c	2008-11-10 12:56:46.000000000 +0100
 @@ -3255,6 +3255,14 @@ purge_remote(iph1)
  			continue;
  		}


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ipsec-tools.spec	17 Oct 2008 16:23:52 -0000	1.60
+++ ipsec-tools.spec	10 Nov 2008 12:03:31 -0000	1.61
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.7.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -124,6 +124,9 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Mon Nov 10 2008 Tomas Mraz <tmraz at redhat.com> - 0.7.1-6
+- fix patch porting error in the dpd-fixes patch (#470575)
+
 * Fri Oct 17 2008 Tomas Mraz <tmraz at redhat.com> - 0.7.1-5
 - fix CVE-2008-3652 (memory leak DoS)
 - compile racoon as PIE