[Buildroot] [PATCH 1/2] mosquitto: bump to version 1.4.11

[Buildroot] [PATCH 1/2] mosquitto: bump to version 1.4.11

[Fabrice Fontaine]

 - This version requires a patch (sent upstream) to remove -lanl from
all Linux builds as this library is only needed for adns support
 - sha512 must be computed locally as eclipse.org does not give it for
this version

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../0001-Remove-lanl-when-WITH_ADNS-is-unset.patch | 32 ++++++++++++++++++++++
 package/mosquitto/mosquitto.hash                   |  4 +--
 package/mosquitto/mosquitto.mk                     |  2 +-
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 package/mosquitto/0001-Remove-lanl-when-WITH_ADNS-is-unset.patch

diff --git a/package/mosquitto/0001-Remove-lanl-when-WITH_ADNS-is-unset.patch b/package/mosquitto/0001-Remove-lanl-when-WITH_ADNS-is-unset.patch
new file mode 100644
index 0000000..f9b1b27
--- /dev/null
+++ b/package/mosquitto/0001-Remove-lanl-when-WITH_ADNS-is-unset.patch
@@ -0,0 +1,32 @@
+From 0de640dd834b6c01c4904e11d51f3a1406c89469 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Mon, 3 Apr 2017 20:34:07 +0200
+Subject: [PATCH] Remove -lanl when WITH_ADNS is unset
+
+Do not add -lanl to BROKER_LIBS for all Linux builds.
+Indeed, -lanl is only needed for getaddrinfo_a which is only used in
+_mosquitto_try_connect_step1 when WITH_ADNS is set
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ config.mk | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/config.mk b/config.mk
+index 6e369c2..44639d2 100644
+--- a/config.mk
++++ b/config.mk
+@@ -159,10 +159,6 @@ ifeq ($(UNAME),QNX)
+ 	LIB_LIBS:=$(LIB_LIBS) -lsocket
+ endif
+ 
+-ifeq ($(UNAME),Linux)
+-	BROKER_LIBS:=$(BROKER_LIBS) -lanl
+-endif
+-
+ ifeq ($(WITH_WRAP),yes)
+ 	BROKER_LIBS:=$(BROKER_LIBS) -lwrap
+ 	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WRAP
+-- 
+2.5.0
+
diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash
index b0b860f..5514c21 100644
--- a/package/mosquitto/mosquitto.hash
+++ b/package/mosquitto/mosquitto.hash
@@ -1,2 +1,2 @@
-# From https://www.eclipse.org/downloads/download.php?file=/mosquitto/source/mosquitto-1.4.10.tar.gz
-sha512  fe5d6d7196a137a496ba6881c77d852396baefb4f0b83ccd9a22175fc05b09e48a09ea249e30ec7db966e11de134ebcc4e2e9b1fd40b31dc59fb0fa2f60b75a1  mosquitto-1.4.10.tar.gz
+# Locally computed:
+sha512  c05ca8679b9a6f540868f4ccf701257fcabc114d5450ac0bbbe80b91bb7cd4fc52668773e945506760c7a5bd8a494e0a56100714112e5d2713d57bfab8951587  mosquitto-1.4.11.tar.gz
diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk
index ddac153..c273c98 100644
--- a/package/mosquitto/mosquitto.mk
+++ b/package/mosquitto/mosquitto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MOSQUITTO_VERSION = 1.4.10
+MOSQUITTO_VERSION = 1.4.11
 MOSQUITTO_SITE = http://mosquitto.org/files/source
 MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0
 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10
-- 
2.5.0

[Buildroot] [PATCH 2/2] mosquitto: enable WITH_ADNS for glibc builds

[Fabrice Fontaine]

WITH_ADNS option has been added in version 1.4.11

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/mosquitto/mosquitto.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk
index c273c98..9ffd149 100644
--- a/package/mosquitto/mosquitto.mk
+++ b/package/mosquitto/mosquitto.mk
@@ -17,6 +17,13 @@ MOSQUITTO_MAKE_OPTS = \
 	WITH_WRAP=no \
 	WITH_DOCS=no
 
+# adns uses getaddrinfo_a
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
+MOSQUITTO_MAKE_OPTS += WITH_ADNS=yes
+else
+MOSQUITTO_MAKE_OPTS += WITH_ADNS=no
+endif
+
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 MOSQUITTO_MAKE_OPTS += WITH_THREADING=yes
 else
-- 
2.5.0

[Buildroot] [PATCH 1/2] mosquitto: bump to version 1.4.11

[Thomas Petazzoni]

Hello,

On Tue,  4 Apr 2017 21:37:29 +0200, Fabrice Fontaine wrote:
>  - This version requires a patch (sent upstream) to remove -lanl from
> all Linux builds as this library is only needed for adns support

And so how does it work when adns support is enabled, by your PATCH
2/2 ?

Thanks,

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

[Buildroot] [PATCH 1/2] mosquitto: bump to version 1.4.11

[Fabrice Fontaine]

Dear Thomas,

2017-04-04 22:01 GMT+02:00 Thomas Petazzoni <
thomas.petazzoni@free-electrons.com>:

> Hello,
>
> On Tue,  4 Apr 2017 21:37:29 +0200, Fabrice Fontaine wrote:
> >  - This version requires a patch (sent upstream) to remove -lanl from
> > all Linux builds as this library is only needed for adns support
>
> And so how does it work when adns support is enabled, by your PATCH
> 2/2 ?
>
When WITH_ADNS is set, the following lines of config.mk will add -lanl
ifeq ($(WITH_ADNS),yes)
    BROKER_LIBS:=$(BROKER_LIBS) -lanl
    BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_ADNS
endif

The issue in the current config.mk was the following lines (removed by my
patch):
ifeq ($(UNAME),Linux)
    BROKER_LIBS:=$(BROKER_LIBS) -lanl
endif

>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
>
Best Regards,

Fabrice
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170404/12478c83/attachment.html>

[Buildroot] [PATCH 1/2] mosquitto: bump to version 1.4.11

[Thomas Petazzoni]

Hello,

On Tue, 4 Apr 2017 22:29:33 +0200, Fabrice Fontaine wrote:

> When WITH_ADNS is set, the following lines of config.mk will add -lanl
> ifeq ($(WITH_ADNS),yes)
>     BROKER_LIBS:=$(BROKER_LIBS) -lanl
>     BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_ADNS
> endif
> 
> The issue in the current config.mk was the following lines (removed by my
> patch):
> ifeq ($(UNAME),Linux)
>     BROKER_LIBS:=$(BROKER_LIBS) -lanl
> endif

OK, thanks, makes sense!

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

[Buildroot] [PATCH 1/2] mosquitto: bump to version 1.4.11

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 >  - This version requires a patch (sent upstream) to remove -lanl from
 > all Linux builds as this library is only needed for adns support
 >  - sha512 must be computed locally as eclipse.org does not give it for
 > this version

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/2] mosquitto: enable WITH_ADNS for glibc builds

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > WITH_ADNS option has been added in version 1.4.11
 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard