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-11-20 22:47:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
and /work/SRC/openSUSE:Factory/.dnsmasq.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dnsmasq"
Sat Nov 20 22:47:53 2021 rev:84 rq:932271 version:2.86
Changes:
--------
--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes 2021-09-26
21:49:27.394832806 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new.1895/dnsmasq.changes
2021-11-20 22:48:11.795829156 +0100
@@ -1,0 +2,12 @@
+Thu Nov 18 13:59:55 UTC 2021 - Reinhard Max <m...@suse.com>
+
+- bsc#1192529, dnsmasq-resolv-conf.patch:
+ Fix a segfault when re-reading an empty resolv.conf
+- Remove "nogroup" membership from the dnsmasq user.
+
+-------------------------------------------------------------------
+Wed Oct 20 17:08:15 UTC 2021 - Callum Farmer <gm...@opensuse.org>
+
+- Use systemd-sysusers from 15.3 onwards
+
+-------------------------------------------------------------------
New:
----
dnsmasq-resolv-conf.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dnsmasq.spec ++++++
--- /var/tmp/diff_new_pack.LmtaYk/_old 2021-11-20 22:48:12.435827035 +0100
+++ /var/tmp/diff_new_pack.LmtaYk/_new 2021-11-20 22:48:12.439827022 +0100
@@ -16,10 +16,10 @@
#
-%if 0%{?suse_version} < 1550
-%bcond_with tftp_user_package
-%else
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
%bcond_without tftp_user_package
+%else
+%bcond_with tftp_user_package
%endif
Name: dnsmasq
Version: 2.86
@@ -37,6 +37,7 @@
Source6: system-user-dnsmasq.conf
Source8: %{name}-rpmlintrc
Patch0: dnsmasq-groups.patch
+Patch1: dnsmasq-resolv-conf.patch
BuildRequires: dbus-1-devel
BuildRequires: dos2unix
BuildRequires: libidn2-devel
@@ -75,6 +76,7 @@
%prep
%setup -q
%patch0
+%patch1
# Remove the executable bit from python example files to
# avoid unwanted automatic dependencies
@@ -143,6 +145,7 @@
%{_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
++++++ dnsmasq-resolv-conf.patch ++++++
>From d290630d31f4517ab26392d00753d1397f9a4114 Mon Sep 17 00:00:00 2001
From: Simon Kelley <si...@thekelleys.org.uk>
Date: Wed, 6 Oct 2021 22:31:06 +0100
Subject: [PATCH] Fix crash after re-reading an empty resolv.conf file.
If dnsmasq re-reads a resolv file, and it's empty, it will
retry after a delay. In the meantime, the old servers from the
resolv file have been deleted, but the servers_array doesn't
get updated, leading to dangling pointers and crashes.
Thanks to Brad Jorsch for finding and analysing this bug.
This problem was introduced in 2.86.
---
src/dnsmasq.c | 5 +++++
1 file changed, 5 insertions(+)
--- src/dnsmasq.c.orig
+++ src/dnsmasq.c
@@ -1668,6 +1668,11 @@ static void poll_resolv(int force, int d
}
else
{
+ /* If we're delaying things, we don't call check_servers(), but
+ reload_servers() may have deleted some servers, rendering the
server_array
+ invalid, so just rebuild that here. Once reload_servers() succeeds,
+ we call check_servers() above, which calls build_server_array
itself. */
+ build_server_array();
latest->mtime = 0;
if (!warned)
{
++++++ system-user-dnsmasq.conf ++++++
--- /var/tmp/diff_new_pack.LmtaYk/_old 2021-11-20 22:48:12.519826756 +0100
+++ /var/tmp/diff_new_pack.LmtaYk/_new 2021-11-20 22:48:12.519826756 +0100
@@ -1,3 +1,3 @@
-#Type Name ID GECOS Home directory
Shell
-u dnsmasq -:nogroup "dnsmasq" /var/lib/empty
-
-m dnsmasq tftp - -
-
+#Type Name ID GECOS Home directory Shell
+u dnsmasq - "dnsmasq" /var/lib/empty -
+m dnsmasq tftp - - -
