mosquitto: bump to version 1.5
PATCH 1/1 mosquitto: bump to version 1.5
Remove patch (already in version)
--- ...01-websockets.c-unbreak-build-without-TLS.patch | 49 ---------------------- package/mosquitto/mosquitto.hash | 2 +- package/mosquitto/mosquitto.mk | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 package/mosquitto/0001-websockets.c-unbreak-build-without-TLS.patch
package/mosquitto/0001-websockets.c-unbreak-build-without-TLS.patch deleted +0 -49
@@ -1,49 +0,0 @@ -From 4822aa97da80a86033ec6e4a8b2f4ad0911235cf Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <[email protected]> -Date: Sat, 3 Mar 2018 11:04:47 +0100 -Subject: [PATCH] websockets.c: unbreak build without TLS - -Commit 7943072b1f3b (Fix use_identity_as_username not working on websockets -clients) added code which unconditionally accesses mosq-ssl, breaking the -build when TLS support is disabled. - -Fix it by guarding this logic inside #ifdef WITH_TLS. - -[Upstream: https://dev.eclipse.org/mhonarc/lists/mosquitto-dev/msg01813.html] -Signed-off-by: Peter Korsgaard <[email protected]> ---- - src/websockets.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/websockets.c b/src/websockets.c -index d4d7961..a796f0a 100644 ---- a/src/websockets.c -+++ b/src/websockets.c -@@ -201,12 +201,14 @@ static int callback_mqtt(struct libwebsocket_context *context, - mosq->ws_context = context; - #endif - mosq->wsi = wsi; -+#ifdef WITH_TLS - if(in){ - mosq->ssl = (SSL *)in; - if(!mosq->listener->ssl_ctx){ - mosq->listener->ssl_ctx = SSL_get_SSL_CTX(mosq->ssl); - } - } -+#endif - u->mosq = mosq; - }else{ - return -1; -@@ -240,7 +242,9 @@ static int callback_mqtt(struct libwebsocket_context *context, - mosq->pollfd_index = -1; - } - mosq->wsi = NULL; -+#ifdef WITH_TLS - mosq->ssl = NULL; -+#endif - do_disconnect(db, mosq); - } - break; --- -2.11.0 -
package/mosquitto/mosquitto.hash +1 -1
@@ -1,5 +1,5 @@ # Locally calculated after checking gpg signature -sha256 7d3b3e245a3b4ec94b05678c8199c806359737949f4cfe0bf936184f6ca89a83 mosquitto-1.4.15.tar.gz +sha256 80c9606a906c736fe582b67bdfb650ee45239fea058fe34927f81277d3486e21 mosquitto-1.5.tar.gz # License files sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt
package/mosquitto/mosquitto.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.4.15 +MOSQUITTO_VERSION = 1.5 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10
Signature · 1 line
2.14.1
PATCH 1/1 mosquitto: bump to version 1.5
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Remove patch (already in version)
Signed-off-by Fabrice Fontaine <[email protected]>
How much have you tested this? I haven't followed the discussion on mosquitto-dev in a lot of details, but apparently there is an unresolved crash issue:
https://github.com/eclipse/mosquitto/issues/505
And a compilation issue caused by a variable name change:
https://github.com/eclipse/mosquitto/pull/810
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 mosquitto: bump to version 1.5
Dear Peter,
2018-06-11 22:19 GMT+02:00 Peter Korsgaard <[email protected]>:
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Remove patch (already in version)
Signed-off-by Fabrice Fontaine <[email protected]>How much have you tested this?
I have tested it and it seems to work, mosquitto was starting, basic publish / subscribe was ok.
Quoted 5 lines
I haven't followed the discussion on
mosquitto-dev in a lot of details, but apparently there is an unresolved crash issue:
This issue is indeed still present in v1.5. The following steps leads to a crash on the broker:
- connect
- subscribe to topic/a
- subscribe to topic/b
- unsubscribe from topic/a
- disconnect
PR #531 fixes the issue but was not merged perhaps because there is a conflict in src/database.c that was not fixed. I will send a v2 of my patch to fix this issue.
Quoted 5 lines
And a compilation issue caused by a variable name change:
I didn't encounter this issue because WITH_WRAP is always set to OFF in our builds.
Quoted 5 lines
--
Bye, Peter Korsgaard
Best Regards,
Fabrice
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180612/f69902c4/attachment.html>
PATCH 1/1 mosquitto: bump to version 1.5
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Hi,
Quoted 4 lines
Quoted 1 line
How much have you tested this?
I have tested it and it seems to work, mosquitto was starting, basic publish / subscribe was ok.
Ok.
Quoted 15 lines
Quoted 5 lines
I haven't followed the discussion on
mosquitto-dev in a lot of details, but apparently there is an unresolved crash issue:This issue is indeed still present in v1.5. The following steps leads to a crash on the broker:
- connect
- subscribe to topic/a
- subscribe to topic/b
- unsubscribe from topic/a
- disconnect
Quoted 3 lines
PR #531 fixes the issue but was not merged perhaps because there is a conflict in
src/database.cthat was not fixed. I will send a v2 of my patch to fix this issue.
Ok, thanks!
Signature · 1 line
Bye, Peter Korsgaard