pool/mosquitto
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 879920 from network:messaging:mqtt

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/879920
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mosquitto?expand=0&rev=20
This commit is contained in:
Richard Brown 2021-03-30 19:18:30 +00:00 committed by Git OBS Bridge
commit 3a00f02bbb
9 changed files with 348 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fix-undefined-symbols-in-plugins.patch Normal file
View File

@ -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
)

14
mosquitto-1.4.1_apparmor.patch
View File

@ -1,11 +1,15 @@
--- a/security/mosquitto.apparmor Index: mosquitto-2.0.8/security/mosquitto.apparmor
+++ b/security/mosquitto.apparmor ===================================================================
@@ -1,3 +1,5 @@ --- mosquitto-2.0.8.orig/security/mosquitto.apparmor
+++ mosquitto-2.0.8/security/mosquitto.apparmor
@@ -1,4 +1,6 @@
-/usr/sbin/mosquitto {
+#include <tunables/global> +#include <tunables/global>
+ +
/usr/sbin/mosquitto { +profile mosquitto /usr/sbin/mosquitto {
#include <abstractions/base> #include <abstractions/base>
#include <abstractions/nameservice> #include <abstractions/nameservice>
@@ -6,6 +8,7 @@ @@ -6,6 +8,7 @@
/etc/mosquitto/mosquitto.conf r, /etc/mosquitto/mosquitto.conf r,
/etc/mosquitto/ca_certificates/* r, /etc/mosquitto/ca_certificates/* r,
@ -14,7 +18,7 @@
/etc/mosquitto/conf.d/* r, /etc/mosquitto/conf.d/* r,
/var/lib/mosquitto/ r, /var/lib/mosquitto/ r,
/var/lib/mosquitto/mosquitto.db rwk, /var/lib/mosquitto/mosquitto.db rwk,
@@ -24,4 +27,5 @@ @@ -25,4 +28,5 @@
/lib{,32,64}/libwrap.so* rm, /lib{,32,64}/libwrap.so* rm,
/etc/hosts.allow r, /etc/hosts.allow r,
/etc/hosts.deny r, /etc/hosts.deny r,

3
mosquitto-1.6.12.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:548d73d19fb787dd0530334e398fd256ef3a581181678488a741a995c4f007fb
size 618718

16
mosquitto-1.6.12.tar.gz.sig
View File

@ -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-----

8
mosquitto-1.6.8-config.patch
View File

@ -1,6 +1,8 @@
--- mosquitto-1.6.8.orig/mosquitto.conf Index: mosquitto-2.0.8/mosquitto.conf
+++ mosquitto-1.6.8/mosquitto.conf ===================================================================
@@ -985,4 +985,4 @@ --- 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 # alphabetical order, with capital letters ordered first. If this option is
# given multiple times, all of the files from the first instance will be # given multiple times, all of the files from the first instance will be
# processed before the next instance. See the man page for examples. # processed before the next instance. See the man page for examples.

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

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

16
mosquitto-2.0.9.tar.gz.sig Normal file
View File

@ -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-----

239
mosquitto.changes
View File

@ -1,3 +1,242 @@
-------------------------------------------------------------------
Fri Mar 12 14:13:54 UTC 2021 - Martin Hauke <mardnh@gmx.de>
- 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 <mrueckert@suse.de>
- Convert some of the BuildRequires from package names to
pkgconfig(): libcares, libcjson, libwebsockets
-------------------------------------------------------------------
Thu Mar 11 12:25:55 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
- 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 <mrueckert@suse.de>
- 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 <mardnh@gmx.de>
- 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 <mardnh@gmx.de>
- 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 <mardnh@gmx.de>
- 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 <mardnh@gmx.de>
- 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 <mardnh@gmx.de>
- 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 <mardnh@gmx.de>
- 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 <mardnh@gmx.de> Wed Aug 19 19:29:23 UTC 2020 - Martin Hauke <mardnh@gmx.de>

42
mosquitto.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package mosquitto # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,28 +20,32 @@
%define c_lib libmosquitto1 %define c_lib libmosquitto1
%define cpp_lib libmosquittopp1 %define cpp_lib libmosquittopp1
Name: mosquitto Name: mosquitto
Version: 1.6.12 Version: 2.0.9
Release: 0 Release: 0
Summary: A MQTT v3.1/v3.1.1 Broker Summary: A MQTT v3.1/v3.1.1 Broker
License: EPL-1.0 License: EPL-1.0
Group: Productivity/Networking/Other Group: Productivity/Networking/Other
URL: https://mosquitto.org/ URL: https://mosquitto.org/
Source: https://mosquitto.org/files/source/mosquitto-%{version}.tar.gz 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 Source1: mosquitto.service
Source4: README-conf-d Source4: README-conf-d
Source5: README-ca_certificates Source5: README-ca_certificates
Source6: README-certs 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 Patch0: mosquitto-1.4.1_apparmor.patch
Patch1: mosquitto-1.6.8-config.patch Patch1: mosquitto-1.6.8-config.patch
Patch2: fix-undefined-symbols-in-plugins.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libcares-devel BuildRequires: libxslt-tools
BuildRequires: libwebsockets-devel
BuildRequires: openssl-devel >= 1.0.0 BuildRequires: openssl-devel >= 1.0.0
BuildRequires: pkgconfig
BuildRequires: tcpd-devel BuildRequires: tcpd-devel
BuildRequires: uthash-devel BuildRequires: uthash-devel
BuildRequires: pkgconfig(libcares)
BuildRequires: pkgconfig(libcjson)
BuildRequires: pkgconfig(libwebsockets)
Requires(pre): shadow Requires(pre): shadow
%{?systemd_ordering} %{?systemd_ordering}
@ -112,13 +116,14 @@ Client for Mosquitto.
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
find misc -type f -exec chmod a-x "{}" "+" find misc -type f -exec chmod a-x "{}" "+"
%build %build
%cmake \ %cmake \
-DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \ -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \
-DWITH_WEBSOCKETS=ON \ -DWITH_WEBSOCKETS=ON \
-DUSE_LIBWRAP=OFF -DUSE_LIBWRAP=ON
%make_build %make_build
%install %install
@ -155,13 +160,16 @@ getent passwd %{name} || %{_sbindir}/useradd -g %{name} -s /bin/false -r -c "%{n
%postun -n %{cpp_lib} -p /sbin/ldconfig %postun -n %{cpp_lib} -p /sbin/ldconfig
%files %files
%license LICENSE.txt %license edl-v10 epl-v20 LICENSE.txt
%doc edl-v10 epl-v10 %doc CONTRIBUTING.md ChangeLog.txt *.html *.example
%doc CONTRIBUTING.md ChangeLog.txt readme.md *.html *.example
%doc examples/ logo/ security/ misc/ %doc examples/ logo/ security/ misc/
%config(noreplace) %attr(-,root,%{name}) %{_sysconfdir}/mosquitto/ %config(noreplace) %attr(-,root,%{name}) %{_sysconfdir}/mosquitto/
%{_bindir}/mosquitto_passwd %{_bindir}/mosquitto_passwd
%{_bindir}/mosquitto_ctrl
#%%{_bindir}/mosquitto_ctrl_dynsec
%{_sbindir}/mosquitto %{_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}/man1/mosquitto_passwd.1%{?ext_man}
%{_mandir}/man5/mosquitto.conf.5%{?ext_man} %{_mandir}/man5/mosquitto.conf.5%{?ext_man}
%{_mandir}/man7/mosquitto-tls.7%{?ext_man} %{_mandir}/man7/mosquitto-tls.7%{?ext_man}
@ -169,6 +177,7 @@ getent passwd %{name} || %{_sbindir}/useradd -g %{name} -s /bin/false -r -c "%{n
%{_mandir}/man8/mosquitto.8%{?ext_man} %{_mandir}/man8/mosquitto.8%{?ext_man}
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%{_sbindir}/rc%{name} %{_sbindir}/rc%{name}
%{_libdir}/mosquitto_dynamic_security.so
%dir %attr(-,%{name},%{name}) %{home} %dir %attr(-,%{name},%{name}) %{home}
%dir %{_sysconfdir}/apparmor.d/ %dir %{_sysconfdir}/apparmor.d/
%dir %{_sysconfdir}/apparmor.d/local/ %dir %{_sysconfdir}/apparmor.d/local/
@ -176,8 +185,7 @@ getent passwd %{name} || %{_sbindir}/useradd -g %{name} -s /bin/false -r -c "%{n
%config(noreplace) %{_sysconfdir}/apparmor.d/local/usr.sbin.mosquitto %config(noreplace) %{_sysconfdir}/apparmor.d/local/usr.sbin.mosquitto
%files clients %files clients
%license LICENSE.txt %license edl-v10 epl-v20 LICENSE.txt
%doc edl-v10 epl-v10
%{_bindir}/mosquitto_pub %{_bindir}/mosquitto_pub
%{_bindir}/mosquitto_sub %{_bindir}/mosquitto_sub
%{_bindir}/mosquitto_rr %{_bindir}/mosquitto_rr
@ -186,22 +194,20 @@ getent passwd %{name} || %{_sbindir}/useradd -g %{name} -s /bin/false -r -c "%{n
%{_mandir}/man1/mosquitto_rr.1%{?ext_man} %{_mandir}/man1/mosquitto_rr.1%{?ext_man}
%files -n %{c_lib} %files -n %{c_lib}
%license LICENSE.txt %license edl-v10 epl-v20 LICENSE.txt
%doc edl-v10 epl-v10
%{_libdir}/libmosquitto.so.* %{_libdir}/libmosquitto.so.*
%files -n %{cpp_lib} %files -n %{cpp_lib}
%license LICENSE.txt %license edl-v10 epl-v20 LICENSE.txt
%doc edl-v10 epl-v10
%{_libdir}/libmosquittopp.so.* %{_libdir}/libmosquittopp.so.*
%files devel %files devel
%{_libdir}/libmosquitto.so %{_libdir}/libmosquitto.so
%{_libdir}/libmosquittopp.so %{_libdir}/libmosquittopp.so
%{_includedir}/mosquitto.h %{_includedir}/mosquitto.h
%{_includedir}/mosquitto_broker.h %{_includedir}/mosquitto_*.h
%{_includedir}/mosquitto_plugin.h
%{_includedir}/mosquittopp.h %{_includedir}/mosquittopp.h
%{_includedir}/mqtt_protocol.h
%{_mandir}/man3/libmosquitto.3%{?ext_man} %{_mandir}/man3/libmosquitto.3%{?ext_man}
%{_libdir}/pkgconfig/libmosquitto.pc %{_libdir}/pkgconfig/libmosquitto.pc
%{_libdir}/pkgconfig/libmosquittopp.pc %{_libdir}/pkgconfig/libmosquittopp.pc