From 0cbaf1350857ce701feb4e03b261fabd2336c12c Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 15 Sep 2025 11:53:29 +0000 Subject: [PATCH] import CS dnsconfd-1.7.3-1.el9 --- .dnsconfd.metadata | 2 +- .gitignore | 2 +- SPECS/dnsconfd.spec | 14 +++++++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.dnsconfd.metadata b/.dnsconfd.metadata index 870871f..313576f 100644 --- a/.dnsconfd.metadata +++ b/.dnsconfd.metadata @@ -1 +1 @@ -1767e543dda69c7adffcc3ff089a4497d60f4850 SOURCES/dnsconfd-1.7.2.tar.gz +fa799ec7e902013be97952bee2d3babe28b1a5d0 SOURCES/dnsconfd-1.7.3.tar.gz diff --git a/.gitignore b/.gitignore index 7b6283f..656c6f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dnsconfd-1.7.2.tar.gz +SOURCES/dnsconfd-1.7.3.tar.gz diff --git a/SPECS/dnsconfd.spec b/SPECS/dnsconfd.spec index 5f4be79..15389b3 100644 --- a/SPECS/dnsconfd.spec +++ b/SPECS/dnsconfd.spec @@ -2,7 +2,7 @@ %global selinuxtype targeted Name: dnsconfd -Version: 1.7.2 +Version: 1.7.3 Release: 1%{?dist} Summary: Local DNS cache configuration daemon License: MIT @@ -17,7 +17,9 @@ BuildRequires: python3-rpm-macros BuildRequires: python3-pip BuildRequires: systemd BuildRequires: systemd-rpm-macros +%if %{defined fedora} && 0%{?fedora} < 42 || %{defined rhel} && 0%{?rhel} < 11 %{?sysusers_requires_compat} +%endif Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) Requires: python3-gobject-base @@ -28,6 +30,7 @@ Requires: dbus-common Requires: %{name}-cache Requires: polkit Suggests: %{name}-unbound +Requires: (%{name}-unbound = %{version}-%{release} if %{name}-unbound) %?python_enable_dependency_generator @@ -182,11 +185,13 @@ fi %posttrans selinux %selinux_relabel_post -s %{selinuxtype} +%if %{defined fedora} && 0%{?fedora} < 42 || %{defined rhel} && 0%{?rhel} < 11 %pre %sysusers_create_compat %{SOURCE1} %pre unbound %sysusers_create_compat %{SOURCE1} +%endif %post %systemd_post %{name}.service @@ -230,12 +235,19 @@ fi %{_unitdir}/unbound.service.d/dnsconfd.conf %config(noreplace) %attr(644,unbound,unbound) %{_sysconfdir}/unbound/conf.d/unbound.conf %attr(664,dnsconfd,dnsconfd) %{_rundir}/dnsconfd/unbound.conf +%{_sysusersdir}/dnsconfd.conf %{_tmpfilesdir}/dnsconfd-unbound.conf %files dracut %{_prefix}/lib/dracut/modules.d/99dnsconfd %changelog +* Tue Jun 03 2025 Tomas Korbar - 1.7.3-1 +- Rebase to 1.7.3 +- Resolves: RHEL-94999 +- Resolves: RHEL-94998 +- Resolves: RHEL-94997 + * Fri Feb 28 2025 Tomas Korbar - 1.7.2-1 - Rebase to 1.7.2 - Resolves: RHEL-80309