summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-29 12:40:16 +0000
committerwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-29 12:40:16 +0000
commitfb89cd24b7dc54f8a0b3738ddfdb692cff2ac753 (patch)
treec7ea673e8bc5889e1e6b7f96d4ff4aa174c737fd /target
parent86c024fa6bc012105b9ea4e0a304a71f2274c7ba (diff)
update openswan to 2.40
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2003 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/package/openswan/Makefile4
-rw-r--r--target/linux/package/openswan/patches/fix-compile-pfkey.patch13
2 files changed, 15 insertions, 2 deletions
diff --git a/target/linux/package/openswan/Makefile b/target/linux/package/openswan/Makefile
index d54ffae85..0e446902e 100644
--- a/target/linux/package/openswan/Makefile
+++ b/target/linux/package/openswan/Makefile
@@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk
include ../../rules.mk
PKG_NAME:=openswan
-PKG_VERSION:=2.3.1
+PKG_VERSION:=2.4.0
PKG_RELEASE:=1
-PKG_MD5SUM:=3dcf1cd7efcbe8db3148fc288d429db1
+PKG_MD5SUM:=6cbba783658eb62b87cbf4937f5e8464
PKG_SOURCE_URL:=http://www.openswan.org/download
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/target/linux/package/openswan/patches/fix-compile-pfkey.patch b/target/linux/package/openswan/patches/fix-compile-pfkey.patch
new file mode 100644
index 000000000..0a0ece36e
--- /dev/null
+++ b/target/linux/package/openswan/patches/fix-compile-pfkey.patch
@@ -0,0 +1,13 @@
+diff -Nur openswan-2.4.0.orig/linux/net/ipsec/pfkey_v2.c openswan-2.4.0/linux/net/ipsec/pfkey_v2.c
+--- openswan-2.4.0.orig/linux/net/ipsec/pfkey_v2.c 2005-09-06 04:10:03.000000000 +0200
++++ openswan-2.4.0/linux/net/ipsec/pfkey_v2.c 2005-09-21 09:32:49.214628750 +0200
+@@ -821,7 +821,9 @@
+ return 0; /* -EINVAL; */
+ }
+
++#ifdef NET_26
+ write_lock_bh(&pfkey_sock_lock);
++#endif
+
+ KLIPS_PRINT(debug_pfkey,
+ "klips_debug:pfkey_release: "