[openswan/f12/master] - New upstream release - Fixes for CVE-2010-3308 and CVE-2010-3302

[avesh agarwal]

commit 8637dbd445483aeffda57f26b69a9382d4e525db
Author: Avesh Agarwal <avagarwa at redhat.com>
Date:   Mon Sep 27 14:54:43 2010 -0400

    - New upstream release
    - Fixes for CVE-2010-3308 and CVE-2010-3302

 .gitignore                              |    1 +
 openswan-2.6-relpath.patch              |   12 ++--
 openswan-ipsec-help-524146-509318.patch |    6 +-
 openswan-nm-584224.patch                |   86 -------------------------------
 openswan.spec                           |    8 ++-
 sources                                 |    2 +-
 6 files changed, 16 insertions(+), 99 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e2b5bb..33da86e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 openswan-2.6.25.tar.gz
 openswan-2.6.27.tar.gz
+/openswan-2.6.29.tar.gz
diff --git a/openswan-2.6-relpath.patch b/openswan-2.6-relpath.patch
index 001eaa6..b17d844 100644
--- a/openswan-2.6-relpath.patch
+++ b/openswan-2.6-relpath.patch
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.27-orig/Makefile.inc openswan-2.6.27-cvs-patched/Makefile.inc
---- openswan-2.6.27-orig/Makefile.inc	2010-06-21 11:43:35.000000000 -0400
-+++ openswan-2.6.27-cvs-patched/Makefile.inc	2010-07-02 14:39:23.856116570 -0400
+diff -urNp openswan-2.6.29-orig/Makefile.inc openswan-2.6.29-cvs-patched/Makefile.inc
+--- openswan-2.6.29-orig/Makefile.inc	2010-09-27 13:10:05.456420264 -0400
++++ openswan-2.6.29-cvs-patched/Makefile.inc	2010-09-27 13:10:25.270412552 -0400
 @@ -123,6 +123,8 @@ FINALRCDIR=$(shell for d in $(INC_RCDIRS
  		do if test -d $(DESTDIR)/$$d ; \
  		then echo $$d ; exit 0 ; \
@@ -10,9 +10,9 @@ diff -urNp openswan-2.6.27-orig/Makefile.inc openswan-2.6.27-cvs-patched/Makefil
  RCDIR=$(DESTDIR)$(FINALRCDIR)
  
  
-diff -urNp openswan-2.6.27-orig/programs/setup/Makefile openswan-2.6.27-cvs-patched/programs/setup/Makefile
---- openswan-2.6.27-orig/programs/setup/Makefile	2010-06-21 11:43:35.000000000 -0400
-+++ openswan-2.6.27-cvs-patched/programs/setup/Makefile	2010-07-02 14:39:52.001360412 -0400
+diff -urNp openswan-2.6.29-orig/programs/setup/Makefile openswan-2.6.29-cvs-patched/programs/setup/Makefile
+--- openswan-2.6.29-orig/programs/setup/Makefile	2010-09-27 13:10:05.486420297 -0400
++++ openswan-2.6.29-cvs-patched/programs/setup/Makefile	2010-09-27 13:10:25.271412259 -0400
 @@ -32,7 +32,7 @@ include ${srcdir}../Makefile.program
  doinstall:: setup
  	@rm -f $(BINDIR)/setup
diff --git a/openswan-ipsec-help-524146-509318.patch b/openswan-ipsec-help-524146-509318.patch
index 958782f..283c3d5 100644
--- a/openswan-ipsec-help-524146-509318.patch
+++ b/openswan-ipsec-help-524146-509318.patch
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.27-orig/programs/ipsec/ipsec.in openswan-2.6.27-cvs-patched/programs/ipsec/ipsec.in
---- openswan-2.6.27-orig/programs/ipsec/ipsec.in	2010-06-21 11:43:35.000000000 -0400
-+++ openswan-2.6.27-cvs-patched/programs/ipsec/ipsec.in	2010-07-02 14:45:45.573355284 -0400
+diff -urNp openswan-2.6.29-orig/programs/ipsec/ipsec.in openswan-2.6.29-cvs-patched/programs/ipsec/ipsec.in
+--- openswan-2.6.29-orig/programs/ipsec/ipsec.in	2010-09-27 13:10:05.529420266 -0400
++++ openswan-2.6.29-cvs-patched/programs/ipsec/ipsec.in	2010-09-27 13:12:47.588189664 -0400
 @@ -79,9 +79,9 @@ case "$1" in
  --help)
  	echo "Usage: ipsec command argument ..."
diff --git a/openswan.spec b/openswan.spec
index 2de557d..258b839 100644
--- a/openswan.spec
+++ b/openswan.spec
@@ -8,7 +8,7 @@
 
 Summary: IPSEC implementation with IKEv1 and IKEv2 keying protocols
 Name: openswan
-Version: 2.6.27
+Version: 2.6.29
 
 Release: 1%{?dist}
 License: GPLv2+
@@ -19,7 +19,6 @@ Source2: ipsec.conf
 
 Patch1: openswan-2.6-relpath.patch
 Patch2: openswan-ipsec-help-524146-509318.patch
-Patch3: openswan-nm-584224.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,7 +74,6 @@ find doc -name .gitignore -print0 | xargs -0 rm -v
 
 %patch1 -p1 -b .relpath
 %patch2 -p1
-%patch3 -p1
 
 
 %build
@@ -229,6 +227,10 @@ fi
 chkconfig --add ipsec || :
 
 %changelog
+* Mon Sep 27 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.29-1
+- New upstream release
+- Fixes for CVE-2010-3308 and CVE-2010-3302 
+
 * Mon Jul 19 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.27-1
 - New upstream release
 - NetworkManager-openswan plugin related changes
diff --git a/sources b/sources
index 1a03d29..024834e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5177b7401bb89e84ca1c89029143441e  openswan-2.6.27.tar.gz
+cd6c127585ec6db63780e9a40d5387fb  openswan-2.6.29.tar.gz