From 86b38a209837556a600386399200197fdbcd6355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 23 Jan 2025 13:09:22 +0100 Subject: [PATCH 1/6] Release 3.4.4-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index a007fea..3fe3eca 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.4.3 +Version: 3.4.4 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -324,6 +324,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Jan 23 2025 Jakub Ružička - 3.4.4-1 +- Update to 3.4.4 + * Tue Dec 10 2024 Jakub Ružička - 3.4.3-1 - Update to 3.4.3 diff --git a/sources b/sources index 8943dbb..ebdd2bb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.4.3.tar.xz) = c05a214a9e5564d09257aff44c0f42e9d084d47536197c95dff7aa125a8b53ed99e26c90affaa6833779778cd8d37af9cc473f108ab6acf7230c476b5858c03f -SHA512 (knot-3.4.3.tar.xz.asc) = ee8618401628a2979475fb9cf6c408d454841d5aa35fd801fdb5c24f48efc000d39160b995490341de4c0db5942deedab8991436304a9d4900560274ea526b48 +SHA512 (knot-3.4.4.tar.xz) = bf8e80d430336934083c1f7c304306de78b254fba5d3b9dd8b44065a0f1527cd78b74d498d994822ed2d364b66091ad967d3cd991bde380fbba67ea34a1ee33f +SHA512 (knot-3.4.4.tar.xz.asc) = ee66d1b1304cd4630ce002e849f02a5f722ba1506c8d32b48bd7f80659227de774a1d4331b02187b0d5c8bb5a13a06cf5c9ca6688ee3662694b866856a5a6a09 From 0073185135a5d21f5b61c3860f8631c427fd3e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 23 Jan 2025 19:41:30 +0100 Subject: [PATCH 2/6] Add sysusers.d config file to allow rpm to create users/groups automatically --- knot.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/knot.spec b/knot.spec index 3fe3eca..2836d60 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz @@ -148,6 +148,11 @@ gpg2 --verify %{SOURCE1} %{SOURCE0} %endif %autosetup -p1 +# Create a sysusers.d config file +cat >knot.sysusers.conf </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 @@ -273,6 +276,7 @@ getent passwd knot >/dev/null || \ %{_mandir}/man8/knotc.* %{_mandir}/man8/knotd.* %ghost %attr(770,root,knot) %dir %{_rundir}/knot +%{_sysusersdir}/knot.conf %files utils %{_bindir}/kdig @@ -324,6 +328,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek - 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 - 3.4.4-1 - Update to 3.4.4 From c459b0f7a562b988bbefe3be2c39ee37772abae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 19 Mar 2025 15:57:06 +0100 Subject: [PATCH 3/6] Release 3.4.5-1 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 2836d60..ae1e887 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.4.4 -Release: 2%{?dist} +Version: 3.4.5 +Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz @@ -328,6 +328,9 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog +* Wed Mar 19 2025 Jakub Ružička - 3.4.5-1 +- Update to 3.4.5 + * Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek - 3.4.4-2 - Add sysusers.d config file to allow rpm to create users/groups automatically diff --git a/sources b/sources index ebdd2bb..b9c4389 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.4.4.tar.xz) = bf8e80d430336934083c1f7c304306de78b254fba5d3b9dd8b44065a0f1527cd78b74d498d994822ed2d364b66091ad967d3cd991bde380fbba67ea34a1ee33f -SHA512 (knot-3.4.4.tar.xz.asc) = ee66d1b1304cd4630ce002e849f02a5f722ba1506c8d32b48bd7f80659227de774a1d4331b02187b0d5c8bb5a13a06cf5c9ca6688ee3662694b866856a5a6a09 +SHA512 (knot-3.4.5.tar.xz) = 62e7023fa2a9b2323104816dbc2adeec513b70c1891f5f87ab4e951d0db18717f1089bab8b5d2ada008fcf2efd9f0547881084a2e6121891e15cbe9992528c9e +SHA512 (knot-3.4.5.tar.xz.asc) = 50b5c798dac5b7370508c9cc7571e2b3bda0f38a3b521b92710f779adb33a370d313a7ee41a6daffabdba5cf28e50c2a7ac463318b017a3eea826a011951cac9 From 7e3eb066389595ff36241b3d293bd7f98a071918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 10 Apr 2025 14:56:53 +0200 Subject: [PATCH 4/6] Release 3.4.6-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index ae1e887..4c34976 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.4.5 +Version: 3.4.6 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -328,6 +328,9 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog +* Thu Apr 10 2025 Jakub Ružička - 3.4.6-1 +- Update to 3.4.6 + * Wed Mar 19 2025 Jakub Ružička - 3.4.5-1 - Update to 3.4.5 diff --git a/sources b/sources index b9c4389..86febab 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.4.5.tar.xz) = 62e7023fa2a9b2323104816dbc2adeec513b70c1891f5f87ab4e951d0db18717f1089bab8b5d2ada008fcf2efd9f0547881084a2e6121891e15cbe9992528c9e -SHA512 (knot-3.4.5.tar.xz.asc) = 50b5c798dac5b7370508c9cc7571e2b3bda0f38a3b521b92710f779adb33a370d313a7ee41a6daffabdba5cf28e50c2a7ac463318b017a3eea826a011951cac9 +SHA512 (knot-3.4.6.tar.xz) = 30e6a843c5b4b89fd51f062f138e031a96cbaf86db5a559ab10dc98d3705086bd987bf99deb5f2c077f7201af8f05311ab8b579bfafa7d285ca4c3e78de8c096 +SHA512 (knot-3.4.6.tar.xz.asc) = 400512cfddadd93e4b536d2421126ee5fce19fa03e0ad6cee2407b1f67e242b9d65ac4ea3f527c17a7100cb63b583cf8a4ca617f6fe119cd4f15a001a0c80abf From 61e20ab0f86912ff995c7760c4b8ead539c92590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 4 Jun 2025 12:17:47 +0200 Subject: [PATCH 5/6] Release 3.4.7-1 --- knot.spec | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- sources | 4 +-- 2 files changed, 86 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 4c34976..68a6d7a 100644 --- a/knot.spec +++ b/knot.spec @@ -2,12 +2,19 @@ %{!?_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.4.6 +Version: 3.4.7 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -39,6 +46,9 @@ BuildRequires: pkgconfig(libmnl) BuildRequires: pkgconfig(libnghttp2) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd) +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: softhsm +%endif # dnstap dependencies BuildRequires: pkgconfig(libfstrm) BuildRequires: pkgconfig(libprotobuf-c) @@ -46,6 +56,15 @@ 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} @@ -129,6 +148,23 @@ 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 doc Summary: Documentation for the Knot DNS server BuildArch: noarch @@ -179,9 +215,43 @@ 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* @@ -302,6 +372,15 @@ V=1 make check %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 libs %license COPYING %doc NEWS @@ -328,6 +407,10 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog +* Thu Jun 12 2025 Jakub Ružička - 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 - 3.4.6-1 - Update to 3.4.6 diff --git a/sources b/sources index 86febab..c5dab5b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.4.6.tar.xz) = 30e6a843c5b4b89fd51f062f138e031a96cbaf86db5a559ab10dc98d3705086bd987bf99deb5f2c077f7201af8f05311ab8b579bfafa7d285ca4c3e78de8c096 -SHA512 (knot-3.4.6.tar.xz.asc) = 400512cfddadd93e4b536d2421126ee5fce19fa03e0ad6cee2407b1f67e242b9d65ac4ea3f527c17a7100cb63b583cf8a4ca617f6fe119cd4f15a001a0c80abf +SHA512 (knot-3.4.7.tar.xz) = edc0ac8f6bcb9a2bb0221fbc438f8b0b048bd592bea0a486f2cd8bedfd52509e3692a2e29daa39fdd4c11f7d1d83aa0b0d7394b94c8e15d570535cdc2b3a2e13 +SHA512 (knot-3.4.7.tar.xz.asc) = 56f15712467b06440daf5ab8e69d69671345959a0c91d799b2c43e6eb7f14f5be543abd11ff0d99edb45bb4b397fc0ee9f02282669832778cf6e4b2d56fe550a From 76fa83c7ac66e62031eeb54bbe524bbcf1437669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 30 Jul 2025 18:51:10 +0200 Subject: [PATCH 6/6] Release 3.4.8-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 68a6d7a..ef0915b 100644 --- a/knot.spec +++ b/knot.spec @@ -14,7 +14,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.4.7 +Version: 3.4.8 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -407,6 +407,9 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog +* Wed Jul 30 2025 Jakub Ružička - 3.4.8-1 +- Update to 3.4.8 + * Thu Jun 12 2025 Jakub Ružička - 3.4.7-1 - Update to 3.4.7 - Add new knot-exporter and python3-libknot packages diff --git a/sources b/sources index c5dab5b..2b9d53a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.4.7.tar.xz) = edc0ac8f6bcb9a2bb0221fbc438f8b0b048bd592bea0a486f2cd8bedfd52509e3692a2e29daa39fdd4c11f7d1d83aa0b0d7394b94c8e15d570535cdc2b3a2e13 -SHA512 (knot-3.4.7.tar.xz.asc) = 56f15712467b06440daf5ab8e69d69671345959a0c91d799b2c43e6eb7f14f5be543abd11ff0d99edb45bb4b397fc0ee9f02282669832778cf6e4b2d56fe550a +SHA512 (knot-3.4.8.tar.xz) = 62fb62e07c751bbc63759c0c74e3967b6a245bb0c76770e109b2c1bacf1580be98315ce3ecac8adfbdd37beab7b300a06078c44e57a1189def9efbc48b8d2c3e +SHA512 (knot-3.4.8.tar.xz.asc) = 55900f6cd9963299066597da6eab2be61a9a8fb7acd562b24a6883466e132372b99fc9e9643aef39566d2eff5fec27850fed0d8b97ca8ea417626ef5c90481e1