Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mosquitto for openSUSE:Factory checked in at 2024-02-07 18:51:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mosquitto (Old) and /work/SRC/openSUSE:Factory/.mosquitto.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mosquitto" Wed Feb 7 18:51:04 2024 rev:29 rq:1144953 version:2.0.18 Changes: -------- --- /work/SRC/openSUSE:Factory/mosquitto/mosquitto.changes 2024-01-03 12:29:45.241921831 +0100 +++ /work/SRC/openSUSE:Factory/.mosquitto.new.1815/mosquitto.changes 2024-02-07 18:53:51.326519174 +0100 @@ -1,0 +2,5 @@ +Sat Feb 3 19:15:47 UTC 2024 - Arjen de Korte <[email protected]> + +- Use sysuser-tools to generate mosquitto user + +------------------------------------------------------------------- New: ---- mosquitto-user.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mosquitto.spec ++++++ --- /var/tmp/diff_new_pack.FonSZO/_old 2024-02-07 18:53:52.022544473 +0100 +++ /var/tmp/diff_new_pack.FonSZO/_new 2024-02-07 18:53:52.026544618 +0100 @@ -1,7 +1,7 @@ # # spec file for package mosquitto # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ URL: https://mosquitto.org/ Source: https://mosquitto.org/files/source/mosquitto-%{version}.tar.gz Source1: mosquitto.service +Source2: %{name}-user.conf Source4: README-conf-d Source5: README-ca_certificates Source6: README-certs @@ -40,12 +41,13 @@ BuildRequires: libxslt-tools BuildRequires: openssl-devel >= 1.0.0 BuildRequires: pkgconfig +BuildRequires: sysuser-tools BuildRequires: tcpd-devel BuildRequires: uthash-devel BuildRequires: pkgconfig(libcares) BuildRequires: pkgconfig(libcjson) BuildRequires: pkgconfig(libwebsockets) -Requires(pre): shadow +%sysusers_requires %{?systemd_ordering} %description @@ -112,12 +114,11 @@ Client for Mosquitto. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 find misc -type f -exec chmod a-x "{}" "+" %build +%sysusers_generate_pre %{SOURCE2} %{name} %{name}-user.conf %cmake \ -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \ -DWITH_WEBSOCKETS=ON \ @@ -136,11 +137,9 @@ install -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/mosquitto/conf.d/README install -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/mosquitto/ca_certificates/README install -D -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/mosquitto/certs/README +install -D -m 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}-user.conf -%pre -getent group %{name} || %{_sbindir}/groupadd -r %{name} -getent passwd %{name} || %{_sbindir}/useradd -g %{name} -s /bin/false -r -c "%{name}" -d %{home} %{name} - +%pre -f %{name}.pre %service_add_pre %{name}.service %preun @@ -176,6 +175,7 @@ %{_unitdir}/%{name}.service %{_sbindir}/rc%{name} %{_libdir}/mosquitto_dynamic_security.so +%{_sysusersdir}/%{name}-user.conf %dir %attr(-,%{name},%{name}) %{home} %dir %{_sysconfdir}/apparmor.d/ %dir %{_sysconfdir}/apparmor.d/local/ ++++++ mosquitto-user.conf ++++++ #Type Name ID GECOS Home directory Shell u mosquitto - "MQTT Broker" /var/lib/mosquitto -
