[openswan/f18: 3/3] -rhbz #771612: ipsec barf should not grep sparse file. The patch has been provided by pwouters at redh

[avesh]

commit 5748b842dc1e02de2b2b26948ab20b42e3baa610
Author: Avesh Agarwal <avagarwa at redhat.com>
Date:   Tue Aug 21 14:58:09 2012 -0400

    -rhbz #771612: ipsec barf should not grep sparse file. The
     patch has been provided by pwouters at redhat.com.
    - rhbz #785180: openswan uses ifconfig which is deprecated.
    - rhbz #796683: Compile time no-strict-aliasing issue.
    - rhbz #834396: Coverity scan fixes, warnings, dead code.
    - rhbz #834400: NAT-OA reserved field issue.

 openswan-771612.patch               |   22 ---
 openswan-785180.patch               |   34 ----
 openswan-834396.patch               |  312 -----------------------------------
 openswan-834400.patch               |   18 --
 openswan-xauth-modecfg-issues.patch |  165 ------------------
 openswan.spec                       |   31 +---
 6 files changed, 3 insertions(+), 579 deletions(-)
---
diff --git a/openswan.spec b/openswan.spec
index 0dc51e4..f0362bc 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.38
 
-Release: 5%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
@@ -31,11 +31,6 @@ Patch10: openswan-ikev1-aes-gcm-esp-fixes.patch
 Patch11: rhbz-831676.patch
 Patch12: rhbz-841325.patch
 Patch13: openswan-updown-netkey.patch
-Patch14: openswan-xauth-modecfg-issues.patch
-Patch15: openswan-771612.patch
-Patch16: openswan-785180.patch
-Patch17: openswan-834396.patch
-Patch18: openswan-834400.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -110,17 +105,12 @@ install -m 644 %{SOURCE3} docs/README.x509
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
 
 %build
 
-#796683: -fno-strict-aliasing
+
 %{__make} \
-  USERCOMPILE="-g %{optflags} -fno-strict-aliasing -fPIE -pie" \
+  USERCOMPILE="-g %{optflags} -fPIE -pie" \
   USERLINK="-g -pie" \
   INC_USRLOCAL=%{_prefix} \
   FINALLIBDIR=%{_libexecdir}/ipsec \
@@ -239,21 +229,6 @@ fi
 chkconfig --add ipsec || :
 
 %changelog
-* Tue Aug 21 2012 Avesh Agarwal <avagarwa at redhat.com> - 2.6.38-5
-- rhbz #771612: ipsec barf should not grep sparse file. The 
-patch has been provided by pwouters at redhat.com.
-- rhbz #785180: openswan uses ifconfig which is deprecated.
-- rhbz #796683: Compile time no-strict-aliasing issue.
-- rhbz #834396: Coverity scan fixes, warnings, dead code.
-- rhbz #834400: NAT-OA reserved field issue. 
-
-* Fri Aug 17 2012 Avesh Agarwal <avagarwa at redhat.com> - 2.6.38-4
-- Phase15 as xauth and modecfg is called in openswan is not
-  handled properly when only xauth (without modecfg) is used.
-- dpd events and ike/sa lifetime expiry events are not created
-  properly when xauth is used without modecfg.
-  This commit addresses these issues.
-
 * Tue Aug 7 2012 Avesh Agarwal <avagarwa at redhat.com> - 2.6.38-3
 - Ikev2 changes from rhel6 to fedora
 - Sha256 changes from rhel6 to fedora