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

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31389 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-04-21 02:17:06 +00:00
parent 3b8a1a8475
commit 549f19c776
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/openswan/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2011 OpenWrt.org # Copyright (C) 2006-2012 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -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.37 PKG_VERSION:=2.6.38
PKG_RELEASE:=2 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:=e5c948555088df06cfadcfbe6c13adfe PKG_MD5SUM:=13073eb5314b83a31be88e4117e8bbcd
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1

6
net/openswan/patches/120-no_manpages.patch
View File

@ -1,6 +1,6 @@
--- a/programs/_confread/Makefile --- a/programs/_confread/Makefile
+++ b/programs/_confread/Makefile +++ b/programs/_confread/Makefile
@@ -16,7 +16,6 @@ @@ -14,7 +14,6 @@
OPENSWANSRCDIR?=$(shell cd ../..; pwd) OPENSWANSRCDIR?=$(shell cd ../..; pwd)
include ${OPENSWANSRCDIR}/Makefile.inc include ${OPENSWANSRCDIR}/Makefile.inc
@ -8,7 +8,7 @@
CONFFILES=ipsec.conf CONFFILES=ipsec.conf
EXCONFILES=ipsec.win2k.conf EXCONFILES=ipsec.win2k.conf
SOURCEDIR=_confread SOURCEDIR=_confread
@@ -26,11 +25,3 @@ CONFDFILES=clear clear-or-private privat @@ -24,11 +23,3 @@ CONFDFILES=clear clear-or-private privat
include ${srcdir}../Makefile.program include ${srcdir}../Makefile.program
@ -22,7 +22,7 @@
- -
--- a/programs/pluto/Makefile --- a/programs/pluto/Makefile
+++ b/programs/pluto/Makefile +++ b/programs/pluto/Makefile
@@ -195,35 +195,11 @@ doinstall: all @@ -196,35 +196,11 @@ doinstall: all
$(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR) $(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR)
#$(INSTALL) $(INSTSUIDFLAGS) $(BINNAMEWHACKINIT) $(LIBEXECDIR) #$(INSTALL) $(INSTSUIDFLAGS) $(BINNAMEWHACKINIT) $(LIBEXECDIR)
if $(USE_ADNS) ; then $(INSTALL) $(INSTBINFLAGS) $(BINNAMEADNS) $(LIBEXECDIR) ; fi if $(USE_ADNS) ; then $(INSTALL) $(INSTBINFLAGS) $(BINNAMEADNS) $(LIBEXECDIR) ; fi

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

@ -17,7 +17,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
@@ -43,10 +43,11 @@ @@ -57,8 +57,10 @@
* 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
*/ */
@ -28,10 +28,8 @@
+#else +#else
+#include <linux/autoconf.h> +#include <linux/autoconf.h>
#endif #endif
-
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #if !defined(RHEL_RELEASE_CODE)
/* Only enable IPv6 support on newer kernels with IPv6 enabled */
# if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
--- a/linux/net/ipsec/aes/ipsec_alg_aes.c --- a/linux/net/ipsec/aes/ipsec_alg_aes.c
+++ b/linux/net/ipsec/aes/ipsec_alg_aes.c +++ b/linux/net/ipsec/aes/ipsec_alg_aes.c
@@ -22,8 +22,10 @@ @@ -22,8 +22,10 @@
@ -230,7 +228,7 @@
--- a/linux/net/ipsec/ipsec_radij.c --- a/linux/net/ipsec/ipsec_radij.c
+++ b/linux/net/ipsec/ipsec_radij.c +++ b/linux/net/ipsec/ipsec_radij.c
@@ -16,8 +16,10 @@ @@ -21,8 +21,10 @@
*/ */
#include <linux/version.h> #include <linux/version.h>
@ -307,7 +305,7 @@
--- a/linux/net/ipsec/ipsec_xform.c --- a/linux/net/ipsec/ipsec_xform.c
+++ b/linux/net/ipsec/ipsec_xform.c +++ b/linux/net/ipsec/ipsec_xform.c
@@ -17,8 +17,10 @@ @@ -15,8 +15,10 @@
*/ */
#include <linux/version.h> #include <linux/version.h>