Imported Upstream version 4.6.4

5 files changed, 51 insertions, 8 deletions

diff --git a/src/ipsec/Android.mk b/src/ipsec/Android.mk
new file mode 100644
index 000000000..d134f7fd2
--- /dev/null
+++ b/src/ipsec/Android.mk
@@ -0,0 +1,33 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+# build ipsec ------------------------------------------------------------------
+
+LOCAL_MODULE := ipsec
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_CLASS := EXECUTABLES
+
+GEN := $(local-intermediates-dir)/ipsec
+
+$(GEN) : PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN) : PRIVATE_CUSTOM_TOOL = sed \
+	-e "s:@IPSEC_SHELL@:/system/bin/sh:" \
+	-e "s:@IPSEC_VERSION@:$(strongswan_VERSION):" \
+	-e "s:@IPSEC_NAME@:strongSwan:" \
+	-e "s:@IPSEC_DISTRO@::" \
+	-e "s:@IPSEC_DIR@:$(strongswan_DIR):" \
+	-e "s:@IPSEC_SBINDIR@:$(strongswan_SBINDIR):" \
+	-e "s:@IPSEC_CONFDIR@:$(strongswan_CONFDIR):" \
+	-e "s:@IPSEC_PIDDIR@:$(strongswan_PIDDIR):" \
+	$< > $@ && chmod +x $@
+
+$(GEN) : $(strongswan_PATH)/Android.mk
+$(GEN) : $(LOCAL_PATH)/ipsec.in
+	$(transform-generated-source)
+
+LOCAL_GENERATED_SOURCES := $(GEN)
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
diff --git a/src/ipsec/Makefile.am b/src/ipsec/Makefile.am
index 510f1021a..bbf009721 100644
--- a/src/ipsec/Makefile.am
+++ b/src/ipsec/Makefile.am
@@ -1,7 +1,7 @@
 sbin_SCRIPTS = ipsec
 CLEANFILES = ipsec ipsec.8
 dist_man8_MANS = ipsec.8
-EXTRA_DIST = ipsec.in ipsec.8.in
+EXTRA_DIST = ipsec.in ipsec.8.in Android.mk
 
 ipsec.8 : ipsec.8.in
 	sed \
@@ -10,6 +10,7 @@ ipsec.8 : ipsec.8.in
 
 ipsec : ipsec.in
 	sed \
+	-e "s:@IPSEC_SHELL@:/bin/sh:" \
 	-e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \
 	-e "s:@IPSEC_NAME@:$(PACKAGE_NAME):" \
 	-e "s:@IPSEC_DISTRO@::" \
diff --git a/src/ipsec/Makefile.in b/src/ipsec/Makefile.in
index 04ca97781..b0474159d 100644
--- a/src/ipsec/Makefile.in
+++ b/src/ipsec/Makefile.in
@@ -172,6 +172,9 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
+attest_plugins = @attest_plugins@
+axis2c_CFLAGS = @axis2c_CFLAGS@
+axis2c_LIBS = @axis2c_LIBS@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -180,6 +183,7 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 c_plugins = @c_plugins@
+clearsilver_LIBS = @clearsilver_LIBS@
 datadir = @datadir@
 datarootdir = @datarootdir@
 dbusservicedir = @dbusservicedir@
@@ -196,11 +200,13 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
+imcvdir = @imcvdir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 ipsecdir = @ipsecdir@
 ipsecgroup = @ipsecgroup@
+ipseclibdir = @ipseclibdir@
 ipsecuser = @ipsecuser@
 libcharon_plugins = @libcharon_plugins@
 libdir = @libdir@
@@ -244,6 +250,7 @@ sharedstatedir = @sharedstatedir@
 soup_CFLAGS = @soup_CFLAGS@
 soup_LIBS = @soup_LIBS@
 srcdir = @srcdir@
+starter_plugins = @starter_plugins@
 strongswan_conf = @strongswan_conf@
 sysconfdir = @sysconfdir@
 systemdsystemunitdir = @systemdsystemunitdir@
@@ -257,7 +264,7 @@ xml_LIBS = @xml_LIBS@
 sbin_SCRIPTS = ipsec
 CLEANFILES = ipsec ipsec.8
 dist_man8_MANS = ipsec.8
-EXTRA_DIST = ipsec.in ipsec.8.in
+EXTRA_DIST = ipsec.in ipsec.8.in Android.mk
 all: all-am
 
 .SUFFIXES:
@@ -539,6 +546,7 @@ ipsec.8 : ipsec.8.in
 
 ipsec : ipsec.in
 	sed \
+	-e "s:@IPSEC_SHELL@:/bin/sh:" \
 	-e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \
 	-e "s:@IPSEC_NAME@:$(PACKAGE_NAME):" \
 	-e "s:@IPSEC_DISTRO@::" \
diff --git a/src/ipsec/ipsec.8 b/src/ipsec/ipsec.8
index 6f4117be7..66e43b481 100644
--- a/src/ipsec/ipsec.8
+++ b/src/ipsec/ipsec.8
@@ -1,4 +1,4 @@
-.TH IPSEC 8 "2010-05-30" "4.5.1" "strongSwan"
+.TH IPSEC 8 "2010-05-30" "4.5.3dr3" "strongSwan"
 .SH NAME
 ipsec \- invoke IPsec utilities
 .SH SYNOPSIS
diff --git a/src/ipsec/ipsec.in b/src/ipsec/ipsec.in
index 2ea0ef798..479974a0e 100755
--- a/src/ipsec/ipsec.in
+++ b/src/ipsec/ipsec.in
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! @IPSEC_SHELL@
 # prefix command to run stuff from our programs directory
 # Copyright (C) 1998-2002  Henry Spencer.
 # Copyright (C) 2006 Andreas Steffen
@@ -19,6 +19,7 @@ PATH="/sbin:/bin:/usr/sbin:/usr/bin:@IPSEC_SBINDIR@"
 export PATH
 
 # name and version of the ipsec implementation
+OS_NAME=`uname -s`
 IPSEC_NAME="@IPSEC_NAME@"
 IPSEC_VERSION="U@IPSEC_VERSION@/K`uname -r`"
 
@@ -60,7 +61,7 @@ case "$1" in
 	echo "	listalgs|listpubkeys|listcerts [--utc]"
 	echo "	listcacerts|listaacerts|listocspcerts [--utc]"
 	echo "	listacerts|listgroups|listcainfos [--utc]"
-	echo "	listcrls|listocsp|listcards|listall [--utc]"
+	echo "	listcrls|listocsp|listcards|listplugins|listall [--utc]"
 	echo "	leases [<poolname> [<address>]]"
 	echo "	rereadsecrets|rereadgroups"
 	echo "	rereadcacerts|rereadaacerts|rereadocspcerts"
@@ -169,7 +170,7 @@ leases)
 	fi
 	exit "$rc"
 	;;
-listalgs|\listpubkeys|\
+listalgs|listpubkeys|listplugins|\
 listcerts|listcacerts|listaacerts|\
 listacerts|listgroups|listocspcerts|\
 listcainfos|listcrls|listocsp|listall|\
@@ -326,7 +327,7 @@ stop)
 		if [ -n "$spid" ]
 		then
 			kill $spid 2>/dev/null
-			loop=5
+			loop=11
 			while [ $loop -gt 0 ] ; do
 				kill -0 $spid 2>/dev/null || break
 				sleep 1
@@ -378,7 +379,7 @@ update)
 	fi
 	;;
 version|--version)
-	printf "Linux $IPSEC_NAME $IPSEC_VERSION\n"
+	printf "$OS_NAME $IPSEC_NAME $IPSEC_VERSION\n"
 	printf "$IPSEC_DISTRO\n"
 	printf "See 'ipsec --copyright' for copyright information.\n"
 	exit 0