aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-04-13 15:41:27 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-04-13 15:41:27 +0000
commit799b6cb395cd21d416bf2fd442bc185d2cae63a4 (patch)
tree3a99a0e6599c7c8aefd1a38a32b6e3fc65c9ad48
parent3ccb0047f21f3cf3870fd41b5ae1c9d68e683869 (diff)
downloadupstream-799b6cb395cd21d416bf2fd442bc185d2cae63a4.tar.gz
upstream-799b6cb395cd21d416bf2fd442bc185d2cae63a4.tar.bz2
upstream-799b6cb395cd21d416bf2fd442bc185d2cae63a4.zip
update openswan to 2.4.5 final
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3635 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/target/linux/package/openswan/Makefile4
-rw-r--r--openwrt/target/linux/package/openswan/patches/100-fix-oops-on-24.patch23
2 files changed, 2 insertions, 25 deletions
diff --git a/openwrt/target/linux/package/openswan/Makefile b/openwrt/target/linux/package/openswan/Makefile
index bedd543fbce..0a8289525b0 100644
--- a/openwrt/target/linux/package/openswan/Makefile
+++ b/openwrt/target/linux/package/openswan/Makefile
@@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk
include ../../rules.mk
PKG_NAME:=openswan
-PKG_VERSION:=2.4.5rc5
+PKG_VERSION:=2.4.5
PKG_RELEASE:=1
-PKG_MD5SUM:=c2547f70b2d7c33deafb2b230305cef5
+PKG_MD5SUM:=a9a8e88313faceebfc5ceb1a9da9a3c4
PKG_SOURCE_URL:=http://www.openswan.org/download
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/openwrt/target/linux/package/openswan/patches/100-fix-oops-on-24.patch b/openwrt/target/linux/package/openswan/patches/100-fix-oops-on-24.patch
deleted file mode 100644
index 0861b0489ec..00000000000
--- a/openwrt/target/linux/package/openswan/patches/100-fix-oops-on-24.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur openswan-2.4.4/linux/net/ipsec/pfkey_v2.c openswan-2.4.4.patched/linux/net/ipsec/pfkey_v2.c
---- openswan-2.4.4/linux/net/ipsec/pfkey_v2.c 2005-09-14 18:40:45.000000000 +0200
-+++ openswan-2.4.4.patched/linux/net/ipsec/pfkey_v2.c 2005-12-25 04:35:57.674968000 +0100
-@@ -820,7 +820,9 @@
- return 0; /* -EINVAL; */
- }
-
-+#ifdef NET_26
- write_lock_bh(&pfkey_sock_lock);
-+#endif
-
- KLIPS_PRINT(debug_pfkey,
- "klips_debug:pfkey_release: "
-@@ -851,7 +853,9 @@
- "klips_debug:pfkey_release: "
- "succeeded.\n");
-
-+#ifdef NET_26
- write_unlock_bh(&pfkey_sock_lock);
-+#endif
-
- return 0;
- }