update openswan to 2.3.1

SVN-Revision: 606

diff --git a/openwrt/package/openswan/Makefile b/openwrt/package/openswan/Makefile
index 61716564c20d13cd0e1bf3e2a37b8023328ceffb..8214e74c6b0e8cd30b94b932a145ee3273cf41af 100644 (file)
--- a/openwrt/package/openswan/Makefile
+++ b/openwrt/package/openswan/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openswan
-PKG_VERSION:=2.3.1dr6
+PKG_VERSION:=2.3.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=x
+PKG_MD5SUM:=3dcf1cd7efcbe8db3148fc288d429db1
 
 PKG_SOURCE_URL:=http://www.openswan.org/download
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/openwrt/package/openswan/patches/scripts.patch b/openwrt/package/openswan/patches/scripts.patch
index 45296f03336834a1424041bcec68f82b287b1796..2ac2b57c85d13993530c3f661485adb34c2e743d 100644 (file)
--- a/openwrt/package/openswan/patches/scripts.patch
+++ b/openwrt/package/openswan/patches/scripts.patch
@@ -82,7 +82,7 @@ diff -uNr openswan-2.3.0.orig/programs/showhostkey/showhostkey.in openswan-2.3.0
  fi
  
 -host="`hostname --fqdn`"
-+host="`nvram get wan_hostname`"
++host="`cat /proc/sys/kernel/hostname`"
  
  awk ' BEGIN {