Changeset 23353 for packages


Ignore:
Timestamp:
2010-10-09T10:43:44+02:00 (6 years ago)
Author:
mb
Message:

openswan: Fix compile on linux-2.6.36

Location:
packages/net/openswan
Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/openswan/Makefile

    r23266 r23353  
    11# 
    2 # Copyright (C) 2006-2009 OpenWrt.org 
     2# Copyright (C) 2006-2010 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.28 
     12PKG_VERSION:=2.6.29 
    1313PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1616PKG_SOURCE_URL:=http://www.openswan.org/download 
    17 PKG_MD5SUM:=37f2ad2664dd89e6ad96ae82f6378166 
     17PKG_MD5SUM:=cd6c127585ec6db63780e9a40d5387fb 
     18 
     19PKG_BUILD_PARALLEL:=1 
     20PKG_INSTALL:=1 
    1821 
    1922include $(INCLUDE_DIR)/package.mk 
     
    5558endef 
    5659 
    57 TARGET_CPPFLAGS += -I$(LINUX_DIR)/include 
     60TARGET_CPPFLAGS += -I$(LINUX_DIR)/include -D__EXPORTED_HEADERS__ 
    5861 
    59 OPENSWAN_MAKE := $(MAKE) -C $(PKG_BUILD_DIR) \ 
     62OPENSWAN_MAKEFLAGS:= \ 
     63        -C $(PKG_BUILD_DIR) \ 
    6064        $(TARGET_CONFIGURE_OPTS) \ 
    6165        LINUX_RELEASE="$(LINUX_RELEASE)" \ 
     
    7276 
    7377define Build/Compile 
    74         $(OPENSWAN_MAKE) \ 
    75                 programs module install 
     78        $(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) programs 
     79        $(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) module 
     80endef 
     81 
     82define Build/Install 
     83        $(MAKE) $(OPENSWAN_MAKEFLAGS) install 
    7684endef 
    7785 
  • packages/net/openswan/patches/110-scripts.patch

    r23180 r23353  
     1--- 
     2 programs/_plutorun/_plutorun.in   |    2 +- 
     3 programs/_realsetup/_realsetup.in |    2 +- 
     4 programs/loggerfix                |    5 +++++ 
     5 3 files changed, 7 insertions(+), 2 deletions(-) 
     6 
    17--- /dev/null 
    2 +++ b/programs/loggerfix 
     8+++ openswan-2.6.29/programs/loggerfix 
    39@@ -0,0 +1,5 @@ 
    410+#!/bin/sh 
     
    713+echo "$*" >> /dev/null 
    814+exit 0 
    9 --- a/programs/_plutorun/_plutorun.in 
    10 +++ b/programs/_plutorun/_plutorun.in 
     15--- openswan-2.6.29.orig/programs/_plutorun/_plutorun.in 
     16+++ openswan-2.6.29/programs/_plutorun/_plutorun.in 
    1117@@ -155,7 +155,7 @@ then 
    1218                        exit 1 
     
    1824                        echo Cannot write to directory to create \"$stderrlog\". 
    1925                        exit 1 
    20 --- a/programs/_realsetup/_realsetup.in 
    21 +++ b/programs/_realsetup/_realsetup.in 
    22 @@ -283,7 +283,7 @@ case "$1" in 
     26--- openswan-2.6.29.orig/programs/_realsetup/_realsetup.in 
     27+++ openswan-2.6.29/programs/_realsetup/_realsetup.in 
     28@@ -290,7 +290,7 @@ case "$1" in 
    2329  
    2430        # misc pre-Pluto setup 
  • packages/net/openswan/patches/130-compat_net_dev_ops.patch

    r22693 r23353  
    1 --- a/linux/include/openswan/ipsec_kversion.h 
    2 +++ b/linux/include/openswan/ipsec_kversion.h 
    3 @@ -363,6 +363,12 @@ 
     1--- 
     2 linux/include/openswan/ipsec_kversion.h |    6 ++++++ 
     3 1 file changed, 6 insertions(+) 
     4 
     5--- openswan-2.6.29.orig/linux/include/openswan/ipsec_kversion.h 
     6+++ openswan-2.6.29/linux/include/openswan/ipsec_kversion.h 
     7@@ -366,6 +366,12 @@ 
    48 #endif 
    59 #endif 
Note: See TracChangeset for help on using the changeset viewer.