Skip to contentSkip to conversation

package/mutt: fix activation of openssl on imap

PATCH New Fabrice Fontaine 3 participants 6 messages Dec 23, 2020 – Dec 27, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/mutt: fix activation of openssl on imap

Activation of openssl for imap is broken since commit 0fcd010a2db771c259224ad1d025fb4c5a9baf3b because of the following typo:
BR2_PACKAGET_MUTT_IMAP

---
 package/mutt/mutt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/mutt/mutt.mk +1 -1
index 58c80d445d..cc4b5f56b4 100644
@@ -43,7 +43,7 @@ MUTT_CONF_OPTS += --disable-pop
 endif
 
 # SSL support is only used by imap or pop3 module
-ifneq ($(BR2_PACKAGET_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),)
+ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),)
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 MUTT_DEPENDENCIES += openssl
 MUTT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
Signature · 1 line
2.29.2
#1 lore raw

PATCH 2/3 package/mutt: add zlib optional dependency

zlib is an optional dependency which is enabled by default since version 1.14.1 and
https://gitlab.com/muttmua/mutt/-/commit/136ae0add512f21bc418f9e31a2f1b970ad1a490

---
 package/mutt/mutt.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/mutt/mutt.mk +7 -0
index cc4b5f56b4..4e14004577 100644
@@ -61,6 +61,13 @@ else
 MUTT_CONF_OPTS += --without-sqlite3
 endif
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+MUTT_DEPENDENCIES += zlib
+MUTT_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr
+else
+MUTT_CONF_OPTS += --without-zlib
+endif
+
 # Avoid running tests to check for:
 #  - target system is *BSD
 #  - C99 conformance (snprintf, vsnprintf)
Signature · 1 line
2.29.2
#2 lore raw

PATCH 2/3 package/mutt: add zlib optional dependency

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

zlib is an optional dependency which is enabled by default since version 1.14.1 and
https://gitlab.com/muttmua/mutt/-/commit/136ae0add512f21bc418f9e31a2f1b970ad1a490

Committed to 2020.08.x and 2020.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 3/3 package/mutt: add gnutls optional dependency

In reply to Fabrice Fontaine

gnutls is an optional dependency since version 1.5.7 and
https://gitlab.com/muttmua/mutt/-/commit/457d70d6b10860bae084837024eb34aa3bfbc5fa

---
 package/mutt/mutt.mk | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)
package/mutt/mutt.mk +14 -3
index 4e14004577..67fc4ed838 100644
@@ -46,12 +46,23 @@ endif
 ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),)
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 MUTT_DEPENDENCIES += openssl
-MUTT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
+MUTT_CONF_OPTS += \
+	--without-gnutls \
+	--with-ssl=$(STAGING_DIR)/usr
+else ifeq ($(BR2_PACKAGE_GNUTLS),y)
+MUTT_DEPENDENCIES += gnutls
+MUTT_CONF_OPTS += \
+	--with-gnutls=$(STAGING_DIR)/usr \
+	--without-ssl
 else
-MUTT_CONF_OPTS += --without-ssl
+MUTT_CONF_OPTS += \
+	--without-gnutls \
+	--without-ssl
 endif
 else
-MUTT_CONF_OPTS += --without-ssl
+MUTT_CONF_OPTS += \
+	--without-gnutls \
+	--without-ssl
 endif
 
 ifeq ($(BR2_PACKAGE_SQLITE),y)
Signature · 1 line
2.29.2
#4 lore raw

PATCH 1/3 package/mutt: fix activation of openssl on imap

In reply to Fabrice Fontaine
Quoted 8 lines · On Wed, 23 Dec 2020 11:59:48 +0100 Fabrice Fontaine…

Activation of openssl for imap is broken since commit 0fcd010a2db771c259224ad1d025fb4c5a9baf3b because of the following typo:
BR2_PACKAGET_MUTT_IMAP

---
 package/mutt/mutt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Series applied. Thanks!

Thomas

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

PATCH 1/3 package/mutt: fix activation of openssl on imap

In reply to Fabrice Fontaine
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Activation of openssl for imap is broken since commit 0fcd010a2db771c259224ad1d025fb4c5a9baf3b because of the following typo:
BR2_PACKAGET_MUTT_IMAP

Committed to 2020.02.x, 2020.08.x and 2020.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard