* [Buildroot] [PATCH 1/1] msmtp: invert gnutls/openssl preference
@ 2018-12-29 15:31 Ryan Coe
2018-12-30 15:32 ` Thomas Petazzoni
0 siblings, 1 reply; 2+ messages in thread
From: Ryan Coe @ 2018-12-29 15:31 UTC (permalink / raw)
To: buildroot
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 <bluemrp9@gmail.com>
---
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.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] msmtp: invert gnutls/openssl preference
2018-12-29 15:31 [Buildroot] [PATCH 1/1] msmtp: invert gnutls/openssl preference Ryan Coe
@ 2018-12-30 15:32 ` Thomas Petazzoni
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2018-12-30 15:32 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 29 Dec 2018 07:31:57 -0800, Ryan Coe wrote:
> 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 <bluemrp9@gmail.com>
> ---
> package/msmtp/msmtp.mk | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-30 15:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-29 15:31 [Buildroot] [PATCH 1/1] msmtp: invert gnutls/openssl preference Ryan Coe
2018-12-30 15:32 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox