package/msmtp: drop unneeded static openssl workaround
PATCH 1/2 package/msmtp: drop unneeded static openssl workaround
msmtp uses pkg-config to find openssl dependencies such as lz or latomic so drop unneeded openssl workaround that was added by
https://git.buildroot.net/buildroot/commit/package/msmtp?id=468bbc1538aaea87beaf455a2ad6ea5a255d5f58
I don't know why it was added seven years ago as msmtp already used pkg-config at this time:
https://github.com/marlam/msmtp-mirror/blob/rel-1-4-27/configure.ac
--- package/msmtp/msmtp.mk | 4 ---- 1 file changed, 4 deletions(-)
package/msmtp/msmtp.mk +0 -4
@@ -46,10 +46,6 @@ 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 MSMTP_CONF_OPTS += --with-tls=no endif
Signature · 1 line
2.20.1
PATCH 2/2 package/mstmp: bump to version 1.8.3
--- package/msmtp/msmtp.hash | 4 ++-- package/msmtp/msmtp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/msmtp/msmtp.hash +2 -2
@@ -1,6 +1,6 @@ # Locally calculated after checking signature -# https://marlam.de/msmtp/releases/msmtp-1.8.0.tar.xz.sig -sha256 bd730cbf000d1b8382849ea21d569a387e63f936be00dc07c569f67915e53ccd msmtp-1.8.0.tar.xz +# https://marlam.de/msmtp/releases/msmtp-1.8.3.tar.xz.sig +sha256 3cb2eefd33d048f0f82de100ef39a494e44fd1485e376ead31f733d2f36b92b4 msmtp-1.8.3.tar.xz # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
package/msmtp/msmtp.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -MSMTP_VERSION = 1.8.0 +MSMTP_VERSION = 1.8.3 MSMTP_SITE = https://marlam.de/msmtp/releases MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz MSMTP_DEPENDENCIES = host-pkgconf
Signature · 1 line
2.20.1
Arnout Vandecappelle
AppliedPATCH 1/2 package/msmtp: drop unneeded static openssl workaround
In reply to Fabrice FontaineQuoted 9 lines · Fabrice Fontaine
msmtp uses pkg-config to find openssl dependencies such as lz or latomic so drop unneeded openssl workaround that was added by
https://git.buildroot.net/buildroot/commit/package/msmtp?id=468bbc1538aaea87beaf455a2ad6ea5a255d5f58I don't know why it was added seven years ago as msmtp already used pkg-config at this time:
https://github.com/marlam/msmtp-mirror/blob/rel-1-4-27/configure.acSigned-off-by Fabrice Fontaine <[email protected]>
Applied both to master, thanks.
Regards,
Arnout
Quoted 20 lines
--- package/msmtp/msmtp.mk | 4 ---- 1 file changed, 4 deletions(-)package/msmtp/msmtp.mk +0
-4@@ -46,10 +46,6 @@ 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 MSMTP_CONF_OPTS += --with-tls=no endif
PATCH 1/2 package/msmtp: drop unneeded static openssl workaround
In reply to Fabrice FontaineQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
msmtp uses pkg-config to find openssl dependencies such as lz or latomic so drop unneeded openssl workaround that was added by
https://git.buildroot.net/buildroot/commit/package/msmtp?id=468bbc1538aaea87beaf455a2ad6ea5a255d5f58I don't know why it was added seven years ago as msmtp already used pkg-config at this time:
https://github.com/marlam/msmtp-mirror/blob/rel-1-4-27/configure.ac
I believe it was because we didn't used to pass --static to pkg-config before
commit 958c9438ccb5e8c8864edf242b6b4ce3b1f058a4
Author: Vicente Olivert Riera <[email protected]> Date: Wed Mar 5 12:19:37 2014 +0000
host-pkgconf: use --static option for static builds
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 package/msmtp: drop unneeded static openssl workaround
In reply to Fabrice FontaineQuoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
msmtp uses pkg-config to find openssl dependencies such as lz or latomic so drop unneeded openssl workaround that was added by
https://git.buildroot.net/buildroot/commit/package/msmtp?id=468bbc1538aaea87beaf455a2ad6ea5a255d5f58I don't know why it was added seven years ago as msmtp already used pkg-config at this time:
https://github.com/marlam/msmtp-mirror/blob/rel-1-4-27/configure.acSigned-off-by Fabrice Fontaine <[email protected]>
Committed to 2019.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard