From 053360cd989f6c903936e5abcae5ce3e010bfb85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 9 Sep 2021 15:04:32 +0200 Subject: [PATCH 01/10] knot-3.1.2-1 Changelog: - Update to 3.1.2 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index e2407ce..4a51027 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.1 +Version: 3.1.2 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -320,6 +320,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Sep 09 2021 Jakub Ružička - 3.1.2-1 +- Update to 3.1.2 + * Tue Aug 10 2021 Jakub Ružička - 3.1.1-1 - Update to 3.1.1 - Enable XDP on ARM and improve XDP config macros diff --git a/sources b/sources index 41537cb..2e078c8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.1.tar.xz) = 44c2973025e752f73ebd6bc78dad5c48c1c1432b62ec3b6d75b5876af4dd21aeed94f78523ef85cd6a986ff27789143a0a67450819c0b75ffa627d06b98e1b0b -SHA512 (knot-3.1.1.tar.xz.asc) = 161a689f751ace7214416241b4e6ce6ee01d50b099c950b792b7fc42d7c726174b9bf686dc45316c63887b15dba91a57bc7e961dd84b728b38046bc9f5f260d2 +SHA512 (knot-3.1.2.tar.xz) = e72f249f6291980cc69f90dca54cd8ba3ffbc617a1e69e441a48bdcbf46afb9fc202bbb1f88a93887fd264ddb59ad42ff6765c9bd0c1fa4789f035a902a3907a +SHA512 (knot-3.1.2.tar.xz.asc) = 3dc0c5e2d8d508ff7e63489b9d944cedbf9d3008fb6764192fdd07a0d7717bd1aeac9496e6401ae7604e94499c968e1e0900639cd82fe1457354c374619e5f99 From bde7a72b6c009c270a14392588a98286d8b11521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 19 Oct 2021 14:46:06 +0200 Subject: [PATCH 02/10] knot-3.1.3-1 Changelog: - Update to 3.1.3 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 4a51027..9e01cdf 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.2 +Version: 3.1.3 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -320,6 +320,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Tue Oct 19 2021 Jakub Ružička - 3.1.3-1 +- Update to 3.1.3 + * Thu Sep 09 2021 Jakub Ružička - 3.1.2-1 - Update to 3.1.2 diff --git a/sources b/sources index 2e078c8..6be7ae5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.2.tar.xz) = e72f249f6291980cc69f90dca54cd8ba3ffbc617a1e69e441a48bdcbf46afb9fc202bbb1f88a93887fd264ddb59ad42ff6765c9bd0c1fa4789f035a902a3907a -SHA512 (knot-3.1.2.tar.xz.asc) = 3dc0c5e2d8d508ff7e63489b9d944cedbf9d3008fb6764192fdd07a0d7717bd1aeac9496e6401ae7604e94499c968e1e0900639cd82fe1457354c374619e5f99 +SHA512 (knot-3.1.3.tar.xz) = 537013e914c3f00615a384c92da06c40bb33871e7dbd28e987280d62d91df42026774cfe0596ac72a218dafa650d8d600b1d831dd0a5c28a9fd796c5cd799838 +SHA512 (knot-3.1.3.tar.xz.asc) = 870a98ae3b18c1ec9ef32ae85dd1d78fd6f021074ef772d093538ceb8107754be466fa1d93b3819f933af46aa663d530ee77e77156065582b9c78d7168076fa3 From b8940605f908fdb3e2e8c4c08a12b5075e867e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 4 Nov 2021 14:17:43 +0100 Subject: [PATCH 03/10] knot-3.1.4-1 Changelog: - Update to 3.1.4 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 9e01cdf..3482f1e 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.3 +Version: 3.1.4 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -320,6 +320,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Nov 04 2021 Jakub Ružička - 3.1.4-1 +- Update to 3.1.4 + * Tue Oct 19 2021 Jakub Ružička - 3.1.3-1 - Update to 3.1.3 diff --git a/sources b/sources index 6be7ae5..ba003c9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.3.tar.xz) = 537013e914c3f00615a384c92da06c40bb33871e7dbd28e987280d62d91df42026774cfe0596ac72a218dafa650d8d600b1d831dd0a5c28a9fd796c5cd799838 -SHA512 (knot-3.1.3.tar.xz.asc) = 870a98ae3b18c1ec9ef32ae85dd1d78fd6f021074ef772d093538ceb8107754be466fa1d93b3819f933af46aa663d530ee77e77156065582b9c78d7168076fa3 +SHA512 (knot-3.1.4.tar.xz) = 307667a12b989fee443832d4642fc927231f38f0331439c8c7196c489d196245eca368d96a36fe49639b773f652f7cb80bf0c16bc1ad107e11b47b70e1f04060 +SHA512 (knot-3.1.4.tar.xz.asc) = 590122df8b83ad9d3bc30b29dbf273b74cc1b3b13e1b38b14b9c567d66db7d7ab93d55ffdfd50a18f579efc66531c0ae11ff30ffc5ec989f07e31bd029d85663 From 76c50d1916f766bc0a824a9c8d9e02fa4a7a10a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 5 Jan 2022 14:39:01 +0000 Subject: [PATCH 04/10] knot-3.1.5-1 Changelog: - Update to 3.1.5 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 3482f1e..deffd1b 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.4 +Version: 3.1.5 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -320,6 +320,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Wed Jan 05 2022 Jakub Ružička - 3.1.5-1 +- Update to 3.1.5 + * Thu Nov 04 2021 Jakub Ružička - 3.1.4-1 - Update to 3.1.4 diff --git a/sources b/sources index ba003c9..9f30483 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.4.tar.xz) = 307667a12b989fee443832d4642fc927231f38f0331439c8c7196c489d196245eca368d96a36fe49639b773f652f7cb80bf0c16bc1ad107e11b47b70e1f04060 -SHA512 (knot-3.1.4.tar.xz.asc) = 590122df8b83ad9d3bc30b29dbf273b74cc1b3b13e1b38b14b9c567d66db7d7ab93d55ffdfd50a18f579efc66531c0ae11ff30ffc5ec989f07e31bd029d85663 +SHA512 (knot-3.1.5.tar.xz) = 3a8cf04a2d65e04343a70009d43796ae00bf09e34348119b55ba70dac7deb7ff42906d88ef0e413d33dec28a952396a51781dee96727c0c2047b4c5ade54e6fa +SHA512 (knot-3.1.5.tar.xz.asc) = f4c84ef324bf6c7b0ede7685d673365c03ae6727fb60abf129fb8677fa551908391379cc8874c25cdd1153834bfae5557897df761e98c0c162965c8281ced245 From 357c771b240b06ae50c5e27d8abd02084b4c24ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 10 Feb 2022 17:33:40 +0000 Subject: [PATCH 05/10] knot-3.1.6-1 Changelog: - Update to 3.1.6 - Add dbus config - Use _sharedstatedir for home --- knot.spec | 17 ++++++++++++++--- sources | 4 ++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/knot.spec b/knot.spec index deffd1b..74d54fd 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.5 +Version: 3.1.6 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -184,9 +184,12 @@ cp -av doc/_build/html %{buildroot}%{_pkgdocdir} [ -r %{buildroot}%{_pkgdocdir}/html/index.html ] || exit 1 rm -f %{buildroot}%{_pkgdocdir}/html/.buildinfo -# install configuration file +# install daemon and dbus configuration files 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 +%endif # install systemd files install -p -m 0644 -D %{repodir}/distro/common/%{name}.service %{buildroot}%{_unitdir}/%{name}.service @@ -208,7 +211,7 @@ V=1 make check %pre getent group knot >/dev/null || groupadd -r knot getent passwd knot >/dev/null || \ - useradd -r -g knot -d %{_sysconfdir}/knot -s /sbin/nologin \ + useradd -r -g knot -d %{_sharedstatedir}/knot -s /sbin/nologin \ -c "Knot DNS server" knot %if 0%{?suse_version} %service_add_pre knot.service @@ -249,6 +252,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %exclude %{_pkgdocdir}/html %attr(770,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 +%endif %attr(770,root,knot) %dir %{_sharedstatedir}/knot %dir %{_libdir}/knot %dir %{_libdir}/knot/modules-* @@ -320,6 +326,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Feb 10 2022 Jakub Ružička - 3.1.6-1 +- Update to 3.1.6 +- Add dbus config +- Use _sharedstatedir for home + * Wed Jan 05 2022 Jakub Ružička - 3.1.5-1 - Update to 3.1.5 diff --git a/sources b/sources index 9f30483..e706203 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.5.tar.xz) = 3a8cf04a2d65e04343a70009d43796ae00bf09e34348119b55ba70dac7deb7ff42906d88ef0e413d33dec28a952396a51781dee96727c0c2047b4c5ade54e6fa -SHA512 (knot-3.1.5.tar.xz.asc) = f4c84ef324bf6c7b0ede7685d673365c03ae6727fb60abf129fb8677fa551908391379cc8874c25cdd1153834bfae5557897df761e98c0c162965c8281ced245 +SHA512 (knot-3.1.6.tar.xz) = daffb3658ecce1ac206a18c623329af62b03035e621c9b297cc68d521d07f61e2d55ae2afa46340b9a0671dc4147490eeb7cb4ee50fc3b91bfa4cf97f6b3e249 +SHA512 (knot-3.1.6.tar.xz.asc) = 5de99084ef64a0451d0fe40d8944479ebd3bc51c1f5519b40af86301e3dca036624f368b3982a289fae50ff07f293473218eb497be8ed07e3bac5050d1e2565d From d12d34dca4d44346e949ba62ffa5d420201934a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 30 Mar 2022 16:46:06 +0200 Subject: [PATCH 06/10] knot-3.1.7-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 74d54fd..d756b9d 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.6 +Version: 3.1.7 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -326,6 +326,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Wed Mar 30 2022 Jakub Ružička - 3.1.7-1 +- Update to 3.1.7 + * Thu Feb 10 2022 Jakub Ružička - 3.1.6-1 - Update to 3.1.6 - Add dbus config diff --git a/sources b/sources index e706203..93247ea 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.6.tar.xz) = daffb3658ecce1ac206a18c623329af62b03035e621c9b297cc68d521d07f61e2d55ae2afa46340b9a0671dc4147490eeb7cb4ee50fc3b91bfa4cf97f6b3e249 -SHA512 (knot-3.1.6.tar.xz.asc) = 5de99084ef64a0451d0fe40d8944479ebd3bc51c1f5519b40af86301e3dca036624f368b3982a289fae50ff07f293473218eb497be8ed07e3bac5050d1e2565d +SHA512 (knot-3.1.7.tar.xz) = 4b6982e8b44addbc77f42d0a1c435dd257cc8a8f112677c371d16063ee8e769b646a6425d54ef338cd21555f276d8d6f4faad2da2f24bf92437ce4af9ff1fb44 +SHA512 (knot-3.1.7.tar.xz.asc) = 41c597228e1f6fb57aeba22d4665c0e39fda7ce60d14c3b8bc4f3ab61ffc0e5cef395527d981c9342ceba8fd5e80d57b4962318e9f2b9aed2000e9ab5dd03ac9 From e3237fbf3a25eabececd68d5934666af5931c92c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 28 Apr 2022 13:50:13 +0200 Subject: [PATCH 07/10] knot-3.1.8-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index d756b9d..26b8279 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.7 +Version: 3.1.8 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -326,6 +326,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Apr 28 2022 Jakub Ružička - 3.1.8-1 +- Update to 3.1.8 + * Wed Mar 30 2022 Jakub Ružička - 3.1.7-1 - Update to 3.1.7 diff --git a/sources b/sources index 93247ea..c031339 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.7.tar.xz) = 4b6982e8b44addbc77f42d0a1c435dd257cc8a8f112677c371d16063ee8e769b646a6425d54ef338cd21555f276d8d6f4faad2da2f24bf92437ce4af9ff1fb44 -SHA512 (knot-3.1.7.tar.xz.asc) = 41c597228e1f6fb57aeba22d4665c0e39fda7ce60d14c3b8bc4f3ab61ffc0e5cef395527d981c9342ceba8fd5e80d57b4962318e9f2b9aed2000e9ab5dd03ac9 +SHA512 (knot-3.1.8.tar.xz) = af72cbcc5b511dad148e7ce990819df00bdf99c110b44b3b521eddd8690a6ebd4c76c24e63d843956971d5f158bbfa851804616630d34f3a0ec06888c78ecf2c +SHA512 (knot-3.1.8.tar.xz.asc) = 1d2e1d11dda0f52041b6e43ba94860891624e25763ce35a4cdcf8fb30bf0713a3e6b9776278fdfa60381c8bd32a32cd83b98a6f5a8684946fc94868f5314fab0 From aac7b7b05650797899a5470bd88cd5bc70493fe5 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 08/10] Release 3.2.0-1 --- ...sts-xdp-tcp-fix-under-32bit-platform.patch | 67 +++++++++++++++++++ 03-revert-distro-harden-systemd-service.patch | 31 +++++++++ knot.spec | 53 ++++++++++----- sources | 4 +- 4 files changed, 137 insertions(+), 18 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 26b8279..83c3886 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.8 +Version: 3.2.0 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -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 Apr 28 2022 Jakub Ružička - 3.1.8-1 - Update to 3.1.8 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 6d5c8368d05b875b6b11cf6ea76cdc4e31584ef1 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 09/10] 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 83c3886..bdffbf5 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 6402179345f3dc1ec22ce149e94994eacf3f742d 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 10/10] 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 bdffbf5..d61fa22 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