From 0e41fdbd5f1e2a3a1603bca9afa7ed944940f4bcbdc47d21a091e4de249b50c8 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 19 Sep 2022 06:55:22 +0000
Subject: [PATCH] Accepting request 1002291 from home:gmbr3:Active

- Ensure the dnsmasq user's group is used
- Remove nogroup requirement

OBS-URL: https://build.opensuse.org/request/show/1002291
OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=149
---
 dnsmasq.changes | 6 ++++++
 dnsmasq.spec    | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dnsmasq.changes b/dnsmasq.changes
index 34f0a17..75864f0 100644
--- a/dnsmasq.changes
+++ b/dnsmasq.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep  9 11:00:25 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Ensure the dnsmasq user's group is used
+- Remove nogroup requirement
+
 -------------------------------------------------------------------
 Wed Jun  8 14:24:38 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 8851347..7764995 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -47,7 +47,6 @@ BuildRequires:  lua-devel
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libnetfilter_conntrack)
 BuildRequires:  pkgconfig(systemd)
-Requires(pre):  group(nogroup)
 Provides:       dns_daemon
 %if %{with tftp_user_package}
 BuildRequires:  sysuser-tools
@@ -96,13 +95,13 @@ sed -i -e 's|\(PREFIX *= *\)%{_prefix}/local|\1/usr|;
 sed -i -e 's|lua5.2|lua%{lua_version}|' Makefile
 
 # SED-FIX-UPSTREAM -- Fix man page
-sed -i -e 's|The default is "dip",|The default is "nogroup",|' \
+sed -i -e 's|The default is "dip",|The default is "dnsmasq",|' \
 	man/dnsmasq.8
 
 # SED-FIX-UPSTREAM -- Fix cachesize, group and user
 sed -i -e 's|CACHESIZ 150|CACHESIZ 2000|;
 	   s|CHUSER "nobody"|CHUSER "dnsmasq"|;
-	   s|CHGRP "dip"|CHGRP "nogroup"|' \
+	   s|CHGRP "dip"|CHGRP "dnsmasq"|' \
 	src/config.h
 
 # Tweaks to the default configuration: