Upgrade to openswan-2.4.6, fix showhostkey script (closes #444), *should* fix #647...

SVN-Revision: 4632

diff --git a/openwrt/package/openswan/Makefile b/openwrt/package/openswan/Makefile
index 6e518531549c94063449c49f04a631cbb9094fa8..cc1707b2f55332b1441b0ee16fda178494c01372 100644 (file)
--- a/openwrt/package/openswan/Makefile
+++ b/openwrt/package/openswan/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openswan
-PKG_VERSION:=2.4.5
+PKG_VERSION:=2.4.6
 PKG_RELEASE:=1
-PKG_MD5SUM:=a9a8e88313faceebfc5ceb1a9da9a3c4
+PKG_MD5SUM:=b34d71ca49dedad017879b0e912d40dd
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=http://www.openswan.org/download

diff --git a/openwrt/package/openswan/patches/101-arp_header.patch b/openwrt/package/openswan/patches/101-arp_header.patch
deleted file mode 100644 (file)
index 7375f65..0000000
--- a/openwrt/package/openswan/patches/101-arp_header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur openswan-2.4.5rc5/linux/net/ipsec/ipsec_tunnel.c openswan-2.4.5rc5.patched/linux/net/ipsec/ipsec_tunnel.c
---- openswan-2.4.5rc5/linux/net/ipsec/ipsec_tunnel.c   2005-11-22 05:11:52.000000000 +0100
-+++ openswan-2.4.5rc5.patched/linux/net/ipsec/ipsec_tunnel.c   2006-03-29 01:13:35.000000000 +0200
-@@ -33,6 +33,7 @@
- #include <linux/types.h>  /* size_t */
- #include <linux/interrupt.h> /* mark_bh */
- 
-+#include <net/arp.h>
- #include <net/tcp.h>
- #include <net/udp.h>
- #include <linux/skbuff.h>

diff --git a/openwrt/package/openswan/patches/102-new_module_param.patch b/openwrt/package/openswan/patches/102-new_module_param.patch
deleted file mode 100644 (file)
index 80c4a2f..0000000
--- a/openwrt/package/openswan/patches/102-new_module_param.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ruN openswan-2.4.5-old/linux/net/ipsec/aes/ipsec_alg_aes.c openswan-2.4.5-new/linux/net/ipsec/aes/ipsec_alg_aes.c
---- openswan-2.4.5-old/linux/net/ipsec/aes/ipsec_alg_aes.c     2005-05-20 18:48:55.000000000 +0200
-+++ openswan-2.4.5-new/linux/net/ipsec/aes/ipsec_alg_aes.c     2006-06-20 00:17:57.000000000 +0200
-@@ -59,12 +59,20 @@
- static int keymaxbits=0;
- #if defined(CONFIG_KLIPS_ENC_AES_MODULE)
- MODULE_AUTHOR("JuanJo Ciarlante <jjo-ipsec@mendoza.gov.ar>");
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,52)
-+module_param(debug_aes, int, 0);
-+module_param(test_aes, int, 0);
-+module_param(excl_aes, int, 0);
-+module_param(keyminbits, int, 0);
-+module_param(keymaxbits, int, 0);
-+#else
- MODULE_PARM(debug_aes, "i");
- MODULE_PARM(test_aes, "i");
- MODULE_PARM(excl_aes, "i");
- MODULE_PARM(keyminbits, "i");
- MODULE_PARM(keymaxbits, "i");
- #endif
-+#endif
- 
- #if CONFIG_KLIPS_ENC_AES_MAC
- #include "crypto/aes_xcbc_mac.h"
-@@ -79,8 +87,12 @@
- #else
- static int auth_id=9;
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,52)
-+module_param(auth_id, int, 0);
-+#else
- MODULE_PARM(auth_id, "i");
- #endif
-+#endif
- 
- #define ESP_AES                       12      /* truely _constant_  :)  */
-