[ptxdist] [PATCH] socat: added openssl option

[ptxdist] [PATCH] socat: added openssl option

[George McCollister]

Added an option to enable openssl in socat.

Signed-off-by: George McCollister <george.mccollister@gmail.com>
---
 rules/socat.in   | 14 +++++++++++++-
 rules/socat.make |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/rules/socat.in b/rules/socat.in
index e94c72e..da8d1eb 100644
--- a/rules/socat.in
+++ b/rules/socat.in
@@ -1,9 +1,11 @@
 ## SECTION=networking
 
-config SOCAT
+menuconfig SOCAT
 	tristate
 	select LIBC_RT
 	select LIBC_UTIL
+	select OPENSSL			if SOCAT_OPENSSL
+	select OPENSSL_SHARED		if SOCAT_OPENSSL
 	prompt "socat"
 	help
 	  Socat (for SOcket CAT) establishes two bidirectional byte streams and
@@ -11,3 +13,13 @@ config SOCAT
 	  (terminal or modem, etc.), or sockets (Unix, IPv4, IPv6, raw, UDP, TCP,
 	  SSL). It provides forking, logging and tracing, different modes for
 	  interprocess communication and many more options.
+
+if SOCAT
+
+config SOCAT_OPENSSL
+	bool
+	prompt "openssl support"
+	help
+	  Include openssl support.
+
+endif
diff --git a/rules/socat.make b/rules/socat.make
index 7eebb9b..bd2ba07 100644
--- a/rules/socat.make
+++ b/rules/socat.make
@@ -60,7 +60,7 @@ SOCAT_CONF_OPT	:= \
 	--enable-pty \
 	--enable-ext2 \
 	--disable-readline \
-	--disable-openssl \
+	--$(call ptx/endis, PTXCONF_SOCAT_OPENSSL)-openssl \
 	--disable-fips \
 	--enable-tun \
 	--enable-sycls \
-- 
2.4.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] socat: added openssl option

[Michael Olbrich]

On Thu, Jun 18, 2015 at 04:16:57PM -0500, George McCollister wrote:
> Added an option to enable openssl in socat.
> 

Thanks, applied.

Michael

> Signed-off-by: George McCollister <george.mccollister@gmail.com>
> ---
>  rules/socat.in   | 14 +++++++++++++-
>  rules/socat.make |  2 +-
>  2 files changed, 14 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/socat.in b/rules/socat.in
> index e94c72e..da8d1eb 100644
> --- a/rules/socat.in
> +++ b/rules/socat.in
> @@ -1,9 +1,11 @@
>  ## SECTION=networking
>  
> -config SOCAT
> +menuconfig SOCAT
>  	tristate
>  	select LIBC_RT
>  	select LIBC_UTIL
> +	select OPENSSL			if SOCAT_OPENSSL
> +	select OPENSSL_SHARED		if SOCAT_OPENSSL
>  	prompt "socat"
>  	help
>  	  Socat (for SOcket CAT) establishes two bidirectional byte streams and
> @@ -11,3 +13,13 @@ config SOCAT
>  	  (terminal or modem, etc.), or sockets (Unix, IPv4, IPv6, raw, UDP, TCP,
>  	  SSL). It provides forking, logging and tracing, different modes for
>  	  interprocess communication and many more options.
> +
> +if SOCAT
> +
> +config SOCAT_OPENSSL
> +	bool
> +	prompt "openssl support"
> +	help
> +	  Include openssl support.
> +
> +endif
> diff --git a/rules/socat.make b/rules/socat.make
> index 7eebb9b..bd2ba07 100644
> --- a/rules/socat.make
> +++ b/rules/socat.make
> @@ -60,7 +60,7 @@ SOCAT_CONF_OPT	:= \
>  	--enable-pty \
>  	--enable-ext2 \
>  	--disable-readline \
> -	--disable-openssl \
> +	--$(call ptx/endis, PTXCONF_SOCAT_OPENSSL)-openssl \
>  	--disable-fips \
>  	--enable-tun \
>  	--enable-sycls \
> -- 
> 2.4.3
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de