Changeset 31389


Ignore:
Timestamp:
2012-04-21T04:17:06+02:00 (6 years ago)
Author:
jow
Message:

[packages] openswan: update to v2.6.38, fixes compilation against Linux v3.3.x (#11316)

Location:
packages/net/openswan
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/openswan/Makefile

    r29586 r31389  
    11# 
    2 # Copyright (C) 2006-2011 OpenWrt.org 
     2# Copyright (C) 2006-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010 
    1111PKG_NAME:=openswan 
    12 PKG_VERSION:=2.6.37 
    13 PKG_RELEASE:=2 
     12PKG_VERSION:=2.6.38 
     13PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1616PKG_SOURCE_URL:=http://www.openswan.org/download 
    17 PKG_MD5SUM:=e5c948555088df06cfadcfbe6c13adfe 
     17PKG_MD5SUM:=13073eb5314b83a31be88e4117e8bbcd 
    1818 
    1919PKG_BUILD_PARALLEL:=1 
  • packages/net/openswan/patches/120-no_manpages.patch

    r26550 r31389  
    11--- a/programs/_confread/Makefile 
    22+++ b/programs/_confread/Makefile 
    3 @@ -16,7 +16,6 @@ 
     3@@ -14,7 +14,6 @@ 
    44 OPENSWANSRCDIR?=$(shell cd ../..; pwd) 
    55 include ${OPENSWANSRCDIR}/Makefile.inc 
     
    99 EXCONFILES=ipsec.win2k.conf 
    1010 SOURCEDIR=_confread 
    11 @@ -26,11 +25,3 @@ CONFDFILES=clear clear-or-private privat 
     11@@ -24,11 +23,3 @@ CONFDFILES=clear clear-or-private privat 
    1212  
    1313 include ${srcdir}../Makefile.program 
     
    2323--- a/programs/pluto/Makefile 
    2424+++ b/programs/pluto/Makefile 
    25 @@ -195,35 +195,11 @@ doinstall: all 
     25@@ -196,35 +196,11 @@ doinstall: all 
    2626        $(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR) 
    2727        #$(INSTALL) $(INSTSUIDFLAGS) $(BINNAMEWHACKINIT) $(LIBEXECDIR) 
  • packages/net/openswan/patches/140-generated_autoconf.patch

    r28739 r31389  
    1818--- a/linux/include/openswan/ipsec_kversion.h 
    1919+++ b/linux/include/openswan/ipsec_kversion.h 
    20 @@ -43,10 +43,11 @@ 
     20@@ -57,8 +57,10 @@ 
    2121  * We use a lot of config defines,  on older kernels that means we 
    2222  * need to include config.h 
    2323  */ 
    2424-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) 
    25 -#include <linux/config.h> 
    26 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) 
    27 +#include <generated/autoconf.h> 
    28 +#else 
    29 +#include <linux/autoconf.h> 
    30  #endif 
    31 - 
    32  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) 
    33  /* Only enable IPv6 support on newer kernels with IPv6 enabled */ 
    34  # if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) 
     25-# include <linux/config.h> 
     26+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) 
     27+#include <generated/autoconf.h> 
     28+#else 
     29+#include <linux/autoconf.h> 
     30 #endif 
     31  
     32 #if !defined(RHEL_RELEASE_CODE)  
    3533--- a/linux/net/ipsec/aes/ipsec_alg_aes.c 
    3634+++ b/linux/net/ipsec/aes/ipsec_alg_aes.c 
     
    231229--- a/linux/net/ipsec/ipsec_radij.c 
    232230+++ b/linux/net/ipsec/ipsec_radij.c 
    233 @@ -16,8 +16,10 @@ 
     231@@ -21,8 +21,10 @@ 
    234232  */ 
    235233  
     
    308306--- a/linux/net/ipsec/ipsec_xform.c 
    309307+++ b/linux/net/ipsec/ipsec_xform.c 
    310 @@ -17,8 +17,10 @@ 
     308@@ -15,8 +15,10 @@ 
    311309  */ 
    312310  
Note: See TracChangeset for help on using the changeset viewer.