From: Doug Kehn <rdkehn@yahoo.com>
Date: Sun, 1 Feb 2015 05:26:52 +0000 (-0600)
Subject: package/ipsec-tools: hybrid config support
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9849366388f9695b2aa532302ab67dcc47c8924d;p=buildroot.git

package/ipsec-tools: hybrid config support

Add config option for enabling hybrid mode.  Hybrid mode is required for
successful interoperability.

Signed-off-by: Doug Kehn <rdkehn@yahoo.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
index a0d7600258..4af4095843 100644
--- a/package/ipsec-tools/Config.in
+++ b/package/ipsec-tools/Config.in
@@ -48,6 +48,12 @@ config BR2_PACKAGE_IPSEC_TOOLS_READLINE
 	select BR2_PACKAGE_READLINE
 	bool "Enable readline input support"
 
+config BR2_PACKAGE_IPSEC_TOOLS_HYBRID
+	bool "Enable hybrid, both mode-cfg and xauth support"
+	help
+	  Hybrid mode is required for successful interoperability
+	  (e.g. Cisco VPN Client).
+
 choice
 	prompt "Security context"
 	default BR2_PACKAGE_IPSEC_SECCTX_DISABLE
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index d9160277da..56e2bed7fd 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -21,7 +21,6 @@ IPSEC_TOOLS_CONF_ENV += LIBS=-lz
 endif
 
 IPSEC_TOOLS_CONF_OPTS = \
-	  --disable-hybrid \
 	  --without-libpam \
 	  --disable-gssapi \
 	  --with-kernel-headers=$(STAGING_DIR)/usr/include
@@ -62,6 +61,12 @@ else
 IPSEC_DEPENDENCIES += readline
 endif
 
+ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_HYBRID), y)
+IPSEC_TOOLS_CONF_OPTS += --enable-hybrid
+else
+IPSEC_TOOLS_CONF_OPTS += --disable-hybrid
+endif
+
 ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y)
 IPSEC_TOOLS_CONF_OPTS += --enable-security-context=no
 endif