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

- Disable --nftset for SLE-15-SP3 and older.

Browse Source 
- bsc#1235517: Reintroduce nogroup for SLE-15-SP3 and older.

OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=175
This commit is contained in:
Reinhard Max 2025-01-14 11:39:29 +00:00 committed by Git OBS Bridge
parent d239adfb9a
commit c90cde3178
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dnsmasq.changes
View File

@ -3,6 +3,8 @@ Tue Jan 14 09:53:47 UTC 2025 - Reinhard Max <max@suse.com>
- bsc#1235834: Don't let compile time options change silently. - bsc#1235834: Don't let compile time options change silently.
- Use pkgconfig for libidn2. - Use pkgconfig for libidn2.
- Disable --nftset for SLE-15-SP3 and older.
- bsc#1235517: Reintroduce nogroup for SLE-15-SP3 and older.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 8 14:17:57 UTC 2024 - Lukas Straub <lukasstraub2@web.de> Tue Oct 8 14:17:57 UTC 2024 - Lukas Straub <lukasstraub2@web.de>

17
dnsmasq.spec
View File

@ -18,8 +18,13 @@
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
%bcond_without tftp_user_package %bcond_without tftp_user_package
%bcond_without nftset
%define dnsmasq_group dnsmasq
%else %else
%bcond_with tftp_user_package %bcond_with tftp_user_package
%bcond_with nftset
Requires(pre): group(nogroup)
%define dnsmasq_group nogroup
%endif %endif
Name: dnsmasq Name: dnsmasq
Version: 2.90 Version: 2.90
@ -42,7 +47,9 @@ BuildRequires: lua-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2)
BuildRequires: pkgconfig(libnetfilter_conntrack) BuildRequires: pkgconfig(libnetfilter_conntrack)
%if %{with nftset}
BuildRequires: pkgconfig(libnftables) BuildRequires: pkgconfig(libnftables)
%endif
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
Provides: dns_daemon Provides: dns_daemon
%if %{with tftp_user_package} %if %{with tftp_user_package}
@ -89,13 +96,13 @@ sed -i -e 's|\(PREFIX *= *\)%{_prefix}/local|\1/usr|;
sed -i -e 's|lua5.2|lua%{lua_version}|' Makefile sed -i -e 's|lua5.2|lua%{lua_version}|' Makefile
# SED-FIX-UPSTREAM -- Fix man page # SED-FIX-UPSTREAM -- Fix man page
sed -i -e 's|The default is "dip",|The default is "dnsmasq",|' \ sed -i -e 's|The default is "dip",|The default is "%dnsmasq_group",|' \
man/dnsmasq.8 man/dnsmasq.8
# SED-FIX-UPSTREAM -- Fix cachesize, group , user and pid location # SED-FIX-UPSTREAM -- Fix cachesize, group , user and pid location
sed -i -e 's|CACHESIZ 150|CACHESIZ 2000|; sed -i -e 's|CACHESIZ 150|CACHESIZ 2000|;
s|CHUSER "nobody"|CHUSER "dnsmasq"|; s|CHUSER "nobody"|CHUSER "dnsmasq"|;
s|CHGRP "dip"|CHGRP "dnsmasq"|; s|CHGRP "dip"|CHGRP "%dnsmasq_group"|;
s|RUNFILE "/var/run/dnsmasq.pid"|RUNFILE "%{_rundir}/dnsmasq.pid"|' \ s|RUNFILE "/var/run/dnsmasq.pid"|RUNFILE "%{_rundir}/dnsmasq.pid"|' \
src/config.h src/config.h
@ -122,11 +129,11 @@ export CFLAGS="%{optflags} -std=gnu99 -fPIC -DPIC -fpie"
export LDFLAGS="-Wl,-z,relro,-z,now -pie" export LDFLAGS="-Wl,-z,relro,-z,now -pie"
# the dnsmasq make system hashes the configuration flags, so we have to supply the # the dnsmasq make system hashes the configuration flags, so we have to supply the
# same flags for make and make install, else everything gets recompiled # same flags for make and make install, else everything gets recompiled
%define _copts "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_LIBIDN2 -DHAVE_DNSSEC -DHAVE_LUASCRIPT -DHAVE_NFTSET" %define _copts "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_LIBIDN2 -DHAVE_DNSSEC -DHAVE_LUASCRIPT %{?with_nftset:-DHAVE_NFTSET}"
%make_build AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" COPTS=%{_copts} %make_build AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" COPTS=%{_copts}
# Make sure that compile time options don't change unnoticed # Make sure that compile time options don't change unnoticed
./src/dnsmasq --version | ./src/dnsmasq --version |
grep -q "Compile time options: IPv6 GNU-getopt DBus no-UBus i18n IDN2 DHCP DHCPv6 Lua TFTP conntrack ipset nftset auth cryptohash DNSSEC loop-detect inotify dumpfile" grep -q "Compile time options: IPv6 GNU-getopt DBus no-UBus i18n IDN2 DHCP DHCPv6 Lua TFTP conntrack ipset %{!?with_nftset:no-}nftset auth cryptohash DNSSEC loop-detect inotify dumpfile"
%if %{with tftp_user_package} %if %{with tftp_user_package}
%sysusers_generate_pre %{SOURCE6} dnsmasq system-user-dnsmasq.conf %sysusers_generate_pre %{SOURCE6} dnsmasq system-user-dnsmasq.conf
%endif %endif
@ -141,7 +148,7 @@ if ! %{_bindir}/getent passwd tftp >/dev/null; then
-r -s /bin/false tftp -r -s /bin/false tftp
fi fi
if ! %{_bindir}/getent passwd dnsmasq >/dev/null; then 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 %{_sbindir}/useradd -r -d %{_localstatedir}/lib/empty -s /bin/false -c "dnsmasq" -g "%dnsmasq_group" -G tftp dnsmasq
fi fi
%else %else