From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 23 Feb 2011 22:56:19 +0000 (+0000)
Subject: [packages] openswan: update to v2.6.33 (#8924)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=8b3c718a61145996c3caeff4cd9b0215cabcc8ae

[packages] openswan: update to v2.6.33 (#8924)


SVN-Revision: 25676
---

diff --git a/net/openswan/Makefile b/net/openswan/Makefile
index 2acb818ff7..8153ae7485 100644
--- a/net/openswan/Makefile
+++ b/net/openswan/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openswan
-PKG_VERSION:=2.6.29
-PKG_RELEASE:=2
+PKG_VERSION:=2.6.33
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openswan.org/download
-PKG_MD5SUM:=cd6c127585ec6db63780e9a40d5387fb
+PKG_MD5SUM:=7e9c28585307b7ad4f59737debb0d940
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
@@ -49,6 +49,7 @@ define KernelPackage/openswan
 $(call Package/openswan/Default)
   SUBMENU:=Network Support
   TITLE+= (kernel module)
+  DEPENDS+=+PACKAGE_kmod-ipv6:kmod-ipv6
   FILES:=$(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX)
 endef
 
diff --git a/net/openswan/patches/130-compat_net_dev_ops.patch b/net/openswan/patches/130-compat_net_dev_ops.patch
index e4a96ff1e4..84c2a2b4ba 100644
--- a/net/openswan/patches/130-compat_net_dev_ops.patch
+++ b/net/openswan/patches/130-compat_net_dev_ops.patch
@@ -4,8 +4,8 @@
 
 --- a/linux/include/openswan/ipsec_kversion.h
 +++ b/linux/include/openswan/ipsec_kversion.h
-@@ -366,6 +366,12 @@
- #endif
+@@ -387,6 +387,12 @@
+ # endif
  #endif
  
 +#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,30)
diff --git a/net/openswan/patches/200-linux-2.6.36.patch b/net/openswan/patches/200-linux-2.6.36.patch
deleted file mode 100644
index 481662cfe3..0000000000
--- a/net/openswan/patches/200-linux-2.6.36.patch
+++ /dev/null
@@ -1,58 +0,0 @@
----
- linux/net/ipsec/ipsec_xmit.c |   21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
---- a/linux/net/ipsec/ipsec_xmit.c
-+++ b/linux/net/ipsec/ipsec_xmit.c
-@@ -105,6 +105,15 @@ static __u32 zeroes[64];
- int ipsec_xmit_trap_count = 0;
- int ipsec_xmit_trap_sendcount = 0;
- 
-+#ifndef NIPQUAD
-+#define NIPQUAD(addr) \
-+	((unsigned char *)&addr)[0], \
-+	((unsigned char *)&addr)[1], \
-+	((unsigned char *)&addr)[2], \
-+	((unsigned char *)&addr)[3]
-+#define NIPQUAD_FMT "%u.%u.%u.%u"
-+#endif
-+
- #define dmp(_x,_y,_z) if(debug_xmit && sysctl_ipsec_debug_verbose) ipsec_dmp_block(_x,_y,_z)
- 
- #if !defined(SKB_COPY_EXPAND) || defined(KLIPS_UNIT_TESTS)
-@@ -2085,7 +2094,11 @@ ipsec_xmit_send(struct ipsec_xmit_state*
- 		return IPSEC_XMIT_ROUTEERR;
- 	}
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
-+	if(ixs->dev == ixs->route->dst.dev) {
-+#else
- 	if(ixs->dev == ixs->route->u.dst.dev) {
-+#endif
- 		ip_rt_put(ixs->route);
- 		/* This is recursion, drop it. */
- 		if (ixs->stats)
-@@ -2098,7 +2111,11 @@ ipsec_xmit_send(struct ipsec_xmit_state*
- 	}
- 
- 	skb_dst_drop(ixs->skb);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
-+	skb_dst_set(ixs->skb, &ixs->route->dst);
-+#else
- 	skb_dst_set(ixs->skb, &ixs->route->u.dst);
-+#endif
- 	if(ixs->stats) {
- 		ixs->stats->tx_bytes += ixs->skb->len;
- 	}
-@@ -2139,7 +2156,11 @@ ipsec_xmit_send(struct ipsec_xmit_state*
- 
- 		else
- 			err = NF_HOOK(PF_INET, OSW_NF_INET_LOCAL_OUT, ixs->skb, NULL,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
-+					ixs->route->dst.dev,
-+#else
- 					ixs->route->u.dst.dev,
-+#endif
- 					ipsec_xmit_send2);
- 
- 		if(err != NET_XMIT_SUCCESS && err != NET_XMIT_CN) {
diff --git a/net/openswan/patches/250-resolv-compile-fix.patch b/net/openswan/patches/250-resolv-compile-fix.patch
deleted file mode 100644
index 111bbe2465..0000000000
--- a/net/openswan/patches/250-resolv-compile-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/programs/pluto/adns.c
-+++ b/programs/pluto/adns.c
-@@ -187,7 +187,7 @@ write_pipe(int fd, const unsigned char *
-     res_query(dname, class, type, answer, anslen)
- # define res_nclose(statp) res_close()
- 
--static struct __res_state *statp = &_res;
-+#define statp	((struct __res_state *)(&_res))
- 
- #else /* !OLD_RESOLVER */
-