SPECS (LINUX_2_6_16): kernel.spec - revert ipsec KLIPS for compati...

[glen]

Author: glen                         Date: Wed Nov 28 00:16:38 2007 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- revert ipsec KLIPS for compatibility with ipsec changes from r1.441.2.1558.2.109
  they are broken in way that not all AC archidectures build. make sure
  kernel.spec still builds on all archidectures if you want these patches added.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.115 -> 1.441.2.1558.2.116) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.115 SPECS/kernel.spec:1.441.2.1558.2.116
--- SPECS/kernel.spec:1.441.2.1558.2.115	Thu Nov 22 16:07:59 2007
+++ SPECS/kernel.spec	Wed Nov 28 01:16:32 2007
@@ -184,7 +184,6 @@
 Source47:	kernel-xenU.config
 Source48:	kernel-xen-extra.config
 Source49:	kernel-grsec+pax.config
-Source50:	kernel-openswan.config
 ###
 #	Patches
 ###
@@ -278,10 +277,6 @@
 Patch81:	linux-2.6-md.patch
 Patch82:	linux-3w-9xxx.patch
 
-# IPSEC KLIPS
-Patch90:        http://www.openswan.org/download/openswan-2.4.9.kernel-2.6-klips.patch.gz
-Patch91:        http://www.openswan.org/download/openswan-2.4.9.kernel-2.6-natt.patch.gz
-
 # vserver from: http://vserver.13thfloor.at/Experimental/patch-2.6.16-vs2.1.1-rc15.diff
 Patch100:	linux-2.6-vs2.1.patch
 Patch101:	linux-2.6-vs2.1-suspend2.patch
@@ -873,9 +868,6 @@
 %patch81 -p1
 %patch82 -p1
 
-%patch90 -p1
-%patch91 -p1
-
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -1028,9 +1020,6 @@
 	%endif
 %endif
 
-	# IPSEC KLIPS
-	cat %{SOURCE50} >> arch/%{_target_base_arch}/defconfig
-
 %if %{with xen0} || %{with xenU}
 	sed -i "s:CONFIG_X86_PC=y:# CONFIG_X86_PC is not set:" arch/%{_target_base_arch}/defconfig
 	sed -i "s:CONFIG_RIO=[ym]:# CONFIG_RIO is not set:" arch/%{_target_base_arch}/defconfig
@@ -1777,6 +1766,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.116  2007-11-28 00:16:32  glen
+- revert ipsec KLIPS for compatibility with ipsec changes from r1.441.2.1558.2.109
+  they are broken in way that not all AC archidectures build. make sure
+  kernel.spec still builds on all archidectures if you want these patches added.
+
 Revision 1.441.2.1558.2.115  2007-11-22 15:07:59  adamg
 - exclude i{3,4,5}86 when building xen kernels
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1558.2.115&r2=1.441.2.1558.2.116&f=u