Update to 2.0.20 for fix CVE-2024-3935,CVE-2024-8376 and CVE-2024-10525

(cherry picked from commit 65a49b510a103af2ac743c286b42f8bf498930df)

mosquitto.spec

@@ -1,15 +1,15 @@
 Name:                mosquitto
-Version:             2.0.16
+Version:             2.0.20
 Release:             1
 Summary:             Open Source MQTT v3.1/v3.1.1 Broker
 License:             EPL-1.0
-URL:                 http://mosquitto.org/
-Source0:             http://mosquitto.org/files/source/%{name}-%{version}.tar.gz
+URL:                 https://mosquitto.org/
+Source0:             https://mosquitto.org/files/source/%{name}-%{version}.tar.gz
 Patch0001:           add-usage-output.patch
 Patch0002:           fix-usage-exit-code.patch
 BuildRequires:       c-ares-devel gcc-c++ libuuid-devel libwebsockets-devel openssl-devel
 BuildRequires:       systemd-devel cjson-devel
-BuildRequires:       make
+BuildRequires:       cmake libxslt
 Provides:            bundled(uthash)
 Requires(pre):       shadow-utils
 Requires(post):      systemd
@@ -31,22 +31,23 @@ Development headers and libraries for %{name}
 
 %prep
 %autosetup -p1
-sed -i "s|prefix?=/usr/local|prefix?=/usr|" config.mk
 sed -i "s|(INSTALL) -s|(INSTALL)|g" lib/Makefile src/Makefile client/Makefile
+sed -i "s/websockets_shared/websockets/" src/CMakeLists.txt
 
 %build
-export CFLAGS="%{optflags}"
-export LDFLAGS="%{optflags} %{__global_ldflags} -Wl,--as-needed"
-make all %{?_smp_mflags} WITH_WEBSOCKETS=yes WITH_SYSTEMD=yes
+%cmake -B %{__cmake_builddir} \
+    -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
+    -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \
+    -DWITH_WEBSOCKETS=ON \
+    -DWITH_SYSTEMD=ON \
+    -DWITH_SRV=ON \
+    -DWITH_TLS=ON
+%__cmake --build "%{__cmake_builddir}"
 
 %install
-%if "%{_lib}" == "lib64"
-export LIB_SUFFIX=64
-%endif
-%make_install
+DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}"
 mkdir -p %{buildroot}%{_unitdir}
 install -p -m 0644 service/systemd/%{name}.service.notify %{buildroot}%{_unitdir}/%{name}.service
-mv %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf.example %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
 
 %check
 
@@ -78,10 +79,8 @@ exit 0
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config%{_sysconfdir}/%{name}/*.example
 %{_unitdir}/%{name}.service
-%{_mandir}/man1/*.1.*
-%{_mandir}/man5/*.5.*
-%{_mandir}/man7/*.7.*
-%{_mandir}/man8/*.8.*
+%{_mandir}/man*/%{name}*
+%{_mandir}/man7/mqtt.7.*
 
 %files devel
 %{_includedir}/*.h
@@ -90,6 +89,23 @@ exit 0
 %{_mandir}/man3/*.3.*
 
 %changelog
+* Mon Nov 04 2024 yaoxin <yao_xin001@hoperun.com> - 2.0.20-1
+- Update to 2.0.20
+  * Fix QoS 1 / QoS 2 publish incorrectly returning "no subscribers". Closes #3128.
+  * Open files with appropriate access on Windows. Closes #3119.
+  * Don't allow invalid response topic values.
+  * Fix some strict protocol compliance issues. Closes #3052.
+  * Fix cmake build on OS X. Closes #3125.
+  * Fix build on NetBSD
+  * Fix mismatched subscribe/unsubscribe with normal/shared topics.
+  * Fix crash on bridge using remapped topic being sent a crafted packet.
+  * Don't allow SUBACK with missing reason codes in client library.
+  * Fix crash on subscribe under certain unlikely conditions. Closes #2885. Closes #2881.
+  * Fix mosquitto_rr not honouring -R. Closes #2893.
+  * Fix max_queued_messages 0 stopping clients from receiving messages. Closes #2879.
+  * Fix max_inflight_messages not being set correctly. Closes #2876.
+  * Fix mosquitto_passwd -U backup file creation. Closes #2873.
+
 * Wed Sep 13 2023 yaoxin <yao_xin001@hoperun.com> - 2.0.16-1
 - Update to 2.0.16 for fix CVE-2021-34431,CVE-2023-28366 and CVE-2023-3592
 
@@ -111,7 +127,7 @@ exit 0
 * Thu Sep 30 2021 lingsheng <lingsheng@huawei.com> - 1.6.15-3
 - add usage output
 
-* Tue Sep 24 2021 zhengyaohui <zhengyaohui1@huawei.com> - 1.6.15-2
+* Fri Sep 24 2021 zhengyaohui <zhengyaohui1@huawei.com> - 1.6.15-2
 - add buildrequires make
 
 * Tue Sep 7 2021 zhengyaohui <zhengyaohui1@huawei.com> - 1.6.15-1