From bf591c7810cd4e68cfdcdbe6cc16db33d5487a35 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 18 Aug 2010 08:10:45 +0000
Subject: [PATCH] [packages] openswan: update to 2.6.28 (closes: #7544, #7725,
 #7782)

SVN-Revision: 22693
---
 net/openswan/Makefile                             |  4 ++--
 net/openswan/patches/110-scripts.patch            | 11 -----------
 net/openswan/patches/120-no_manpages.patch        |  2 +-
 net/openswan/patches/130-compat_net_dev_ops.patch |  8 ++++----
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/net/openswan/Makefile b/net/openswan/Makefile
index 86baa0637c..0d270d3ed1 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.25
+PKG_VERSION:=2.6.28
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openswan.org/download
-PKG_MD5SUM:=c1223786c9eb58950a4be0ab2d0a84d1
+PKG_MD5SUM:=37f2ad2664dd89e6ad96ae82f6378166
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/openswan/patches/110-scripts.patch b/net/openswan/patches/110-scripts.patch
index bd0b049c93..8af8a998fa 100644
--- a/net/openswan/patches/110-scripts.patch
+++ b/net/openswan/patches/110-scripts.patch
@@ -17,14 +17,3 @@
  		then
  			echo Cannot write to directory to create \"$stderrlog\".
  			exit 1
---- a/programs/_realsetup/_realsetup.in
-+++ b/programs/_realsetup/_realsetup.in
-@@ -282,7 +282,7 @@ case "$1" in
- 
- 	# misc pre-Pluto setup
- 
--	perform test -d `dirname $subsyslock` "&&" touch $subsyslock
-+	perform test -d `echo $subsyslock | sed -r 's/(^.*\/)(.*$)/\1/'` "&&" touch $subsyslock "&&" rm -f $subsyslock
- 
- 	manualconns
- 
diff --git a/net/openswan/patches/120-no_manpages.patch b/net/openswan/patches/120-no_manpages.patch
index b3d31cf378..0ce520c55a 100644
--- a/net/openswan/patches/120-no_manpages.patch
+++ b/net/openswan/patches/120-no_manpages.patch
@@ -22,7 +22,7 @@
 -
 --- a/programs/pluto/Makefile
 +++ b/programs/pluto/Makefile
-@@ -188,35 +188,11 @@ doinstall: all
+@@ -191,35 +191,11 @@ doinstall: all
  	$(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR)
  	#$(INSTALL) $(INSTSUIDFLAGS) $(BINNAMEWHACKINIT) $(LIBEXECDIR)
  	if $(USE_ADNS) ; then $(INSTALL) $(INSTBINFLAGS) $(BINNAMEADNS)  $(LIBEXECDIR) ; fi
diff --git a/net/openswan/patches/130-compat_net_dev_ops.patch b/net/openswan/patches/130-compat_net_dev_ops.patch
index 97cb853b03..e87b955dfc 100644
--- a/net/openswan/patches/130-compat_net_dev_ops.patch
+++ b/net/openswan/patches/130-compat_net_dev_ops.patch
@@ -1,7 +1,7 @@
 --- a/linux/include/openswan/ipsec_kversion.h
 +++ b/linux/include/openswan/ipsec_kversion.h
-@@ -351,6 +351,12 @@
- # define HAVE_CURRENT_UID
+@@ -363,6 +363,12 @@
+ #endif
  #endif
  
 +#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,30)
@@ -11,5 +11,5 @@
 +#endif
 +
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
- # define HAVE_SKB_DST 1
- #endif
+ # define USE_NETDEV_OPS
+ #else
-- 
2.30.2