From 7bc23d50fdd3952f7339183762233e0423be4390 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Sat, 29 Dec 2018 07:31:57 -0800 Subject: [PATCH] package/msmtp: prefer gnutls over openssl Msmtp no longer uses openssl as default [1], and even discourages the use of the OpenSSL. Let's follow this upstream recommendation: if the Buildroot configuration has both OpenSSL and GnuTLS enabled, GnuTLS will be preferred over OpenSSL. [1] https://marlam.de/msmtp/news/openssl-discouraged/ Signed-off-by: Ryan Coe [Thomas: improve commit log] Signed-off-by: Thomas Petazzoni --- package/msmtp/msmtp.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk index a26de92ef9..079c7c2319 100644 --- a/package/msmtp/msmtp.mk +++ b/package/msmtp/msmtp.mk @@ -40,16 +40,16 @@ else MSMTP_CONF_OPTS += --without-libsecret endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) +ifeq ($(BR2_PACKAGE_GNUTLS),y) +MSMTP_CONF_OPTS += --with-tls=gnutls +MSMTP_DEPENDENCIES += gnutls +else ifeq ($(BR2_PACKAGE_OPENSSL),y) MSMTP_CONF_OPTS += --with-tls=openssl MSMTP_DEPENDENCIES += openssl ifeq ($(BR2_STATIC_LIBS),y) # openssl uses zlib, so we need to explicitly link with it when static MSMTP_CONF_ENV += LIBS=-lz endif -else ifeq ($(BR2_PACKAGE_GNUTLS),y) -MSMTP_CONF_OPTS += --with-tls=gnutls -MSMTP_DEPENDENCIES += gnutls else MSMTP_CONF_OPTS += --with-tls=no endif -- 2.30.2