[openswan/f14/master] - rhbz#636572, fix to openswan default start issue

[avesh agarwal]

commit 9e1161911fa0faccccc24e3a47021f7208b33859
Author: Avesh Agarwal <avagarwa at redhat.com>
Date:   Thu Sep 30 11:42:03 2010 -0400

    - rhbz#636572, fix to openswan default start issue

 openswan-setup.patch |   11 +++++++++++
 openswan.spec        |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/openswan-setup.patch b/openswan-setup.patch
new file mode 100644
index 0000000..028fd8d
--- /dev/null
+++ b/openswan-setup.patch
@@ -0,0 +1,11 @@
+--- openswan-2.6.29-orig/programs/setup/setup.in	2010-09-27 12:40:32.000000000 -0400
++++ openswan-2.6.29-cvs-patched/programs/setup/setup.in	2010-09-30 11:26:10.533181945 -0400
+@@ -5,7 +5,7 @@
+ # Provides:          ipsec
+ # Required-Start:    $network $remote_fs $syslog $named
+ # Required-Stop:     $syslog $remote_fs
+-# Default-Start:     2 3 4 5
++# Default-Start:
+ # Default-Stop:      0 1 6
+ # Short-Description: Start Openswan IPsec at boot time
+ # Description:       Enable automatic key management for IPsec (KLIPS and NETKEY)
diff --git a/openswan.spec b/openswan.spec
index b6f61d6..7983a5e 100644
--- a/openswan.spec
+++ b/openswan.spec
@@ -10,7 +10,7 @@ Summary: IPSEC implementation with IKEv1 and IKEv2 keying protocols
 Name: openswan
 Version: 2.6.29
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
@@ -21,6 +21,7 @@ Patch1: openswan-2.6-relpath.patch
 Patch2: openswan-ipsec-help-524146-509318.patch
 Patch3: openswan-600174.patch
 Patch4: openswan-600167.patch
+Patch5: openswan-setup.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -78,6 +79,7 @@ find doc -name .gitignore -print0 | xargs -0 rm -v
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 
@@ -230,6 +232,9 @@ fi
 chkconfig --add ipsec || :
 
 %changelog
+* Thu Sep 30 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.29-2
+- rhbz#636572, fix to openswan default start issue 
+
 * 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