[Buildroot] [PATCH 1/2] libsecret: bump to version 0.18

[Buildroot] [PATCH 1/2] libsecret: bump to version 0.18

[Gustavo Zacarias]

Also add hash file.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/libsecret/libsecret.hash |  2 ++
 package/libsecret/libsecret.mk   | 15 +++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 package/libsecret/libsecret.hash

diff --git a/package/libsecret/libsecret.hash b/package/libsecret/libsecret.hash
new file mode 100644
index 0000000..8e5bbf7
--- /dev/null
+++ b/package/libsecret/libsecret.hash
@@ -0,0 +1,2 @@
+# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.18/libsecret-0.18.sha256sum
+sha256	0c73aa762dbd1e38ba7b03de350e23ce818cb810b0784375e95ef61e004b02e3	libsecret-0.18.tar.xz
diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk
index a059a79..5a230ae 100644
--- a/package/libsecret/libsecret.mk
+++ b/package/libsecret/libsecret.mk
@@ -4,22 +4,21 @@
 #
 ################################################################################
 
-LIBSECRET_VERSION = 0.15
+LIBSECRET_VERSION = 0.18
 LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION)
 LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz
-LIBSECRET_LICENSE = LGPLv2.1+
-LIBSECRET_LICENSE_FILES = COPYING
 LIBSECRET_INSTALL_STAGING = YES
-
 LIBSECRET_DEPENDENCIES = libglib2 host-intltool
 LIBSECRET_CONF_OPTS = --disable-manpages --disable-strict --disable-coverage --enable-vala=no
+LIBSECRET_LICENSE = LGPLv2.1+
+LIBSECRET_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
-	LIBSECRET_DEPENDENCIES += libgcrypt
-	LIBSECRET_CONF_OPTS += --enable-gcrypt \
-		--with-libgcrypt-prefix=$(STAGING_DIR)/usr
+LIBSECRET_DEPENDENCIES += libgcrypt
+LIBSECRET_CONF_OPTS += --enable-gcrypt \
+	--with-libgcrypt-prefix=$(STAGING_DIR)/usr
 else
-	LIBSECRET_CONF_OPTS += --disable-gcrypt
+LIBSECRET_CONF_OPTS += --disable-gcrypt
 endif
 
 $(eval $(autotools-package))
-- 
2.0.5

[Buildroot] [PATCH 2/2] msmtp: bump to version 1.6.0

[Gustavo Zacarias]

Also drop license comment from help, we have PKG_LICENSE* for that.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/msmtp/Config.in  |  2 --
 package/msmtp/msmtp.hash |  5 +++--
 package/msmtp/msmtp.mk   | 20 ++++++++++++--------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/package/msmtp/Config.in b/package/msmtp/Config.in
index 385ad90..46bb198 100644
--- a/package/msmtp/Config.in
+++ b/package/msmtp/Config.in
@@ -5,6 +5,4 @@ config BR2_PACKAGE_MSMTP
 	  mail to an SMTP server (for example at a free mail provider)
 	  which takes care of further delivery.
 
-	  Note that msmtp is licensed under GPLv3.
-
 	  http://msmtp.sourceforge.net/
diff --git a/package/msmtp/msmtp.hash b/package/msmtp/msmtp.hash
index 41c6caa..2196afb 100644
--- a/package/msmtp/msmtp.hash
+++ b/package/msmtp/msmtp.hash
@@ -1,2 +1,3 @@
-# Locally computed:
-sha256  2bf0c5c7e78f9905f48de235a75111a1a88238793043bbeae00360b22f1a5f88  msmtp-1.4.32.tar.bz2
+# From http://sourceforge.net/projects/msmtp/files/msmtp/1.6.0/
+md5	1c166853b63c02ae2ab56b50f1aae57b	msmtp-1.6.0.tar.xz
+sha1	39e597619f797ec3550c0146cd3d9e55e85947eb	msmtp-1.6.0.tar.xz
diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk
index 2d8e630..1c6de16 100644
--- a/package/msmtp/msmtp.mk
+++ b/package/msmtp/msmtp.mk
@@ -4,13 +4,22 @@
 #
 ################################################################################
 
-MSMTP_VERSION = 1.4.32
+MSMTP_VERSION = 1.6.0
 MSMTP_SITE = http://downloads.sourceforge.net/project/msmtp/msmtp/$(MSMTP_VERSION)
-MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.bz2
+MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz
+MSMTP_DEPENDENCIES = host-pkgconf
+MSMTP_CONF_OPTS = \
+	--without-libidn \
+	--without-libgsasl
 MSMTP_LICENSE = GPLv3+
 MSMTP_LICENSE_FILES = COPYING
 
-MSMTP_DEPENDENCIES += host-pkgconf
+ifeq ($(BR2_PACKAGE_LIBSECRET),y)
+MSMTP_CONF_OPTS += --with-libsecret
+MSMTP_DEPENDENCIES += libsecret
+else
+MSMTP_CONF_OPTS += --without-libsecret
+endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 MSMTP_CONF_OPTS += --with-ssl=openssl
@@ -26,9 +35,4 @@ else
 MSMTP_CONF_OPTS += --with-ssl=no
 endif
 
-MSMTP_CONF_OPTS += \
-	--without-libidn \
-	--without-libgsasl \
-	--without-gnome-keyring
-
 $(eval $(autotools-package))
-- 
2.0.5

[Buildroot] [PATCH 2/2] msmtp: bump to version 1.6.0

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Fri,  2 Jan 2015 19:45:07 -0300, Gustavo Zacarias wrote:
> Also drop license comment from help, we have PKG_LICENSE* for that.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

This does much more than that: it adds an optional dependency on
libsecret, and remove --without-gnome-keyring. I've applied the patch
with an edited commit log, but for future patches, try to have more
detailed commit logs (or even do multiple separate patches for separate
issues). Thanks!

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

[Buildroot] [PATCH 1/2] libsecret: bump to version 0.18

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Fri,  2 Jan 2015 19:45:06 -0300, Gustavo Zacarias wrote:
> Also add hash file.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/libsecret/libsecret.hash |  2 ++
>  package/libsecret/libsecret.mk   | 15 +++++++--------
>  2 files changed, 9 insertions(+), 8 deletions(-)
>  create mode 100644 package/libsecret/libsecret.hash

Applied, thanks. It would have been good to mention in the commit log
that you also fixed up the indentation.

Thanks,

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