SPECS (LINUX_2_6_16): kernel.spec - KLIPS is back. wrrr. On what a...

[marcus]

Author: marcus                       Date: Fri Jan 18 14:14:37 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- KLIPS is back. wrrr. On what archs it doesn; build ?
  Tested on i686 and amd64. Please send to test build.
  Rel.2.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.118 -> 1.441.2.1558.2.119) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.118 SPECS/kernel.spec:1.441.2.1558.2.119
--- SPECS/kernel.spec:1.441.2.1558.2.118	Fri Jan 18 00:42:37 2008
+++ SPECS/kernel.spec	Fri Jan 18 15:14:31 2008
@@ -132,7 +132,7 @@
 
 %define		_basever	2.6.16
 %define		_postver	.58
-%define		_rel		1
+%define		_rel		2
 %define		_subname	%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -184,6 +184,7 @@
 Source47:	kernel-xenU.config
 Source48:	kernel-xen-extra.config
 Source49:	kernel-grsec+pax.config
+Source50:	kernel-openswan.config
 ###
 #	Patches
 ###
@@ -277,6 +278,10 @@
 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
@@ -867,6 +872,9 @@
 %patch81 -p1
 %patch82 -p1
 
+%patch90 -p1
+%patch91 -p1
+
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -1019,6 +1027,9 @@
 	%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
@@ -1765,6 +1776,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.119  2008-01-18 14:14:31  marcus
+- KLIPS is back. wrrr. On what archs it doesn; build ?
+  Tested on i686 and amd64. Please send to test build.
+  Rel.2.
+
 Revision 1.441.2.1558.2.118  2008-01-17 23:42:37  glen
 - no pain provides for kernel-headers
 
================================================================

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