The package rpms/knot.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/knot.git/commit/?id=9d2fa2b1911e1....
Change:
-%ifarch aarch64 %{arm}
Thanks.
Full change:
============
commit 9d2fa2b1911e1807f7fc13bb6a0d4d5c06420480
Author: Jakub Ružička <jakub.ruzicka(a)nic.cz>
Date: Tue Aug 10 16:25:10 2021 +0200
knot-3.1.1-1
Changelog:
- Update to 3.1.1
- Enable XDP on ARM and improve XDP config macros
- Remove patch included upstream
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 <libor.peltan(a)nic.cz>
-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 0f3dc38..1e27b79 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 <jakub.ruzicka(a)nic.cz> - 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 <jakub.ruzicka(a)nic.cz> 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