Release 3.3.10-1

Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>

knot.spec

@@ -2,19 +2,12 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}}
 
 %define GPG_CHECK 1
-%if 0%{?fedora} >= 40 || 0%{?rhel} >= 9
-# use modern %pyproject_* macros on distros which support them
-%define PYPROJECT 1
-%else
-# use older %py3_* macros on older/other distros
-%define PYPROJECT 0
-%endif
 %define BASE_VERSION %(echo "%{version}" | sed 's/^\\([^.]\\+\\.[^.]\\+\\).*/\\1/')
 %define repodir %{_builddir}/%{name}-%{version}
 
 Summary:	High-performance authoritative DNS server
 Name:		knot
-Version:	3.5.2
+Version:	3.3.10
 Release:	1%{?dist}
 License:	GPL-3.0-or-later
 URL:		https://www.knot-dns.cz
@@ -46,10 +39,6 @@ BuildRequires:	pkgconfig(libmnl)
 BuildRequires:	pkgconfig(libnghttp2)
 BuildRequires:	pkgconfig(libsystemd)
 BuildRequires:	pkgconfig(systemd)
-BuildRequires:	pkgconfig(hiredis)
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires:	softhsm
-%endif
 # dnstap dependencies
 BuildRequires:	pkgconfig(libfstrm)
 BuildRequires:	pkgconfig(libprotobuf-c)
@@ -57,15 +46,6 @@ BuildRequires:	pkgconfig(libprotobuf-c)
 BuildRequires:	pkgconfig(libmaxminddb)
 # XDP dependencies
 BuildRequires:	pkgconfig(libbpf)
-# Python modules (python3-libknot, knot-exporter) dependencies
-BuildRequires:  python3-devel
-%if 0%{?PYPROJECT}
-BuildRequires:  pyproject-rpm-macros
-BuildRequires:  python3-pip
-BuildRequires:  python3-hatchling
-%else
-BuildRequires:  python3-setuptools
-%endif
 
 # Distro-dependent dependencies
 %if 0%{?suse_version}
@@ -95,8 +75,6 @@ Requires(postun):	systemd
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
-Recommends:	%{name}-keymgr
-
 %if 0%{?suse_version}
 Provides:	group(knot)
 %endif
@@ -106,8 +84,8 @@ Knot DNS is a high-performance authoritative DNS server implementation.
 
 %package libs
 Summary:	Libraries used by the Knot DNS server and client applications
-# Knot DNS 3.5+ isn't compatible with earlier knot-resolver
-Conflicts:	knot-resolver < 5.7.6-3
+# Knot DNS 3.3+ isn't compatible with earlier knot-resolver
+Conflicts:	knot-resolver < 5.7.0
 
 %description libs
 The package contains shared libraries used by the Knot DNS server and
@@ -137,13 +115,6 @@ Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 %description dnssecutils
 The package contains DNSSEC tools shipped with the Knot DNS server.
 
-%package keymgr
-Summary:	Knot DNS key management utility
-Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
-
-%description keymgr
-The package contains keymgr program for Knot DNS key management.
-
 %package module-dnstap
 Summary:	dnstap module for Knot DNS
 Requires:	%{name} = %{version}-%{release}
@@ -158,30 +129,6 @@ Requires:	%{name} = %{version}-%{release}
 %description module-geoip
 The package contains geoip Knot DNS module for geography-based responses.
 
-%package exporter
-Summary:	Prometheus exporter for Knot DNS
-BuildArch:	noarch
-Requires:	%{name}-libs = %{version}-%{release}
-
-%description exporter
-The package provides Python Prometheus exporter for Knot DNS.
-
-%package -n python3-libknot
-Summary:	Python bindings for libknot
-BuildArch:	noarch
-Requires:	%{name}-libs = %{version}-%{release}
-%{?python_provide:%python_provide python3-libknot}
-
-%description -n python3-libknot
-The package provides Python bindings for the libknot shared library.
-
-%package -n valkey-module-knot
-Summary:	Valkey module for Knot DNS.
-Requires:	%{name}-libs = %{version}-%{release}
-
-%description -n valkey-module-knot
-The package provides Valkey module for Knot DNS.
-
 %package doc
 Summary:	Documentation for the Knot DNS server
 BuildArch:	noarch
@@ -201,11 +148,6 @@ gpg2 --verify %{SOURCE1} %{SOURCE0}
 %endif
 %autosetup -p1
 
-# Create a sysusers.d config file
-cat >knot.sysusers.conf <<EOF
-u knot - 'Knot DNS server' %{_sharedstatedir}/knot -
-EOF
-
 %build
 # disable debug code (causes unused warnings)
 CFLAGS="%{optflags} -DNDEBUG -Wno-unused"
@@ -222,11 +164,9 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused"
   --libexecdir=/usr/lib/knot \
   --with-rundir=/run/knot \
   --with-moduledir=%{_libdir}/knot/modules-%{BASE_VERSION} \
-  --with-redisdir=%{_libdir}/valkey/modules \
   --with-storage=/var/lib/knot \
   %{?configure_db_sizes} \
   %{?configure_quic} \
-  --enable-redis=auto \
   --disable-static \
   --enable-dnstap=yes \
   --with-module-dnstap=shared \
@@ -234,43 +174,9 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused"
 make %{?_smp_mflags}
 make html
 
-# build python3-libknot
-pushd python/libknot
-%if %{PYPROJECT}
-%pyproject_wheel
-%else
-%py3_build
-%endif
-popd
-# build knot-exporter
-pushd python/knot_exporter
-%if %{PYPROJECT}
-%pyproject_wheel
-%else
-%py3_build
-%endif
-popd
-
 %install
 make install DESTDIR=%{buildroot}
 
-# install python3-libknot
-pushd python/libknot
-%if %{PYPROJECT}
-%pyproject_install
-%else
-%py3_install
-%endif
-popd
-# install knot-exporter
-pushd python/knot_exporter
-%if %{PYPROJECT}
-%pyproject_install
-%else
-%py3_install
-%endif
-popd
-
 # install documentation
 install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples
 install -p -m 0644 -t %{buildroot}%{_pkgdocdir}/samples samples/*.zone*
@@ -299,12 +205,14 @@ install -d -m 0770 -D %{buildroot}%{_sharedstatedir}/knot
 # remove libarchive files
 find %{buildroot} -type f -name "*.la" -delete -print
 
-install -m0644 -D knot.sysusers.conf %{buildroot}%{_sysusersdir}/knot.conf
-
 %check
 V=1 make check
 
 %pre
+getent group knot >/dev/null || groupadd -r knot
+getent passwd knot >/dev/null || \
+  useradd -r -g knot -d %{_sharedstatedir}/knot -s /sbin/nologin \
+  -c "Knot DNS server" knot
 %if 0%{?suse_version}
 %service_add_pre knot.service
 %endif
@@ -352,6 +260,7 @@ V=1 make check
 %{_unitdir}/knot.service
 %{_sbindir}/kcatalogprint
 %{_sbindir}/kjournalprint
+%{_sbindir}/keymgr
 %{_sbindir}/knotc
 %{_sbindir}/knotd
 %if 0%{?suse_version}
@@ -360,10 +269,10 @@ V=1 make check
 %{_mandir}/man5/knot.conf.*
 %{_mandir}/man8/kcatalogprint.*
 %{_mandir}/man8/kjournalprint.*
+%{_mandir}/man8/keymgr.*
 %{_mandir}/man8/knotc.*
 %{_mandir}/man8/knotd.*
 %ghost %attr(770,root,knot) %dir %{_rundir}/knot
-%{_sysusersdir}/knot.conf
 
 %files utils
 %{_bindir}/kdig
@@ -383,28 +292,12 @@ V=1 make check
 %{_mandir}/man1/kzonecheck.*
 %{_mandir}/man1/kzonesign.*
 
-%files keymgr
-%{_sbindir}/keymgr
-%{_mandir}/man8/keymgr.*
-
 %files module-dnstap
 %{_libdir}/knot/modules-*/dnstap.so
 
 %files module-geoip
 %{_libdir}/knot/modules-*/geoip.so
 
-%files exporter
-%{_bindir}/knot-exporter
-%{python3_sitelib}/knot_exporter
-%{python3_sitelib}/knot_exporter-*-info
-
-%files -n python3-libknot
-%{python3_sitelib}/libknot
-%{python3_sitelib}/libknot-*-info
-
-%files -n valkey-module-knot
-%attr(0755, root, root) %{_libdir}/valkey/modules/knot.so
-
 %files libs
 %license COPYING
 %doc NEWS
@@ -431,50 +324,8 @@ V=1 make check
 %doc %{_pkgdocdir}/html
 
 %changelog
-* Fri Dec 19 2025 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.5.2-1
-- Update to 3.5.2
-
-* Thu Oct 16 2025 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.5.1-1
-- Update to 3.5.1
-- Add new valkey-module-knot package
-- Split keymgr into knot-keymgr package
-
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 3.4.8-3
-- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 3.4.8-2
-- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Wed Jul 30 2025 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.4.8-1
-- Update to 3.4.8
-
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jun 12 2025 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.4.7-1
-- Update to 3.4.7
-- Add new knot-exporter and python3-libknot packages
-
-* Thu Apr 10 2025 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.4.6-1
-- Update to 3.4.6
-
-* Wed Mar 19 2025 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.4.5-1
-- Update to 3.4.5
-
-* Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.4.4-2
-- Add sysusers.d config file to allow rpm to create users/groups automatically
-
-* Thu Jan 23 2025 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.4.4-1
-- Update to 3.4.4
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Tue Dec 10 2024 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.4.3-1
-- Update to 3.4.3
-
-* Mon Nov 25 2024 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.4.2-1
-- Update to 3.4.2
+* Thu Dec 12 2024 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.3.10-1
+- Update to 3.3.10
 
 * Mon Aug 26 2024 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.3.9-1
 - Update to 3.3.9
@@ -482,9 +333,6 @@ V=1 make check
 * Mon Jul 22 2024 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.3.8-1
 - Update to 3.3.8
 
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
 * Tue Jun 25 2024 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.3.7-1
 - Update to 3.3.7
 
@@ -497,9 +345,6 @@ V=1 make check
 * Wed Jan 24 2024 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.3.4-1
 - Update to 3.3.4
 
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
 * Wed Dec 13 2023 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.3.3-1
 - Update to 3.3.3
 
@@ -515,9 +360,6 @@ V=1 make check
 * Thu Jul 27 2023 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.2.9-1
 - Update to 3.2.9
 
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
 * Mon Jun 26 2023 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.2.8-1
 - Update to 3.2.8
 
@@ -536,21 +378,12 @@ V=1 make check
 * Thu Feb 02 2023 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.2.5-1
 - Update to 3.2.5
 
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
 * Mon Dec 12 2022 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.2.4-1
 - Update to 3.2.4
 
-* Mon Nov 28 2022 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.2.3-2
-- Rebuilt for libbpf 1.0 transition
-
 * Mon Nov 21 2022 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.2.3-1
 - Update to 3.2.3
 
-* Fri Nov 04 2022 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.2.2-2
-- New BuildRequires: libxdp (needed for libbpf >= 1.0)
-
 * Tue Nov 01 2022 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.2.2-1
 - Update to 3.2.2
 
@@ -568,9 +401,6 @@ V=1 make check
 - Debian compat (knot-utils vs knot-dnsutils)
 - Remove bundled(jquery) version as it differes between distros
 
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
 * Thu Apr 28 2022 Jakub Ružička <jakub.ruzicka@nic.cz> - 3.1.8-1
 - Update to 3.1.8
 

sources

@@ -1,2 +1,2 @@
-SHA512 (knot-3.5.2.tar.xz) = 4dd8e42088f792459859da807427024ded926c2a8fb5b9fd4596b631a184269e3d84f0cd4be9192f2546977c598c418f8d44cabccbc393f9f7cf2f0dd5adc595
-SHA512 (knot-3.5.2.tar.xz.asc) = 5f6ee7fedc0d5b904572d2f6d47858065cdc4efa7217b4e9dcbb38ae63a1533646ba2b042bb0c1fe533a3caf6ba41c81010616393d2a0adcea77712608931b38
+SHA512 (knot-3.3.10.tar.xz) = 0110afd6670d95335ad711489d2548f2862601f6426f509734c1c809738d22ac325aaa9358b0873ee0aefe152111b8cb6fd544f3c65ffabb30ea1a8f5c1befae
+SHA512 (knot-3.3.10.tar.xz.asc) = 06e609e2f1555b515288e9e5ea1829970cfd1b4bc4c7f8214c719723f5ab8ad927f761206ecc27a04c9eb51141b625716ed308aac0b610b4c5f459fda0f46e38