From 9c77bba174a84e839e61f18814a7699e6d29fcc86e848b74cbafeca4bab0c0a7 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Mon, 14 Dec 2020 13:12:18 +0000 Subject: [PATCH] Accepting request 855502 from home:mnhauke - Update to version 2.0.2 Broker: * Fix DH group not being set for TLS connections, which meant ciphers using DHE couldn't be used. * Fix websockets listeners not causing the main loop not to wake up. Client library: * Fix DH group not being set for TLS connections, which meant ciphers using DHE couldn't be used. Apps: * Fix "mosquitto_passwd -U" Build: - Fix cjson include paths. - Fix build using WITH_TLS=no when the openssl headers aren't available. - Distribute cmake/ and snap/ directories in tar. - Drop patch: * mosquitto-fix-cmake-cjson-detection.patch - Update to version 2.0.0 !!! Mosquitto 2.0 introduces a number of changes to the behaviour of the broker. See the following document for details https://mosquitto.org/documentation/migrating-to-2-0/ Noteworthy changes * Mosquitto is now more secure by default and requires users to take an active decision in how they configure security on their broker, instead of possibly relying on the older very permissive behaviour, as well as dropping privileged access more quickly * A new plugin interface has been introduced which goes beyond OBS-URL: https://build.opensuse.org/request/show/855502 OBS-URL: https://build.opensuse.org/package/show/network:messaging:mqtt/mosquitto?expand=0&rev=46 --- mosquitto-1.6.12.tar.gz | 3 --- mosquitto-1.6.12.tar.gz.sig | 16 ----------- mosquitto-2.0.2.tar.gz | 3 +++ mosquitto-2.0.2.tar.gz.sig | 16 +++++++++++ mosquitto.changes | 54 +++++++++++++++++++++++++++++++++++++ mosquitto.spec | 36 ++++++++++++++----------- 6 files changed, 93 insertions(+), 35 deletions(-) delete mode 100644 mosquitto-1.6.12.tar.gz delete mode 100644 mosquitto-1.6.12.tar.gz.sig create mode 100644 mosquitto-2.0.2.tar.gz create mode 100644 mosquitto-2.0.2.tar.gz.sig diff --git a/mosquitto-1.6.12.tar.gz b/mosquitto-1.6.12.tar.gz deleted file mode 100644 index 80aeb56..0000000 --- a/mosquitto-1.6.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:548d73d19fb787dd0530334e398fd256ef3a581181678488a741a995c4f007fb -size 618718 diff --git a/mosquitto-1.6.12.tar.gz.sig b/mosquitto-1.6.12.tar.gz.sig deleted file mode 100644 index 81ba193..0000000 --- a/mosquitto-1.6.12.tar.gz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEoNbuodyuSaY1o7Lwd5si37PnF7cFAl89LzcACgkQd5si37Pn -F7c/dRAAzKrJj+h9F5p0XEksAwxH5R8IDxASRLBgPE94zSEtQuBxhQHfH81FAT8a -An7i0DAM2hig9nyv8iqVY10SCaSsxqiD3EhY4VGytEIcsQB56LXyrr+YKAWgEIB7 -876X4ZwDUKQzb75mkY8907oFR87yTfLwyy0QrjtJygzKhkVD6sm0BSA7wghmQg3R -26FC3thoV2gLnlTIQA/8s7ZOJRwRyybOt05A4AMmblP6wH/B8bbAKMzruxGj6YVv -Y373k162rkHmYdy3g5DBlQLrUa6C3qcW6wYvmKe8kBMzNlSK0QnqPWoOGOkJ+Q/U -w+iDRdwx1rHgxzzWon93Ipu1muMJgLzy96P/WCEoKmoOXnSe++Z6Hxxe9mktbhPY -cR8O046deQUiF1oRw6sQxkcerj9ZcAekoBOZ3AfMEOZ4huKqI79EkCtYCrrBFxXu -ZXX32hobwMxrOxcKtKSDWODWhrg9y8tFZzPVX9QlAkkhjdG+xgwQhOpjUGTvwykY -wD+U+Nn2r/1lkcGdMXkzYBCCZAEDQ387yIF3QRFPDHDOtgEIcMwx90R3C+6ktSFw -g4L7xb49x39xHtW1zPhQ+tP/JMfRWpjTy0xaK6fQiuyB7AcCJuEKict95g8JsyoC -WYHpyu3yM7thrjT5cQ9wU2JqVS3IZIyt6GPm5vln5uxZUb94T+I= -=kMWd ------END PGP SIGNATURE----- diff --git a/mosquitto-2.0.2.tar.gz b/mosquitto-2.0.2.tar.gz new file mode 100644 index 0000000..df0c3e2 --- /dev/null +++ b/mosquitto-2.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ea9ebf0a5ed3e95cecd75f30ebcf84f054584eff5617ac0f2e60428d3ad9707 +size 749529 diff --git a/mosquitto-2.0.2.tar.gz.sig b/mosquitto-2.0.2.tar.gz.sig new file mode 100644 index 0000000..68a071a --- /dev/null +++ b/mosquitto-2.0.2.tar.gz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEoNbuodyuSaY1o7Lwd5si37PnF7cFAl/SsdAACgkQd5si37Pn +F7eDjRAAvJp4iZGlOSfsTD8EB4L2A7UQquzPYHfrqLSJPEzxJ3ReVCEnJQlYTg9V +FgbJiPZ06XAJzr4jQ3WdBIy5XMnWXBVgMWHiQCnCwkfAUOSswHqvfJsHWNy5w6Fm +ItBWSx07zkBBvJF39ijuke6kzf4NbFDH5UkuTsqpTTQ6mE+olNV32HrNoYkfvCpG +6n2aqygALhi4plN+q5Bn0YpXSNOv38XhZGQ/KLS0+NBSRyr0w3TbJb2jr52qKdPe +59ybfsBF4uKOH/4wz12irwzPJkYH7+jWfy11zli+yweecXC3TQBT/NaE7Gw1Xdw1 +oxlmEFCsE/Y5qqIQw5aVSks/DIKKpqiKyNydg4thUcsTCPPCNjQu3eC9e9/cY3l9 +oYkMNib6LDyVesmOhSN/KbCyVsLV57ZIXmERx12B/pL0+s04HFgx1fM9/dNhZHnN +tnKu3r2+MT4sXl8U/gQKSdUJgi6WTxqOKw89t+PsECuP/OdaCGQucyUMM0BNyudk +xw94rfgLed6PbSRxShy7XN1QqfUQ0EfktxFkHlis+c7g17OIadi39CzMw/VT36T2 +V4TQq6RKWL39DfJeUQX4aYT7BnceRgNGD4OW+Ky8qh7b8zVxkKFv2IsXZwmoUevR +d1o8p4fMir1pB2sZri2aqlkniZYwJTb7jF9DE+rcMIwDWp+XPb0= +=xC3R +-----END PGP SIGNATURE----- diff --git a/mosquitto.changes b/mosquitto.changes index 6b4e684..9890b33 100644 --- a/mosquitto.changes +++ b/mosquitto.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Sat Dec 12 22:03:09 UTC 2020 - Martin Hauke + +- Update to version 2.0.2 + Broker: + * Fix DH group not being set for TLS connections, which meant + ciphers using DHE couldn't be used. + * Fix websockets listeners not causing the main loop not to + wake up. + Client library: + * Fix DH group not being set for TLS connections, which meant + ciphers using DHE couldn't be used. + Apps: + * Fix "mosquitto_passwd -U" + Build: + - Fix cjson include paths. + - Fix build using WITH_TLS=no when the openssl headers aren't + available. + - Distribute cmake/ and snap/ directories in tar. +- Drop patch: + * mosquitto-fix-cmake-cjson-detection.patch + +------------------------------------------------------------------- +Sat Dec 5 17:02:00 UTC 2020 - Martin Hauke + +- Update to version 2.0.0 + !!! Mosquitto 2.0 introduces a number of changes to the + behaviour of the broker. See the following document for details + https://mosquitto.org/documentation/migrating-to-2-0/ + Noteworthy changes + * Mosquitto is now more secure by default and requires users to + take an active decision in how they configure security on + their broker, instead of possibly relying on the older very + permissive behaviour, as well as dropping privileged access + more quickly + * A new plugin interface has been introduced which goes beyond + the existing authentication and access control plugin + interface to offer more plugin capabilities + * A new plugin has been introduced to provide client, group, + and role based authentication and access control. + * The broker performance has been improved, particularly for + higher numbers of clients + * A new utility, mosquitto_ctrl has been added for controlling + aspects of a running broker. + * Bridges now support MQTT v5. + * The mosquitto command line clients have received a variety + of small improvements. mosquitto_sub can now format its + output in fixed column widths, for example, and filter its + output randomly so you can keep an eye on the overall + behaviour of a topic without having to see every message, + for example. +- Add patch: + * mosquitto-fix-cmake-cjson-detection.patch + ------------------------------------------------------------------- Wed Aug 19 19:29:23 UTC 2020 - Martin Hauke diff --git a/mosquitto.spec b/mosquitto.spec index 18cceca..aabdc37 100644 --- a/mosquitto.spec +++ b/mosquitto.spec @@ -20,28 +20,30 @@ %define c_lib libmosquitto1 %define cpp_lib libmosquittopp1 Name: mosquitto -Version: 1.6.12 +Version: 2.0.2 Release: 0 Summary: A MQTT v3.1/v3.1.1 Broker License: EPL-1.0 Group: Productivity/Networking/Other URL: https://mosquitto.org/ Source: https://mosquitto.org/files/source/mosquitto-%{version}.tar.gz -Source98: https://mosquitto.org/files/source/mosquitto-%{version}.tar.gz.asc#/%{name}-%{version}.tar.gz.sig -Source99: %{name}.keyring Source1: mosquitto.service Source4: README-conf-d Source5: README-ca_certificates Source6: README-certs +Source98: https://mosquitto.org/files/source/mosquitto-%{version}.tar.gz.asc#/%{name}-%{version}.tar.gz.sig +Source99: %{name}.keyring Patch0: mosquitto-1.4.1_apparmor.patch Patch1: mosquitto-1.6.8-config.patch BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libcares-devel -BuildRequires: libwebsockets-devel BuildRequires: openssl-devel >= 1.0.0 +BuildRequires: pkgconfig BuildRequires: tcpd-devel BuildRequires: uthash-devel +BuildRequires: pkgconfig(libcares) +BuildRequires: pkgconfig(libcjson) +BuildRequires: pkgconfig(libwebsockets) Requires(pre): shadow %{?systemd_ordering} @@ -116,6 +118,7 @@ find misc -type f -exec chmod a-x "{}" "+" %build %cmake \ + -DCMAKE_SHARED_LINKER_FLAGS="" \ -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \ -DWITH_WEBSOCKETS=ON \ -DUSE_LIBWRAP=OFF @@ -155,13 +158,16 @@ getent passwd %{name} || %{_sbindir}/useradd -g %{name} -s /bin/false -r -c "%{n %postun -n %{cpp_lib} -p /sbin/ldconfig %files -%license LICENSE.txt -%doc edl-v10 epl-v10 -%doc CONTRIBUTING.md ChangeLog.txt readme.md *.html *.example +%license edl-v10 epl-v20 LICENSE.txt +%doc CONTRIBUTING.md ChangeLog.txt *.html *.example %doc examples/ logo/ security/ misc/ %config(noreplace) %attr(-,root,%{name}) %{_sysconfdir}/mosquitto/ %{_bindir}/mosquitto_passwd +%{_bindir}/mosquitto_ctrl +#%%{_bindir}/mosquitto_ctrl_dynsec %{_sbindir}/mosquitto +%{_mandir}/man1/mosquitto_ctrl.1%{?ext_man} +%{_mandir}/man1/mosquitto_ctrl_dynsec.1%{?ext_man} %{_mandir}/man1/mosquitto_passwd.1%{?ext_man} %{_mandir}/man5/mosquitto.conf.5%{?ext_man} %{_mandir}/man7/mosquitto-tls.7%{?ext_man} @@ -169,6 +175,7 @@ getent passwd %{name} || %{_sbindir}/useradd -g %{name} -s /bin/false -r -c "%{n %{_mandir}/man8/mosquitto.8%{?ext_man} %{_unitdir}/%{name}.service %{_sbindir}/rc%{name} +%{_libdir}/mosquitto_dynamic_security.so %dir %attr(-,%{name},%{name}) %{home} %dir %{_sysconfdir}/apparmor.d/ %dir %{_sysconfdir}/apparmor.d/local/ @@ -176,8 +183,7 @@ getent passwd %{name} || %{_sbindir}/useradd -g %{name} -s /bin/false -r -c "%{n %config(noreplace) %{_sysconfdir}/apparmor.d/local/usr.sbin.mosquitto %files clients -%license LICENSE.txt -%doc edl-v10 epl-v10 +%license edl-v10 epl-v20 LICENSE.txt %{_bindir}/mosquitto_pub %{_bindir}/mosquitto_sub %{_bindir}/mosquitto_rr @@ -186,22 +192,20 @@ getent passwd %{name} || %{_sbindir}/useradd -g %{name} -s /bin/false -r -c "%{n %{_mandir}/man1/mosquitto_rr.1%{?ext_man} %files -n %{c_lib} -%license LICENSE.txt -%doc edl-v10 epl-v10 +%license edl-v10 epl-v20 LICENSE.txt %{_libdir}/libmosquitto.so.* %files -n %{cpp_lib} -%license LICENSE.txt -%doc edl-v10 epl-v10 +%license edl-v10 epl-v20 LICENSE.txt %{_libdir}/libmosquittopp.so.* %files devel %{_libdir}/libmosquitto.so %{_libdir}/libmosquittopp.so %{_includedir}/mosquitto.h -%{_includedir}/mosquitto_broker.h -%{_includedir}/mosquitto_plugin.h +%{_includedir}/mosquitto_*.h %{_includedir}/mosquittopp.h +%{_includedir}/mqtt_protocol.h %{_mandir}/man3/libmosquitto.3%{?ext_man} %{_libdir}/pkgconfig/libmosquitto.pc %{_libdir}/pkgconfig/libmosquittopp.pc