Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mosquitto: backport upstream patches to fix compilation #9243

Closed
wants to merge 1 commit into from

Conversation

hnyman
Copy link
Contributor

@hnyman hnyman commented Jun 17, 2019

Maintainer: @karlp

Fix compilation problems by backporting two upstream commits. Patches fix the glibc detection related compilation problems (and random number generation with glibc and without TLS).

Reference to issue #9005

Compile tested: ipq806x/R7800, OpenWrt master
Run tested: -

Karl, any objections for applying the upstream glibc related fix that you seemed to acknowledge a month ago in #9005 ? Mosquitto has been broken in buildbot for a month, now. I noticed this in the collectd version update discussion, so I though to fix it to enable proper compilation of all collectd modules.

References:
bug report #9005

Upstream discussion:
eclipse/mosquitto#1291

Upstream commits:
eclipse/mosquitto@d05bd95
eclipse/mosquitto@b1298df

Fix compilation problems by backporting two upstream commits.
Patches fix the glibc detection related compilation problems
(and random number generation with glibc and without TLS).

Reference to issue openwrt#9005

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
@neheb
Copy link
Contributor

neheb commented Jun 17, 2019

Note that this patch seems wrong too. It compiles but musl itself has getrandom support since version 1.1.20. The proper solution is probably to check it in the configure script.

@karlp
Copy link
Contributor

karlp commented Jun 18, 2019

next release of mosquitto was meant to be on friday, has been pushed out due to eclipse issues internally. changelog is already available, should be tomorrow latest, There's a bunch of other fixes, not just these two, so I hadn't really seen any point in trying to bump it along, though I was expecting this dot release from upstream almost two weeks ago...

@neheb, if you have concerns with the patch, please take it up with upstream directly.

@neheb
Copy link
Contributor

neheb commented Jun 18, 2019

In any case, this should be backported to 19.07 as it fails there. Note that TurrisOS uses mosquitto by default.

@hnyman
Copy link
Contributor Author

hnyman commented Jun 18, 2019

next release of mosquitto was meant to be on friday, has been pushed out due to eclipse issues internally. changelog is already available, should be tomorrow latest,

Well, mosquitto 1.6.3 has now been tagged...

https://github.com/eclipse/mosquitto/releases
7 hours ago
v1.6.3
be73f79 zip tar.gz

I will close this PR as I assume that @karlp will likely issue the version bump instead.

@hnyman hnyman closed this Jun 18, 2019
@karlp
Copy link
Contributor

karlp commented Jun 18, 2019

yes, I started builds for 1907 and master this afternoon when it came out. I'll finish them tomorrow.

karlp added a commit that referenced this pull request Jun 19, 2019
Fixes multiple issues, primarily of interest to OpenWrt:
* getrandom issues with and without TLS and glibc
See #9005 and
#9243

Many many many other fixes related to mqttv5/v3.1.1 interactions and
mqtt5 support options.

Full changelog at: https://mosquitto.org/blog/2019/06/version-1-6-3-released/

Signed-off-by: Karl Palsson <karlp@etactica.com>
karlp added a commit that referenced this pull request Jun 19, 2019
Fixes multiple issues, primarily of interest to OpenWrt:
* getrandom issues with and without TLS and glibc
See #9005 and
#9243

Many many many other fixes related to mqttv5/v3.1.1 interactions and
mqtt5 support options.

Full changelog at: https://mosquitto.org/blog/2019/06/version-1-6-3-released/

Signed-off-by: Karl Palsson <karlp@etactica.com>
@hnyman hnyman deleted the mosq branch June 20, 2019 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants