[Buildroot] [PATCH v2 1/2] mutt: Bump version to 1.5.23

[Buildroot] [PATCH v2 1/2] mutt: Bump version to 1.5.23

[Bernd Kuhls]

removed upstream applied patch mutt-02-automake.patch
http://dev.mutt.org/trac/changeset/0488deb39a35

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: no changes

 package/mutt/mutt-02-automake.patch |   16 ----------------
 package/mutt/mutt.mk                |    4 ++--
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 package/mutt/mutt-02-automake.patch

diff --git a/package/mutt/mutt-02-automake.patch b/package/mutt/mutt-02-automake.patch
deleted file mode 100644
index 19950a9..0000000
--- a/package/mutt/mutt-02-automake.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix for automake 1.12+
-http://dev.mutt.org/trac/ticket/3579
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura mutt-1.5.21.orig/configure.ac mutt-1.5.21/configure.ac
---- mutt-1.5.21.orig/configure.ac	2013-09-16 11:07:25.699781892 -0300
-+++ mutt-1.5.21/configure.ac	2013-09-16 11:07:45.120419960 -0300
-@@ -27,7 +27,6 @@
- 
- AC_PROG_CC
- AC_ISC_POSIX
--AM_C_PROTOTYPES
- if test "x$U" != "x"; then
-   AC_MSG_ERROR(Compiler not ANSI compliant)
- fi
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index 0c17589..5aa18eb 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-MUTT_VERSION = 1.5.21
-MUTT_SITE = http://downloads.sourceforge.net/project/mutt/mutt-dev
+MUTT_VERSION = 1.5.23
+MUTT_SITE = http://downloads.sourceforge.net/project/mutt/mutt
 MUTT_LICENSE = GPLv2+
 MUTT_LICENSE_FILES = GPL
 MUTT_DEPENDENCIES = ncurses
-- 
1.7.10.4

[Buildroot] [PATCH v2 2/2] mutt: Add options for imap/pop3 support, enable optional iconv/OpenSSL support

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: - do not disable iconv support for toolchains with locale support (Thomas)
    - optimize if-clause for OpenSSL support (Thomas)

 package/mutt/Config.in |   16 +++++++++++++++-
 package/mutt/mutt.mk   |   31 ++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/package/mutt/Config.in b/package/mutt/Config.in
index 430eeb8..372c137 100644
--- a/package/mutt/Config.in
+++ b/package/mutt/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_MUTT
+menuconfig BR2_PACKAGE_MUTT
 	bool "mutt"
 	depends on BR2_USE_WCHAR
 	depends on BR2_USE_MMU # fork()
@@ -8,6 +8,20 @@ config BR2_PACKAGE_MUTT
 
 	  http://www.mutt.org/
 
+if BR2_PACKAGE_MUTT
+
+config BR2_PACKAGE_MUTT_IMAP
+	bool "imap"
+	help
+	  IMAP support
+
+config BR2_PACKAGE_MUTT_POP3
+	bool "pop3"
+	help
+	  POP3 support
+
+endif # BR2_PACKAGE_MUTT
+
 comment "mutt needs a toolchain w/ wchar"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index 5aa18eb..633b2af 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -9,7 +9,36 @@ MUTT_SITE = http://downloads.sourceforge.net/project/mutt/mutt
 MUTT_LICENSE = GPLv2+
 MUTT_LICENSE_FILES = GPL
 MUTT_DEPENDENCIES = ncurses
-MUTT_CONF_OPT = --disable-iconv --disable-smtp
+MUTT_CONF_OPT = --disable-smtp
 MUTT_AUTORECONF = YES
 
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+MUTT_DEPENDENCIES += libiconv
+MUTT_CONF_OPT += --enable-iconv
+endif
+
+ifeq ($(BR2_PACKAGE_MUTT_IMAP),y)
+MUTT_CONF_OPT += --enable-imap
+else
+MUTT_CONF_OPT += --disable-imap
+endif
+
+ifeq ($(BR2_PACKAGE_MUTT_POP3),y)
+MUTT_CONF_OPT += --enable-pop
+else
+MUTT_CONF_OPT += --disable-pop
+endif
+
+# SSL support is only used by imap or pop3 module
+ifneq ($(BR2_PACKAGET_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),)
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+MUTT_DEPENDENCIES += openssl
+MUTT_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr
+else
+MUTT_CONF_OPT += --without-ssl
+endif
+else
+MUTT_CONF_OPT += --without-ssl
+endif
+
 $(eval $(autotools-package))
-- 
1.7.10.4

[Buildroot] [PATCH v2 2/2] mutt: Add options for imap/pop3 support, enable optional iconv/OpenSSL support

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sun, 13 Apr 2014 14:14:17 +0200, Bernd Kuhls wrote:
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: - do not disable iconv support for toolchains with locale support (Thomas)
>     - optimize if-clause for OpenSSL support (Thomas)

Applied, thanks. However, I've kept a 'config BR2_PACKAGE_MUTT' and not
switched to a 'menuconfig BR2_PACKAGE_MUTT'. There are not enough
sub-options for now to warrant a menuconfig for mutt I believe.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v2 1/2] mutt: Bump version to 1.5.23

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sun, 13 Apr 2014 14:14:16 +0200, Bernd Kuhls wrote:
> removed upstream applied patch mutt-02-automake.patch
> http://dev.mutt.org/trac/changeset/0488deb39a35
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: no changes

Applied.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com