[Buildroot] [PATCH 1/1] package/openconnect: Fix openssl support

[Buildroot] [PATCH 1/1] package/openconnect: Fix openssl support

[Bernd Kuhls]

Enable needed OpenSSL options even when GnuTLS is enabled by respecting
BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL=y set by other packages.

Fixes:
http://autobuild.buildroot.net/results/f53/f535a63b80f2efe59709d5d9b59bc27ba66d2c26/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/openconnect/Config.in      | 4 ++--
 package/openconnect/openconnect.mk | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/openconnect/Config.in b/package/openconnect/Config.in
index cacf617fb9..6bc747bc2d 100644
--- a/package/openconnect/Config.in
+++ b/package/openconnect/Config.in
@@ -4,8 +4,8 @@ config BR2_PACKAGE_OPENCONNECT
 	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS
 	# configure: error: LibreSSL does not support Cisco DTLS.
 	select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if !BR2_PACKAGE_GNUTLS
-	select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if !BR2_PACKAGE_GNUTLS
-	select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if !BR2_PACKAGE_GNUTLS
+	select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
+	select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_ZLIB
 	help
diff --git a/package/openconnect/openconnect.mk b/package/openconnect/openconnect.mk
index 3fd9f990b0..20d2e3b4e4 100644
--- a/package/openconnect/openconnect.mk
+++ b/package/openconnect/openconnect.mk
@@ -14,7 +14,7 @@ OPENCONNECT_CONF_OPTS = \
 	--with-vpnc-script=/etc/vpnc/vpnc-script \
 	--without-java
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ifeq ($(BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL),y)
 OPENCONNECT_DEPENDENCIES += openssl
 OPENCONNECT_CONF_OPTS += --without-gnutls --with-openssl
 else ifeq ($(BR2_PACKAGE_GNUTLS),y)
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/openconnect: Fix openssl support

[Thomas Petazzoni via buildroot]

On Tue,  6 Aug 2024 07:36:23 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> Enable needed OpenSSL options even when GnuTLS is enabled by respecting
> BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL=y set by other packages.
> 
> Fixes:
> http://autobuild.buildroot.net/results/f53/f535a63b80f2efe59709d5d9b59bc27ba66d2c26/
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  package/openconnect/Config.in      | 4 ++--
>  package/openconnect/openconnect.mk | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/package/openconnect/Config.in b/package/openconnect/Config.in
> index cacf617fb9..6bc747bc2d 100644
> --- a/package/openconnect/Config.in
> +++ b/package/openconnect/Config.in
> @@ -4,8 +4,8 @@ config BR2_PACKAGE_OPENCONNECT
>  	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS
>  	# configure: error: LibreSSL does not support Cisco DTLS.
>  	select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if !BR2_PACKAGE_GNUTLS
> -	select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if !BR2_PACKAGE_GNUTLS
> -	select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if !BR2_PACKAGE_GNUTLS
> +	select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
> +	select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL

Using BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL seemed not really
appropriate here. Other packages that have to do this use:

	select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL

so I changed to this instead.

> -ifeq ($(BR2_PACKAGE_OPENSSL),y)
> +ifeq ($(BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL),y)

This change was not needed, so I dropped it.

Applied with those changes. Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot