Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dnsmasq for openSUSE:Factory checked
in at 2021-07-07 18:29:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
and /work/SRC/openSUSE:Factory/.dnsmasq.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dnsmasq"
Wed Jul 7 18:29:47 2021 rev:82 rq:904175 version:2.85
Changes:
--------
--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes 2021-04-29
01:37:02.526462923 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new.2625/dnsmasq.changes
2021-07-07 18:30:23.307033903 +0200
@@ -1,0 +2,10 @@
+Sun Jun 13 13:28:49 UTC 2021 - Callum Farmer <gm...@opensuse.org>
+
+- Add now working CONFIG parameter to sysusers generator
+
+-------------------------------------------------------------------
+Wed Jun 2 10:28:12 UTC 2021 - Callum Farmer <gm...@opensuse.org>
+
+- Change to using systemd-sysusers on TW
+
+-------------------------------------------------------------------
New:
----
system-user-dnsmasq.conf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dnsmasq.spec ++++++
--- /var/tmp/diff_new_pack.h77N6J/_old 2021-07-07 18:30:23.807029979 +0200
+++ /var/tmp/diff_new_pack.h77N6J/_new 2021-07-07 18:30:23.807029979 +0200
@@ -34,6 +34,7 @@
Source3: dnsmasq.reg
Source4: dnsmasq.service
Source5: rc.dnsmasq-suse
+Source6: system-user-dnsmasq.conf
Source8: %{name}-rpmlintrc
Patch0: dnsmasq-groups.patch
BuildRequires: dbus-1-devel
@@ -47,7 +48,9 @@
Requires(pre): group(nogroup)
Provides: dns_daemon
%if %{with tftp_user_package}
+BuildRequires: sysuser-tools
Requires(pre): user(tftp)
+%sysusers_requires
%else
Requires(pre): %{_sbindir}/useradd
%endif
@@ -111,9 +114,12 @@
# same flags for make and make install, else everything gets recompiled
%define _copts "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_LIBIDN2 -DHAVE_DNSSEC
-DHAVE_LUASCRIPT"
%make_build AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
COPTS=%{_copts}
+%if %{with tftp_user_package}
+%sysusers_generate_pre %{SOURCE6} dnsmasq system-user-dnsmasq.conf
+%endif
-%pre
%if %{without tftp_user_package}
+%pre
if ! %{_bindir}/getent group tftp >/dev/null; then
%{_sbindir}/groupadd -r tftp
fi
@@ -121,11 +127,12 @@
%{_sbindir}/useradd -c "TFTP account" -d /srv/tftpboot -G tftp -g tftp \
-r -s /bin/false tftp
fi
-%endif
if ! %{_bindir}/getent passwd dnsmasq >/dev/null; then
%{_sbindir}/useradd -r -d %{_localstatedir}/lib/empty -s /bin/false -c
"dnsmasq" -g nogroup -G tftp dnsmasq
fi
-
+%else
+%pre -f dnsmasq.pre
+%endif
%service_add_pre %{name}.service
%post
@@ -156,6 +163,9 @@
install -D -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/dnsmasq.service
%if %{without tftp_user_package}
install -d -m 0755 %{buildroot}/srv/tftpboot
+%else
+mkdir -p %{buildroot}%{_sysusersdir}
+install -m 0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/
%endif
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcdnsmasq
install -d -m 755 %{buildroot}/%{_sysconfdir}/dnsmasq.d
@@ -194,6 +204,8 @@
%config(noreplace) %{_sysconfdir}/dnsmasq.d/trust-anchors.conf
%if %{without tftp_user_package}
%dir %attr(0755,tftp,tftp) /srv/tftpboot
+%else
+%{_sysusersdir}/system-user-dnsmasq.conf
%endif
%files utils
++++++ system-user-dnsmasq.conf ++++++
#Type Name ID GECOS Home directory
Shell
u dnsmasq -:nogroup "dnsmasq" /var/lib/empty -
m dnsmasq tftp - - -
