From 445ef4d90e553efa0f8566dfbb70e3104e5068a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 22 Aug 2022 15:13:27 +0200 Subject: [PATCH 01/17] Release 3.2.0-1 --- ...sts-xdp-tcp-fix-under-32bit-platform.patch | 67 +++++++++++++++++++ 03-revert-distro-harden-systemd-service.patch | 31 +++++++++ knot.spec | 55 ++++++++++----- sources | 4 +- 4 files changed, 138 insertions(+), 19 deletions(-) create mode 100644 02-tests-xdp-tcp-fix-under-32bit-platform.patch create mode 100644 03-revert-distro-harden-systemd-service.patch diff --git a/02-tests-xdp-tcp-fix-under-32bit-platform.patch b/02-tests-xdp-tcp-fix-under-32bit-platform.patch new file mode 100644 index 0000000..06e45e5 --- /dev/null +++ b/02-tests-xdp-tcp-fix-under-32bit-platform.patch @@ -0,0 +1,67 @@ +From 2fc4c0fcc1b0f75413ceeb580472ad05ffffe3b6 Mon Sep 17 00:00:00 2001 +From: Libor Peltan +Date: Mon, 22 Aug 2022 15:07:50 +0200 +Subject: [PATCH] tests/xdp-tcp: fix under 32bit platform + +--- + tests/libknot/test_xdp_tcp.c | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/tests/libknot/test_xdp_tcp.c b/tests/libknot/test_xdp_tcp.c +index fb044aca4..64e3bdc95 100644 +--- a/tests/libknot/test_xdp_tcp.c ++++ b/tests/libknot/test_xdp_tcp.c +@@ -23,6 +23,8 @@ + #include "libknot/xdp/tcp_iobuf.c" + #include "libknot/xdp/bpf-user.h" + ++#define INFTY INT32_MAX ++ + knot_tcp_table_t *test_table = NULL; + knot_tcp_table_t *test_syn_table = NULL; + #define TEST_TABLE_SIZE 100 +@@ -148,7 +150,7 @@ static int mock_send2(_unused_ knot_xdp_socket_t *sock, const knot_xdp_msg_t msg + + static void clean_table(void) + { +- (void)tcp_cleanup(test_table, 0, UINT32_MAX); ++ (void)tcp_cleanup(test_table, 0, INFTY); + } + + static void clean_sent(void) +@@ -421,8 +423,8 @@ void test_many(void) + clean_sent(); + + knot_sweep_stats_t stats = { 0 }; +- ret = knot_tcp_sweep(test_table, timeout_time, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, +- UINT32_MAX, rls, CONNS, &stats); ++ ret = knot_tcp_sweep(test_table, timeout_time, INFTY, INFTY, INFTY, INFTY, ++ INFTY, rls, CONNS, &stats); + is_int(KNOT_EOK, ret, "many/timeout1: OK"); + is_int(CONNS - 1, stats.counters[KNOT_SWEEP_CTR_TIMEOUT], "many/timeout1: close count"); + is_int(0, stats.counters[KNOT_SWEEP_CTR_LIMIT_CONN], "may/timeout1: reset count"); +@@ -431,8 +433,8 @@ void test_many(void) + check_sent(0, 0, 0, CONNS - 1); + + knot_sweep_stats_reset(&stats); +- ret = knot_tcp_sweep(test_table, UINT32_MAX, timeout_time, UINT32_MAX, UINT32_MAX, UINT32_MAX, +- UINT32_MAX, rls, CONNS, &stats); ++ ret = knot_tcp_sweep(test_table, INFTY, timeout_time, INFTY, INFTY, INFTY, ++ INFTY, rls, CONNS, &stats); + is_int(KNOT_EOK, ret, "many/timeout2: OK"); + is_int(0, stats.counters[KNOT_SWEEP_CTR_TIMEOUT], "many/timeout2: close count"); + is_int(CONNS - 1, stats.counters[KNOT_SWEEP_CTR_LIMIT_CONN], "may/timeout2: reset count"); +@@ -502,8 +504,8 @@ void test_ibufs_size(void) + + // now free some + knot_sweep_stats_t stats = { 0 }; +- ret = knot_tcp_sweep(test_table, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, +- test_table->inbufs_total - 8, UINT32_MAX, rls, ++ ret = knot_tcp_sweep(test_table, INFTY, INFTY, INFTY, INFTY, ++ test_table->inbufs_total - 8, INFTY, rls, + CONNS, &stats); + is_int(KNOT_EOK, ret, "inbufs: timeout OK"); + ret = knot_tcp_send(test_sock, rls, CONNS, CONNS); +-- +2.37.1 + diff --git a/03-revert-distro-harden-systemd-service.patch b/03-revert-distro-harden-systemd-service.patch new file mode 100644 index 0000000..c4f5ce3 --- /dev/null +++ b/03-revert-distro-harden-systemd-service.patch @@ -0,0 +1,31 @@ +From 76b2e79356052753e0d5dc2c8daca2049b221e55 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= +Date: Wed, 24 Aug 2022 13:08:03 +0200 +Subject: [PATCH] Revert "distro: harden systemd service" + +This reverts commit e152a4c21e0f34bece12eb68af61e54ab2f30d8d. +--- + distro/common/knot.service | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/distro/common/knot.service b/distro/common/knot.service +index 39017de1e..a87292943 100644 +--- a/distro/common/knot.service ++++ b/distro/common/knot.service +@@ -21,13 +21,5 @@ Environment="KNOT_ZONE_LOAD_TIMEOUT_SEC=180" + # Maximum size (MiB) of a configuration database + Environment="KNOT_CONF_MAX_SIZE=512" + +-# Expected systemd >= v239 +-TemporaryFileSystem=/run:ro /var:ro +-BindPaths=/run/systemd +-RuntimeDirectory=knot +-StateDirectory=knot +-LogsDirectory=knot +-NoNewPrivileges=yes +- + [Install] + WantedBy=multi-user.target +-- +2.37.1 + diff --git a/knot.spec b/knot.spec index 64459ac..ce3094b 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.8 -Release: 2%{?dist} +Version: 3.2.0 +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 @@ -24,6 +24,10 @@ BuildRequires: gnupg2 # Test fails on F30+ aarch/s390x for unknown reason, but it is not neccassary for Knot DNS Patch1: 01-test_net-disable-udp-send-on-unconnected.patch +# Fix tests on 32bit platforms (merged upstream, drop on next release) +Patch2: 02-tests-xdp-tcp-fix-under-32bit-platform.patch +# Revert hardening of service file (problematic) +Patch3: 03-revert-distro-harden-systemd-service.patch # Required dependencies BuildRequires: autoconf @@ -65,18 +69,18 @@ BuildRequires: pkgconfig(lmdb) %endif %if 0%{?centos} == 7 || 0%{?rhel} == 7 -# disable XDP on old EL %define configure_xdp --enable-xdp=no %else %define use_xdp 1 -%if 0%{?rhel} >= 8 || 0%{?suse_version} -# enable XDP on recent EL using embedded libbpf +%if 0%{?rhel} == 8 || 0%{?suse_version} +# Use the embedded libbpf %define use_xdp 1 -%define configure_xdp --enable-xdp=yes +%define configure_xdp --enable-xdp=yes --enable-quic=yes BuildRequires: pkgconfig(libelf) %else # XDP is auto-enabled when libbpf is present -BuildRequires: pkgconfig(libbpf) >= 0.0.6 +%define configure_xdp --enable-quic=yes +BuildRequires: pkgconfig(libbpf) >= 0.0.6 %endif %endif @@ -110,10 +114,19 @@ included in knot-libs package. %package utils Summary: DNS client utilities shipped with the Knot DNS server Requires: %{name}-libs%{?_isa} = %{version}-%{release} +# Debian package compat +Provides: %{name}-dnsutils = %{version}-%{release} %description utils The package contains DNS client utilities shipped with the Knot DNS server. +%package dnssecutils +Summary: DNSSEC tools shipped with the Knot DNS server +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description dnssecutils +The package contains DNSSEC tools shipped with the Knot DNS server. + %package module-dnstap Summary: dnstap module for Knot DNS Requires: %{name} = %{version}-%{release} @@ -131,7 +144,7 @@ The package contains geoip Knot DNS module for geography-based responses. %package doc Summary: Documentation for the Knot DNS server BuildArch: noarch -Provides: bundled(jquery) = 3.1.0 +Provides: bundled(jquery) %description doc The package contains documentation for the Knot DNS server. @@ -193,7 +206,6 @@ install -p -m 0644 -D %{repodir}/distro/common/cz.nic.knotd.conf %{buildroot}%{_ # install systemd files install -p -m 0644 -D %{repodir}/distro/common/%{name}.service %{buildroot}%{_unitdir}/%{name}.service -install -p -m 0644 -D %{repodir}/distro/common/%{name}.tmpfiles %{buildroot}%{_tmpfilesdir}/%{name}.conf %if 0%{?suse_version} ln -s service %{buildroot}/%{_sbindir}/rcknot %endif @@ -218,7 +230,6 @@ getent passwd knot >/dev/null || \ %endif %post -systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %if 0%{?suse_version} %service_add_post knot.service %else @@ -259,9 +270,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %dir %{_libdir}/knot %dir %{_libdir}/knot/modules-* %{_unitdir}/knot.service -%{_tmpfilesdir}/knot.conf -%{_bindir}/kzonecheck -%{_bindir}/kzonesign %{_sbindir}/kcatalogprint %{_sbindir}/kjournalprint %{_sbindir}/keymgr @@ -270,8 +278,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %if 0%{?suse_version} %{_sbindir}/rcknot %endif -%{_mandir}/man1/kzonecheck.* -%{_mandir}/man1/kzonesign.* %{_mandir}/man5/knot.conf.* %{_mandir}/man8/kcatalogprint.* %{_mandir}/man8/kjournalprint.* @@ -283,7 +289,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %files utils %{_bindir}/kdig %{_bindir}/khost -%{_bindir}/knsec3hash %{_bindir}/knsupdate %if 0%{?use_xdp} %{_sbindir}/kxdpgun @@ -291,9 +296,16 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %endif %{_mandir}/man1/kdig.* %{_mandir}/man1/khost.* -%{_mandir}/man1/knsec3hash.* %{_mandir}/man1/knsupdate.* +%files dnssecutils +%{_bindir}/knsec3hash +%{_bindir}/kzonecheck +%{_bindir}/kzonesign +%{_mandir}/man1/knsec3hash.* +%{_mandir}/man1/kzonecheck.* +%{_mandir}/man1/kzonesign.* + %files module-dnstap %{_libdir}/knot/modules-*/dnstap.so @@ -326,6 +338,15 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Mon Aug 22 2022 Jakub Ružička - 3.2.0-1 +- Update to 3.2.0 +- Patch: fix tests on 32-bit platforms +- Patch: revert problematic hardening of service file +- Enable QUIC +- New knot-dnssecutils subpackage +- Debian compat (knot-utils vs knot-dnsutils) +- Remove bundled(jquery) version as it differes between distros + * Thu Jul 21 2022 Fedora Release Engineering - 3.1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index c031339..d33dd09 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.8.tar.xz) = af72cbcc5b511dad148e7ce990819df00bdf99c110b44b3b521eddd8690a6ebd4c76c24e63d843956971d5f158bbfa851804616630d34f3a0ec06888c78ecf2c -SHA512 (knot-3.1.8.tar.xz.asc) = 1d2e1d11dda0f52041b6e43ba94860891624e25763ce35a4cdcf8fb30bf0713a3e6b9776278fdfa60381c8bd32a32cd83b98a6f5a8684946fc94868f5314fab0 +SHA512 (knot-3.2.0.tar.xz) = e007d633f1debb559d47a7646b055dc970502be11a1849063da3e3d28355f77e6cba41e34f06726bc5945e4e2ba3ecb84a4b39813a8079514d3bf584d7d565a2 +SHA512 (knot-3.2.0.tar.xz.asc) = 47546df3933d66229bdc4b059664cbc4cda3f988ac3d8b2b8d0d8edeb2d0b60eb7a2bbd00019092d872eb56ac8d25f7227c526ae90035814be31fff755255681 From a9a7549aaa5f49e6789cdbf86d7855b1148b9d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Fri, 9 Sep 2022 15:40:47 +0200 Subject: [PATCH 02/17] Release 3.2.1-1 --- ...sts-xdp-tcp-fix-under-32bit-platform.patch | 67 ------------------- 03-revert-distro-harden-systemd-service.patch | 31 --------- knot.spec | 16 ++--- sources | 4 +- 4 files changed, 10 insertions(+), 108 deletions(-) delete mode 100644 02-tests-xdp-tcp-fix-under-32bit-platform.patch delete mode 100644 03-revert-distro-harden-systemd-service.patch diff --git a/02-tests-xdp-tcp-fix-under-32bit-platform.patch b/02-tests-xdp-tcp-fix-under-32bit-platform.patch deleted file mode 100644 index 06e45e5..0000000 --- a/02-tests-xdp-tcp-fix-under-32bit-platform.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 2fc4c0fcc1b0f75413ceeb580472ad05ffffe3b6 Mon Sep 17 00:00:00 2001 -From: Libor Peltan -Date: Mon, 22 Aug 2022 15:07:50 +0200 -Subject: [PATCH] tests/xdp-tcp: fix under 32bit platform - ---- - tests/libknot/test_xdp_tcp.c | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/tests/libknot/test_xdp_tcp.c b/tests/libknot/test_xdp_tcp.c -index fb044aca4..64e3bdc95 100644 ---- a/tests/libknot/test_xdp_tcp.c -+++ b/tests/libknot/test_xdp_tcp.c -@@ -23,6 +23,8 @@ - #include "libknot/xdp/tcp_iobuf.c" - #include "libknot/xdp/bpf-user.h" - -+#define INFTY INT32_MAX -+ - knot_tcp_table_t *test_table = NULL; - knot_tcp_table_t *test_syn_table = NULL; - #define TEST_TABLE_SIZE 100 -@@ -148,7 +150,7 @@ static int mock_send2(_unused_ knot_xdp_socket_t *sock, const knot_xdp_msg_t msg - - static void clean_table(void) - { -- (void)tcp_cleanup(test_table, 0, UINT32_MAX); -+ (void)tcp_cleanup(test_table, 0, INFTY); - } - - static void clean_sent(void) -@@ -421,8 +423,8 @@ void test_many(void) - clean_sent(); - - knot_sweep_stats_t stats = { 0 }; -- ret = knot_tcp_sweep(test_table, timeout_time, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, -- UINT32_MAX, rls, CONNS, &stats); -+ ret = knot_tcp_sweep(test_table, timeout_time, INFTY, INFTY, INFTY, INFTY, -+ INFTY, rls, CONNS, &stats); - is_int(KNOT_EOK, ret, "many/timeout1: OK"); - is_int(CONNS - 1, stats.counters[KNOT_SWEEP_CTR_TIMEOUT], "many/timeout1: close count"); - is_int(0, stats.counters[KNOT_SWEEP_CTR_LIMIT_CONN], "may/timeout1: reset count"); -@@ -431,8 +433,8 @@ void test_many(void) - check_sent(0, 0, 0, CONNS - 1); - - knot_sweep_stats_reset(&stats); -- ret = knot_tcp_sweep(test_table, UINT32_MAX, timeout_time, UINT32_MAX, UINT32_MAX, UINT32_MAX, -- UINT32_MAX, rls, CONNS, &stats); -+ ret = knot_tcp_sweep(test_table, INFTY, timeout_time, INFTY, INFTY, INFTY, -+ INFTY, rls, CONNS, &stats); - is_int(KNOT_EOK, ret, "many/timeout2: OK"); - is_int(0, stats.counters[KNOT_SWEEP_CTR_TIMEOUT], "many/timeout2: close count"); - is_int(CONNS - 1, stats.counters[KNOT_SWEEP_CTR_LIMIT_CONN], "may/timeout2: reset count"); -@@ -502,8 +504,8 @@ void test_ibufs_size(void) - - // now free some - knot_sweep_stats_t stats = { 0 }; -- ret = knot_tcp_sweep(test_table, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, -- test_table->inbufs_total - 8, UINT32_MAX, rls, -+ ret = knot_tcp_sweep(test_table, INFTY, INFTY, INFTY, INFTY, -+ test_table->inbufs_total - 8, INFTY, rls, - CONNS, &stats); - is_int(KNOT_EOK, ret, "inbufs: timeout OK"); - ret = knot_tcp_send(test_sock, rls, CONNS, CONNS); --- -2.37.1 - diff --git a/03-revert-distro-harden-systemd-service.patch b/03-revert-distro-harden-systemd-service.patch deleted file mode 100644 index c4f5ce3..0000000 --- a/03-revert-distro-harden-systemd-service.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 76b2e79356052753e0d5dc2c8daca2049b221e55 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= -Date: Wed, 24 Aug 2022 13:08:03 +0200 -Subject: [PATCH] Revert "distro: harden systemd service" - -This reverts commit e152a4c21e0f34bece12eb68af61e54ab2f30d8d. ---- - distro/common/knot.service | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/distro/common/knot.service b/distro/common/knot.service -index 39017de1e..a87292943 100644 ---- a/distro/common/knot.service -+++ b/distro/common/knot.service -@@ -21,13 +21,5 @@ Environment="KNOT_ZONE_LOAD_TIMEOUT_SEC=180" - # Maximum size (MiB) of a configuration database - Environment="KNOT_CONF_MAX_SIZE=512" - --# Expected systemd >= v239 --TemporaryFileSystem=/run:ro /var:ro --BindPaths=/run/systemd --RuntimeDirectory=knot --StateDirectory=knot --LogsDirectory=knot --NoNewPrivileges=yes -- - [Install] - WantedBy=multi-user.target --- -2.37.1 - diff --git a/knot.spec b/knot.spec index ce3094b..5747798 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.0 +Version: 3.2.1 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -24,10 +24,6 @@ BuildRequires: gnupg2 # Test fails on F30+ aarch/s390x for unknown reason, but it is not neccassary for Knot DNS Patch1: 01-test_net-disable-udp-send-on-unconnected.patch -# Fix tests on 32bit platforms (merged upstream, drop on next release) -Patch2: 02-tests-xdp-tcp-fix-under-32bit-platform.patch -# Revert hardening of service file (problematic) -Patch3: 03-revert-distro-harden-systemd-service.patch # Required dependencies BuildRequires: autoconf @@ -88,9 +84,6 @@ Requires(post): systemd %{_sbindir}/runuser Requires(preun): systemd Requires(postun): systemd -# Knot DNS 2.7+ isn't compatible with earlier knot-resolver -Conflicts: knot-resolver < 3.0.0 - Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description @@ -98,6 +91,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.2+ isn't compatible with earlier knot-resolver +Conflicts: knot-resolver < 5.5.2 %description libs The package contains shared libraries used by the Knot DNS server and @@ -338,6 +333,11 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Fri Sep 09 2022 Jakub Ružička - 3.2.1-1 +- Update to 3.2.1 +- Remove patches included upstream +- Update Conflicts and move to knot-libs + * Mon Aug 22 2022 Jakub Ružička - 3.2.0-1 - Update to 3.2.0 - Patch: fix tests on 32-bit platforms diff --git a/sources b/sources index d33dd09..6466b75 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.0.tar.xz) = e007d633f1debb559d47a7646b055dc970502be11a1849063da3e3d28355f77e6cba41e34f06726bc5945e4e2ba3ecb84a4b39813a8079514d3bf584d7d565a2 -SHA512 (knot-3.2.0.tar.xz.asc) = 47546df3933d66229bdc4b059664cbc4cda3f988ac3d8b2b8d0d8edeb2d0b60eb7a2bbd00019092d872eb56ac8d25f7227c526ae90035814be31fff755255681 +SHA512 (knot-3.2.1.tar.xz) = 2f12750dc0db06fd915c1b322626780c1d66e10c0b8170dea57559e514f66ee105ed8dbbc0a5f8084fcf772e82c242a8b09ae449631960abf4d60af4a13a1ea0 +SHA512 (knot-3.2.1.tar.xz.asc) = 029a43329388db4f1ff66b1e6b887a6a69e728ee15671a2a57e2fc2ed324af10451afe9a01d4b85a87f8aae4bd5569a4875ea90c6150ff23c1bb2944599f972a From b6aa43cf8579a2ea15d04824c52d2380eba0a45d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 1 Nov 2022 14:05:56 +0100 Subject: [PATCH 03/17] Release 3.2.2-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 5747798..105c5ff 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.1 +Version: 3.2.2 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -333,6 +333,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Tue Nov 01 2022 Jakub Ružička - 3.2.2-1 +- Update to 3.2.2 + * Fri Sep 09 2022 Jakub Ružička - 3.2.1-1 - Update to 3.2.1 - Remove patches included upstream diff --git a/sources b/sources index 6466b75..1f81a20 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.1.tar.xz) = 2f12750dc0db06fd915c1b322626780c1d66e10c0b8170dea57559e514f66ee105ed8dbbc0a5f8084fcf772e82c242a8b09ae449631960abf4d60af4a13a1ea0 -SHA512 (knot-3.2.1.tar.xz.asc) = 029a43329388db4f1ff66b1e6b887a6a69e728ee15671a2a57e2fc2ed324af10451afe9a01d4b85a87f8aae4bd5569a4875ea90c6150ff23c1bb2944599f972a +SHA512 (knot-3.2.2.tar.xz) = 29fadb96c1ea525c6183f9e7552f4ad370579b67d74aec1910a92d561cc2c5656fd7876015f29161d279a07c23643f6584308bf9fa0e74d351b17af54e5e9a7f +SHA512 (knot-3.2.2.tar.xz.asc) = 78289cffd9eca23539210ca9dc9b3a67d0cce6a86de1dc185b3f58aa10030fc73401bb50b4a0b9cc2c9122db69c461880c0c9166b85dadb15a117dbbd338ab75 From bf59c363449dc41b64d7e4492aecbc2c11b39c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Fri, 4 Nov 2022 13:33:07 +0100 Subject: [PATCH 04/17] Release 3.2.2-2 --- knot.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 105c5ff..027814e 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.2.2 -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 @@ -77,6 +77,9 @@ BuildRequires: pkgconfig(libelf) # XDP is auto-enabled when libbpf is present %define configure_xdp --enable-quic=yes BuildRequires: pkgconfig(libbpf) >= 0.0.6 +%if 0%{?fedora} >= 36 +BuildRequires: pkgconfig(libxdp) +%endif %endif %endif @@ -333,6 +336,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Fri Nov 04 2022 Jakub Ružička - 3.2.2-2 +- New BuildRequires: libxdp (needed for libbpf >= 1.0) + * Tue Nov 01 2022 Jakub Ružička - 3.2.2-1 - Update to 3.2.2 From 0fde5e12de9fca05a7e063f2d16b365226d02c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 21 Nov 2022 14:38:58 +0100 Subject: [PATCH 05/17] Release 3.2.3-1 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 027814e..b9abc97 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.2 -Release: 2%{?dist} +Version: 3.2.3 +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 @@ -336,6 +336,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Mon Nov 21 2022 Jakub Ružička - 3.2.3-1 +- Update to 3.2.3 + * Fri Nov 04 2022 Jakub Ružička - 3.2.2-2 - New BuildRequires: libxdp (needed for libbpf >= 1.0) diff --git a/sources b/sources index 1f81a20..ad813ba 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.2.tar.xz) = 29fadb96c1ea525c6183f9e7552f4ad370579b67d74aec1910a92d561cc2c5656fd7876015f29161d279a07c23643f6584308bf9fa0e74d351b17af54e5e9a7f -SHA512 (knot-3.2.2.tar.xz.asc) = 78289cffd9eca23539210ca9dc9b3a67d0cce6a86de1dc185b3f58aa10030fc73401bb50b4a0b9cc2c9122db69c461880c0c9166b85dadb15a117dbbd338ab75 +SHA512 (knot-3.2.3.tar.xz) = 1696f90b14f9fe64491170738d69fd690c398daf938c838a497cf052b3601e2f0c4aacdf6087e054401869794e336ac9e49ce7d0b3025b41b6de11a374547bf3 +SHA512 (knot-3.2.3.tar.xz.asc) = a0ec79e055e77e96ff2ced914f82521c6cddc8f02c8bbd6591c92dfb59c31d6bb3c57eab03ff30a22af7b0112822aa16bda33c700848835b34c8e669e65a31be From 69d9b0874f5ba6d48da62b3e6809597350543180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 12 Dec 2022 13:53:40 +0100 Subject: [PATCH 06/17] Release 3.2.4-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index b9abc97..063681c 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.3 +Version: 3.2.4 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -336,6 +336,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Mon Dec 12 2022 Jakub Ružička - 3.2.4-1 +- Update to 3.2.4 + * Mon Nov 21 2022 Jakub Ružička - 3.2.3-1 - Update to 3.2.3 diff --git a/sources b/sources index ad813ba..680ec0f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.3.tar.xz) = 1696f90b14f9fe64491170738d69fd690c398daf938c838a497cf052b3601e2f0c4aacdf6087e054401869794e336ac9e49ce7d0b3025b41b6de11a374547bf3 -SHA512 (knot-3.2.3.tar.xz.asc) = a0ec79e055e77e96ff2ced914f82521c6cddc8f02c8bbd6591c92dfb59c31d6bb3c57eab03ff30a22af7b0112822aa16bda33c700848835b34c8e669e65a31be +SHA512 (knot-3.2.4.tar.xz) = 5a32ef5bd837324d99fdef4d3b378ed1b1df61ee9bad95ba51edce6f2da3c1c8c2b0b31b578e4cb7f9079a9b4db1363a8d984f29beb29fed4e91315ef9e0b77b +SHA512 (knot-3.2.4.tar.xz.asc) = 3db05f92b3e5bd5a1fd6e7b388c63fb0fd44f947a389bd68ddb44de3447bf5aed0d33389084b70fb7cac8943ae9d30c7c0be6fae8fac78ff1cc342894d8ae187 From ca87bf3d51fd491c5013c16125eca7d544a54b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 2 Feb 2023 14:20:58 +0100 Subject: [PATCH 07/17] Release 3.2.5-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 063681c..4cb7955 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.4 +Version: 3.2.5 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -336,6 +336,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Feb 02 2023 Jakub Ružička - 3.2.5-1 +- Update to 3.2.5 + * Mon Dec 12 2022 Jakub Ružička - 3.2.4-1 - Update to 3.2.4 diff --git a/sources b/sources index 680ec0f..68ba26a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.4.tar.xz) = 5a32ef5bd837324d99fdef4d3b378ed1b1df61ee9bad95ba51edce6f2da3c1c8c2b0b31b578e4cb7f9079a9b4db1363a8d984f29beb29fed4e91315ef9e0b77b -SHA512 (knot-3.2.4.tar.xz.asc) = 3db05f92b3e5bd5a1fd6e7b388c63fb0fd44f947a389bd68ddb44de3447bf5aed0d33389084b70fb7cac8943ae9d30c7c0be6fae8fac78ff1cc342894d8ae187 +SHA512 (knot-3.2.5.tar.xz) = c73874b60970b4b1d14f141fa40d47d6620e475b1fb3a5f803956e3b6d8b670d7250b049b26679e1488bfba5bfcfa65ef75c68a494c94f36b60d697fa95048f7 +SHA512 (knot-3.2.5.tar.xz.asc) = ebbe9fa0c3c3d077ffeb63272ba64ede1d07c3a4b521f7f20be2f7093fe3fb93f078580dc3b107c896019ef92410ac005c792778a9c254bd72cb648717ea7c88 From 17e5b04381c2127068b244b57b43fc3dd77681dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 6 Apr 2023 16:39:50 +0200 Subject: [PATCH 08/17] Release 3.2.6-1 --- knot.spec | 49 ++++++++++++++++++++----------------------------- sources | 4 ++-- 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/knot.spec b/knot.spec index 4cb7955..f526f91 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.5 +Version: 3.2.6 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -47,6 +47,8 @@ BuildRequires: pkgconfig(libfstrm) BuildRequires: pkgconfig(libprotobuf-c) # geoip dependencies BuildRequires: pkgconfig(libmaxminddb) +# XDP dependencies +BuildRequires: pkgconfig(libbpf) # Distro-dependent dependencies %if 0%{?suse_version} @@ -54,33 +56,20 @@ BuildRequires: python3-Sphinx BuildRequires: lmdb-devel BuildRequires: protobuf-c Requires(pre): pwdutils -%endif -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: python-sphinx -BuildRequires: lmdb-devel -%endif -%if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: python3-sphinx -BuildRequires: pkgconfig(lmdb) -%endif - -%if 0%{?centos} == 7 || 0%{?rhel} == 7 -%define configure_xdp --enable-xdp=no -%else -%define use_xdp 1 -%if 0%{?rhel} == 8 || 0%{?suse_version} -# Use the embedded libbpf -%define use_xdp 1 -%define configure_xdp --enable-xdp=yes --enable-quic=yes -BuildRequires: pkgconfig(libelf) -%else -# XDP is auto-enabled when libbpf is present -%define configure_xdp --enable-quic=yes -BuildRequires: pkgconfig(libbpf) >= 0.0.6 -%if 0%{?fedora} >= 36 +%if 0%{?sle_version} != 150400 BuildRequires: pkgconfig(libxdp) %endif %endif +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: python3-sphinx +BuildRequires: pkgconfig(lmdb) +%if 0%{?fedora} +BuildRequires: pkgconfig(libxdp) +%endif +%endif + +%if 0%{?rhel} >= 9 || 0%{?suse_version} || 0%{?fedora} +%define configure_quic --enable-quic=yes %endif Requires(post): systemd %{_sbindir}/runuser @@ -176,7 +165,7 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused" --with-moduledir=%{_libdir}/knot/modules-%{BASE_VERSION} \ --with-storage=/var/lib/knot \ %{?configure_db_sizes} \ - %{?configure_xdp} \ + %{?configure_quic} \ --disable-static \ --enable-dnstap=yes \ --with-module-dnstap=shared \ @@ -259,7 +248,7 @@ getent passwd knot >/dev/null || \ %license COPYING %doc %{_pkgdocdir} %exclude %{_pkgdocdir}/html -%attr(770,root,knot) %dir %{_sysconfdir}/knot +%attr(750,root,knot) %dir %{_sysconfdir}/knot %config(noreplace) %attr(640,root,knot) %{_sysconfdir}/knot/knot.conf %if 0%{?fedora} || 0%{?rhel} > 7 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/cz.nic.knotd.conf @@ -288,10 +277,8 @@ getent passwd knot >/dev/null || \ %{_bindir}/kdig %{_bindir}/khost %{_bindir}/knsupdate -%if 0%{?use_xdp} %{_sbindir}/kxdpgun %{_mandir}/man8/kxdpgun.* -%endif %{_mandir}/man1/kdig.* %{_mandir}/man1/khost.* %{_mandir}/man1/knsupdate.* @@ -336,6 +323,10 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Apr 06 2023 Jakub Ružička - 3.2.6-1 +- Update to 3.2.6 +- Sync upstream packaging improvements + * Thu Feb 02 2023 Jakub Ružička - 3.2.5-1 - Update to 3.2.5 diff --git a/sources b/sources index 68ba26a..e9e70c8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.5.tar.xz) = c73874b60970b4b1d14f141fa40d47d6620e475b1fb3a5f803956e3b6d8b670d7250b049b26679e1488bfba5bfcfa65ef75c68a494c94f36b60d697fa95048f7 -SHA512 (knot-3.2.5.tar.xz.asc) = ebbe9fa0c3c3d077ffeb63272ba64ede1d07c3a4b521f7f20be2f7093fe3fb93f078580dc3b107c896019ef92410ac005c792778a9c254bd72cb648717ea7c88 +SHA512 (knot-3.2.6.tar.xz) = a7b87845105d43732972aab16d556ef9e1d46cbe0db441d5fbd8bb5f6793f276088d8ee9b4c2289caecf340be799b92fea84905a30a161ab5b3d77145977afff +SHA512 (knot-3.2.6.tar.xz.asc) = 0c63d767cd208b9713eddd1868f1e935e861168aba0e1c2ad4872091c20c5a24593e186528eeac3240e9f4c4fee4b2b4137ae3ae3f134465ef77b07fb01fc810 From f5dc1eceefc3aa0c7e88f2ece3a349940d70a927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 28 Nov 2022 22:25:29 +0000 Subject: [PATCH 09/17] Rebuilt for libbpf 1.0 transition --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index f526f91..a396ef2 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.2.6 -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 @@ -323,6 +323,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu May 04 2023 Jakub Ružička - 3.2.6-2 +- Rebuilt for libbpf 1.0 transition + * Thu Apr 06 2023 Jakub Ružička - 3.2.6-1 - Update to 3.2.6 - Sync upstream packaging improvements From 64e27febf913ddc158b71dada057068630c5025c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 11 Apr 2023 14:55:35 +0200 Subject: [PATCH 10/17] Update upstream signing key pub rsa4096/0x10BB7AF6FEBBD6AB 2017-07-10 [SC] [expires: 2026-11-11] Key fingerprint = 742F A4E9 5829 B6C5 EAC6 B857 10BB 7AF6 FEBB D6AB uid Daniel Salzman --- ...E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc | 89 +++++++++++++------ 1 file changed, 63 insertions(+), 26 deletions(-) diff --git a/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc b/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc index 5e7bbef..be2545a 100644 --- a/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc +++ b/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc @@ -11,7 +11,19 @@ om9rg89Ih876PA53vUXBB+FWP9QOFDcOfz3nMjCrLbMzhTsAzrNFXxchzLq+66CL qsQQytDVFpLI+X++sKRTOHkq6vV1bAPjlljrannLnn1y/DvkOOkiHOdYyjmR7Dfk vxgcWh/3Gx4J9gipxZITOr7LamEYgHfElY/UWCtc1Vjt8Xvgt4dofDpvSwY9YzgR WxJKC5ewYdqTCI+zxL1f0fjkeiRYNi959UMMjgdcY7Zpi8oPPQmlyBw15QARAQAB -tCZEYW5pZWwgU2Fsem1hbiA8ZGFuaWVsLnNhbHptYW5AbmljLmN6PokCVAQTAQoA +tCZEYW5pZWwgU2Fsem1hbiA8ZGFuaWVsLnNhbHptYW5AbmljLmN6PokCPQQTAQoA +JwUCWWOUFwIbAwUJA8JnAAULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRAQu3r2 +/rvWq1+eEAClhOEK2MZOz+nwJSeX7iINKbw477Y+LSvYkKG81pve+xtblQEn7rI3 +cYnDrqlUb3bXdbMHujYrg1fPoccpCvf6d/JvlN6WXCE25R+GR6vxr6v7jycHdSOb +Fe4sTcwce6IViwiWiSizh4UCkz8285LjLcf3AnT2v6GJwHiZbPOeMQUNIRj6PEYL +SQsq0ZlqEx8LGKLTc5Ukrkoi4lN44SI1rzSwDPIqvlvrVnDXcDB8M7E2Ii51zU8/ +TVk920KeayUeCPxpmgQW3USI45NrE/jEgyodyxMGp5lg3OqzHT2wu9BVLWkQvTjF +fLfEsTay4K4kUSbYzbpS93b33J+I20rYLGBBYlTrN5417IgF6Bb8NzyrfVy1Wdqh +cggAEKX5EkOmZM8oduRxsHqiRLC/xKF8GqTo6t3GMS5i8RClNvmdq0WUkQUvld4b +OnXBCZ2QLbjV7sXjcr56ee+qdpiuRQjEidjHzpibcIBN8LVupVgXAZl9lsiBtoJX +OHsvSdU3VgGWnRGtzFjSHzl3TRPIsaVVqD7aCzQDfXDjrGlmhzgDfMwkqmBGgsku +8tSR3Ag0MRAouJFXiZrcM3XGeYVbHT6dt7UMAB27Xc5foc0kGRo5tzlK6rWG2sJI +lcQB7tKvwI/tE9lwJDjw+XNekEdIpcdcQ7mWa1COYkcYTre3oPmN+4kCVAQTAQoA PgIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBHQvpOlYKbbF6sa4VxC7evb+ u9arBQJcZrrTBQkGxY28AAoJEBC7evb+u9arU78QAJOVSul2YTXediwcY1YtpAli KtHcjOS5PzaezB4c+E89xw6x/XO76KLI6+7GFrcGallPPCHXQfseQh5FmlZ2VMMT @@ -24,29 +36,54 @@ HUH2N6rQP283fnFSrABHTk1laqKwXDMI7IdGChc/QtiHso5gjCi2OdVpuQfp19e6 8U7+ZWSq71HhFWsR9Y1QlXfV6ADEXtemV/iXA5No1TUTvUmvo7T2k7LBlrSWd+gJ MyxMn/aUroVm2InU3jPwRUPySUJcX1EZrbWgi/scbKcryJQoH5BEEdOr72V9vNt7 o6dlMgnYoSkv3JVpJW4T6+PY8HanVFuFNWqOg5fg7xM5CCL7gqVSuWExK1X0rfqu -aeq5Pvm92kMrx+XkzqqFuQINBFljlBcBEADpGfFgbzb9f4Dj2yuAdH3IjGUepKro -iE2f6IlDmWlWl94Ei04bg0O7gCrlfjWkAnc0rGwI9XraARqV38LuAmtMjmtqD/zs -ZgUWjpBGvAaxZUY5Eaz0bWkEXtlnCE8nAPcx5qAZk19ZnNHFd58vU/eauk7d61IQ -TAQ0e0KoQw/rH8keHdIqicoCUvjF+PcXnhoqPi6khyPEYEAkfy7rps3UaZiOy0HP -NsPhNY1PB8qCnXlfGOtOBtOEXLsIGg6BxoCmJhM8TsPmcHX4DKEaOc7dmU2DLVkg -dUMWTocRqRqooz1CWQmdmwHb5xOpeVXR62YVCx50KDaxSJ6vSGEisQ460ZBtjU/7 -S+/5VGho3KbeuK2X7vREbxaCsc0sxEdUZ4tGreA4We353/eHuZ4Aps5Fb9ljfRSn -C2G2VliByIXOgMkJbwF7WLVfi2iJRoyQWHv2N3thO9nzv4/gOWUL0w2yirlxj9sc -E1li1d/vLpepWpijYhsVRHdVcq3NI3l5iblikU9zPOaDVs2CXeLpYFw4XgQ8QkRW -Nn67Wvn0299UtDxdWH9CYugbvHygVy+FZy0zLXtV2bipmOlID4HWxChx6F2tr7FP -49ZXSRytimyrCRh4VFCckaoi6lYeei2oY4E0DJBYhyMrornLQJ6Kglmk03k57leW -gxexiaBexH6BNQARAQABiQI8BBgBCgAmAhsMFiEEdC+k6VgptsXqxrhXELt69v67 -1qsFAlxmuuMFCQbFjcwACgkQELt69v671qtQEw//d5Liq0sNZQXkdAn+/lBa97oh -kKNMegMBx6+rhoIHRECwZoQpxa28YKy50Fe6DXEdTIo7ZWyxnqbukU7jzTKMsAFA -bS4OBQXsPSZjOsfQ2+95LQxwqNAkvbZq3zknV4p2QEnEezYljltscV6BoFbaYvj5 -LidIQsWuMd21aOYmMwi2u7EAoKhnHxhG9HN8guQBevkJxlRpJxFXOPYFwk/nYvzs -fScbX4j2EyEukBse0CHHcmF4tH105qlCXeIynq5Ikcb5P7cAuiCCiH6zV9fNmfFn -lCK5q7dRl8sWSxchYDNdkEGvfAsnw48Mp1iwV4YrctlVZOdd4WoaNz2CzHzHv51b -u5HuNjDEYBQjrsaVMRkGK+G0+gUZgsjOzJO8hv51wzFQd5PiB1AlcezhidbZ3uTp -6XqKbH5BcikFOAVripB5J0pMOMadWvhhgiG3TYU1sf680Q8D0x/8qDBmOONjjdVX -8ICy5tHCBF9qBYt9BdnrW9ov2RgdA2pJxg6nFmNW7ij+MOG8CsRy/rJ14xWYfixv -yATajfmWwOvdFwYDQkrWo8z7bKEmT/SlM/DAgUdHpK+Zs5LNIleaDu+8sqMcHSDv -fdZu2nGmgIOyi0CleVsF6Ej8peQvnNkfQ3gfr93Np+3nMezPpRiezzlNc9qWo5ir -FhTRDc+3LonY+arOEWs= -=t/98 +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 +tW29kqO09AEalR9l +=t42C -----END PGP PUBLIC KEY BLOCK----- From 6e0824792b23e03cf30dd6d229343535723d2a2a Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 12 May 2023 11:24:05 -0700 Subject: [PATCH 11/17] Add BR on libxdp on RHEL >= 9 to use with libbpf-1.x --- knot.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index a396ef2..355a04e 100644 --- a/knot.spec +++ b/knot.spec @@ -63,7 +63,7 @@ BuildRequires: pkgconfig(libxdp) %if 0%{?fedora} || 0%{?rhel} BuildRequires: python3-sphinx BuildRequires: pkgconfig(lmdb) -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 9 BuildRequires: pkgconfig(libxdp) %endif %endif From f34d9d2df090647b28cd35f37d1fa06c24d93fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 6 Jun 2023 13:31:36 +0200 Subject: [PATCH 12/17] Release 3.2.7-1 --- ..._net-disable-udp-send-on-unconnected.patch | 26 ------------------- knot.spec | 18 +++++++------ sources | 4 +-- 3 files changed, 12 insertions(+), 36 deletions(-) delete mode 100644 01-test_net-disable-udp-send-on-unconnected.patch diff --git a/01-test_net-disable-udp-send-on-unconnected.patch b/01-test_net-disable-udp-send-on-unconnected.patch deleted file mode 100644 index f2b5b11..0000000 --- a/01-test_net-disable-udp-send-on-unconnected.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Tomas Krizek -Date: 2019-02-28 14:26:56 +0100 - - test_net: disable UDP send on unconnected - - This test started to fail with 5.0 kernel in F30+ on aarch64 and s390x. - The functionality isn't used by Knot DNS, so disabling this test until - the issue is resolved should be safe. - - Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1675235 - -diff --git a/tests/contrib/test_net.c b/tests/contrib/test_net.c -index 0a22abbbc..6ec4bda31 100644 ---- a/tests/contrib/test_net.c -+++ b/tests/contrib/test_net.c -@@ -310,10 +310,6 @@ static void test_unconnected(void) - r = net_dgram_recv(sock, buffer, buffer_len, TIMEOUT_SHORT); - is_int(KNOT_ETIMEOUT, r, "UDP, receive timeout on unconnected socket"); - -- struct sockaddr_storage server_addr = addr_from_socket(server); -- r = net_dgram_send(sock, buffer, buffer_len, &server_addr); -- is_int(buffer_len, r, "UDP, send on defined address"); -- - close(sock); - - // TCP diff --git a/knot.spec b/knot.spec index 355a04e..216b002 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.6 -Release: 2%{?dist} +Version: 3.2.7 +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 @@ -22,9 +22,6 @@ Source100: gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc BuildRequires: gnupg2 %endif -# Test fails on F30+ aarch/s390x for unknown reason, but it is not neccassary for Knot DNS -Patch1: 01-test_net-disable-udp-send-on-unconnected.patch - # Required dependencies BuildRequires: autoconf BuildRequires: automake @@ -32,7 +29,7 @@ BuildRequires: libtool BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig(liburcu) -BuildRequires: pkgconfig(gnutls) >= 3.3 +BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(libedit) # Optional dependencies @@ -188,7 +185,7 @@ rm -f %{buildroot}%{_pkgdocdir}/html/.buildinfo rm %{buildroot}%{_sysconfdir}/%{name}/* install -p -m 0644 -D %{repodir}/samples/%{name}.sample.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf %if 0%{?fedora} || 0%{?rhel} > 7 -install -p -m 0644 -D %{repodir}/distro/common/cz.nic.knotd.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/cz.nic.knotd.conf +install -p -m 0644 -D %{repodir}/distro/common/cz.nic.knotd.conf %{buildroot}%{_datadir}/dbus-1/system.d/cz.nic.knotd.conf %endif # install systemd files @@ -251,7 +248,7 @@ getent passwd knot >/dev/null || \ %attr(750,root,knot) %dir %{_sysconfdir}/knot %config(noreplace) %attr(640,root,knot) %{_sysconfdir}/knot/knot.conf %if 0%{?fedora} || 0%{?rhel} > 7 -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/cz.nic.knotd.conf +%config(noreplace) %attr(644,root,root) %{_datadir}/dbus-1/system.d/cz.nic.knotd.conf %endif %attr(770,root,knot) %dir %{_sharedstatedir}/knot %dir %{_libdir}/knot @@ -323,6 +320,11 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Tue Jun 06 2023 Jakub Ružička - 3.2.7-1 +- Update to 3.2.7 +- Remove unneeded tests patch +- Use _datadir for config + * Thu May 04 2023 Jakub Ružička - 3.2.6-2 - Rebuilt for libbpf 1.0 transition diff --git a/sources b/sources index e9e70c8..133e413 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.6.tar.xz) = a7b87845105d43732972aab16d556ef9e1d46cbe0db441d5fbd8bb5f6793f276088d8ee9b4c2289caecf340be799b92fea84905a30a161ab5b3d77145977afff -SHA512 (knot-3.2.6.tar.xz.asc) = 0c63d767cd208b9713eddd1868f1e935e861168aba0e1c2ad4872091c20c5a24593e186528eeac3240e9f4c4fee4b2b4137ae3ae3f134465ef77b07fb01fc810 +SHA512 (knot-3.2.7.tar.xz) = 8fc31c40ba9953401ef7bf4227bd56250e02a72fc60bdb10b4066254a1f0a24ecb68b16e710126beb58f06e4adb247f7c77aa042b4b14abd92a024fe92d6e5f8 +SHA512 (knot-3.2.7.tar.xz.asc) = 003868a58a29505887f6c85438def4cbfe15720c5f5f7c409efbed54afd3ce95e6704896f5416f0464c5952f6425d7b66f18c9784e02f33b040cf965f85e01e1 From abe6a00addbc7ca4081d9518440a8d5a86380803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 26 Jun 2023 16:00:51 +0200 Subject: [PATCH 13/17] Release 3.2.8-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 216b002..4b95262 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.7 +Version: 3.2.8 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -320,6 +320,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Mon Jun 26 2023 Jakub Ružička - 3.2.8-1 +- Update to 3.2.8 + * Tue Jun 06 2023 Jakub Ružička - 3.2.7-1 - Update to 3.2.7 - Remove unneeded tests patch diff --git a/sources b/sources index 133e413..f6e58f7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.7.tar.xz) = 8fc31c40ba9953401ef7bf4227bd56250e02a72fc60bdb10b4066254a1f0a24ecb68b16e710126beb58f06e4adb247f7c77aa042b4b14abd92a024fe92d6e5f8 -SHA512 (knot-3.2.7.tar.xz.asc) = 003868a58a29505887f6c85438def4cbfe15720c5f5f7c409efbed54afd3ce95e6704896f5416f0464c5952f6425d7b66f18c9784e02f33b040cf965f85e01e1 +SHA512 (knot-3.2.8.tar.xz) = 792e7d062ef018530594abc26b90fcd023758cb88b77f971460ca73de36121d1faf84fe55d5f24e72cc07adcc48115c24b6c60817d90f5620cdca13f7782e67d +SHA512 (knot-3.2.8.tar.xz.asc) = 6fbfdd7618787f73fabb15f1e5709b78c2ea9e305588bfa9ff1803d4af397b121d8b75d82bf8ed225d30af489aa376806c90daf926b2dbabb0d4f8cc85030658 From a184ff1ec16963ae0273a35341475456cbf9b51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 27 Jul 2023 17:59:19 +0200 Subject: [PATCH 14/17] Release 3.2.9-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 4b95262..12823da 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.8 +Version: 3.2.9 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -320,6 +320,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Jul 27 2023 Jakub Ružička - 3.2.9-1 +- Update to 3.2.9 + * Mon Jun 26 2023 Jakub Ružička - 3.2.8-1 - Update to 3.2.8 diff --git a/sources b/sources index f6e58f7..fdd401d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.8.tar.xz) = 792e7d062ef018530594abc26b90fcd023758cb88b77f971460ca73de36121d1faf84fe55d5f24e72cc07adcc48115c24b6c60817d90f5620cdca13f7782e67d -SHA512 (knot-3.2.8.tar.xz.asc) = 6fbfdd7618787f73fabb15f1e5709b78c2ea9e305588bfa9ff1803d4af397b121d8b75d82bf8ed225d30af489aa376806c90daf926b2dbabb0d4f8cc85030658 +SHA512 (knot-3.2.9.tar.xz) = baf8da222e38198c85fa62e45e71b29ddac7c90433b811710ace1e0395e6e7b5d63547ce8f3a62792ee11259ec2e36d6ddd8fff999416f9171671444a95086cf +SHA512 (knot-3.2.9.tar.xz.asc) = 77f8b57251bd31b5feac45cbd13b775c9817ca2caf84ce196537e99e92d089954a24ee10c37de5f8c5f7a029a53ae5b5d7fd0214984db0809609363285d6e190 From 8567789906f4855ee087ec0ea07f186c25f3238d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 28 Aug 2023 16:10:32 +0200 Subject: [PATCH 15/17] Release 3.3.0-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 12823da..bc67434 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.9 +Version: 3.3.0 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -320,6 +320,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Mon Aug 28 2023 Jakub Ružička - 3.3.0-1 +- Update to 3.3.0 + * Thu Jul 27 2023 Jakub Ružička - 3.2.9-1 - Update to 3.2.9 diff --git a/sources b/sources index fdd401d..dda0882 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.9.tar.xz) = baf8da222e38198c85fa62e45e71b29ddac7c90433b811710ace1e0395e6e7b5d63547ce8f3a62792ee11259ec2e36d6ddd8fff999416f9171671444a95086cf -SHA512 (knot-3.2.9.tar.xz.asc) = 77f8b57251bd31b5feac45cbd13b775c9817ca2caf84ce196537e99e92d089954a24ee10c37de5f8c5f7a029a53ae5b5d7fd0214984db0809609363285d6e190 +SHA512 (knot-3.3.0.tar.xz) = 695248838655e80df036a341729fc3b120908f30604b9ce5a6ea16da91cf8342cb1afdc10cffa3181a8045d1d9aaaea5705837787675ac6efcf0f4beb411f0e1 +SHA512 (knot-3.3.0.tar.xz.asc) = 85f1641832035d84cfaf9920bb66d4e76e6f13ebceb668458259771fb6a4e8d17a708fd52b63653cf4fec11f336395157d0964ff1190c7d5839525b9918d7e6b From 6461bb9e3039a6c297eea66933b19ae158add28b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 12 Sep 2023 11:19:48 +0200 Subject: [PATCH 16/17] Release 3.3.1-1 --- knot.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/knot.spec b/knot.spec index bc67434..a1f5b22 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.3.0 +Version: 3.3.1 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -80,8 +80,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.2+ isn't compatible with earlier knot-resolver -Conflicts: knot-resolver < 5.5.2 +# 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 @@ -320,6 +320,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Tue Sep 12 2023 Jakub Ružička - 3.3.1-1 +- Update to 3.3.1 + * Mon Aug 28 2023 Jakub Ružička - 3.3.0-1 - Update to 3.3.0 diff --git a/sources b/sources index dda0882..f59e717 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.3.0.tar.xz) = 695248838655e80df036a341729fc3b120908f30604b9ce5a6ea16da91cf8342cb1afdc10cffa3181a8045d1d9aaaea5705837787675ac6efcf0f4beb411f0e1 -SHA512 (knot-3.3.0.tar.xz.asc) = 85f1641832035d84cfaf9920bb66d4e76e6f13ebceb668458259771fb6a4e8d17a708fd52b63653cf4fec11f336395157d0964ff1190c7d5839525b9918d7e6b +SHA512 (knot-3.3.1.tar.xz) = 3ccf53135b2a3c01123e3445b226fc0e348b7378800759f4ca37a0cbce1a1015e46ef096b82e8ece253ed040791bbc235767ccbbcbca2bd0e04c319a55a4c6d4 +SHA512 (knot-3.3.1.tar.xz.asc) = 7c92a27a955fcda33273ab24a09d9fe091449b54df1d33918fcc715fe4c264a5a0f4d9c012c7ed2965778bed444f9cfc4b74d9ccdc70bf06eb0e910bfbd20710 From 7a916b8d05c9b01cd2ae3cc06fbdad28bf71e644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Sat, 21 Oct 2023 01:29:58 +0200 Subject: [PATCH 17/17] Release 3.3.2-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index a1f5b22..155ed83 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.3.1 +Version: 3.3.2 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -320,6 +320,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Fri Oct 20 2023 Jakub Ružička - 3.3.2-1 +- Update to 3.3.2 + * Tue Sep 12 2023 Jakub Ružička - 3.3.1-1 - Update to 3.3.1 diff --git a/sources b/sources index f59e717..2ecb7fe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.3.1.tar.xz) = 3ccf53135b2a3c01123e3445b226fc0e348b7378800759f4ca37a0cbce1a1015e46ef096b82e8ece253ed040791bbc235767ccbbcbca2bd0e04c319a55a4c6d4 -SHA512 (knot-3.3.1.tar.xz.asc) = 7c92a27a955fcda33273ab24a09d9fe091449b54df1d33918fcc715fe4c264a5a0f4d9c012c7ed2965778bed444f9cfc4b74d9ccdc70bf06eb0e910bfbd20710 +SHA512 (knot-3.3.2.tar.xz) = c19a11db43b208a6aabfd96e0c31856affdcef1b599425343663fd6e00bacc964f197de7e5d732d7180219ba57b6e426afd2b762c7528cb50755f81429aaac1a +SHA512 (knot-3.3.2.tar.xz.asc) = ed0b744169c8f127cced5ace70e0d252993d73f17e34a956ada9cae37b468fdaaf9e8f294a39d3427ca89c2c1fb25ecfc9b32c76fb0c10bebe9fe59809b6d47f