From 9c77bba174a84e839e61f18814a7699e6d29fcc86e848b74cbafeca4bab0c0a7 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Mon, 14 Dec 2020 13:12:18 +0000 Subject: [PATCH 1/6] 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 From bb4d9422c51e4142c2e7a68877a7f54a86e3e3021adb078046f5d7b82d0d8cd9 Mon Sep 17 00:00:00 2001 From: Martin Hauke Date: Sat, 26 Dec 2020 20:38:30 +0000 Subject: [PATCH 2/6] Accepting request 858370 from home:mnhauke - Update to version 2.0.4 Broker: * Fix $SYS/broker/publish/messages/+ counters not being updated for QoS 1, 2 messages. * mosquitto_connect_bind_async() and mosquitto_connect_bind_v5() should not reset the bind address option if called with bind_address == NULL. * Add more log messages for dynsec load/save error conditions. Build: * Fix man pages not being built when using CMake. - Update to version 2.0.3 Security: * Running mosquitto_passwd with the following arguments only `mosquitto_passwd -b password_file username password` would cause the username to be used as the password. Broker: * Fix LWT not being sent on client takeover when the existing session wasn't being continued. * Fix bridges possibly not completing connections when WITH_ADNS is in use. * Fix QoS 0 messages not being delivered if max_queued_messages was set to 0. * Fix local bridges being disconnected on SIGHUP. * Fix slow initial bridge connections for WITH_ADNS=no. * Fix persistence_location not appending a '/'. Clients: * Fix mosquitto_sub being unable to terminate with Ctrl-C if a successful connection is not made. Apps: * Fix `mosquitto_passwd -b` using username as password (not if OBS-URL: https://build.opensuse.org/request/show/858370 OBS-URL: https://build.opensuse.org/package/show/network:messaging:mqtt/mosquitto?expand=0&rev=47 --- mosquitto-2.0.2.tar.gz | 3 --- mosquitto-2.0.2.tar.gz.sig | 16 ---------------- mosquitto-2.0.4.tar.gz | 3 +++ mosquitto-2.0.4.tar.gz.sig | 16 ++++++++++++++++ mosquitto.changes | 37 +++++++++++++++++++++++++++++++++++++ mosquitto.spec | 2 +- 6 files changed, 57 insertions(+), 20 deletions(-) delete mode 100644 mosquitto-2.0.2.tar.gz delete mode 100644 mosquitto-2.0.2.tar.gz.sig create mode 100644 mosquitto-2.0.4.tar.gz create mode 100644 mosquitto-2.0.4.tar.gz.sig diff --git a/mosquitto-2.0.2.tar.gz b/mosquitto-2.0.2.tar.gz deleted file mode 100644 index df0c3e2..0000000 --- a/mosquitto-2.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 68a071a..0000000 --- a/mosquitto-2.0.2.tar.gz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------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-2.0.4.tar.gz b/mosquitto-2.0.4.tar.gz new file mode 100644 index 0000000..63875c7 --- /dev/null +++ b/mosquitto-2.0.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba3126d82533fe40a18cf1a989e61eaea887e81829cd93518149e73553d20f10 +size 751539 diff --git a/mosquitto-2.0.4.tar.gz.sig b/mosquitto-2.0.4.tar.gz.sig new file mode 100644 index 0000000..63ee9b5 --- /dev/null +++ b/mosquitto-2.0.4.tar.gz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEoNbuodyuSaY1o7Lwd5si37PnF7cFAl/iJX8ACgkQd5si37Pn +F7d4PRAAzhH7prRiWmdD7ey1MkQGQ5sMqb1W70uKAzKP3+2A8WPyUR0BbFkY25eB +cV1008rZaHVRmCH2/6hGK7kfGvReJPs4pQC8Hbb8Gh8mx32DKrKWmMYY4Vy25sa9 +KXgx4Bb0pMCZI61IlXqNKfNzHbj0AMs6x42EawAurjEAaw88TnjGp2tq0qims6jJ +LGXu3OsrGvjfqE84MOhQ3eyRffdkgvakPPubIymnuFv8VSA2W409Ce2ms54Iqsdc +Ngty42M02HvV5/Z1/+ZT1C/tgMvHHaUkknzK09NhW3+XAkbFsRI6muFwDUrPGNCd +6gL2KUixs3aacDaN4O4bRg8CPq9X3PA5Y8uAm4fh3PPpk1vA2Amv3mv/Rlpn8rYa +JqnTYcIXvdNWU3OWgmgCc8LJhjOG5o2CeK3GmRaMevZrnLqGXgYjY+5cAx5E4Mph +Ln3P8mWpJH67MaiEuI0envfYodwnWJBTVTVCj7uQALnOvtCSZUlnSvQFMp3oRR6K +Wk8iWXvrM4eCfOM5EYPziqbIOwWYY5XH+RnoxYw9dGNUwbJAm3q7WFxEnezTdGNo +NIjsKtFprAfXZ7xjahsi0x/mAe/iKm5s6F7VPzZoczjo68vSKVaBkCkmB5EJdREP +iZpXBOsEVkkFs4HUc9erjs/K+4cW/ShTE/DnecRSyzy/7Gtq9DQ= +=SaB8 +-----END PGP SIGNATURE----- diff --git a/mosquitto.changes b/mosquitto.changes index 9890b33..f00eb5e 100644 --- a/mosquitto.changes +++ b/mosquitto.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Wed Dec 23 17:12:17 UTC 2020 - Martin Hauke + +- Update to version 2.0.4 + Broker: + * Fix $SYS/broker/publish/messages/+ counters not being updated + for QoS 1, 2 messages. + * mosquitto_connect_bind_async() and mosquitto_connect_bind_v5() + should not reset the bind address option if called with + bind_address == NULL. + * Add more log messages for dynsec load/save error conditions. + Build: + * Fix man pages not being built when using CMake. +- Update to version 2.0.3 + Security: + * Running mosquitto_passwd with the following arguments only + `mosquitto_passwd -b password_file username password` would + cause the username to be used as the password. + Broker: + * Fix LWT not being sent on client takeover when the existing + session wasn't being continued. + * Fix bridges possibly not completing connections when WITH_ADNS + is in use. + * Fix QoS 0 messages not being delivered if max_queued_messages + was set to 0. + * Fix local bridges being disconnected on SIGHUP. + * Fix slow initial bridge connections for WITH_ADNS=no. + * Fix persistence_location not appending a '/'. + Clients: + * Fix mosquitto_sub being unable to terminate with Ctrl-C if a + successful connection is not made. + Apps: + * Fix `mosquitto_passwd -b` using username as password (not if + `-c` is also used). + Build: + * Fix `install` target when using WITH_CJSON=no. + ------------------------------------------------------------------- Sat Dec 12 22:03:09 UTC 2020 - Martin Hauke diff --git a/mosquitto.spec b/mosquitto.spec index aabdc37..3aa3d26 100644 --- a/mosquitto.spec +++ b/mosquitto.spec @@ -20,7 +20,7 @@ %define c_lib libmosquitto1 %define cpp_lib libmosquittopp1 Name: mosquitto -Version: 2.0.2 +Version: 2.0.4 Release: 0 Summary: A MQTT v3.1/v3.1.1 Broker License: EPL-1.0 From 011170316e3505e55510962c6e7079ff59805b2186ec3f89cb32ce9b4a9bc5c4 Mon Sep 17 00:00:00 2001 From: Martin Hauke Date: Sun, 7 Feb 2021 20:09:41 +0000 Subject: [PATCH 3/6] Accepting request 870017 from home:mnhauke - Update to version 2.0.7 Broker: * Fix some minor memory leaks on exit only. * Fix possible memory leak on connect. * Fix openssl engine not being able to load private key. Clients: * Fix config files truncating options after the first space. Build: - Fix man page building to not absolutely require xsltproc when using CMake. - Update to version 2.0.6 Broker: * Fix calculation of remaining length parameter for websockets clients that send fragmented packets. Broker: * Fix potential duplicate Will messages being sent when a will delay interval has been set. * Fix message expiry interval property not being honoured in `mosquitto_broker_publish` and `mosquitto_broker_publish_copy`. * Fix websockets listeners with TLS not responding. * Improve logging in obscure cases when a client disconnects. * Fix reloading of listeners where multiple listeners have been defined with the same port but different bind addresses. * Fix `message_size_limit` not applying to the Will payload. * The error topic-alias-invalid was being sent if an MQTT v5 client published a message with empty topic and topic alias set, but the topic alias hadn't already been configured on the broker. This has been fixed to send a protocol error, as per section 3.3.4 of the specification. * Note in the man pages that SIGHUP reloads TLS certificates. OBS-URL: https://build.opensuse.org/request/show/870017 OBS-URL: https://build.opensuse.org/package/show/network:messaging:mqtt/mosquitto?expand=0&rev=48 --- mosquitto-2.0.4.tar.gz | 3 -- mosquitto-2.0.4.tar.gz.sig | 16 --------- mosquitto-2.0.7.tar.gz | 3 ++ mosquitto-2.0.7.tar.gz.sig | 16 +++++++++ mosquitto.changes | 70 ++++++++++++++++++++++++++++++++++++++ mosquitto.spec | 5 +-- 6 files changed, 92 insertions(+), 21 deletions(-) delete mode 100644 mosquitto-2.0.4.tar.gz delete mode 100644 mosquitto-2.0.4.tar.gz.sig create mode 100644 mosquitto-2.0.7.tar.gz create mode 100644 mosquitto-2.0.7.tar.gz.sig diff --git a/mosquitto-2.0.4.tar.gz b/mosquitto-2.0.4.tar.gz deleted file mode 100644 index 63875c7..0000000 --- a/mosquitto-2.0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba3126d82533fe40a18cf1a989e61eaea887e81829cd93518149e73553d20f10 -size 751539 diff --git a/mosquitto-2.0.4.tar.gz.sig b/mosquitto-2.0.4.tar.gz.sig deleted file mode 100644 index 63ee9b5..0000000 --- a/mosquitto-2.0.4.tar.gz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEoNbuodyuSaY1o7Lwd5si37PnF7cFAl/iJX8ACgkQd5si37Pn -F7d4PRAAzhH7prRiWmdD7ey1MkQGQ5sMqb1W70uKAzKP3+2A8WPyUR0BbFkY25eB -cV1008rZaHVRmCH2/6hGK7kfGvReJPs4pQC8Hbb8Gh8mx32DKrKWmMYY4Vy25sa9 -KXgx4Bb0pMCZI61IlXqNKfNzHbj0AMs6x42EawAurjEAaw88TnjGp2tq0qims6jJ -LGXu3OsrGvjfqE84MOhQ3eyRffdkgvakPPubIymnuFv8VSA2W409Ce2ms54Iqsdc -Ngty42M02HvV5/Z1/+ZT1C/tgMvHHaUkknzK09NhW3+XAkbFsRI6muFwDUrPGNCd -6gL2KUixs3aacDaN4O4bRg8CPq9X3PA5Y8uAm4fh3PPpk1vA2Amv3mv/Rlpn8rYa -JqnTYcIXvdNWU3OWgmgCc8LJhjOG5o2CeK3GmRaMevZrnLqGXgYjY+5cAx5E4Mph -Ln3P8mWpJH67MaiEuI0envfYodwnWJBTVTVCj7uQALnOvtCSZUlnSvQFMp3oRR6K -Wk8iWXvrM4eCfOM5EYPziqbIOwWYY5XH+RnoxYw9dGNUwbJAm3q7WFxEnezTdGNo -NIjsKtFprAfXZ7xjahsi0x/mAe/iKm5s6F7VPzZoczjo68vSKVaBkCkmB5EJdREP -iZpXBOsEVkkFs4HUc9erjs/K+4cW/ShTE/DnecRSyzy/7Gtq9DQ= -=SaB8 ------END PGP SIGNATURE----- diff --git a/mosquitto-2.0.7.tar.gz b/mosquitto-2.0.7.tar.gz new file mode 100644 index 0000000..7f2c3dd --- /dev/null +++ b/mosquitto-2.0.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a98054f0b8161588975ef24e1d467550d3935f4c16ccee63ecb623248a28356e +size 756625 diff --git a/mosquitto-2.0.7.tar.gz.sig b/mosquitto-2.0.7.tar.gz.sig new file mode 100644 index 0000000..5880956 --- /dev/null +++ b/mosquitto-2.0.7.tar.gz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEoNbuodyuSaY1o7Lwd5si37PnF7cFAmAbyRQACgkQd5si37Pn +F7eGhBAA19cgL5pC2++Cwi62GTIkeiQzlly6uthf8iYqsKzq3Q/REknH38y3u/0J +xQVCgqAej2WFXJN4mVZgeXwIvsokdjeeQIz4LSHOAPjSs4By2X+a8SufYYZzLLaA +ZIG2LmnqEg9YJZfqrCkUwdC2+PJ1S7Elc+0W2YV0Rxm/gfbtcaRs3XRqmgPtJNJz +MQqg1JJA3KPqA7ru4RCHSWMNjK3/LTgPVNDWxX8txN2T1jCCXcjnuBQTo3dPytGt +xI5Xly1l3pDtml1tnTH5IGMtO73A2MM3GHNcKQSHJ4i5LyGJAa5I1f0inQycW2zm +HEbNsFmRBJ3NIukex1DqHQuj7TRDFBsU0VvYoovSEoLN0+l3+FFfKmndjCc/41s9 +TX/Zk7DplhXRR8w2uz/dpgoejLeqF3Qnnpxm3AAQTtFEyvLzrhYO4onxhnD4S5O7 +Vbqlt5vlZhkJqzimQsleBcwnmi3xwkU6l9EeI/S4uuJBvMOopKykEyj/aijbZsc4 +mwS+Yj7FLLiHPUjm8R3PWkL5OCHRQ2OtXzklHwLr3LC6MT02Tcpo6vzPdADDzGyr +Ml1kaRXTufZfNwqJFni+elFAmyPp7aG+U9aNY8Qr6jJG5p5jSmBuC8BAcV145aTb +iDeXxyVmO2BZaCzIBcPphqkzLuszJdP2LTemdPf11//fiobpF7M= +=zyy4 +-----END PGP SIGNATURE----- diff --git a/mosquitto.changes b/mosquitto.changes index f00eb5e..c02aff5 100644 --- a/mosquitto.changes +++ b/mosquitto.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat Feb 6 21:36:22 UTC 2021 - Martin Hauke + +- Update to version 2.0.7 + Broker: + * Fix some minor memory leaks on exit only. + * Fix possible memory leak on connect. + * Fix openssl engine not being able to load private key. + Clients: + * Fix config files truncating options after the first space. + Build: + - Fix man page building to not absolutely require xsltproc when + using CMake. +- Update to version 2.0.6 + Broker: + * Fix calculation of remaining length parameter for websockets + clients that send fragmented packets. + Broker: + * Fix potential duplicate Will messages being sent when a will + delay interval has been set. + * Fix message expiry interval property not being honoured in + `mosquitto_broker_publish` and `mosquitto_broker_publish_copy`. + * Fix websockets listeners with TLS not responding. + * Improve logging in obscure cases when a client disconnects. + * Fix reloading of listeners where multiple listeners have been + defined with the same port but different bind addresses. + * Fix `message_size_limit` not applying to the Will payload. + * The error topic-alias-invalid was being sent if an MQTT v5 + client published a message with empty topic and topic alias + set, but the topic alias hadn't already been configured on + the broker. This has been fixed to send a protocol error, as + per section 3.3.4 of the specification. + * Note in the man pages that SIGHUP reloads TLS certificates. + Apps: + * Allow command line arguments to override config file options in + mosquitto_ctrl. + * mosquitto_ctrl: produce an error when requesting a new password + if both attempts do not match. + +------------------------------------------------------------------- +Tue Jan 12 07:45:11 UTC 2021 - Martin Hauke + +- Update to version 2.0.5 + Broker: + * Fix "auth_method" not being provided to the extended auth + plugin event. + * Fix large packets not being completely published to slow + clients. + * Fix bridge connection not relinquishing POLLOUT after messages + are sent. + * Fix apparmor incorrectly denying access to + /var/lib/mosquitto/mosquitto.db.new. + * Fix potential intermittent initial bridge connections when + using poll(). + * Fix "bind_interface" option. + * Fix invalid behaviour in dynsec plugin if a group or client is + deleted before a role that was attached to the group or client + is deleted. + * Improve logging in dynsec addGroupRole/addGroupClient commands. + Client library: + * Improve documentation around the "_v5()" and non-v5 functions, + e.g. `mosquitto_publish()` and `mosquitto_publish_v5(). + Build: + * "install" Makefile target should depend on "all", not + "mosquitto", to ensure that man pages are always built. + Apps: + * Disallow control characters in mosquitto_passwd usernames. + * Fix incorrect description in mosquitto_ctrl man page. + * Fix `mosquitto_ctrl dynsec getGroup` not showing roles. + ------------------------------------------------------------------- Wed Dec 23 17:12:17 UTC 2020 - Martin Hauke diff --git a/mosquitto.spec b/mosquitto.spec index 3aa3d26..70c8b3d 100644 --- a/mosquitto.spec +++ b/mosquitto.spec @@ -1,7 +1,7 @@ # # spec file for package mosquitto # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define c_lib libmosquitto1 %define cpp_lib libmosquittopp1 Name: mosquitto -Version: 2.0.4 +Version: 2.0.7 Release: 0 Summary: A MQTT v3.1/v3.1.1 Broker License: EPL-1.0 @@ -37,6 +37,7 @@ Patch0: mosquitto-1.4.1_apparmor.patch Patch1: mosquitto-1.6.8-config.patch BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: libxslt-tools BuildRequires: openssl-devel >= 1.0.0 BuildRequires: pkgconfig BuildRequires: tcpd-devel From 18084c4dbe7593ba0cfa406500956c43a68d5da9f189e7daca4ea6d7ad506f82 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Mon, 1 Mar 2021 10:49:00 +0000 Subject: [PATCH 4/6] Accepting request 875783 from home:mnhauke - Update to version 2.0.8 Broker: * Fix incorrect datatypes in `struct mosquitto_evt_tick`. This changes the size and offset of two of the members of this struct, and changes the size of the struct. This is an ABI break, but is considered to be acceptable because plugins should never be allocating their own instance of this struct, and currently none of the struct members are used for anything, so a plugin should not be accessing them. It would also be safe to read/write from the existing struct parameters. * Give compile time warning if libwebsockets compiled without external poll support. Client library: * Fix mosquitto_{pub|sub}_topic_check() functions not returning MOSQ_ERR_INVAL on topic == NULL. Clients: * Fix possible loss of data in `mosquitto_pub -l` when sending multiple long lines. OBS-URL: https://build.opensuse.org/request/show/875783 OBS-URL: https://build.opensuse.org/package/show/network:messaging:mqtt/mosquitto?expand=0&rev=49 --- mosquitto-2.0.7.tar.gz | 3 --- mosquitto-2.0.7.tar.gz.sig | 16 ---------------- mosquitto-2.0.8.tar.gz | 3 +++ mosquitto-2.0.8.tar.gz.sig | 16 ++++++++++++++++ mosquitto.changes | 22 ++++++++++++++++++++++ mosquitto.spec | 2 +- 6 files changed, 42 insertions(+), 20 deletions(-) delete mode 100644 mosquitto-2.0.7.tar.gz delete mode 100644 mosquitto-2.0.7.tar.gz.sig create mode 100644 mosquitto-2.0.8.tar.gz create mode 100644 mosquitto-2.0.8.tar.gz.sig diff --git a/mosquitto-2.0.7.tar.gz b/mosquitto-2.0.7.tar.gz deleted file mode 100644 index 7f2c3dd..0000000 --- a/mosquitto-2.0.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a98054f0b8161588975ef24e1d467550d3935f4c16ccee63ecb623248a28356e -size 756625 diff --git a/mosquitto-2.0.7.tar.gz.sig b/mosquitto-2.0.7.tar.gz.sig deleted file mode 100644 index 5880956..0000000 --- a/mosquitto-2.0.7.tar.gz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEoNbuodyuSaY1o7Lwd5si37PnF7cFAmAbyRQACgkQd5si37Pn -F7eGhBAA19cgL5pC2++Cwi62GTIkeiQzlly6uthf8iYqsKzq3Q/REknH38y3u/0J -xQVCgqAej2WFXJN4mVZgeXwIvsokdjeeQIz4LSHOAPjSs4By2X+a8SufYYZzLLaA -ZIG2LmnqEg9YJZfqrCkUwdC2+PJ1S7Elc+0W2YV0Rxm/gfbtcaRs3XRqmgPtJNJz -MQqg1JJA3KPqA7ru4RCHSWMNjK3/LTgPVNDWxX8txN2T1jCCXcjnuBQTo3dPytGt -xI5Xly1l3pDtml1tnTH5IGMtO73A2MM3GHNcKQSHJ4i5LyGJAa5I1f0inQycW2zm -HEbNsFmRBJ3NIukex1DqHQuj7TRDFBsU0VvYoovSEoLN0+l3+FFfKmndjCc/41s9 -TX/Zk7DplhXRR8w2uz/dpgoejLeqF3Qnnpxm3AAQTtFEyvLzrhYO4onxhnD4S5O7 -Vbqlt5vlZhkJqzimQsleBcwnmi3xwkU6l9EeI/S4uuJBvMOopKykEyj/aijbZsc4 -mwS+Yj7FLLiHPUjm8R3PWkL5OCHRQ2OtXzklHwLr3LC6MT02Tcpo6vzPdADDzGyr -Ml1kaRXTufZfNwqJFni+elFAmyPp7aG+U9aNY8Qr6jJG5p5jSmBuC8BAcV145aTb -iDeXxyVmO2BZaCzIBcPphqkzLuszJdP2LTemdPf11//fiobpF7M= -=zyy4 ------END PGP SIGNATURE----- diff --git a/mosquitto-2.0.8.tar.gz b/mosquitto-2.0.8.tar.gz new file mode 100644 index 0000000..afaf6a3 --- /dev/null +++ b/mosquitto-2.0.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b15da8fc4edcb91d554e1259e220ea0173ef639ceaa4b465e06feb7e125b84bf +size 756636 diff --git a/mosquitto-2.0.8.tar.gz.sig b/mosquitto-2.0.8.tar.gz.sig new file mode 100644 index 0000000..7ffbcaf --- /dev/null +++ b/mosquitto-2.0.8.tar.gz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEoNbuodyuSaY1o7Lwd5si37PnF7cFAmA33jMACgkQd5si37Pn +F7eACxAAruozs3XCNjAXIGDWvnnxD13qbgmft5XVD6RVKINvmp18/zsIooJ/eqUE +s/H9wqHC6SNqThWh+2s7TdBC9Nrdv1AgeMEVAgL/PTdnMATQTfz7Wcg6XwObNa8e +wXRFntsX8KwBIow6slDw5kepqMgL/ByHFtEWvvGKElnZ0FRAqNyfzrL/4njvPet0 +sh/CB0BYYIuL8hVZ/NWJHWpoTbE02pBY6ZmDGCjI4+EsP6xZNPoRsIKWUBastz4M +uA2KCursxn3pKviZnMLrlT8vfogESUh/33+AhiubRuyg8IgOkJgxTV0xmBKXEq7s +ZLqacFHKVYXB6iwTbSPi90cmHHI4eivibq1peV6SfyTyQUPv+J2wN4rHTfGjFFCO ++vcRZPgGa4yO1Iv18PzScoVznOtsfQBuBDQ3CqoEDF74zvSfo7Nkda8gEfdbcIBI +WyLycbNzDDBmu8sJyx/2mGht2KSnkNi9sB+AOBGtNAZfsXzLzGPwEYpI7TSUKgKB +cTZKsBt2osfpB/Kpx7BpWVhq+wloexfhZanX59DHGqrI0hv0sISUmg63a+m86yH2 +UhNDNQGBCW5H3Xrcs5UdcagUVQtjTYe8SM1YbpFGYkm1ZRi0gFqL7nzvkd8TFMOc +XYWfjQ7YCZtwdlD3iuK0I9ASfFZNrXh6CTebrhw497O2O03UjUA= +=D++5 +-----END PGP SIGNATURE----- diff --git a/mosquitto.changes b/mosquitto.changes index c02aff5..c4068fd 100644 --- a/mosquitto.changes +++ b/mosquitto.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sun Feb 28 12:56:09 UTC 2021 - Martin Hauke + +- Update to version 2.0.8 + Broker: + * Fix incorrect datatypes in `struct mosquitto_evt_tick`. This + changes the size and offset of two of the members of this + struct, and changes the size of the struct. This is an ABI + break, but is considered to be acceptable because plugins + should never be allocating their own instance of this struct, + and currently none of the struct members are used for anything, + so a plugin should not be accessing them. It would also be + safe to read/write from the existing struct parameters. + * Give compile time warning if libwebsockets compiled without + external poll support. + Client library: + * Fix mosquitto_{pub|sub}_topic_check() functions not returning + MOSQ_ERR_INVAL on topic == NULL. + Clients: + * Fix possible loss of data in `mosquitto_pub -l` when sending + multiple long lines. + ------------------------------------------------------------------- Sat Feb 6 21:36:22 UTC 2021 - Martin Hauke diff --git a/mosquitto.spec b/mosquitto.spec index 70c8b3d..8d7a4b6 100644 --- a/mosquitto.spec +++ b/mosquitto.spec @@ -20,7 +20,7 @@ %define c_lib libmosquitto1 %define cpp_lib libmosquittopp1 Name: mosquitto -Version: 2.0.7 +Version: 2.0.8 Release: 0 Summary: A MQTT v3.1/v3.1.1 Broker License: EPL-1.0 From 7507500d4269caae531120397481c15c6d079892c472b92729ed138ade3ff4e8 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Thu, 11 Mar 2021 12:29:52 +0000 Subject: [PATCH 5/6] - Convert some of the BuildRequires from package names to pkgconfig(): libcares, libcjson, libwebsockets - Fix linking of modules: - Add fix-undefined-symbols-in-plugins.patch - revert old workaround of settings -DCMAKE_SHARED_LINKER_FLAGS= - Update mosquitto-1.6.8-config.patch: Set a short profilename for a cleaner ps aufxZ output - Refreshed mosquitto-1.6.8-config.patch to apply cleanly again OBS-URL: https://build.opensuse.org/package/show/network:messaging:mqtt/mosquitto?expand=0&rev=50 --- fix-undefined-symbols-in-plugins.patch | 52 ++++++++++++++++++++++++++ mosquitto-1.4.1_apparmor.patch | 14 ++++--- mosquitto-1.6.8-config.patch | 8 ++-- mosquitto.changes | 20 ++++++++++ mosquitto.spec | 3 +- 5 files changed, 88 insertions(+), 9 deletions(-) create mode 100644 fix-undefined-symbols-in-plugins.patch diff --git a/fix-undefined-symbols-in-plugins.patch b/fix-undefined-symbols-in-plugins.patch new file mode 100644 index 0000000..d40e4ec --- /dev/null +++ b/fix-undefined-symbols-in-plugins.patch @@ -0,0 +1,52 @@ +Index: mosquitto-2.0.8/plugins/auth-by-ip/CMakeLists.txt +=================================================================== +--- mosquitto-2.0.8.orig/plugins/auth-by-ip/CMakeLists.txt ++++ mosquitto-2.0.8/plugins/auth-by-ip/CMakeLists.txt +@@ -1,7 +1,7 @@ + include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/include + ${STDBOOL_H_PATH} ${STDINT_H_PATH}) + +-add_library(mosquitto_auth_by_ip SHARED mosquitto_auth_by_ip.c) ++add_library(mosquitto_auth_by_ip MODULE mosquitto_auth_by_ip.c) + set_target_properties(mosquitto_auth_by_ip PROPERTIES + POSITION_INDEPENDENT_CODE 1 + ) +Index: mosquitto-2.0.8/plugins/dynamic-security/CMakeLists.txt +=================================================================== +--- mosquitto-2.0.8.orig/plugins/dynamic-security/CMakeLists.txt ++++ mosquitto-2.0.8/plugins/dynamic-security/CMakeLists.txt +@@ -12,7 +12,7 @@ if (CJSON_FOUND AND WITH_TLS) + include_directories(${CLIENT_INC}) + link_directories(${CLIENT_DIR} ${mosquitto_SOURCE_DIR}) + +- add_library(mosquitto_dynamic_security SHARED ++ add_library(mosquitto_dynamic_security MODULE + acl.c + auth.c + clients.c +Index: mosquitto-2.0.8/plugins/message-timestamp/CMakeLists.txt +=================================================================== +--- mosquitto-2.0.8.orig/plugins/message-timestamp/CMakeLists.txt ++++ mosquitto-2.0.8/plugins/message-timestamp/CMakeLists.txt +@@ -1,7 +1,7 @@ + include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/include + ${STDBOOL_H_PATH} ${STDINT_H_PATH}) + +-add_library(mosquitto_message_timestamp SHARED mosquitto_message_timestamp.c) ++add_library(mosquitto_message_timestamp MODULE mosquitto_message_timestamp.c) + set_target_properties(mosquitto_message_timestamp PROPERTIES + POSITION_INDEPENDENT_CODE 1 + ) +Index: mosquitto-2.0.8/plugins/payload-modification/CMakeLists.txt +=================================================================== +--- mosquitto-2.0.8.orig/plugins/payload-modification/CMakeLists.txt ++++ mosquitto-2.0.8/plugins/payload-modification/CMakeLists.txt +@@ -2,7 +2,7 @@ include_directories(${mosquitto_SOURCE_D + ${STDBOOL_H_PATH} ${STDINT_H_PATH}) + link_directories(${mosquitto_SOURCE_DIR}) + +-add_library(mosquitto_payload_modification SHARED mosquitto_payload_modification.c) ++add_library(mosquitto_payload_modification MODULE mosquitto_payload_modification.c) + set_target_properties(mosquitto_payload_modification PROPERTIES + POSITION_INDEPENDENT_CODE 1 + ) diff --git a/mosquitto-1.4.1_apparmor.patch b/mosquitto-1.4.1_apparmor.patch index 1640a44..a495c87 100644 --- a/mosquitto-1.4.1_apparmor.patch +++ b/mosquitto-1.4.1_apparmor.patch @@ -1,11 +1,15 @@ ---- a/security/mosquitto.apparmor -+++ b/security/mosquitto.apparmor -@@ -1,3 +1,5 @@ +Index: mosquitto-2.0.8/security/mosquitto.apparmor +=================================================================== +--- mosquitto-2.0.8.orig/security/mosquitto.apparmor ++++ mosquitto-2.0.8/security/mosquitto.apparmor +@@ -1,4 +1,6 @@ +-/usr/sbin/mosquitto { +#include + - /usr/sbin/mosquitto { ++profile mosquitto /usr/sbin/mosquitto { #include #include + @@ -6,6 +8,7 @@ /etc/mosquitto/mosquitto.conf r, /etc/mosquitto/ca_certificates/* r, @@ -14,7 +18,7 @@ /etc/mosquitto/conf.d/* r, /var/lib/mosquitto/ r, /var/lib/mosquitto/mosquitto.db rwk, -@@ -24,4 +27,5 @@ +@@ -25,4 +28,5 @@ /lib{,32,64}/libwrap.so* rm, /etc/hosts.allow r, /etc/hosts.deny r, diff --git a/mosquitto-1.6.8-config.patch b/mosquitto-1.6.8-config.patch index ce00d44..4e23976 100644 --- a/mosquitto-1.6.8-config.patch +++ b/mosquitto-1.6.8-config.patch @@ -1,6 +1,8 @@ ---- mosquitto-1.6.8.orig/mosquitto.conf -+++ mosquitto-1.6.8/mosquitto.conf -@@ -985,4 +985,4 @@ +Index: mosquitto-2.0.8/mosquitto.conf +=================================================================== +--- mosquitto-2.0.8.orig/mosquitto.conf ++++ mosquitto-2.0.8/mosquitto.conf +@@ -871,4 +871,4 @@ # alphabetical order, with capital letters ordered first. If this option is # given multiple times, all of the files from the first instance will be # processed before the next instance. See the man page for examples. diff --git a/mosquitto.changes b/mosquitto.changes index c4068fd..5ec84b3 100644 --- a/mosquitto.changes +++ b/mosquitto.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Mar 11 12:27:06 UTC 2021 - Marcus Rueckert + +- Convert some of the BuildRequires from package names to + pkgconfig(): libcares, libcjson, libwebsockets + +------------------------------------------------------------------- +Thu Mar 11 12:25:55 UTC 2021 - Marcus Rueckert + +- Fix linking of modules: + - Add fix-undefined-symbols-in-plugins.patch + - revert old workaround of settings -DCMAKE_SHARED_LINKER_FLAGS= + +------------------------------------------------------------------- +Thu Mar 11 12:22:47 UTC 2021 - Marcus Rueckert + +- Update mosquitto-1.6.8-config.patch: + Set a short profilename for a cleaner ps aufxZ output +- Refreshed mosquitto-1.6.8-config.patch to apply cleanly again + ------------------------------------------------------------------- Sun Feb 28 12:56:09 UTC 2021 - Martin Hauke diff --git a/mosquitto.spec b/mosquitto.spec index 8d7a4b6..37aa75b 100644 --- a/mosquitto.spec +++ b/mosquitto.spec @@ -35,6 +35,7 @@ Source98: https://mosquitto.org/files/source/mosquitto-%{version}.tar.gz.a Source99: %{name}.keyring Patch0: mosquitto-1.4.1_apparmor.patch Patch1: mosquitto-1.6.8-config.patch +Patch2: fix-undefined-symbols-in-plugins.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libxslt-tools @@ -115,11 +116,11 @@ Client for Mosquitto. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 find misc -type f -exec chmod a-x "{}" "+" %build %cmake \ - -DCMAKE_SHARED_LINKER_FLAGS="" \ -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \ -DWITH_WEBSOCKETS=ON \ -DUSE_LIBWRAP=OFF From 7839c644479a8dad94323ae14cc16e94672884b23c533bc8c8be26dce3b8d2d0 Mon Sep 17 00:00:00 2001 From: Martin Hauke Date: Thu, 18 Mar 2021 15:27:14 +0000 Subject: [PATCH 6/6] Accepting request 878570 from home:mnhauke - Build with support for tcp-wrapper (-DUSE_LIBWRAP=ON) - Update to version 2.0.9 Security: * If an empty or invalid CA file was provided to the client library for verifying the remote broker, then the initialx connection would fail but subsequent connections would succeed without verifying the remote broker certificate. * If an empty or invalid CA file was provided to the broker for verifying the remote broker for an outgoing bridge connection then the initial connection would fail but subsequent connections would succeed without verifying the remote broker certificate. Broker: * Fix encrypted bridge connections incorrectly connecting when `bridge_cafile` is empty or invalid. * Fix `tls_version` behaviour not matching documentation. It was setting the exact TLS version to use, not the minimium TLS version to use. * Fix messages to `$` prefixed topics being rejected. * Fix QoS 0 messages not being delivered when max_queued_bytes was configured. * Fix bridge increasing backoff calculation. * Improve handling of invalid combinations of listener address and bind interface configurations. * Fix `max_keepalive` option not applying to clients connecting with keepalive set to 0. Client library: * Fix encrypted connections incorrectly connecting when the CA file passed to `mosquitto_tls_set()` is empty or invalid. * Fix connections retrying very rapidly in some situations. OBS-URL: https://build.opensuse.org/request/show/878570 OBS-URL: https://build.opensuse.org/package/show/network:messaging:mqtt/mosquitto?expand=0&rev=51 --- mosquitto-2.0.8.tar.gz | 3 --- mosquitto-2.0.8.tar.gz.sig | 16 ---------------- mosquitto-2.0.9.tar.gz | 3 +++ mosquitto-2.0.9.tar.gz.sig | 16 ++++++++++++++++ mosquitto.changes | 36 ++++++++++++++++++++++++++++++++++++ mosquitto.spec | 4 ++-- 6 files changed, 57 insertions(+), 21 deletions(-) delete mode 100644 mosquitto-2.0.8.tar.gz delete mode 100644 mosquitto-2.0.8.tar.gz.sig create mode 100644 mosquitto-2.0.9.tar.gz create mode 100644 mosquitto-2.0.9.tar.gz.sig diff --git a/mosquitto-2.0.8.tar.gz b/mosquitto-2.0.8.tar.gz deleted file mode 100644 index afaf6a3..0000000 --- a/mosquitto-2.0.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b15da8fc4edcb91d554e1259e220ea0173ef639ceaa4b465e06feb7e125b84bf -size 756636 diff --git a/mosquitto-2.0.8.tar.gz.sig b/mosquitto-2.0.8.tar.gz.sig deleted file mode 100644 index 7ffbcaf..0000000 --- a/mosquitto-2.0.8.tar.gz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEoNbuodyuSaY1o7Lwd5si37PnF7cFAmA33jMACgkQd5si37Pn -F7eACxAAruozs3XCNjAXIGDWvnnxD13qbgmft5XVD6RVKINvmp18/zsIooJ/eqUE -s/H9wqHC6SNqThWh+2s7TdBC9Nrdv1AgeMEVAgL/PTdnMATQTfz7Wcg6XwObNa8e -wXRFntsX8KwBIow6slDw5kepqMgL/ByHFtEWvvGKElnZ0FRAqNyfzrL/4njvPet0 -sh/CB0BYYIuL8hVZ/NWJHWpoTbE02pBY6ZmDGCjI4+EsP6xZNPoRsIKWUBastz4M -uA2KCursxn3pKviZnMLrlT8vfogESUh/33+AhiubRuyg8IgOkJgxTV0xmBKXEq7s -ZLqacFHKVYXB6iwTbSPi90cmHHI4eivibq1peV6SfyTyQUPv+J2wN4rHTfGjFFCO -+vcRZPgGa4yO1Iv18PzScoVznOtsfQBuBDQ3CqoEDF74zvSfo7Nkda8gEfdbcIBI -WyLycbNzDDBmu8sJyx/2mGht2KSnkNi9sB+AOBGtNAZfsXzLzGPwEYpI7TSUKgKB -cTZKsBt2osfpB/Kpx7BpWVhq+wloexfhZanX59DHGqrI0hv0sISUmg63a+m86yH2 -UhNDNQGBCW5H3Xrcs5UdcagUVQtjTYe8SM1YbpFGYkm1ZRi0gFqL7nzvkd8TFMOc -XYWfjQ7YCZtwdlD3iuK0I9ASfFZNrXh6CTebrhw497O2O03UjUA= -=D++5 ------END PGP SIGNATURE----- diff --git a/mosquitto-2.0.9.tar.gz b/mosquitto-2.0.9.tar.gz new file mode 100644 index 0000000..b1f8871 --- /dev/null +++ b/mosquitto-2.0.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4 +size 757878 diff --git a/mosquitto-2.0.9.tar.gz.sig b/mosquitto-2.0.9.tar.gz.sig new file mode 100644 index 0000000..2979bd5 --- /dev/null +++ b/mosquitto-2.0.9.tar.gz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEoNbuodyuSaY1o7Lwd5si37PnF7cFAmBKm6EACgkQd5si37Pn +F7dmgQ//XpvIqRaP3xEjYHHonQh/vAJziXSsC2GjyY7lGK8S5Ab0ft7EPjhEQBoF +UU1CRHJcdVpY8Xaw8c7lihWrxSl+wY9tKwlqOA2I4gMKBU2iKlcGeah1G35ncnZV +35RqaKr/5Cx5W4e80jqcCJ75/JBIXpYLH5lDZaOT2z3644HjOsnWzVPO6Ht2rsYT +99N0/Wobl3cRZTuqv7R2qOasg5OriY/aUn3RBdJm1pBbX2qHN/altBwkdyqaxScf +QmkSdjBdvHCkQRn0spNRnECPWsmVIGQ3YO9HPGdxu0+vA3PLm8fFnvytWOC0W5fv +our4OJqvvTmYTh1+ZhCqlzraR1g8jkH/ExAHwBxJ8wDZGGobtfg4Eq4cwXMYVNa5 +jxILPn/BVEbYAmi9IQqBaapr6vbRPpJVDuX8613rEcJ9Npd8EPPPy0uJEqd7nAEi +mYHsMcS6cch4mbiFcy9FE0rUkOpVZrthOpCv7jMPoIpM1fc7Q4ev3/fhjmFDSSOH +RNn+nZQux9GNJXnCcyCGIj/AFW0wm0+kiw7MsaDnlxXyovekrNQ2aXfqCOahhBzv +goVNRrTQCRcWuGWgUI2Vr728mLgwPbsszotwbvX5Gxv5VOJTU1DAtQAr4J4w/Sd1 ++lgcxziT77nyCXzdjB9OgpR/xXe0BgKzDpdVMIHqmTOzfxNwIVI= +=aRYG +-----END PGP SIGNATURE----- diff --git a/mosquitto.changes b/mosquitto.changes index 5ec84b3..443871c 100644 --- a/mosquitto.changes +++ b/mosquitto.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Fri Mar 12 14:13:54 UTC 2021 - Martin Hauke + +- Build with support for tcp-wrapper (-DUSE_LIBWRAP=ON) +- Update to version 2.0.9 + Security: + * If an empty or invalid CA file was provided to the client + library for verifying the remote broker, then the initialx + connection would fail but subsequent connections would succeed + without verifying the remote broker certificate. + * If an empty or invalid CA file was provided to the broker for + verifying the remote broker for an outgoing bridge connection + then the initial connection would fail but subsequent + connections would succeed without verifying the + remote broker certificate. + Broker: + * Fix encrypted bridge connections incorrectly connecting when + `bridge_cafile` is empty or invalid. + * Fix `tls_version` behaviour not matching documentation. It was + setting the exact TLS version to use, not the minimium TLS + version to use. + * Fix messages to `$` prefixed topics being rejected. + * Fix QoS 0 messages not being delivered when max_queued_bytes + was configured. + * Fix bridge increasing backoff calculation. + * Improve handling of invalid combinations of listener address + and bind interface configurations. + * Fix `max_keepalive` option not applying to clients connecting + with keepalive set to 0. + Client library: + * Fix encrypted connections incorrectly connecting when the CA + file passed to `mosquitto_tls_set()` is empty or invalid. + * Fix connections retrying very rapidly in some situations. + Build: + * Fix cmake epoll detection. + ------------------------------------------------------------------- Thu Mar 11 12:27:06 UTC 2021 - Marcus Rueckert diff --git a/mosquitto.spec b/mosquitto.spec index 37aa75b..b28a54c 100644 --- a/mosquitto.spec +++ b/mosquitto.spec @@ -20,7 +20,7 @@ %define c_lib libmosquitto1 %define cpp_lib libmosquittopp1 Name: mosquitto -Version: 2.0.8 +Version: 2.0.9 Release: 0 Summary: A MQTT v3.1/v3.1.1 Broker License: EPL-1.0 @@ -123,7 +123,7 @@ find misc -type f -exec chmod a-x "{}" "+" %cmake \ -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \ -DWITH_WEBSOCKETS=ON \ - -DUSE_LIBWRAP=OFF + -DUSE_LIBWRAP=ON %make_build %install