Update openswan to 2.6.18 (#4019)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@13092 3c298f89-4303-0410-b956-a3cf2f4a3e73

net/openswan/Makefile

@@ -10,19 +10,19 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openswan
-PKG_VERSION:=2.4.10
+PKG_VERSION:=2.6.18
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openswan.org/download
-PKG_MD5SUM:=2b36785342c74d524d8d86bde89a445f
+PKG_MD5SUM:=b485b38b1074155bc337f80557c24c0d
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/openswan/Default
   TITLE:=Openswan
   URL:=http://www.openswan.org/
-  DEPENDS:=@BROKEN
+  DEPENDS:=@LINUX_2_6
 endef
 
 define Package/openswan/Default/description

net/openswan/files/ipsec.init

@@ -2,7 +2,6 @@
 # IPsec startup and shutdown script
 # Copyright (C) 1998, 1999, 2001  Henry Spencer.
 # Copyright (C) 2002			  Michael Richardson <mcr@freeswan.org>
-# Copyright (C) 2006              OpenWrt.org
 # 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -14,7 +13,6 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 #
-# RCSID $Id: setup.in,v 1.122.6.1 2005/07/25 19:17:03 ken Exp $
 #
 # ipsec		 init.d script for starting and stopping
 #			   the IPsec security subsystem (KLIPS and Pluto).
@@ -33,6 +31,9 @@
 # KLIPS is the kernel half of it, Pluto is the user-level management daemon.
 
 START=60
+EXTRA_COMMANDS=status
+EXTRA_HELP="    status  Show the status of the service"
+
 script_init() {
 	me='ipsec setup'		# for messages
 
@@ -69,10 +70,34 @@ script_init() {
 		exit 1
 	fi
 
+	# accept a few flags
+
+	export IPSEC_setupflags
+	IPSEC_setupflags=""
+
+	config=""
+
+	for dummy
+	do
+		case "$1" in
+		--showonly|--show)  IPSEC_setupflags="$1" ;;
+		--config)  config="--config $2" ; shift	;;
+		*) break ;;
+		esac
+		shift
+	done
+
+
 	# Pick up IPsec configuration (until we have done this, successfully, we
 	# do not know where errors should go, hence the explicit "daemon.error"s.)
 	# Note the "--export", which exports the variables created.
-	eval `ipsec _confread $config --optional --varprefix IPSEC --export --type config setup`
+	variables=`ipsec addconn $config --varprefix IPSEC --configsetup`
+	if [ $? != 0 ]
+	then
+		echo "Failed to parse config setup portion of ipsec.conf"
+		exit $?
+	fi
+	eval $variables
 
 	if test " $IPSEC_confreadstatus" != " "
 	then
@@ -100,21 +125,19 @@ script_init() {
 }
 
 script_command() {
-	if [ "${USER}" != "root" ]
+	# do it
+	case "$1" in
+	start|--start|stop|--stop|_autostop|_autostart)
+		# remove for: @cygwin_START@ 
+		# portable way for checking for root
+		if [ ! -w / ]
 		then
+
 			echo "permission denied (must be superuser)" |
 				logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
 			exit 1
 		fi
-	# make sure all required directories exist
+		# remove for: @cygwin_END@
-	if [ ! -d /var/run/pluto ]
-	then
-		mkdir -p /var/run/pluto
-	fi
-	if [ ! -d /var/lock/subsys ]
-	then
-		mkdir -p /var/lock/subsys
-	fi
 		tmp=/var/run/pluto/ipsec_setup.st
 		outtmp=/var/run/pluto/ipsec_setup.out
 		(
@@ -131,9 +154,40 @@ script_command() {
 			cat ${outtmp} | logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
 			rm -f ${outtmp}
 		fi
+		;;
+
+	restart|--restart|force-reload)
+		$0 $IPSEC_setupflags stop
+		$0 $IPSEC_setupflags start
+		;;
+
+	_autorestart)			# for internal use only
+		$0 $IPSEC_setupflags _autostop
+		$0 $IPSEC_setupflags _autostart
+		;;
+
+	status|--status)
+		ipsec _realsetup $1
+		exit
+		;;
+
+	--version)
+		echo "$me $IPSEC_VERSION"
+		exit 0
+		;;
+
+	--help)
+		echo "Usage: $me [ --showonly ] {--start|--stop|--restart}"
+		echo "	   $me --status"
+		exit 0
+		;;
+
+	*)
+		echo "Usage: $me [ --showonly ] {--start|--stop|--restart}"
+		echo "	   $me --status"
+		exit 2
+	esac
 }
-
-
 start() {
 	script_init start "$@"
 	script_command start "$@"
@@ -154,5 +208,4 @@ status() {
 	script_init status "$@"
 	ipsec _realsetup status
 }
-EXTRA_COMMANDS=status
+
-EXTRA_HELP="	status	Show the status of the service"

net/openswan/patches/120-use_dev_urandom.patch

@@ -1,39 +0,0 @@
-Index: openswan-2.4.8/programs/ranbits/ranbits.c
-===================================================================
---- openswan-2.4.8.orig/programs/ranbits/ranbits.c	2007-06-04 13:22:49.835279168 +0200
-+++ openswan-2.4.8/programs/ranbits/ranbits.c	2007-06-04 13:22:51.648003592 +0200
-@@ -29,7 +29,7 @@
- #include <openswan.h>
- 
- #ifndef DEVICE
--#define	DEVICE	"/dev/random"
-+#define	DEVICE	"/dev/urandom"
- #endif
- #ifndef QDEVICE
- #define	QDEVICE	"/dev/urandom"
-Index: openswan-2.4.8/programs/rsasigkey/rsasigkey.c
-===================================================================
---- openswan-2.4.8.orig/programs/rsasigkey/rsasigkey.c	2007-06-04 13:22:49.842278104 +0200
-+++ openswan-2.4.8/programs/rsasigkey/rsasigkey.c	2007-06-04 13:22:51.649003440 +0200
-@@ -31,7 +31,7 @@
- #include <gmp.h>
- 
- #ifndef DEVICE
--#define	DEVICE	"/dev/random"
-+#define	DEVICE	"/dev/urandom"
- #endif
- #ifndef MAXBITS
- #define	MAXBITS	20000
-Index: openswan-2.4.8/programs/starter/files.h
-===================================================================
---- openswan-2.4.8.orig/programs/starter/files.h	2007-06-04 13:22:49.850276888 +0200
-+++ openswan-2.4.8/programs/starter/files.h	2007-06-04 13:22:51.649003440 +0200
-@@ -36,7 +36,7 @@
- 
- #define MY_PID_FILE     "/var/run/pluto/ipsec-starter.pid"
- 
--#define DEV_RANDOM      "/dev/random"
-+#define DEV_RANDOM      "/dev/urandom"
- #define DEV_URANDOM     "/dev/urandom"
- 
- #define PROC_IPSECVERSION   "/proc/net/ipsec_version"