From 58170c277c1f716ec748d3665356354838965b23 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 19 Apr 2010 02:48:02 +0000
Subject: [PATCH] openswan: update to 2.6.25

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

diff --git a/net/openswan/Makefile b/net/openswan/Makefile
index d6a61ade8..86baa0637 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.24
+PKG_VERSION:=2.6.25
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openswan.org/download
-PKG_MD5SUM:=1c76b6982c05392f7c360afb92699661
+PKG_MD5SUM:=c1223786c9eb58950a4be0ab2d0a84d1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -30,11 +30,11 @@ endef
 
 define Package/openswan
 $(call Package/openswan/Default)
+  SUBMENU:=VPN
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS+= +kmod-openswan +libgmp +ip
   TITLE+= (daemon)
-  URL:=http://www.openswan.org/
+  DEPENDS+= +kmod-openswan +libgmp +ip
 endef
 
 define Package/openswan/description
diff --git a/net/openswan/patches/110-scripts.patch b/net/openswan/patches/110-scripts.patch
index a32c32455..bd0b049c9 100644
--- a/net/openswan/patches/110-scripts.patch
+++ b/net/openswan/patches/110-scripts.patch
@@ -8,7 +8,7 @@
 +exit 0
 --- a/programs/_plutorun/_plutorun.in
 +++ b/programs/_plutorun/_plutorun.in
-@@ -156,7 +156,7 @@
+@@ -155,7 +155,7 @@ then
  			exit 1
  		fi
  	else
@@ -19,7 +19,7 @@
  			exit 1
 --- a/programs/_realsetup/_realsetup.in
 +++ b/programs/_realsetup/_realsetup.in
-@@ -282,7 +282,7 @@
+@@ -282,7 +282,7 @@ case "$1" in
  
  	# misc pre-Pluto setup
  
diff --git a/net/openswan/patches/120-no_manpages.patch b/net/openswan/patches/120-no_manpages.patch
index b2fb2f619..b3d31cf37 100644
--- a/net/openswan/patches/120-no_manpages.patch
+++ b/net/openswan/patches/120-no_manpages.patch
@@ -8,7 +8,7 @@
  CONFFILES=ipsec.conf
  EXCONFILES=ipsec.win2k.conf
  SOURCEDIR=_confread
-@@ -26,11 +25,3 @@
+@@ -26,11 +25,3 @@ CONFDFILES=clear clear-or-private privat
  
  include ${srcdir}../Makefile.program
  
@@ -22,7 +22,7 @@
 -
 --- a/programs/pluto/Makefile
 +++ b/programs/pluto/Makefile
-@@ -188,35 +188,11 @@
+@@ -188,35 +188,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 607753b73..97cb853b0 100644
--- a/net/openswan/patches/130-compat_net_dev_ops.patch
+++ b/net/openswan/patches/130-compat_net_dev_ops.patch
@@ -1,6 +1,6 @@
 --- a/linux/include/openswan/ipsec_kversion.h
 +++ b/linux/include/openswan/ipsec_kversion.h
-@@ -339,6 +339,12 @@
+@@ -351,6 +351,12 @@
  # define HAVE_CURRENT_UID
  #endif
  
-- 
2.30.2