[svn-upgrade] Integrating new upstream version, strongswan (4.1.4)

2 files changed, 7 insertions, 7 deletions

diff --git a/src/ipsec/Makefile.in b/src/ipsec/Makefile.in
index 3a12ba5b9..decd32b88 100644
--- a/src/ipsec/Makefile.in
+++ b/src/ipsec/Makefile.in
@@ -113,6 +113,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
diff --git a/src/ipsec/ipsec.in b/src/ipsec/ipsec.in
index 067d24784..e4cedd09a 100755
--- a/src/ipsec/ipsec.in
+++ b/src/ipsec/ipsec.in
@@ -36,8 +36,7 @@ IPSEC_STARTER="${IPSEC_DIR}/starter"
 
 export IPSEC_DIR IPSEC_SBINDIR IPSEC_CONFDIR IPSEC_PIDDIR IPSEC_VERSION IPSEC_NAME IPSEC_STARTER_PID IPSEC_PLUTO_PID IPSEC_CHARON_PID
 
-IPSEC_DISTRO="Institute for Internet Technologies and Applications\n
-              University of Applied Sciences Rapperswil, Switzerland"
+IPSEC_DISTRO="Institute for Internet Technologies and Applications\nUniversity of Applied Sciences Rapperswil, Switzerland"
 
 case "$1" in
 '')
@@ -82,10 +81,6 @@ case "$1" in
 	echo "$IPSEC_VERSION"
 	exit 0
 	;;
---copyright)
-	set _copyright
-	# and fall through, invoking "ipsec _copyright"
-	;;
 --directory)
 	echo "$IPSEC_DIR"
 	exit 0
@@ -94,6 +89,10 @@ case "$1" in
 	echo "$IPSEC_CONFDIR"
 	exit 0
 	;;
+copyright|--copyright)
+	set _copyright
+	# and fall through, invoking "ipsec _copyright"
+	;;
 down)
 	shift
 	if [ "$#" -ne 1 ]
@@ -266,8 +265,8 @@ update)
 	;;
 version|--version)
 	echo "Linux $IPSEC_NAME $IPSEC_VERSION"
+	echo -e $IPSEC_DISTRO
 	echo "See \`ipsec --copyright' for copyright information."
-	echo $IPSEC_DISTRO
 	exit 0
 	;;
 --*)