Skip to contentSkip to conversation

msmtp: invert gnutls/openssl preference

PATCH New Ryan Coe 2 participants 2 messages Dec 29, 2018 – Dec 30, 2018

lore
Share & tools
lore

Ryan Coe

author
#0 lore raw

PATCH 1/1 msmtp: invert gnutls/openssl preference

Msmtp no longer uses openssl as default [1]. If the configuration has both libraries, gnutls should be preferred over openssl.

[1] https://marlam.de/msmtp/news/openssl-discouraged/

Signed-off-by Ryan Coe <[email protected]>
---
 package/msmtp/msmtp.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
package/msmtp/msmtp.mk +4 -4
index a26de92ef9..079c7c2319 100644
@@ -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
Signature · 1 line
2.20.1
Applied
#1 lore raw

PATCH 1/1 msmtp: invert gnutls/openssl preference

Hello,

Quoted 9 lines · Ryan Coe

Msmtp no longer uses openssl as default [1]. If the configuration has both libraries, gnutls should be preferred over openssl.

[1] https://marlam.de/msmtp/news/openssl-discouraged/

Signed-off-by Ryan Coe <[email protected]>
---
 package/msmtp/msmtp.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com