From 83b06e6b6048c54ba2c385e4c1b4908d2d633576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 15:35:23 +0100 Subject: [PATCH 1/3] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- knot-resolver.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/knot-resolver.spec b/knot-resolver.spec index 35809b2..17290de 100644 --- a/knot-resolver.spec +++ b/knot-resolver.spec @@ -7,7 +7,7 @@ Name: knot-resolver Version: 5.7.4 -Release: 1%{?dist} +Release: 4%{?dist} Summary: Caching full DNS Resolver License: GPL-3.0-or-later @@ -66,7 +66,6 @@ BuildRequires: lmdb-devel Requires: lua-basexx Requires: lua-psl Requires: lua-http -Requires(pre): shadow-utils %endif %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: pkgconfig(lmdb) @@ -75,7 +74,6 @@ Requires: lua5.1-basexx Requires: lua5.1-cqueues Requires: lua5.1-http Recommends: lua5.1-psl -Requires(pre): shadow-utils %endif # we do not build HTTP module on SuSE so the build requires is not needed @@ -167,6 +165,11 @@ gpg2 --verify %{SOURCE1} %{SOURCE0} %endif %setup -q -n %{name}-%{version} +# Create a sysusers.d config file +cat >knot-resolver.sysusers.conf </dev/null || groupadd -r knot-resolver -getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysconfdir}/knot-resolver -s /sbin/nologin -c "Knot Resolver" knot-resolver +install -m0644 -D knot-resolver.sysusers.conf %{buildroot}%{_sysusersdir}/knot-resolver.conf +%pre %if "x%{?rhel}" == "x" # upgrade-4-to-5 if [ -f %{_unitdir}/kresd.socket ] ; then @@ -349,6 +351,7 @@ fi %{_libdir}/knot-resolver/kres_modules/watchdog.lua %{_libdir}/knot-resolver/kres_modules/workarounds.lua %{_mandir}/man8/kresd.8.gz +%{_sysusersdir}/knot-resolver.conf %files devel %{_includedir}/libkres @@ -378,6 +381,9 @@ fi %endif %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 5.7.4-4 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Wed Jul 24 2024 Jakub Ružička - 5.7.4-1 - New upstream version 5.7.4 From dd2ee9e7f4d775adedbfec5a0f3891862cd006aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 24 Apr 2025 14:33:47 +0200 Subject: [PATCH 2/3] Release 5.7.5-1 --- knot-resolver.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/knot-resolver.spec b/knot-resolver.spec index 17290de..7906130 100644 --- a/knot-resolver.spec +++ b/knot-resolver.spec @@ -6,8 +6,8 @@ %define NINJA ninja-build Name: knot-resolver -Version: 5.7.4 -Release: 4%{?dist} +Version: 5.7.5 +Release: 1%{?dist} Summary: Caching full DNS Resolver License: GPL-3.0-or-later @@ -317,7 +317,6 @@ fi %{_sbindir}/kresc %{_sbindir}/kres-cache-gc %{_libdir}/libkres.so.* -%dir %{_libdir}/knot-resolver %{_libdir}/knot-resolver/*.so %{_libdir}/knot-resolver/*.lua %dir %{_libdir}/knot-resolver/kres_modules @@ -381,6 +380,10 @@ fi %endif %changelog +* Thu Apr 24 2025 Jakub Ružička - 5.7.5-1 +- New upstream version 5.7.5 +- Remove duplicate file listing + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 5.7.4-4 - Add sysusers.d config file to allow rpm to create users/groups automatically diff --git a/sources b/sources index 9f73da1..c63e839 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-resolver-5.7.4.tar.xz) = 5d8ea5b5b0cba5a1058aaa6e04573c838895d6b2c204e8d09c9ad898fb074c52ef7589afdad164b007edf151167d31fd0f940466edfeec597f96e5bc1cd72171 -SHA512 (knot-resolver-5.7.4.tar.xz.asc) = d34a0e1fd8be372c325199ace5bb6f20b2b395a4fb5a6f6f4c2c89f29741ecfd36234900b0e836c174df831716012589231551b13426a6728e37aba6c74c197f +SHA512 (knot-resolver-5.7.5.tar.xz) = b9ade76accf60c7eee173cfff18e1881e79bcd63d85ef583973244bf37f40c4c57fed00d840c61643b65b82b1f93f85480c4f10334416cab87fae3da46918fc3 +SHA512 (knot-resolver-5.7.5.tar.xz.asc) = df06eb244fa051a5f71385424b2da2479203019c6824344ec2226bc4851a3eb12eb3bb0f6f5a3e5ccce8c5875b6867924fa46b6939545cb35b24ef799f9ef6b0 From 5564e5de3acdc08251d978bdf84499e3f3156ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Fri, 18 Jul 2025 14:53:19 +0200 Subject: [PATCH 3/3] Release 5.7.6-1 --- knot-resolver.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot-resolver.spec b/knot-resolver.spec index 7906130..79e410a 100644 --- a/knot-resolver.spec +++ b/knot-resolver.spec @@ -6,7 +6,7 @@ %define NINJA ninja-build Name: knot-resolver -Version: 5.7.5 +Version: 5.7.6 Release: 1%{?dist} Summary: Caching full DNS Resolver @@ -53,7 +53,7 @@ Requires: systemd Requires(post): systemd # dnstap module dependencies -# SUSE is missing protoc-c protobuf compiler +# SUSE is missing protoc protobuf compiler %if "x%{?suse_version}" == "x" BuildRequires: pkgconfig(libfstrm) BuildRequires: pkgconfig(libprotobuf-c) @@ -380,6 +380,9 @@ fi %endif %changelog +* Fri Jul 18 2025 Jakub Ružička - 5.7.6-1 +- New upstream version 5.7.6 + * Thu Apr 24 2025 Jakub Ružička - 5.7.5-1 - New upstream version 5.7.5 - Remove duplicate file listing diff --git a/sources b/sources index c63e839..0ed2cdf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-resolver-5.7.5.tar.xz) = b9ade76accf60c7eee173cfff18e1881e79bcd63d85ef583973244bf37f40c4c57fed00d840c61643b65b82b1f93f85480c4f10334416cab87fae3da46918fc3 -SHA512 (knot-resolver-5.7.5.tar.xz.asc) = df06eb244fa051a5f71385424b2da2479203019c6824344ec2226bc4851a3eb12eb3bb0f6f5a3e5ccce8c5875b6867924fa46b6939545cb35b24ef799f9ef6b0 +SHA512 (knot-resolver-5.7.6.tar.xz) = 4dcaff56b0368bc147e04ffbf6ce4a3595fa3a59e99e73b516edc7813142abcb20823b987824b11a31e3eca3cc62fa176caf4408361daeac67b6f0587f9a0268 +SHA512 (knot-resolver-5.7.6.tar.xz.asc) = 478449d96dddaff9aff134a2a3bc991d8e50423f38a00e7256b54be9ab89d85d66eaa8e83815f4b31700b16fd94f8017493db6347e57d0583feec38bb35655f6