Accepting request 898869 from home:mnhauke

- Update to version 2.0.11
  Security:
  * If a MQTT v5 client connects with a crafted CONNECT packet a
    memory leak will occur. This has been fixed.
  Broker:
  * Fix possible crash having just upgraded from 1.6 if
    `per_listener_settings true` is set, and a SIGHUP is sent to
    the broker before a client has reconnected to the broker.
  * Fix bridge not reconnectng if the first reconnection attempt
    fails.
  * Improve QoS 0 outgoing packet queueing.
  * Fix QoS 0 messages not being queued when `queue_qos0_messages`
    was enabled.
  Clients:
  * If sending mosquitto_sub output to a pipe, mosquitto_sub will
    now detect that the pipe has closed and disconnect.
  * Fix `mosquitto_pub -l` quitting if a message publication is
    attempted when the broker is temporarily unavailable.
- Remove not longer needed patch:
  * fix-undefined-symbols-in-plugins.patch (fixed upstream)

OBS-URL: https://build.opensuse.org/request/show/898869
OBS-URL: https://build.opensuse.org/package/show/network:messaging:mqtt/mosquitto?expand=0&rev=55
This commit is contained in:
Marcus Rückert 2021-06-10 09:30:41 +00:00 committed by Git OBS Bridge
parent ad0fe15447
commit bddcf02d37
7 changed files with 44 additions and 74 deletions

View File

@ -1,52 +0,0 @@
diff --git a/plugins/auth-by-ip/CMakeLists.txt b/plugins/auth-by-ip/CMakeLists.txt
index 45260bd..e5e25d8 100644
--- a/plugins/auth-by-ip/CMakeLists.txt
+++ b/plugins/auth-by-ip/CMakeLists.txt
@@ -1,7 +1,7 @@
include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/include
${OPENSSL_INCLUDE_DIR} ${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
)
diff --git a/plugins/dynamic-security/CMakeLists.txt b/plugins/dynamic-security/CMakeLists.txt
index 213ea03..0e02518 100644
--- a/plugins/dynamic-security/CMakeLists.txt
+++ b/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
diff --git a/plugins/message-timestamp/CMakeLists.txt b/plugins/message-timestamp/CMakeLists.txt
index e53a4bc..d28cb1d 100644
--- a/plugins/message-timestamp/CMakeLists.txt
+++ b/plugins/message-timestamp/CMakeLists.txt
@@ -1,7 +1,7 @@
include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/include
${OPENSSL_INCLUDE_DIR} ${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
)
diff --git a/plugins/payload-modification/CMakeLists.txt b/plugins/payload-modification/CMakeLists.txt
index a449291..e77c870 100644
--- a/plugins/payload-modification/CMakeLists.txt
+++ b/plugins/payload-modification/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/include
${OPENSSL_INCLUDE_DIR} ${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
)

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0188f7b21b91d6d80e992b8d6116ba851468b3bd154030e8a003ed28fb6f4a44
size 759106

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEoNbuodyuSaY1o7Lwd5si37PnF7cFAmBoSz8ACgkQd5si37Pn
F7exyQ//Q9UXpuHS7aywypHcHKAdTm3Eu/unQhlMojbLD7K97uy/ROP2qt4B5QpY
ckj7uhzYPuno/dGOE+uU8HR+RQ2bpJJ84VbI+t6SI1RFJImPyNnkDYuLPO+L1PWs
OlITozi6W4HpwwY6sCXxJujXGE8tTQzfE3FIMYg7KrKFRpx34wYFRzQVWJ/FkDkJ
ZeJnwJ/ZTbNOc1fMJFfSx2+Xx1Yppk28HFshKmEZlFzJiaXQi8jx1XFJ5ySsA18/
6uLTExy9tz/vPHz1tR18VNSYy/Ix7TNEdmfFg62rkMm5BbQlCR0Yx0sRYaCtxafN
fW1L9DYM8D9TBRNg4LKUXAJjZwnwqMqXdt9n2h4jG/DHoCsPuimi+gVnwVwHOENt
B5UcuxdqDq6zfSSQx8Y9XLFJ4BZYtojJFqzHoq/dmKsOwi+LbuJPali6FiX+nl9K
Qxt5etp6rfgIfv+2FD0g+gg2E8wLOm/m2qEC0mBMGEMtqnyshel3Pyh3PUeMsP5u
HhIbLDP2GJ7qcGoz63BUpXx8enlgqLxEXFptwTsFb0NvlwHH81gySUStcZwcz9rH
4q+EfmEV1gFeaNV1ceFvvt33stEaYzZRYBT/sSUJ0/CewGkOfdA7f8gzgetvbLN4
Vw4wMHtLPNiaA0EFXaLc+RLu+5ZoJ4AiV0HxXeR5+jLuJwrcD0c=
=34DU
-----END PGP SIGNATURE-----

3
mosquitto-2.0.11.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b36a7198bce85cf31b132f5c6ee36dcf5dadf86fb768501eb1e11ce95d4f78a
size 760325

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEoNbuodyuSaY1o7Lwd5si37PnF7cFAmDAtecACgkQd5si37Pn
F7dDVw/7BzIhxXWhS34tt5BtAoLvrcPMoBXtOn8YTlYmuY8bqCcsFoj7zNx8rlXb
/8HBVDwphYGHNvuSPPBmUZ+vp1ODK75fhyjba9n7ALC9VRNFiSh0ffTVYXoz58Mx
0nf9foTSVD3s73JhA+9qoZq0PjOekrZieOyKQzrNbjNys58IjT++wP4xLTGusmU6
+kLHT9p6vflnWB09f4G6yDYkzPb6hoc5qzWFva0wbr7SLzJEbsmLps0dYZAFa7SH
kUpnYfegEcNQz3y0drx7R3jox4J0+oH8Jm5+BNKtpTyZfMNpXMlcbSx7t1oL7ynS
tAoDdL/81xljsG5I/qHSXIMi3ZsNxgE63fiKEjjLpba0crIdoK6m+Uhq2lyl8k1y
flsuL98AE+W/hUnBLyNKpor2FZb23uQN/jsEZ2akW2RgoR4Wcv8oowNP0DDOV/ee
KbBQ+Qj24t1EreiYULCm0bzv7W+0i1/zK/XpxPQXNS6UFeowV1t32XQnVbxWZdmm
5RrbnjN0bFbGV57t06Tjf+P7RHnjunsw0ydgLHwrJI06+I0Qa+2zhMFPozhA8t2y
H1/0h2xW4jAvHfvhPv0QdapbqJVpN3EvKpihT5RfsT9H0/ShiClqPJVLFT977xF3
HlDVjmoFytVcBaAjQ1kOKEf4qZXxMAXfzb34EmOQf8El9+va+ps=
=I/jf
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Wed Jun 9 19:10:49 UTC 2021 - Martin Hauke <mardnh@gmx.de>
- Update to version 2.0.11
Security:
* If a MQTT v5 client connects with a crafted CONNECT packet a
memory leak will occur. This has been fixed.
Broker:
* Fix possible crash having just upgraded from 1.6 if
`per_listener_settings true` is set, and a SIGHUP is sent to
the broker before a client has reconnected to the broker.
* Fix bridge not reconnectng if the first reconnection attempt
fails.
* Improve QoS 0 outgoing packet queueing.
* Fix QoS 0 messages not being queued when `queue_qos0_messages`
was enabled.
Clients:
* If sending mosquitto_sub output to a pipe, mosquitto_sub will
now detect that the pipe has closed and disconnect.
* Fix `mosquitto_pub -l` quitting if a message publication is
attempted when the broker is temporarily unavailable.
- Remove not longer needed patch:
* fix-undefined-symbols-in-plugins.patch (fixed upstream)
-------------------------------------------------------------------
Tue Apr 6 18:58:02 UTC 2021 - Martin Hauke <mardnh@gmx.de>

View File

@ -20,7 +20,7 @@
%define c_lib libmosquitto1
%define cpp_lib libmosquittopp1
Name: mosquitto
Version: 2.0.10
Version: 2.0.11
Release: 0
Summary: A MQTT v3.1/v3.1.1 Broker
License: EPL-1.0
@ -35,7 +35,6 @@ 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
@ -116,7 +115,6 @@ Client for Mosquitto.
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
find misc -type f -exec chmod a-x "{}" "+"
%build