bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openswan: Update Openswan to upstream 2.6.34

Browse Source 
OpenWRT's bulid process currently uses Openswan v2.6.33, which does not build against the 2.6.39 kernel.
This patch updates the OpenWRT build process to build Openswan v2.6.34, released 2011-06-08.

hauke:
 * use Openswan v2.6.35

Signed-off-by: Stephen Oberholtzer <oliverklozoff@gmail.com>



git-svn-id: svn://svn.openwrt.org/openwrt/packages@27922 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2011-08-06 12:17:56 +00:00
parent b7e0c76645
commit 39c9ee10d8
4 changed files with 338 additions and 543 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/openswan/Makefile
View File

@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=openswan PKG_NAME:=openswan
PKG_VERSION:=2.6.33 PKG_VERSION:=2.6.35
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.openswan.org/download PKG_SOURCE_URL:=http://www.openswan.org/download
PKG_MD5SUM:=7e9c28585307b7ad4f59737debb0d940 PKG_MD5SUM:=7909a251fbbb807914545b7f42437013
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1

22
net/openswan/patches/110-scripts.patch
View File

@ -12,25 +12,3 @@
+# pref. log to nfs mount +# pref. log to nfs mount
+echo "$*" >> /dev/null +echo "$*" >> /dev/null
+exit 0 +exit 0
--- a/programs/_plutorun/_plutorun.in
+++ b/programs/_plutorun/_plutorun.in
@@ -157,7 +157,7 @@ then
exit 1
fi
else
- if test ! -w "`dirname $stderrlog`"
+ if test ! -w "${stderrlog%/*}"
then
echo Cannot write to directory to create \"$stderrlog\".
exit 1
--- a/programs/_realsetup/_realsetup.in
+++ b/programs/_realsetup/_realsetup.in
@@ -291,7 +291,7 @@ case "$1" in
# misc pre-Pluto setup
- perform test -d $subsysdir "&&" touch $subsyslock
+ perform test -d "${subsyslock%/*}" "&&" touch $subsyslock "&&" rm -f $subsyslock
manualconns

2
net/openswan/patches/130-compat_net_dev_ops.patch
View File

@ -4,7 +4,7 @@
--- a/linux/include/openswan/ipsec_kversion.h --- a/linux/include/openswan/ipsec_kversion.h
+++ b/linux/include/openswan/ipsec_kversion.h +++ b/linux/include/openswan/ipsec_kversion.h
@@ -387,6 +387,12 @@ @@ -393,6 +393,12 @@
# endif # endif
#endif #endif

853
net/openswan/patches/140-generated_autoconf.patch
View File

@ -1,550 +1,367 @@
--- a/linux/net/ipsec/ipsec_ocf.c --- a/linux/include/ocf-compat.h
+++ b/linux/net/ipsec/ipsec_ocf.c +++ b/linux/include/ocf-compat.h
@@ -15,10 +15,12 @@ @@ -35,10 +35,11 @@
* for more details. /****************************************************************************/
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#define __NO_VERSION__
#include <linux/module.h>
--- a/linux/net/ipsec/pfkey_v2_ext_process.c
+++ b/linux/net/ipsec/pfkey_v2_ext_process.c
@@ -19,10 +19,12 @@
* Template from klips/net/ipsec/ipsec/ipsec_netlink.c.
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#include <linux/kernel.h> /* printk() */
#include "openswan/ipsec_param.h"
--- a/linux/net/ipsec/version.in.c
+++ b/linux/net/ipsec/version.in.c
@@ -15,10 +15,12 @@
*/
#ifdef __KERNEL__ #ifdef __KERNEL__
-# ifndef AUTOCONF_INCLUDED
-# include <linux/config.h>
-# endif
# include <linux/version.h>
+# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+# include <generated/autoconf.h>
+# else
+# include <linux/autoconf.h>
+# endif
# define __NO_VERSION__
# include <linux/module.h>
# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,26)
--- a/linux/net/ipsec/ipsec_ipcomp.c
+++ b/linux/net/ipsec/ipsec_ipcomp.c
@@ -13,10 +13,12 @@
* for more details.
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h> #include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#define __NO_VERSION__
#include <linux/module.h>
--- a/linux/net/ipsec/radij.c
+++ b/linux/net/ipsec/radij.c
@@ -53,10 +53,12 @@
* Routines to build and maintain radix trees for routing lookups.
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h> -#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#include <linux/kernel.h> /* printk() */
#include "openswan/ipsec_param.h"
--- a/linux/net/ipsec/ipsec_mast.c
+++ b/linux/net/ipsec/ipsec_mast.c
@@ -17,9 +17,12 @@ char ipsec_mast_c_version[] = "Please us
#define __NO_VERSION__
#include <linux/module.h>
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif /* for CONFIG_IP_FORWARD */
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif /* For Config IP-FORWARD */
#include <linux/version.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_xmit.c
+++ b/linux/net/ipsec/ipsec_xmit.c
@@ -21,9 +21,12 @@
#define __NO_VERSION__
#include <linux/module.h>
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif /* for CONFIG_IP_FORWARD */
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif /* for CONFIG_IP_FORWARD */
#include <linux/version.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_ipip.c
+++ b/linux/net/ipsec/ipsec_ipip.c
@@ -13,8 +13,11 @@
* for more details.
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h> +#include <generated/autoconf.h>
+#else +#else
+#include <linux/autoconf.h> +#include <linux/autoconf.h>
#endif #endif
#include <linux/version.h>
--- a/linux/net/ipsec/ipsec_snprintf.c
+++ b/linux/net/ipsec/ipsec_snprintf.c
@@ -18,10 +18,12 @@
* Split out from ipsec_proc.c.
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#define __NO_VERSION__
#include <linux/module.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_xform.c
+++ b/linux/net/ipsec/ipsec_xform.c
@@ -16,10 +16,12 @@
* RCSID $Id: ipsec_xform.c,v 1.65 2005/04/29 05:10:22 mcr Exp $
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#include <linux/kernel.h> /* printk() */
#include "freeswan/ipsec_param.h"
--- a/linux/net/ipsec/alg/ipsec_alg_cryptoapi.c
+++ b/linux/net/ipsec/alg/ipsec_alg_cryptoapi.c
@@ -27,11 +27,12 @@
* modprobe ipsec_cryptoapi aes=128,128 (force these keylens)
* modprobe ipsec_cryptoapi des_ede3=0 (everything but 3DES)
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
- -
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) /*
+#include <generated/autoconf.h> * fake some BSD driver interface stuff specifically for OCF use
+#else
+#include <linux/autoconf.h>
+#endif
/*
* special case: ipsec core modular with this static algo inside:
* must avoid MODULE magic for this file
--- a/linux/net/ipsec/aes/ipsec_alg_aes.c
+++ b/linux/net/ipsec/aes/ipsec_alg_aes.c
@@ -21,10 +21,12 @@
* PK: make XCBC comply with latest draft (keylength)
*
*/ */
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
/*
* special case: ipsec core modular with this static algo inside:
--- a/linux/net/ipsec/ipsec_proc.c
+++ b/linux/net/ipsec/ipsec_proc.c
@@ -18,10 +18,12 @@
* Split out from ipsec_init.c version 1.70.
*/
-#ifndef AUTOCONF_INCLUDED
-# include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#define __NO_VERSION__
#include <linux/module.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,26)
--- a/linux/net/ipsec/ipcomp.c
+++ b/linux/net/ipsec/ipcomp.c
@@ -18,10 +18,12 @@
/* SSS */
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#define __NO_VERSION__
#include <linux/module.h>
--- a/linux/net/ipsec/ipsec_sa.c
+++ b/linux/net/ipsec/ipsec_sa.c
@@ -18,10 +18,12 @@
*
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#include <linux/kernel.h> /* printk() */
#include "openswan/ipsec_param.h"
--- a/linux/net/ipsec/des/ipsec_alg_3des.c
+++ b/linux/net/ipsec/des/ipsec_alg_3des.c
@@ -18,10 +18,12 @@
* for more details.
*
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
/*
* special case: ipsec core modular with this static algo inside:
--- a/linux/net/ipsec/ipsec_radij.c
+++ b/linux/net/ipsec/ipsec_radij.c
@@ -15,10 +15,12 @@
*
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#include <linux/kernel.h> /* printk() */
#include "openswan/ipsec_param.h"
--- a/linux/net/ipsec/ipsec_rcv.c
+++ b/linux/net/ipsec/ipsec_rcv.c
@@ -20,10 +20,12 @@
* for more details.
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#define __NO_VERSION__
#include <linux/module.h>
--- a/linux/net/ipsec/ipsec_esp.c
+++ b/linux/net/ipsec/ipsec_esp.c
@@ -13,10 +13,12 @@
* for more details.
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#define __NO_VERSION__
#include <linux/module.h>
--- a/linux/net/ipsec/ipsec_life.c
+++ b/linux/net/ipsec/ipsec_life.c
@@ -30,9 +30,12 @@
#define __NO_VERSION__
#include <linux/module.h>
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif /* for CONFIG_IP_FORWARD */
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif /* for CONFIG_IP_FORWARD */
#include <linux/version.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_alg.c
+++ b/linux/net/ipsec/ipsec_alg.c
@@ -18,10 +18,12 @@
* for more details.
*
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#define __NO_VERSION__
#include <linux/module.h>
--- a/linux/net/ipsec/pfkey_v2.c
+++ b/linux/net/ipsec/pfkey_v2.c
@@ -22,8 +22,10 @@
#define __NO_VERSION__
#include <linux/module.h>
#include <linux/version.h>
-#ifndef AUTOCONF_INCLUDED
-# include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
#include <linux/kernel.h>
--- a/linux/net/ipsec/ipsec_tunnel.c
+++ b/linux/net/ipsec/ipsec_tunnel.c
@@ -20,9 +20,12 @@
#define __NO_VERSION__
#include <linux/module.h>
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif /* for CONFIG_IP_FORWARD */
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif /* for CONFIG_IP_FORWARD */
#include <linux/version.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/include/openswan/ipsec_kversion.h --- a/linux/include/openswan/ipsec_kversion.h
+++ b/linux/include/openswan/ipsec_kversion.h +++ b/linux/include/openswan/ipsec_kversion.h
@@ -43,8 +43,11 @@ @@ -43,10 +43,11 @@
* We use a lot of config defines, on older kernels that means we * We use a lot of config defines, on older kernels that means we
* need to include config.h * need to include config.h
*/ */
-#ifndef AUTOCONF_INCLUDED -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h> -#include <linux/config.h>
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h> +#include <generated/autoconf.h>
+#else +#else
+#include <linux/autoconf.h> +#include <linux/autoconf.h>
#endif #endif
-
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
--- a/linux/include/openswan/ipsec_rcv.h /* Only enable IPv6 support on newer kernels with IPv6 enabled */
+++ b/linux/include/openswan/ipsec_rcv.h # if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
@@ -36,9 +36,12 @@ --- a/linux/net/ipsec/aes/ipsec_alg_aes.c
/* struct options; */ +++ b/linux/net/ipsec/aes/ipsec_alg_aes.c
@@ -22,8 +22,10 @@
#define __NO_VERSION__
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif /* for CONFIG_IP_FORWARD */
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif /* for CONFIG_IP_FORWARD */
#ifdef CONFIG_MODULES
#include <linux/module.h>
#endif
--- a/linux/net/ipsec/ipsec_ocf.h
+++ b/linux/net/ipsec/ipsec_ocf.h
@@ -18,10 +18,12 @@
* for more details.
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#include <linux/kernel.h>
#ifdef CONFIG_KLIPS_OCF
--- a/linux/net/ipsec/ipsec_ah.c
+++ b/linux/net/ipsec/ipsec_ah.c
@@ -13,10 +13,12 @@
* for more details.
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#define __NO_VERSION__
#include <linux/module.h>
--- a/linux/net/ipsec/pfkey_v2_parser.c
+++ b/linux/net/ipsec/pfkey_v2_parser.c
@@ -22,10 +22,12 @@
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#include <linux/kernel.h> /* printk() */
#include "openswan/ipsec_param.h"
--- a/linux/net/ipsec/ipsec_init.c
+++ b/linux/net/ipsec/ipsec_init.c
@@ -18,10 +18,12 @@
* *
*/ */
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/version.h> #include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
#include <linux/module.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_alg_cryptoapi.c
+++ b/linux/net/ipsec/ipsec_alg_cryptoapi.c
@@ -27,10 +27,12 @@
* modprobe ipsec_cryptoapi aes=128,128 (force these keylens)
* modprobe ipsec_cryptoapi des_ede3=0 (everything but 3DES)
*/
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h> -#include <linux/config.h>
-#endif
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
+#endif
/*
* special case: ipsec core modular with this static algo inside:
--- a/linux/include/ocf-compat.h
+++ b/linux/include/ocf-compat.h
@@ -34,8 +34,11 @@
*/
/****************************************************************************/
#ifdef __KERNEL__
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h> +#include <generated/autoconf.h>
+#else +#else
+#include <linux/autoconf.h> +#include <linux/autoconf.h>
#endif #endif
#include <linux/version.h>
--- a/linux/net/ipsec/des/ipsec_alg_3des.c
+++ b/linux/net/ipsec/des/ipsec_alg_3des.c
@@ -19,8 +19,10 @@
*
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
#include <linux/version.h>
--- a/linux/net/ipsec/ipcomp.c
+++ b/linux/net/ipsec/ipcomp.c
@@ -19,10 +19,11 @@
/* SSS */
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
-
#define __NO_VERSION__
#include <linux/module.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_ah.c
+++ b/linux/net/ipsec/ipsec_ah.c
@@ -14,10 +14,11 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
-
#define __NO_VERSION__
#include <linux/module.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_alg.c
+++ b/linux/net/ipsec/ipsec_alg.c
@@ -19,10 +19,11 @@
*
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
-
#define __NO_VERSION__
#include <linux/module.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_alg_cryptoapi.c
+++ b/linux/net/ipsec/ipsec_alg_cryptoapi.c
@@ -28,10 +28,11 @@
* modprobe ipsec_cryptoapi des_ede3=0 (everything but 3DES)
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
-
/*
* special case: ipsec core modular with this static algo inside:
* must avoid MODULE magic for this file
--- a/linux/net/ipsec/ipsec_esp.c
+++ b/linux/net/ipsec/ipsec_esp.c
@@ -14,10 +14,11 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
-
#define __NO_VERSION__
#include <linux/module.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_init.c
+++ b/linux/net/ipsec/ipsec_init.c
@@ -19,8 +19,10 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
#include <linux/module.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_ipcomp.c
+++ b/linux/net/ipsec/ipsec_ipcomp.c
@@ -14,10 +14,11 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
-
#define __NO_VERSION__
#include <linux/module.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_ipip.c
+++ b/linux/net/ipsec/ipsec_ipip.c
@@ -14,10 +14,11 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
-
#define __NO_VERSION__
#include <linux/module.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_ocf.c
+++ b/linux/net/ipsec/ipsec_ocf.c
@@ -16,10 +16,11 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
-
#define __NO_VERSION__
#include <linux/module.h>
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_ocf.h
+++ b/linux/net/ipsec/ipsec_ocf.h
@@ -19,8 +19,10 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
#include <linux/kernel.h>
--- a/linux/net/ipsec/ipsec_radij.c
+++ b/linux/net/ipsec/ipsec_radij.c
@@ -16,8 +16,10 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_rcv.c
+++ b/linux/net/ipsec/ipsec_rcv.c
@@ -21,10 +21,11 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
-
#define __NO_VERSION__
#include <linux/module.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,26)
--- a/linux/net/ipsec/ipsec_sa.c
+++ b/linux/net/ipsec/ipsec_sa.c
@@ -19,8 +19,10 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_snprintf.c
+++ b/linux/net/ipsec/ipsec_snprintf.c
@@ -19,8 +19,10 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
#define __NO_VERSION__
#include <linux/module.h>
--- a/linux/net/ipsec/ipsec_tunnel.c
+++ b/linux/net/ipsec/ipsec_tunnel.c
@@ -24,8 +24,10 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,26)
# include <linux/moduleparam.h>
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/ipsec_xform.c
+++ b/linux/net/ipsec/ipsec_xform.c
@@ -17,8 +17,10 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/pfkey_v2_ext_process.c
+++ b/linux/net/ipsec/pfkey_v2_ext_process.c
@@ -20,8 +20,10 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/pfkey_v2_parser.c
+++ b/linux/net/ipsec/pfkey_v2_parser.c
@@ -23,8 +23,10 @@
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
#include <linux/kernel.h> /* printk() */
--- a/linux/net/ipsec/radij.c
+++ b/linux/net/ipsec/radij.c
@@ -54,8 +54,10 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
-#include <linux/config.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/autoconf.h>
+#else
+#include <linux/autoconf.h>
#endif
#include <linux/kernel.h> /* printk() */
/*