net/openswan/patches/140-generated_autoconf.patch

   1 --- a/linux/net/ipsec/ipsec_ocf.c
   2 +++ b/linux/net/ipsec/ipsec_ocf.c
   3 @@ -15,10 +15,12 @@
   4   * for more details.
   5   */
   6
   7 -#ifndef AUTOCONF_INCLUDED
   8 -#include <linux/config.h>
   9 -#endif
  10  #include <linux/version.h>
  11 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
  12 +#include <generated/autoconf.h>
  13 +#else
  14 +#include <linux/autoconf.h>
  15 +#endif
  16
  17  #define __NO_VERSION__
  18  #include <linux/module.h>
  19 --- a/linux/net/ipsec/pfkey_v2_ext_process.c
  20 +++ b/linux/net/ipsec/pfkey_v2_ext_process.c
  21 @@ -19,10 +19,12 @@
  22   *             Template from klips/net/ipsec/ipsec/ipsec_netlink.c.
  23   */
  24
  25 -#ifndef AUTOCONF_INCLUDED
  26 -#include <linux/config.h>
  27 -#endif
  28  #include <linux/version.h>
  29 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
  30 +#include <generated/autoconf.h>
  31 +#else
  32 +#include <linux/autoconf.h>
  33 +#endif
  34  #include <linux/kernel.h> /* printk() */
  35
  36  #include "openswan/ipsec_param.h"
  37 --- a/linux/net/ipsec/version.in.c
  38 +++ b/linux/net/ipsec/version.in.c
  39 @@ -15,10 +15,12 @@
  40   */
  41
  42  #ifdef __KERNEL__
  43 -# ifndef AUTOCONF_INCLUDED
  44 -#  include <linux/config.h>
  45 -# endif
  46  # include <linux/version.h>
  47 +# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
  48 +# include <generated/autoconf.h>
  49 +# else
  50 +# include <linux/autoconf.h>
  51 +# endif
  52  # define __NO_VERSION__
  53  # include <linux/module.h>
  54  # if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,26)
  55 --- a/linux/net/ipsec/ipsec_ipcomp.c
  56 +++ b/linux/net/ipsec/ipsec_ipcomp.c
  57 @@ -13,10 +13,12 @@
  58   * for more details.
  59   */
  60
  61 -#ifndef AUTOCONF_INCLUDED
  62 -#include <linux/config.h>
  63 -#endif
  64  #include <linux/version.h>
  65 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
  66 +#include <generated/autoconf.h>
  67 +#else
  68 +#include <linux/autoconf.h>
  69 +#endif
  70
  71  #define __NO_VERSION__
  72  #include <linux/module.h>
  73 --- a/linux/net/ipsec/radij.c
  74 +++ b/linux/net/ipsec/radij.c
  75 @@ -53,10 +53,12 @@
  76   * Routines to build and maintain radix trees for routing lookups.
  77   */
  78
  79 -#ifndef AUTOCONF_INCLUDED
  80 -#include <linux/config.h>
  81 -#endif
  82  #include <linux/version.h>
  83 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
  84 +#include <generated/autoconf.h>
  85 +#else
  86 +#include <linux/autoconf.h>
  87 +#endif
  88  #include <linux/kernel.h> /* printk() */
  89
  90  #include "openswan/ipsec_param.h"
  91 --- a/linux/net/ipsec/ipsec_mast.c
  92 +++ b/linux/net/ipsec/ipsec_mast.c
  93 @@ -17,9 +17,12 @@ char ipsec_mast_c_version[] = "Please us
  94
  95  #define __NO_VERSION__
  96  #include <linux/module.h>
  97 -#ifndef AUTOCONF_INCLUDED
  98 -#include <linux/config.h>
  99 -#endif /* for CONFIG_IP_FORWARD */
 100 +#include <linux/version.h>
 101 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 102 +#include <generated/autoconf.h>
 103 +#else
 104 +#include <linux/autoconf.h>
 105 +#endif /* For Config IP-FORWARD */
 106  #include <linux/version.h>
 107  #include <linux/kernel.h> /* printk() */
 108
 109 --- a/linux/net/ipsec/ipsec_xmit.c
 110 +++ b/linux/net/ipsec/ipsec_xmit.c
 111 @@ -21,9 +21,12 @@
 112
 113  #define __NO_VERSION__
 114  #include <linux/module.h>
 115 -#ifndef AUTOCONF_INCLUDED
 116 -#include <linux/config.h>
 117 -#endif /* for CONFIG_IP_FORWARD */
 118 +#include <linux/version.h>
 119 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 120 +#include <generated/autoconf.h>
 121 +#else
 122 +#include <linux/autoconf.h>
 123 +#endif /* for CONFIG_IP_FORWARD */
 124  #include <linux/version.h>
 125  #include <linux/kernel.h> /* printk() */
 126
 127 --- a/linux/net/ipsec/ipsec_ipip.c
 128 +++ b/linux/net/ipsec/ipsec_ipip.c
 129 @@ -13,8 +13,11 @@
 130   * for more details.
 131   */
 132
 133 -#ifndef AUTOCONF_INCLUDED
 134 -#include <linux/config.h>
 135 +#include <linux/version.h>
 136 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 137 +#include <generated/autoconf.h>
 138 +#else
 139 +#include <linux/autoconf.h>
 140  #endif
 141  #include <linux/version.h>
 142
 143 --- a/linux/net/ipsec/ipsec_snprintf.c
 144 +++ b/linux/net/ipsec/ipsec_snprintf.c
 145 @@ -18,10 +18,12 @@
 146   * Split out from ipsec_proc.c.
 147   */
 148
 149 -#ifndef AUTOCONF_INCLUDED
 150 -#include <linux/config.h>
 151 -#endif
 152  #include <linux/version.h>
 153 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 154 +#include <generated/autoconf.h>
 155 +#else
 156 +#include <linux/autoconf.h>
 157 +#endif
 158  #define __NO_VERSION__
 159  #include <linux/module.h>
 160  #include <linux/kernel.h> /* printk() */
 161 --- a/linux/net/ipsec/ipsec_xform.c
 162 +++ b/linux/net/ipsec/ipsec_xform.c
 163 @@ -16,10 +16,12 @@
 164   * RCSID $Id: ipsec_xform.c,v 1.65 2005/04/29 05:10:22 mcr Exp $
 165   */
 166
 167 -#ifndef AUTOCONF_INCLUDED
 168 -#include <linux/config.h>
 169 -#endif
 170  #include <linux/version.h>
 171 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 172 +#include <generated/autoconf.h>
 173 +#else
 174 +#include <linux/autoconf.h>
 175 +#endif
 176  #include <linux/kernel.h> /* printk() */
 177
 178  #include "freeswan/ipsec_param.h"
 179 --- a/linux/net/ipsec/alg/ipsec_alg_cryptoapi.c
 180 +++ b/linux/net/ipsec/alg/ipsec_alg_cryptoapi.c
 181 @@ -27,11 +27,12 @@
 182   *   modprobe ipsec_cryptoapi aes=128,128                (force these keylens)
 183   *   modprobe ipsec_cryptoapi des_ede3=0                 (everything but 3DES)
 184   */
 185 -#ifndef AUTOCONF_INCLUDED
 186 -#include <linux/config.h>
 187 -#endif
 188  #include <linux/version.h>
 189 -
 190 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 191 +#include <generated/autoconf.h>
 192 +#else
 193 +#include <linux/autoconf.h>
 194 +#endif
 195  /*
 196   *     special case: ipsec core modular with this static algo inside:
 197   *     must avoid MODULE magic for this file
 198 --- a/linux/net/ipsec/aes/ipsec_alg_aes.c
 199 +++ b/linux/net/ipsec/aes/ipsec_alg_aes.c
 200 @@ -21,10 +21,12 @@
 201   *     PK:     make XCBC comply with latest draft (keylength)
 202   *
 203   */
 204 -#ifndef AUTOCONF_INCLUDED
 205 -#include <linux/config.h>
 206 -#endif
 207  #include <linux/version.h>
 208 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 209 +#include <generated/autoconf.h>
 210 +#else
 211 +#include <linux/autoconf.h>
 212 +#endif
 213
 214  /*
 215   *     special case: ipsec core modular with this static algo inside:
 216 --- a/linux/net/ipsec/ipsec_proc.c
 217 +++ b/linux/net/ipsec/ipsec_proc.c
 218 @@ -18,10 +18,12 @@
 219   * Split out from ipsec_init.c version 1.70.
 220   */
 221
 222 -#ifndef AUTOCONF_INCLUDED
 223 -# include <linux/config.h>
 224 -#endif
 225  #include <linux/version.h>
 226 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 227 +#include <generated/autoconf.h>
 228 +#else
 229 +#include <linux/autoconf.h>
 230 +#endif
 231  #define __NO_VERSION__
 232  #include <linux/module.h>
 233  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,26)
 234 --- a/linux/net/ipsec/ipcomp.c
 235 +++ b/linux/net/ipsec/ipcomp.c
 236 @@ -18,10 +18,12 @@
 237
 238  /* SSS */
 239
 240 -#ifndef AUTOCONF_INCLUDED
 241 -#include <linux/config.h>
 242 -#endif
 243  #include <linux/version.h>
 244 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 245 +#include <generated/autoconf.h>
 246 +#else
 247 +#include <linux/autoconf.h>
 248 +#endif
 249
 250  #define __NO_VERSION__
 251  #include <linux/module.h>
 252 --- a/linux/net/ipsec/ipsec_sa.c
 253 +++ b/linux/net/ipsec/ipsec_sa.c
 254 @@ -18,10 +18,12 @@
 255   *
 256   */
 257
 258 -#ifndef AUTOCONF_INCLUDED
 259 -#include <linux/config.h>
 260 -#endif
 261  #include <linux/version.h>
 262 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 263 +#include <generated/autoconf.h>
 264 +#else
 265 +#include <linux/autoconf.h>
 266 +#endif
 267  #include <linux/kernel.h> /* printk() */
 268
 269  #include "openswan/ipsec_param.h"
 270 --- a/linux/net/ipsec/des/ipsec_alg_3des.c
 271 +++ b/linux/net/ipsec/des/ipsec_alg_3des.c
 272 @@ -18,10 +18,12 @@
 273   * for more details.
 274   *
 275   */
 276 -#ifndef AUTOCONF_INCLUDED
 277 -#include <linux/config.h>
 278 -#endif
 279  #include <linux/version.h>
 280 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 281 +#include <generated/autoconf.h>
 282 +#else
 283 +#include <linux/autoconf.h>
 284 +#endif
 285
 286  /*
 287   *     special case: ipsec core modular with this static algo inside:
 288 --- a/linux/net/ipsec/ipsec_radij.c
 289 +++ b/linux/net/ipsec/ipsec_radij.c
 290 @@ -15,10 +15,12 @@
 291   *
 292   */
 293
 294 -#ifndef AUTOCONF_INCLUDED
 295 -#include <linux/config.h>
 296 -#endif
 297  #include <linux/version.h>
 298 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 299 +#include <generated/autoconf.h>
 300 +#else
 301 +#include <linux/autoconf.h>
 302 +#endif
 303  #include <linux/kernel.h> /* printk() */
 304
 305  #include "openswan/ipsec_param.h"
 306 --- a/linux/net/ipsec/ipsec_rcv.c
 307 +++ b/linux/net/ipsec/ipsec_rcv.c
 308 @@ -20,10 +20,12 @@
 309   * for more details.
 310   */
 311
 312 -#ifndef AUTOCONF_INCLUDED
 313 -#include <linux/config.h>
 314 -#endif
 315  #include <linux/version.h>
 316 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 317 +#include <generated/autoconf.h>
 318 +#else
 319 +#include <linux/autoconf.h>
 320 +#endif
 321
 322  #define __NO_VERSION__
 323  #include <linux/module.h>
 324 --- a/linux/net/ipsec/ipsec_esp.c
 325 +++ b/linux/net/ipsec/ipsec_esp.c
 326 @@ -13,10 +13,12 @@
 327   * for more details.
 328   */
 329
 330 -#ifndef AUTOCONF_INCLUDED
 331 -#include <linux/config.h>
 332 -#endif
 333  #include <linux/version.h>
 334 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 335 +#include <generated/autoconf.h>
 336 +#else
 337 +#include <linux/autoconf.h>
 338 +#endif
 339
 340  #define __NO_VERSION__
 341  #include <linux/module.h>
 342 --- a/linux/net/ipsec/ipsec_life.c
 343 +++ b/linux/net/ipsec/ipsec_life.c
 344 @@ -30,9 +30,12 @@
 345
 346  #define __NO_VERSION__
 347  #include <linux/module.h>
 348 -#ifndef AUTOCONF_INCLUDED
 349 -#include <linux/config.h>
 350 -#endif /* for CONFIG_IP_FORWARD */
 351 +#include <linux/version.h>
 352 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 353 +#include <generated/autoconf.h>
 354 +#else
 355 +#include <linux/autoconf.h>
 356 +#endif /* for CONFIG_IP_FORWARD */
 357  #include <linux/version.h>
 358  #include <linux/kernel.h> /* printk() */
 359
 360 --- a/linux/net/ipsec/ipsec_alg.c
 361 +++ b/linux/net/ipsec/ipsec_alg.c
 362 @@ -18,10 +18,12 @@
 363   * for more details.
 364   *
 365   */
 366 -#ifndef AUTOCONF_INCLUDED
 367 -#include <linux/config.h>
 368 -#endif
 369  #include <linux/version.h>
 370 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 371 +#include <generated/autoconf.h>
 372 +#else
 373 +#include <linux/autoconf.h>
 374 +#endif
 375
 376  #define __NO_VERSION__
 377  #include <linux/module.h>
 378 --- a/linux/net/ipsec/pfkey_v2.c
 379 +++ b/linux/net/ipsec/pfkey_v2.c
 380 @@ -22,8 +22,10 @@
 381  #define __NO_VERSION__
 382  #include <linux/module.h>
 383  #include <linux/version.h>
 384 -#ifndef AUTOCONF_INCLUDED
 385 -# include <linux/config.h>
 386 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 387 +#include <generated/autoconf.h>
 388 +#else
 389 +#include <linux/autoconf.h>
 390  #endif
 391  #include <linux/kernel.h>
 392
 393 --- a/linux/net/ipsec/ipsec_tunnel.c
 394 +++ b/linux/net/ipsec/ipsec_tunnel.c
 395 @@ -20,9 +20,12 @@
 396
 397  #define __NO_VERSION__
 398  #include <linux/module.h>
 399 -#ifndef AUTOCONF_INCLUDED
 400 -#include <linux/config.h>
 401 -#endif /* for CONFIG_IP_FORWARD */
 402 +#include <linux/version.h>
 403 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 404 +#include <generated/autoconf.h>
 405 +#else
 406 +#include <linux/autoconf.h>
 407 +#endif /* for CONFIG_IP_FORWARD */
 408  #include <linux/version.h>
 409  #include <linux/kernel.h> /* printk() */
 410
 411 --- a/linux/include/openswan/ipsec_kversion.h
 412 +++ b/linux/include/openswan/ipsec_kversion.h
 413 @@ -43,8 +43,11 @@
 414   * We use a lot of config defines,  on older kernels that means we
 415   * need to include config.h
 416   */
 417 -#ifndef AUTOCONF_INCLUDED
 418 -#include <linux/config.h>
 419 +#include <linux/version.h>
 420 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 421 +#include <generated/autoconf.h>
 422 +#else
 423 +#include <linux/autoconf.h>
 424  #endif
 425
 426  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 427 --- a/linux/include/openswan/ipsec_rcv.h
 428 +++ b/linux/include/openswan/ipsec_rcv.h
 429 @@ -36,9 +36,12 @@
 430  /* struct options; */
 431
 432  #define __NO_VERSION__
 433 -#ifndef AUTOCONF_INCLUDED
 434 -#include <linux/config.h>
 435 -#endif /* for CONFIG_IP_FORWARD */
 436 +#include <linux/version.h>
 437 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 438 +#include <generated/autoconf.h>
 439 +#else
 440 +#include <linux/autoconf.h>
 441 +#endif /* for CONFIG_IP_FORWARD */
 442  #ifdef CONFIG_MODULES
 443  #include <linux/module.h>
 444  #endif
 445 --- a/linux/net/ipsec/ipsec_ocf.h
 446 +++ b/linux/net/ipsec/ipsec_ocf.h
 447 @@ -18,10 +18,12 @@
 448   * for more details.
 449   */
 450
 451 -#ifndef AUTOCONF_INCLUDED
 452 -#include <linux/config.h>
 453 -#endif
 454  #include <linux/version.h>
 455 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 456 +#include <generated/autoconf.h>
 457 +#else
 458 +#include <linux/autoconf.h>
 459 +#endif
 460  #include <linux/kernel.h>
 461
 462  #ifdef CONFIG_KLIPS_OCF
 463 --- a/linux/net/ipsec/ipsec_ah.c
 464 +++ b/linux/net/ipsec/ipsec_ah.c
 465 @@ -13,10 +13,12 @@
 466   * for more details.
 467   */
 468
 469 -#ifndef AUTOCONF_INCLUDED
 470 -#include <linux/config.h>
 471 -#endif
 472  #include <linux/version.h>
 473 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 474 +#include <generated/autoconf.h>
 475 +#else
 476 +#include <linux/autoconf.h>
 477 +#endif
 478
 479  #define __NO_VERSION__
 480  #include <linux/module.h>
 481 --- a/linux/net/ipsec/pfkey_v2_parser.c
 482 +++ b/linux/net/ipsec/pfkey_v2_parser.c
 483 @@ -22,10 +22,12 @@
 484   */
 485
 486
 487 -#ifndef AUTOCONF_INCLUDED
 488 -#include <linux/config.h>
 489 -#endif
 490  #include <linux/version.h>
 491 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 492 +#include <generated/autoconf.h>
 493 +#else
 494 +#include <linux/autoconf.h>
 495 +#endif
 496  #include <linux/kernel.h> /* printk() */
 497
 498  #include "openswan/ipsec_param.h"
 499 --- a/linux/net/ipsec/ipsec_init.c
 500 +++ b/linux/net/ipsec/ipsec_init.c
 501 @@ -18,10 +18,12 @@
 502   *
 503   */
 504
 505 -#ifndef AUTOCONF_INCLUDED
 506 -#include <linux/config.h>
 507 -#endif
 508  #include <linux/version.h>
 509 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 510 +#include <generated/autoconf.h>
 511 +#else
 512 +#include <linux/autoconf.h>
 513 +#endif
 514  #include <linux/module.h>
 515  #include <linux/kernel.h> /* printk() */
 516
 517 --- a/linux/net/ipsec/ipsec_alg_cryptoapi.c
 518 +++ b/linux/net/ipsec/ipsec_alg_cryptoapi.c
 519 @@ -27,10 +27,12 @@
 520   *   modprobe ipsec_cryptoapi aes=128,128                (force these keylens)
 521   *   modprobe ipsec_cryptoapi des_ede3=0                 (everything but 3DES)
 522   */
 523 -#ifndef AUTOCONF_INCLUDED
 524 -#include <linux/config.h>
 525 -#endif
 526  #include <linux/version.h>
 527 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 528 +#include <generated/autoconf.h>
 529 +#else
 530 +#include <linux/autoconf.h>
 531 +#endif
 532
 533  /*
 534   *     special case: ipsec core modular with this static algo inside:
 535 --- a/linux/include/ocf-compat.h
 536 +++ b/linux/include/ocf-compat.h
 537 @@ -34,8 +34,11 @@
 538   */
 539  /****************************************************************************/
 540  #ifdef __KERNEL__
 541 -#ifndef AUTOCONF_INCLUDED
 542 -#include <linux/config.h>
 543 +#include <linux/version.h>
 544 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 545 +#include <generated/autoconf.h>
 546 +#else
 547 +#include <linux/autoconf.h>
 548  #endif
 549
 550  /*