From 1939ebf4788eb3565ec16ba6e5836ccaeb56fa14 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 13 Apr 2006 15:41:27 +0000 Subject: update openswan to 2.4.5 final git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3635 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/target/linux/package/openswan/Makefile | 4 ++-- .../openswan/patches/100-fix-oops-on-24.patch | 23 ---------------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 openwrt/target/linux/package/openswan/patches/100-fix-oops-on-24.patch (limited to 'openwrt') diff --git a/openwrt/target/linux/package/openswan/Makefile b/openwrt/target/linux/package/openswan/Makefile index bedd543fbc..0a8289525b 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 0861b0489e..0000000000 --- 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; - } -- cgit v1.2.3