From 59060184a4d6b16d6346b2bcf2436967e28f5e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 30 Mar 2021 14:49:08 +0000 Subject: [PATCH 01/14] knot-3.0.5-1 Changelog: - Update to 3.0.5 - Properly escape BASE_VERSION macro - Include module dirs in main package --- knot.spec | 11 +++++++++-- sources | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index a5c20c2..dd4dd51 100644 --- a/knot.spec +++ b/knot.spec @@ -2,12 +2,12 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define BASE_VERSION %(echo %{version} | sed 's/^\([^.]\+\.[^.]\+\).*/\1/') +%define BASE_VERSION %(echo "%{version}" | sed 's/^\\([^.]\\+\\.[^.]\\+\\).*/\\1/') %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server Name: knot -Version: 3.0.4 +Version: 3.0.5 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -238,6 +238,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %attr(770,root,knot) %dir %{_sysconfdir}/knot %config(noreplace) %attr(640,root,knot) %{_sysconfdir}/knot/knot.conf %attr(770,root,knot) %dir %{_sharedstatedir}/knot +%dir %{_libdir}/knot +%dir %{_libdir}/knot/modules-* %{_unitdir}/knot.service %{_tmpfilesdir}/knot.conf %{_bindir}/kzonecheck @@ -306,6 +308,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Tue Mar 30 2021 Jakub Ružička 3.0.5-1 +- Update to 3.0.5 +- Properly escape BASE_VERSION macro +- Include module dirs in main package + * Mon Feb 01 2021 Jakub Ružička - 3.0.4-1 - Update to 3.0.4 - Move dnstap module to subpackage diff --git a/sources b/sources index 1dcbfa8..056213e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.4.tar.xz) = d674faaafcbe882539d28e53f1cd6cdda61ca8065f66dc0b9127f249f34b59a9d3d1ac206799c2974a2d38264842a2387db35f814bd05f3eaeac0b35b90b21ac -SHA512 (knot-3.0.4.tar.xz.asc) = b5f77494da6aa1b256feb3f38fcaac42811bd7e04644806c9e00fa09386f51503ac86163b6c4a85588a4eaf8990812ab8c48f751aaf04b00ab838b99bc9ed8f6 +SHA512 (knot-3.0.5.tar.xz) = b4875b3a5bef0c597d89ded3c1c87ab65952057e02f4ee79088e08fe62ee542ff737b544995bf8f2cc4dfaeac1fac230213a8492040ed80992bab8c7e8f8c786 +SHA512 (knot-3.0.5.tar.xz.asc) = 3b6e8260dc26703a4601a342c10c5147e2de95297f87124747e4bf95ce0831c46a87eac910e4e09ddd5dfbe6ea9a899cedd9ccde6edd26fd96e1dfa7dc2e1b1b From 65b41552fb920bb51aa18bfb2ee86e6e62216770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Fri, 14 May 2021 13:10:25 +0200 Subject: [PATCH 02/14] knot-3.0.6-1 Changelog: - Update to 3.0.6 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index dd4dd51..7b7b30e 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.0.5 +Version: 3.0.6 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -308,6 +308,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Fri May 14 2021 Jakub Ružička - 3.0.6-1 +- Update to 3.0.6 + * Tue Mar 30 2021 Jakub Ružička 3.0.5-1 - Update to 3.0.5 - Properly escape BASE_VERSION macro diff --git a/sources b/sources index 056213e..d327402 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.5.tar.xz) = b4875b3a5bef0c597d89ded3c1c87ab65952057e02f4ee79088e08fe62ee542ff737b544995bf8f2cc4dfaeac1fac230213a8492040ed80992bab8c7e8f8c786 -SHA512 (knot-3.0.5.tar.xz.asc) = 3b6e8260dc26703a4601a342c10c5147e2de95297f87124747e4bf95ce0831c46a87eac910e4e09ddd5dfbe6ea9a899cedd9ccde6edd26fd96e1dfa7dc2e1b1b +SHA512 (knot-3.0.6.tar.xz) = f1bfb0bc3a4cf622a68562409e71c8b84ee628a5452b48e172148bcac9cd0827b60a0c060075b80a086ca65da958d2d63e33ef7e373ab300b50089d06af3e5d0 +SHA512 (knot-3.0.6.tar.xz.asc) = 7e62201dca5bfd5cf24a32850eee974a3d9690dc1265d267b5fe29f1bcb318efa4e96390b07deeac71e0c2aeac69e0df33efb888540613718fae97afed2723ba From a5fde96c8240979aa1a1c0e309533197af5ac3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 17 Jun 2021 12:36:58 +0000 Subject: [PATCH 03/14] knot-3.0.7-1 Changelog: - Update to 3.0.7 --- 01-test_net-disable-udp-send-on-unconnected.patch | 7 +++---- knot.spec | 5 ++++- sources | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/01-test_net-disable-udp-send-on-unconnected.patch b/01-test_net-disable-udp-send-on-unconnected.patch index 07a2f3a..f2b5b11 100644 --- a/01-test_net-disable-udp-send-on-unconnected.patch +++ b/01-test_net-disable-udp-send-on-unconnected.patch @@ -1,4 +1,3 @@ -commit 44b5e271a8564370efec3b9e95365aa039e0db61 Author: Tomas Krizek Date: 2019-02-28 14:26:56 +0100 @@ -11,16 +10,16 @@ Date: 2019-02-28 14:26:56 +0100 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 99a9e3ee3..c8e5e0a25 100644 +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); - ok(r == KNOT_ETIMEOUT, "UDP, receive timeout on unconnected socket"); + 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); -- ok(r == buffer_len, "UDP, send on defined address"); +- is_int(buffer_len, r, "UDP, send on defined address"); - close(sock); diff --git a/knot.spec b/knot.spec index 7b7b30e..d333481 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.0.6 +Version: 3.0.7 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -308,6 +308,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Jun 17 2021 Jakub Ružička - 3.0.7-1 +- Update to 3.0.7 + * Fri May 14 2021 Jakub Ružička - 3.0.6-1 - Update to 3.0.6 diff --git a/sources b/sources index d327402..b68b512 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.6.tar.xz) = f1bfb0bc3a4cf622a68562409e71c8b84ee628a5452b48e172148bcac9cd0827b60a0c060075b80a086ca65da958d2d63e33ef7e373ab300b50089d06af3e5d0 -SHA512 (knot-3.0.6.tar.xz.asc) = 7e62201dca5bfd5cf24a32850eee974a3d9690dc1265d267b5fe29f1bcb318efa4e96390b07deeac71e0c2aeac69e0df33efb888540613718fae97afed2723ba +SHA512 (knot-3.0.7.tar.xz) = 89e17cd2bc5a07b05ccd11cfd58481078eff4076a537d1623ed575c1ab87eac87ce949c12dc35eb15dc7e4358a405c19a6660b4da9abc230077a251792f196bd +SHA512 (knot-3.0.7.tar.xz.asc) = 369aba7e666e5d04e755b3692ae43a50dabef2b9cba721cd5fb0feab13cde666f788b394c568e4500caa7512c03759101d99b0e3299f9b4ff176ad3e89dc9338 From ea5eae04007970b6563f1bc35975baeb31afeae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Fri, 16 Jul 2021 17:00:01 +0200 Subject: [PATCH 04/14] knot-3.0.8-1 Changelog: - Update to 3.0.8 - Print failed tests during check --- knot.spec | 8 ++++++-- sources | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index d333481..d61c4ae 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.0.7 +Version: 3.0.8 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -191,7 +191,7 @@ install -d -m 0770 -D %{buildroot}%{_sharedstatedir}/knot find %{buildroot} -type f -name "*.la" -delete -print %check -make check +V=1 make check %pre getent group knot >/dev/null || groupadd -r knot @@ -308,6 +308,10 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Fri Jul 16 2021 Jakub Ružička - 3.0.8-1 +- Update to 3.0.8 +- Print failed tests during check + * Thu Jun 17 2021 Jakub Ružička - 3.0.7-1 - Update to 3.0.7 diff --git a/sources b/sources index b68b512..69848cd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.7.tar.xz) = 89e17cd2bc5a07b05ccd11cfd58481078eff4076a537d1623ed575c1ab87eac87ce949c12dc35eb15dc7e4358a405c19a6660b4da9abc230077a251792f196bd -SHA512 (knot-3.0.7.tar.xz.asc) = 369aba7e666e5d04e755b3692ae43a50dabef2b9cba721cd5fb0feab13cde666f788b394c568e4500caa7512c03759101d99b0e3299f9b4ff176ad3e89dc9338 +SHA512 (knot-3.0.8.tar.xz) = 0ed55681210211427b54634428c07ac313a6fbc20492ab127f171a26e48a06e22d8360391a8f80247206c339ce76c32f0a82d6db2ec5dfb43cbfa8f455a4ee60 +SHA512 (knot-3.0.8.tar.xz.asc) = 397348d1c4ea19a14d021374b347db9682267edd607d7d506ebc9dc8d3d814b95417edcb68ca55dcd59977e18dd53447fa549df01245e2bbeadf594509996efa From c84290f4bb7dca5c15ff4717fc0d8129d88467e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 2 Aug 2021 13:56:23 +0000 Subject: [PATCH 05/14] knot-3.1.0-1 Changelog: - Update to 3.1.0 - Add missing BuildRequires including new libmnl for kxdpgun - Temporarily disable XDP on ARM until issues are resolved --- knot.spec | 27 +++++++++++++++++++++++---- sources | 4 ++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/knot.spec b/knot.spec index d61c4ae..0f8ed50 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.0.8 +Version: 3.1.0 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -26,6 +26,9 @@ BuildRequires: gnupg2 Patch1: 01-test_net-disable-udp-send-on-unconnected.patch # Required dependencies +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig(liburcu) @@ -35,6 +38,7 @@ BuildRequires: pkgconfig(libedit) # Optional dependencies BuildRequires: pkgconfig(libcap-ng) BuildRequires: pkgconfig(libidn2) +BuildRequires: pkgconfig(libmnl) BuildRequires: pkgconfig(libnghttp2) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd) @@ -59,12 +63,22 @@ BuildRequires: lmdb-devel BuildRequires: python3-sphinx BuildRequires: pkgconfig(lmdb) %endif + +%ifarch aarch64 %{arm} +# disable XDP on ARM until issues are resolved +%define configure_xdp --enable-xdp=no +%else +%if 0%{?fedora} >= 31 +# XDP is auto-enabled when libbpf is present +%define use_xdp 1 +BuildRequires: pkgconfig(libbpf) >= 0.0.6 +%endif %if 0%{?rhel} >= 8 || 0%{?suse_version} +# enable XDP on EL using embedded libbpf +%define use_xdp 1 %define configure_xdp --enable-xdp=yes BuildRequires: pkgconfig(libelf) %endif -%if 0%{?fedora} >= 31 -BuildRequires: pkgconfig(libbpf) >= 0.0.6 %endif Requires(post): systemd %{_sbindir}/runuser @@ -267,7 +281,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_bindir}/khost %{_bindir}/knsec3hash %{_bindir}/knsupdate -%if 0%{?rhel} >= 8 || 0%{?suse_version} || 0%{?fedora} >= 31 +%if 0%{?use_xdp} %{_sbindir}/kxdpgun %{_mandir}/man8/kxdpgun.* %endif @@ -308,6 +322,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Mon Aug 02 2021 Jakub Ružička - 3.1.0-1 +- Update to 3.1.0 +- Add missing BuildRequires including new libmnl for kxdpgun +- Temporarily disable XDP on ARM until issues are resolved + * Fri Jul 16 2021 Jakub Ružička - 3.0.8-1 - Update to 3.0.8 - Print failed tests during check diff --git a/sources b/sources index 69848cd..19e03db 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.8.tar.xz) = 0ed55681210211427b54634428c07ac313a6fbc20492ab127f171a26e48a06e22d8360391a8f80247206c339ce76c32f0a82d6db2ec5dfb43cbfa8f455a4ee60 -SHA512 (knot-3.0.8.tar.xz.asc) = 397348d1c4ea19a14d021374b347db9682267edd607d7d506ebc9dc8d3d814b95417edcb68ca55dcd59977e18dd53447fa549df01245e2bbeadf594509996efa +SHA512 (knot-3.1.0.tar.xz) = 7a76ca1547f6aded1045b8a124ec4e35c61199b822b7692b656ef9bfadb68bdfde097a1ece973725ea14690743da2e2c08717055516b150696e3ac341fa5c728 +SHA512 (knot-3.1.0.tar.xz.asc) = b3e3d89cc5d876fe7fc611b239a37d26dcc57257e1f8b3c24d6a3f653cc4e5dfdcf2f00d808f655ec0390bf4557740610b06f4e6b8455bb7d3108ba2eec145da From 9475f2f1abe0f0a20eff41f8aa1c35f203dea70b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 4 Aug 2021 13:27:54 +0000 Subject: [PATCH 06/14] knot-3.1.0-2 Changelog: - Introduce a patch to fix tests on ppc64le - Use autosetup macro to apply patches --- 02-test-journal-enable-64k.patch | 62 ++++++++++++++++++++++++++++++++ knot.spec | 10 ++++-- 2 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 02-test-journal-enable-64k.patch diff --git a/02-test-journal-enable-64k.patch b/02-test-journal-enable-64k.patch new file mode 100644 index 0000000..f845e09 --- /dev/null +++ b/02-test-journal-enable-64k.patch @@ -0,0 +1,62 @@ +From 8644e030223cad41e21386c1870bac3875b42d1d Mon Sep 17 00:00:00 2001 +From: Libor Peltan +Date: Tue, 3 Aug 2021 22:07:19 +0200 +Subject: [PATCH] test/journal: enable 64k (and other weird) page size + +--- + tests/knot/test_journal.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +diff --git a/tests/knot/test_journal.c b/tests/knot/test_journal.c +index 3e2025cb3..ca79b0a79 100644 +--- a/tests/knot/test_journal.c ++++ b/tests/knot/test_journal.c +@@ -44,6 +44,16 @@ zone_journal_t jj; + + unsigned env_flag; + ++static unsigned lmdb_page_size(knot_lmdb_db_t *db) ++{ ++ knot_lmdb_txn_t txn = { 0 }; ++ knot_lmdb_begin(db, &txn, false); ++ MDB_stat st = { 0 }; ++ mdb_stat(txn.txn, txn.db->dbi, &st); ++ knot_lmdb_abort(&txn); ++ return st.ms_psize; ++} ++ + static void set_conf(int zonefile_sync, size_t journal_usage, const knot_dname_t *apex) + { + (void)apex; +@@ -708,7 +718,7 @@ static void test_merge(const knot_dname_t *apex) + list_t l; + + // allow merge +- set_conf(-1, 100 * 1024, apex); ++ set_conf(-1, 400 * 1024, apex); + ok(!journal_allow_flush(jj), "journal: merge allowed"); + + ret = journal_scrape_with_md(jj, false); +@@ -761,7 +771,7 @@ static void test_merge(const knot_dname_t *apex) + // now fill up with dumy changesets to enforce merge + tm_chs(apex, -1); + while (changeset_to(tm_chs(apex, 0)) != 2) { } +- for (i = 0; i < 400; i++) { ++ for (i = 0; i < 1600; i++) { + ret = journal_insert(jj, tm_chs(apex, i), NULL); + assert(ret == KNOT_EOK); + } +@@ -853,7 +863,9 @@ int main(int argc, char *argv[]) + + test_store_load(apex); + +- test_size_control(apex, apex2); ++ if (lmdb_page_size(&jdb) == 4096) { ++ test_size_control(apex, apex2); ++ } // else it is not manually optimized enough to test correctly + + test_merge(apex); + +-- +2.32.0 + diff --git a/knot.spec b/knot.spec index 0f8ed50..6311719 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.1.0 -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 @@ -24,6 +24,7 @@ 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 +Patch2: 02-test-journal-enable-64k.patch # Required dependencies BuildRequires: autoconf @@ -146,8 +147,7 @@ mkdir --mode=700 ${GNUPGHOME} gpg2 --import %{SOURCE100} gpg2 --verify %{SOURCE1} %{SOURCE0} %endif -%setup -q -%patch1 -p1 +%autosetup -p1 %build # disable debug code (causes unused warnings) @@ -322,6 +322,10 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Wed Aug 04 2021 Jakub Ružička 3.1.0-2 +- Introduce a patch to fix tests on ppc64le +- Use autosetup macro to apply patches + * Mon Aug 02 2021 Jakub Ružička - 3.1.0-1 - Update to 3.1.0 - Add missing BuildRequires including new libmnl for kxdpgun From 9a9697c3a535719bc25dc1d4c6d23f2f2a906f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 10 Aug 2021 16:25:10 +0200 Subject: [PATCH 07/14] knot-3.1.1-1 Changelog: - Update to 3.1.1 - Enable XDP on ARM and improve XDP config macros - Remove patch included upstream --- 02-test-journal-enable-64k.patch | 62 -------------------------------- knot.spec | 23 ++++++------ sources | 4 +-- 3 files changed, 15 insertions(+), 74 deletions(-) delete mode 100644 02-test-journal-enable-64k.patch diff --git a/02-test-journal-enable-64k.patch b/02-test-journal-enable-64k.patch deleted file mode 100644 index f845e09..0000000 --- a/02-test-journal-enable-64k.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 8644e030223cad41e21386c1870bac3875b42d1d Mon Sep 17 00:00:00 2001 -From: Libor Peltan -Date: Tue, 3 Aug 2021 22:07:19 +0200 -Subject: [PATCH] test/journal: enable 64k (and other weird) page size - ---- - tests/knot/test_journal.c | 18 +++++++++++++++--- - 1 file changed, 15 insertions(+), 3 deletions(-) - -diff --git a/tests/knot/test_journal.c b/tests/knot/test_journal.c -index 3e2025cb3..ca79b0a79 100644 ---- a/tests/knot/test_journal.c -+++ b/tests/knot/test_journal.c -@@ -44,6 +44,16 @@ zone_journal_t jj; - - unsigned env_flag; - -+static unsigned lmdb_page_size(knot_lmdb_db_t *db) -+{ -+ knot_lmdb_txn_t txn = { 0 }; -+ knot_lmdb_begin(db, &txn, false); -+ MDB_stat st = { 0 }; -+ mdb_stat(txn.txn, txn.db->dbi, &st); -+ knot_lmdb_abort(&txn); -+ return st.ms_psize; -+} -+ - static void set_conf(int zonefile_sync, size_t journal_usage, const knot_dname_t *apex) - { - (void)apex; -@@ -708,7 +718,7 @@ static void test_merge(const knot_dname_t *apex) - list_t l; - - // allow merge -- set_conf(-1, 100 * 1024, apex); -+ set_conf(-1, 400 * 1024, apex); - ok(!journal_allow_flush(jj), "journal: merge allowed"); - - ret = journal_scrape_with_md(jj, false); -@@ -761,7 +771,7 @@ static void test_merge(const knot_dname_t *apex) - // now fill up with dumy changesets to enforce merge - tm_chs(apex, -1); - while (changeset_to(tm_chs(apex, 0)) != 2) { } -- for (i = 0; i < 400; i++) { -+ for (i = 0; i < 1600; i++) { - ret = journal_insert(jj, tm_chs(apex, i), NULL); - assert(ret == KNOT_EOK); - } -@@ -853,7 +863,9 @@ int main(int argc, char *argv[]) - - test_store_load(apex); - -- test_size_control(apex, apex2); -+ if (lmdb_page_size(&jdb) == 4096) { -+ test_size_control(apex, apex2); -+ } // else it is not manually optimized enough to test correctly - - test_merge(apex); - --- -2.32.0 - diff --git a/knot.spec b/knot.spec index 6311719..f764f75 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.0 -Release: 2%{?dist} +Version: 3.1.1 +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,7 +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 -Patch2: 02-test-journal-enable-64k.patch # Required dependencies BuildRequires: autoconf @@ -65,20 +64,19 @@ BuildRequires: python3-sphinx BuildRequires: pkgconfig(lmdb) %endif -%ifarch aarch64 %{arm} -# disable XDP on ARM until issues are resolved +%if 0%{?centos} == 7 || 0%{?rhel} == 7 +# disable XDP on old EL %define configure_xdp --enable-xdp=no %else -%if 0%{?fedora} >= 31 -# XDP is auto-enabled when libbpf is present %define use_xdp 1 -BuildRequires: pkgconfig(libbpf) >= 0.0.6 -%endif %if 0%{?rhel} >= 8 || 0%{?suse_version} -# enable XDP on EL using embedded libbpf +# enable XDP on recent EL using embedded libbpf %define use_xdp 1 %define configure_xdp --enable-xdp=yes BuildRequires: pkgconfig(libelf) +%else +# XDP is auto-enabled when libbpf is present +BuildRequires: pkgconfig(libbpf) >= 0.0.6 %endif %endif @@ -322,6 +320,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* 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 +- Remove patch included upstream + * Wed Aug 04 2021 Jakub Ružička 3.1.0-2 - Introduce a patch to fix tests on ppc64le - Use autosetup macro to apply patches diff --git a/sources b/sources index 19e03db..41537cb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.0.tar.xz) = 7a76ca1547f6aded1045b8a124ec4e35c61199b822b7692b656ef9bfadb68bdfde097a1ece973725ea14690743da2e2c08717055516b150696e3ac341fa5c728 -SHA512 (knot-3.1.0.tar.xz.asc) = b3e3d89cc5d876fe7fc611b239a37d26dcc57257e1f8b3c24d6a3f653cc4e5dfdcf2f00d808f655ec0390bf4557740610b06f4e6b8455bb7d3108ba2eec145da +SHA512 (knot-3.1.1.tar.xz) = 44c2973025e752f73ebd6bc78dad5c48c1c1432b62ec3b6d75b5876af4dd21aeed94f78523ef85cd6a986ff27789143a0a67450819c0b75ffa627d06b98e1b0b +SHA512 (knot-3.1.1.tar.xz.asc) = 161a689f751ace7214416241b4e6ce6ee01d50b099c950b792b7fc42d7c726174b9bf686dc45316c63887b15dba91a57bc7e961dd84b728b38046bc9f5f260d2 From 8834ef058c5be916fad329c0bb4202b36c46eeda 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 08/14] 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 f764f75..3b646cd 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 60a0733dff03fdef3a0c0626c87cc1a27394407d 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 09/14] 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 3b646cd..dbd3fe3 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 afc255913b17bb7fa0f59ab36797fa259ec519db 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 10/14] 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 dbd3fe3..b260976 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 6c34f7e5d4b6d19b0d9956e6767b191302b7abf6 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 11/14] 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 b260976..fbf6b07 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 5aa3dc801a9d5d9cbdd13d9001f02447e749eea1 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 12/14] 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 fbf6b07..7b8e610 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 e9e30f5ec0325906d82a049bd09846d494067937 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 13/14] 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 7b8e610..9e0800c 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 694fadf73dc4835d3304a4addafe83ba34c23ca1 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 14/14] 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 9e0800c..95d9dc2 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