From 9910ab6398742d240c0f9966bf5e5ca94e5ff252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 6 Oct 2020 12:51:17 +0000 Subject: [PATCH 01/18] knot-3.0.0-2: rebuild Changelog: - Rebuild for new bodhi update --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 1339843..ddf8c58 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -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 @@ -285,6 +285,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Tue Oct 06 2020 Jakub Ružička 3.0.0-2 +- Rebuild for new bodhi update + * Thu Sep 10 2020 Jakub Ružička 3.0.0-1 - New major upstream release 3.0.0 - Sync packaging from upstream From f81152a900f3e898b3f7f02127a999704addc94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 12 Oct 2020 16:01:12 +0200 Subject: [PATCH 02/18] knot-3.0.1-1: new upstream release Changelog: - Update to 3.0.1 - Sync packaging from upstream --- knot.spec | 32 ++++++++++++++++---------------- sources | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/knot.spec b/knot.spec index ddf8c58..9d6278c 100644 --- a/knot.spec +++ b/knot.spec @@ -2,13 +2,13 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 3.0.0 +%define VERSION 3.0.1 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -Release: 2%{?dist} +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 @@ -164,10 +164,9 @@ install -p -m 0644 -D %{repodir}/distro/common/%{name}.tmpfiles %{buildroot}%{_t ln -s service %{buildroot}/%{_sbindir}/rcknot %endif -# create storage dir and key dir +# create storage dir install -d %{buildroot}%{_sharedstatedir} -install -d -m 0775 -D %{buildroot}%{_sharedstatedir}/%{name} -install -d -m 0770 -D %{buildroot}%{_sharedstatedir}/%{name}/keys +install -d -m 0770 -D %{buildroot}%{_sharedstatedir}/knot # remove libarchive files find %{buildroot} -type f -name "*.la" -delete -print @@ -215,15 +214,13 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %files %license COPYING -%{_pkgdocdir}/NEWS -%{_pkgdocdir}/README.md -%{_pkgdocdir}/samples -%dir %attr(750,root,knot) %{_sysconfdir}/%{name} -%config(noreplace) %attr(640,root,knot) %{_sysconfdir}/%{name}/%{name}.conf -%dir %attr(775,root,knot) %{_sharedstatedir}/%{name} -%dir %attr(770,root,knot) %{_sharedstatedir}/%{name}/keys +%doc %{_pkgdocdir} +%exclude %{_pkgdocdir}/html +%attr(770,root,knot) %dir %{_sysconfdir}/knot +%config(noreplace) %attr(640,root,knot) %{_sysconfdir}/knot/knot.conf +%attr(770,root,knot) %dir %{_sharedstatedir}/knot %{_unitdir}/knot.service -%{_tmpfilesdir}/%{name}.conf +%{_tmpfilesdir}/knot.conf %{_bindir}/kzonecheck %{_bindir}/kzonesign %{_sbindir}/kcatalogprint @@ -242,8 +239,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_mandir}/man8/keymgr.* %{_mandir}/man8/knotc.* %{_mandir}/man8/knotd.* -%{_mandir}/man8/knotd.* -%ghost /run/knot +%ghost %attr(770,root,knot) %dir %{_rundir}/knot %files utils %{_bindir}/kdig @@ -282,9 +278,13 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %files doc %dir %{_pkgdocdir} -%{_pkgdocdir}/html +%doc %{_pkgdocdir}/html %changelog +* Mon Oct 12 2020 Jakub Ružička - 3.0.1-1 +- Update to 3.0.1 +- Sync packaging from upstream + * Tue Oct 06 2020 Jakub Ružička 3.0.0-2 - Rebuild for new bodhi update diff --git a/sources b/sources index 46e6adf..5441177 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.0.tar.xz) = 286861e4127f8c70eeba1e76f2de82e8f89d4c15d2dc3733902f8d19103f6a44b9da97a91bc99168fd4f6024d60b8bc53a78580ed04a6e9cbf8c6ad921780c81 -SHA512 (knot-3.0.0.tar.xz.asc) = c3320ce2daf8f84e00ea40e08d89d07ec40530bc860f30e4489d44bcfa296c2954bcb431db793121c0b1aa2ff1f71a343f58492df87893f5fcf85f2470d70d13 +SHA512 (knot-3.0.1.tar.xz) = e220d1db7d01c4899d687b0c1eaf792a48ef3a2d356265fd89addfc89c23f41462967fc974b96d22714e0c812c70f83f919bc2b91803776025e0b907e0cd914d +SHA512 (knot-3.0.1.tar.xz.asc) = 179681474d08b136cab0d46c58f5980dc9a5bbf5424a235447c05da2cbbf9e0a6c578de70de3419279dd79c9f18f6f04f137d60ac6e614c6daa445a2df7426e0 From fa1460cd34470904da798c3653bd87719780cc79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 12 Oct 2020 14:18:05 +0200 Subject: [PATCH 03/18] tests: replace standard-test-rpm with -basic Replace current failing tests mixed with custom roles with standard tests as described in Fedora CI docs: https://docs.fedoraproject.org/en-US/ci/how-to-add-dist-git-test/ Functionality of test_basic_zone.yml was ported to scripts/test_basic_zone.sh. --- tests/README.md | 10 +--------- tests/scripts/test_basic_zone.sh | 18 +++++++++++++++++ tests/test_basic_zone.yml | 33 -------------------------------- tests/tests.yml | 28 +++++++++------------------ 4 files changed, 28 insertions(+), 61 deletions(-) create mode 100755 tests/scripts/test_basic_zone.sh delete mode 100644 tests/test_basic_zone.yml diff --git a/tests/README.md b/tests/README.md index c52e8a5..e1d6352 100644 --- a/tests/README.md +++ b/tests/README.md @@ -2,7 +2,7 @@ Package tests ============= These tests implement the standard test interface in Fedora CI. -See https://fedoraproject.org/wiki/CI/Tests for details. +See https://docs.fedoraproject.org/en-US/ci/tests/ for details. Manual execution ---------------- @@ -12,11 +12,3 @@ modifications to your system. It's best to run these on a clean, throw-away testing system or a VM. ansible-playbook tests/tests.yml -e subjects=/path/to/knot.rpm,/path/to/knot-libs.rpm -e artifacts=/path/to/artifacts - -Automatic execution -------------------- - -These tests should eventually be automatically executed by the Fedora CI -pipeline. As of 2018-01-10, it is not supported for packages that aren't part -of Fedora Atomic. Once it is implemented, the results of these tests should be -visible in dist-git commits on src.fedoraproject.org diff --git a/tests/scripts/test_basic_zone.sh b/tests/scripts/test_basic_zone.sh new file mode 100755 index 0000000..9c08f0e --- /dev/null +++ b/tests/scripts/test_basic_zone.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# test basic system-wide functionality of Knot DNS +set -ex + +# create zone file from examples +cp /usr/share/doc/knot/samples/example.com.zone /var/lib/knot/example.com.zone +# configure knot to serve example.com zone using dark sed magic +sed 's/^#\?\([ \t]*-[ \t]*domain:[ \t]\+example.com\)[ \t]*$/\1/' -i /etc/knot/knot.conf + +# (re)start knotd +systemctl stop knot.service +systemctl start knot.service || systemctl status knot.service + +# check valid query is answered +dig @127.0.0.1 example.com | grep NOERROR + +# check query for non-existent zone is refused +dig @127.0.0.1 bad-example.com | grep REFUSED diff --git a/tests/test_basic_zone.yml b/tests/test_basic_zone.yml deleted file mode 100644 index 0f75c94..0000000 --- a/tests/test_basic_zone.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- block: - - name: create zone file - shell: cp /usr/share/doc/knot/samples/example.com.zone /var/lib/knot/example.com.zone - - - name: configure knot to serve example.com zone - lineinfile: - path: /etc/knot/knot.conf - regexp: '^#? - domain: example.com$' - state: present - line: ' - domain: example.com' - - - name: start knot.service - service: - name: knot.service - state: restarted - - - name: check if query is answered - shell: dig @127.0.0.1 example.com - register: res - failed_when: "'NOERROR' not in res.stdout" - - - name: check query for non-existent zone is refused - shell: dig @127.0.0.1 example2.com - register: res - failed_when: "'REFUSED' not in res.stdout" - - rescue: - - set_fact: - test_basic_zone_failed: true - always: - - name: collect journal - shell: journalctl --since -10m > {{ artifacts }}/test_basic_zone_journal.log diff --git a/tests/tests.yml b/tests/tests.yml index b86e45f..8cf0411 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -1,25 +1,15 @@ --- - hosts: localhost remote_user: root - pre_tasks: - - package: # Install additional dependecies - name: bind-utils - state: latest roles: - - role: standard-test-rpm + - role: standard-test-basic tags: - classic - tasks: - - include_tasks: test_basic_zone.yml - - - set_fact: - tests_passed: '{{ test_basic_zone_failed is undefined }}' - - name: report results - debug: - msg: | - test_basic_zone: {{ 'FAILED' if test_basic_zone_failed is defined else 'OK'}} - - - name: fail playbook if tests failed - debug: - msg: --- {{ 'PASSED' if tests_passed else 'FAILED' }} --- - failed_when: not tests_passed + required_packages: + - bind-utils + tests: + - knotd-show-version: + run: knotd --version + - basic-zone: + dir: scripts + run: ./test_basic_zone.sh From 7589f735ef19386b4a49def6eb89f41457753bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 29 Oct 2020 11:55:48 +0000 Subject: [PATCH 04/18] knot-3.0.1-2: respect GnuTLS insecure algorithms Changelog: - Respect GnuTLS insecure algorithms --- ...c-respect-GnuTLS-insecure-algorithms.patch | 127 ++++++++++++++++++ knot.spec | 7 +- 2 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 02-libdnssec-respect-GnuTLS-insecure-algorithms.patch diff --git a/02-libdnssec-respect-GnuTLS-insecure-algorithms.patch b/02-libdnssec-respect-GnuTLS-insecure-algorithms.patch new file mode 100644 index 0000000..2f8af15 --- /dev/null +++ b/02-libdnssec-respect-GnuTLS-insecure-algorithms.patch @@ -0,0 +1,127 @@ +From 1cd35b0cad2007307867fcd90d7c546fc439e5ff Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= +Date: Thu, 29 Oct 2020 08:23:00 +0100 +Subject: [PATCH] libdnssec: respect GnuTLS insecure algorithms + +--- + src/libdnssec/key.h | 6 +++++- + src/libdnssec/key/algorithm.c | 6 ------ + src/libdnssec/key/ds.c | 17 +++++++++++++++-- + src/libdnssec/sign/sign.c | 16 +++++++++++----- + 4 files changed, 31 insertions(+), 14 deletions(-) + +diff --git a/src/libdnssec/key.h b/src/libdnssec/key.h +index ac84f8190..0023e8dde 100644 +--- a/src/libdnssec/key.h ++++ b/src/libdnssec/key.h +@@ -68,6 +68,10 @@ typedef struct dnssec_key dnssec_key_t; + * Check whether a DNSKEY algorithm is supported. + * + * @note: less secure algorithms may go unsupported on purpose. ++ * - if IETF RFCs deprecate algorithm even for validation (see RFC 8624) ++ * - if (local) GnuTLS policy considers an algorithm insecure ++ * ++ * Perhaps confusing: it's implemented in ./sign/sign.c and not ./key/ + */ + bool dnssec_algorithm_key_support(dnssec_key_algorithm_t algo); + +@@ -269,7 +273,7 @@ typedef enum dnssec_key_digest { + /*! + * Check whether a DS algorithm is supported. + * +- * @note: less secure algorithms may go unsupported on purpose. ++ * @note: see note at dnssec_algorithm_key_support(). + */ + bool dnssec_algorithm_digest_support(dnssec_key_digest_t algo); + +diff --git a/src/libdnssec/key/algorithm.c b/src/libdnssec/key/algorithm.c +index 83cbe94b9..97800c8a4 100644 +--- a/src/libdnssec/key/algorithm.c ++++ b/src/libdnssec/key/algorithm.c +@@ -109,12 +109,6 @@ gnutls_pk_algorithm_t algorithm_to_gnutls(dnssec_key_algorithm_t dnssec) + + /* -- public API ----------------------------------------------------------- */ + +-_public_ +-bool dnssec_algorithm_key_support(dnssec_key_algorithm_t algo) +-{ +- return algorithm_to_gnutls(algo) != GNUTLS_PK_UNKNOWN; +-} +- + _public_ + bool dnssec_algorithm_reproducible(dnssec_key_algorithm_t algo, bool explicit) + { +diff --git a/src/libdnssec/key/ds.c b/src/libdnssec/key/ds.c +index 36fcdbd98..64389148e 100644 +--- a/src/libdnssec/key/ds.c ++++ b/src/libdnssec/key/ds.c +@@ -40,9 +40,22 @@ static gnutls_digest_algorithm_t lookup_algorithm(dnssec_key_digest_t algorithm) + } + + _public_ +-bool dnssec_algorithm_digest_support(dnssec_key_digest_t algo) ++bool dnssec_algorithm_digest_support(dnssec_key_digest_t algorithm) + { +- return lookup_algorithm(algo) != GNUTLS_DIG_UNKNOWN; ++ /* GnuTLS docs: ++ * > It is not possible to query for insecure hash algorithms directly ++ * > (only indirectly through the signature API). ++ * So let's query combining the hash with RSA. ++ */ ++ gnutls_sign_algorithm_t rsa; ++ switch (algorithm) { ++ case DNSSEC_KEY_DIGEST_SHA1: rsa = GNUTLS_SIGN_RSA_SHA1; break; ++ case DNSSEC_KEY_DIGEST_SHA256: rsa = GNUTLS_SIGN_RSA_SHA256; break; ++ case DNSSEC_KEY_DIGEST_SHA384: rsa = GNUTLS_SIGN_RSA_SHA384; break; ++ default: ++ return false; ++ }; ++ return gnutls_sign_is_secure(rsa); + } + + static void wire_write_digest(wire_ctx_t *wire, +diff --git a/src/libdnssec/sign/sign.c b/src/libdnssec/sign/sign.c +index 3f9557aaf..1a7e8292e 100644 +--- a/src/libdnssec/sign/sign.c ++++ b/src/libdnssec/sign/sign.c +@@ -230,11 +230,9 @@ static gnutls_digest_algorithm_t get_digest_algorithm(const dnssec_key_t *key) + } + #endif + +-static gnutls_sign_algorithm_t get_sign_algorithm(const dnssec_key_t *key) ++static gnutls_sign_algorithm_t algo_dnssec2gnutls(dnssec_key_algorithm_t algorithm) + { +- uint8_t algorithm = dnssec_key_get_algorithm(key); +- +- switch ((dnssec_key_algorithm_t)algorithm) { ++ switch (algorithm) { + case DNSSEC_KEY_ALGORITHM_RSA_SHA1: + case DNSSEC_KEY_ALGORITHM_RSA_SHA1_NSEC3: + return GNUTLS_SIGN_RSA_SHA1; +@@ -261,6 +259,13 @@ static gnutls_sign_algorithm_t get_sign_algorithm(const dnssec_key_t *key) + + /* -- public API ---------------------------------------------------------- */ + ++_public_ ++bool dnssec_algorithm_key_support(dnssec_key_algorithm_t algo) ++{ ++ gnutls_sign_algorithm_t a = algo_dnssec2gnutls(algo); ++ return a != GNUTLS_SIGN_UNKNOWN && gnutls_sign_is_secure(a); ++} ++ + _public_ + int dnssec_sign_new(dnssec_sign_ctx_t **ctx_ptr, const dnssec_key_t *key) + { +@@ -278,7 +283,8 @@ int dnssec_sign_new(dnssec_sign_ctx_t **ctx_ptr, const dnssec_key_t *key) + return DNSSEC_INVALID_KEY_ALGORITHM; + } + +- ctx->sign_algorithm = get_sign_algorithm(key); ++ const uint8_t algo_raw = dnssec_key_get_algorithm(key); ++ ctx->sign_algorithm = algo_dnssec2gnutls((dnssec_key_algorithm_t)algo_raw); + int result = dnssec_sign_init(ctx); + if (result != DNSSEC_EOK) { + free(ctx); +-- +2.28.0 + diff --git a/knot.spec b/knot.spec index 9d6278c..d3bd65a 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -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-libdnssec-respect-GnuTLS-insecure-algorithms.patch # Required dependencies BuildRequires: gcc @@ -117,6 +118,7 @@ gpg2 --verify %{SOURCE1} %{SOURCE0} %endif %setup -q %patch1 -p1 +%patch2 -p1 %build # disable debug code (causes unused warnings) @@ -281,6 +283,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Oct 29 2020 Jakub Ružička - 3.0.1-2 +- Respect GnuTLS insecure algorithms + * Mon Oct 12 2020 Jakub Ružička - 3.0.1-1 - Update to 3.0.1 - Sync packaging from upstream From f29c8044ca05ebeb8e3a6c8b2af3ac417fa27467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 11 Nov 2020 16:03:35 +0100 Subject: [PATCH 05/18] knot-3.0.2-1: new upstream release Changelog: - Update to 3.0.2 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index d3bd65a..94fe62e 100644 --- a/knot.spec +++ b/knot.spec @@ -2,13 +2,13 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 3.0.1 +%define VERSION 3.0.2 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -Release: 2%{?dist} +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 @@ -283,6 +283,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Wed Nov 11 2020 Jakub Ružička - 3.0.2-1 +- Update to 3.0.2 + * Thu Oct 29 2020 Jakub Ružička - 3.0.1-2 - Respect GnuTLS insecure algorithms diff --git a/sources b/sources index 5441177..286230f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.1.tar.xz) = e220d1db7d01c4899d687b0c1eaf792a48ef3a2d356265fd89addfc89c23f41462967fc974b96d22714e0c812c70f83f919bc2b91803776025e0b907e0cd914d -SHA512 (knot-3.0.1.tar.xz.asc) = 179681474d08b136cab0d46c58f5980dc9a5bbf5424a235447c05da2cbbf9e0a6c578de70de3419279dd79c9f18f6f04f137d60ac6e614c6daa445a2df7426e0 +SHA512 (knot-3.0.2.tar.xz) = 677de7a80688d4820d56c020af1bb1da97546f44a616e2d72d7e0301fca4a7ab682994cf66e8c37403e65ddb45ea3e0eb37b3304739c1239364115588c589699 +SHA512 (knot-3.0.2.tar.xz.asc) = 056afa176067d05917928d8b11bad40499d51ea8699dbc6bebf5c638e8fc9990582338e6745ed178c0685cfb97a19aa0a844e28a2b13c89f9195702d1b816a49 From 9e0deabc371fe20f9f344a62e9b09a7691e1b312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 11 Nov 2020 15:20:54 +0000 Subject: [PATCH 06/18] knot-3.0.2-2 Changelog: - Remove patch included in upstream release --- ...c-respect-GnuTLS-insecure-algorithms.patch | 127 ------------------ knot.spec | 7 +- 2 files changed, 4 insertions(+), 130 deletions(-) delete mode 100644 02-libdnssec-respect-GnuTLS-insecure-algorithms.patch diff --git a/02-libdnssec-respect-GnuTLS-insecure-algorithms.patch b/02-libdnssec-respect-GnuTLS-insecure-algorithms.patch deleted file mode 100644 index 2f8af15..0000000 --- a/02-libdnssec-respect-GnuTLS-insecure-algorithms.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 1cd35b0cad2007307867fcd90d7c546fc439e5ff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= -Date: Thu, 29 Oct 2020 08:23:00 +0100 -Subject: [PATCH] libdnssec: respect GnuTLS insecure algorithms - ---- - src/libdnssec/key.h | 6 +++++- - src/libdnssec/key/algorithm.c | 6 ------ - src/libdnssec/key/ds.c | 17 +++++++++++++++-- - src/libdnssec/sign/sign.c | 16 +++++++++++----- - 4 files changed, 31 insertions(+), 14 deletions(-) - -diff --git a/src/libdnssec/key.h b/src/libdnssec/key.h -index ac84f8190..0023e8dde 100644 ---- a/src/libdnssec/key.h -+++ b/src/libdnssec/key.h -@@ -68,6 +68,10 @@ typedef struct dnssec_key dnssec_key_t; - * Check whether a DNSKEY algorithm is supported. - * - * @note: less secure algorithms may go unsupported on purpose. -+ * - if IETF RFCs deprecate algorithm even for validation (see RFC 8624) -+ * - if (local) GnuTLS policy considers an algorithm insecure -+ * -+ * Perhaps confusing: it's implemented in ./sign/sign.c and not ./key/ - */ - bool dnssec_algorithm_key_support(dnssec_key_algorithm_t algo); - -@@ -269,7 +273,7 @@ typedef enum dnssec_key_digest { - /*! - * Check whether a DS algorithm is supported. - * -- * @note: less secure algorithms may go unsupported on purpose. -+ * @note: see note at dnssec_algorithm_key_support(). - */ - bool dnssec_algorithm_digest_support(dnssec_key_digest_t algo); - -diff --git a/src/libdnssec/key/algorithm.c b/src/libdnssec/key/algorithm.c -index 83cbe94b9..97800c8a4 100644 ---- a/src/libdnssec/key/algorithm.c -+++ b/src/libdnssec/key/algorithm.c -@@ -109,12 +109,6 @@ gnutls_pk_algorithm_t algorithm_to_gnutls(dnssec_key_algorithm_t dnssec) - - /* -- public API ----------------------------------------------------------- */ - --_public_ --bool dnssec_algorithm_key_support(dnssec_key_algorithm_t algo) --{ -- return algorithm_to_gnutls(algo) != GNUTLS_PK_UNKNOWN; --} -- - _public_ - bool dnssec_algorithm_reproducible(dnssec_key_algorithm_t algo, bool explicit) - { -diff --git a/src/libdnssec/key/ds.c b/src/libdnssec/key/ds.c -index 36fcdbd98..64389148e 100644 ---- a/src/libdnssec/key/ds.c -+++ b/src/libdnssec/key/ds.c -@@ -40,9 +40,22 @@ static gnutls_digest_algorithm_t lookup_algorithm(dnssec_key_digest_t algorithm) - } - - _public_ --bool dnssec_algorithm_digest_support(dnssec_key_digest_t algo) -+bool dnssec_algorithm_digest_support(dnssec_key_digest_t algorithm) - { -- return lookup_algorithm(algo) != GNUTLS_DIG_UNKNOWN; -+ /* GnuTLS docs: -+ * > It is not possible to query for insecure hash algorithms directly -+ * > (only indirectly through the signature API). -+ * So let's query combining the hash with RSA. -+ */ -+ gnutls_sign_algorithm_t rsa; -+ switch (algorithm) { -+ case DNSSEC_KEY_DIGEST_SHA1: rsa = GNUTLS_SIGN_RSA_SHA1; break; -+ case DNSSEC_KEY_DIGEST_SHA256: rsa = GNUTLS_SIGN_RSA_SHA256; break; -+ case DNSSEC_KEY_DIGEST_SHA384: rsa = GNUTLS_SIGN_RSA_SHA384; break; -+ default: -+ return false; -+ }; -+ return gnutls_sign_is_secure(rsa); - } - - static void wire_write_digest(wire_ctx_t *wire, -diff --git a/src/libdnssec/sign/sign.c b/src/libdnssec/sign/sign.c -index 3f9557aaf..1a7e8292e 100644 ---- a/src/libdnssec/sign/sign.c -+++ b/src/libdnssec/sign/sign.c -@@ -230,11 +230,9 @@ static gnutls_digest_algorithm_t get_digest_algorithm(const dnssec_key_t *key) - } - #endif - --static gnutls_sign_algorithm_t get_sign_algorithm(const dnssec_key_t *key) -+static gnutls_sign_algorithm_t algo_dnssec2gnutls(dnssec_key_algorithm_t algorithm) - { -- uint8_t algorithm = dnssec_key_get_algorithm(key); -- -- switch ((dnssec_key_algorithm_t)algorithm) { -+ switch (algorithm) { - case DNSSEC_KEY_ALGORITHM_RSA_SHA1: - case DNSSEC_KEY_ALGORITHM_RSA_SHA1_NSEC3: - return GNUTLS_SIGN_RSA_SHA1; -@@ -261,6 +259,13 @@ static gnutls_sign_algorithm_t get_sign_algorithm(const dnssec_key_t *key) - - /* -- public API ---------------------------------------------------------- */ - -+_public_ -+bool dnssec_algorithm_key_support(dnssec_key_algorithm_t algo) -+{ -+ gnutls_sign_algorithm_t a = algo_dnssec2gnutls(algo); -+ return a != GNUTLS_SIGN_UNKNOWN && gnutls_sign_is_secure(a); -+} -+ - _public_ - int dnssec_sign_new(dnssec_sign_ctx_t **ctx_ptr, const dnssec_key_t *key) - { -@@ -278,7 +283,8 @@ int dnssec_sign_new(dnssec_sign_ctx_t **ctx_ptr, const dnssec_key_t *key) - return DNSSEC_INVALID_KEY_ALGORITHM; - } - -- ctx->sign_algorithm = get_sign_algorithm(key); -+ const uint8_t algo_raw = dnssec_key_get_algorithm(key); -+ ctx->sign_algorithm = algo_dnssec2gnutls((dnssec_key_algorithm_t)algo_raw); - int result = dnssec_sign_init(ctx); - if (result != DNSSEC_EOK) { - free(ctx); --- -2.28.0 - diff --git a/knot.spec b/knot.spec index 94fe62e..36ff9c1 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -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,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-libdnssec-respect-GnuTLS-insecure-algorithms.patch # Required dependencies BuildRequires: gcc @@ -118,7 +117,6 @@ gpg2 --verify %{SOURCE1} %{SOURCE0} %endif %setup -q %patch1 -p1 -%patch2 -p1 %build # disable debug code (causes unused warnings) @@ -283,6 +281,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Wed Nov 11 2020 Jakub Ružička - 3.0.2-2 +- Remove patch included in upstream release + * Wed Nov 11 2020 Jakub Ružička - 3.0.2-1 - Update to 3.0.2 From acd548b8ac75c66a58b695d888691df7028c5d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 17 Dec 2020 13:06:59 +0000 Subject: [PATCH 07/18] knot-3.0.3-1 Changelog: - Update to 3.0.3 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 36ff9c1..0d0c02f 100644 --- a/knot.spec +++ b/knot.spec @@ -2,13 +2,13 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 3.0.2 +%define VERSION 3.0.3 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -Release: 2%{?dist} +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 @@ -281,6 +281,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Dec 17 2020 Jakub Ružička - 3.0.3-1 +- Update to 3.0.3 + * Wed Nov 11 2020 Jakub Ružička - 3.0.2-2 - Remove patch included in upstream release diff --git a/sources b/sources index 286230f..f30e35d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.2.tar.xz) = 677de7a80688d4820d56c020af1bb1da97546f44a616e2d72d7e0301fca4a7ab682994cf66e8c37403e65ddb45ea3e0eb37b3304739c1239364115588c589699 -SHA512 (knot-3.0.2.tar.xz.asc) = 056afa176067d05917928d8b11bad40499d51ea8699dbc6bebf5c638e8fc9990582338e6745ed178c0685cfb97a19aa0a844e28a2b13c89f9195702d1b816a49 +SHA512 (knot-3.0.3.tar.xz) = 4a4de22f8324d8459a7012faa49fb1503ad3b2f23af434a82381a73bf3f43a66f096bba7b0dfc8a61f416d9e02ce97c449ed1590a8a899279ac793798423c339 +SHA512 (knot-3.0.3.tar.xz.asc) = 4fccc5e97241556a36fc58d08dbe96666485f66e45bfb4ef59097a413f3409231f974a17c0c2f68207d8360c58e75769b08fac24d95d75d1f6da47c1974ea2ea From a0f7e989f09138c00237aa1f22c8acd596fd9cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 1 Feb 2021 15:33:09 +0000 Subject: [PATCH 08/18] knot-3.0.4-1 Changelog: - Update to 3.0.4 - Move dnstap module to subpackage - Move geoip module to subpackage - Remove redundant VERSION macro --- knot.spec | 44 +++++++++++++++++++++++++++++++++++++------- sources | 4 ++-- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/knot.spec b/knot.spec index 0d0c02f..83be108 100644 --- a/knot.spec +++ b/knot.spec @@ -2,12 +2,12 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 3.0.3 +%define BASE_VERSION %(echo %{version} | sed 's/^\([^.]\+\.[^.]\+\).*/\1/') %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server Name: knot -Version: %{VERSION} +Version: 3.0.4 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -33,20 +33,22 @@ BuildRequires: pkgconfig(libedit) # Optional dependencies BuildRequires: pkgconfig(libcap-ng) -BuildRequires: pkgconfig(libfstrm) BuildRequires: pkgconfig(libidn2) -BuildRequires: pkgconfig(libmaxminddb) BuildRequires: pkgconfig(libnghttp2) -BuildRequires: pkgconfig(libprotobuf-c) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd) +# dnstap dependencies +BuildRequires: pkgconfig(libfstrm) +BuildRequires: pkgconfig(libprotobuf-c) +# geoip dependencies +BuildRequires: pkgconfig(libmaxminddb) # Distro-dependent dependencies %if 0%{?suse_version} BuildRequires: python3-Sphinx BuildRequires: lmdb-devel BuildRequires: protobuf-c -Requires(pre): pwdutils +Requires(pre): pwdutils %endif %if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: python-sphinx @@ -98,6 +100,20 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description utils The package contains DNS client utilities shipped with the Knot DNS server. +%package module-dnstap +Summary: dnstap module for Knot DNS +Requires: %{name} = %{version}-%{release} + +%description module-dnstap +The package contains dnstap Knot DNS module for logging DNS traffic. + +%package module-geoip +Summary: geoip module for Knot DNS +Requires: %{name} = %{version}-%{release} + +%description module-geoip +The package contains geoip Knot DNS module for geography-based responses. + %package doc Summary: Documentation for the Knot DNS server BuildArch: noarch @@ -133,12 +149,14 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused" --localstatedir=/var/lib \ --libexecdir=/usr/lib/knot \ --with-rundir=/run/knot \ + --with-moduledir=%{_libdir}/knot/modules-%{BASE_VERSION} \ --with-storage=/var/lib/knot \ %{?configure_db_sizes} \ %{?configure_xdp} \ --disable-static \ --enable-dnstap=yes \ - --with-module-dnstap=yes + --with-module-dnstap=shared \ + --with-module-geoip=shared make %{?_smp_mflags} make html @@ -255,6 +273,12 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_mandir}/man1/knsec3hash.* %{_mandir}/man1/knsupdate.* +%files module-dnstap +%{_libdir}/knot/modules-*/dnstap.so + +%files module-geoip +%{_libdir}/knot/modules-*/geoip.so + %files libs %license COPYING %doc NEWS @@ -281,6 +305,12 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Mon Feb 01 2021 Jakub Ružička - 3.0.4-1 +- Update to 3.0.4 +- Move dnstap module to subpackage +- Move geoip module to subpackage +- Remove redundant VERSION macro + * Thu Dec 17 2020 Jakub Ružička - 3.0.3-1 - Update to 3.0.3 diff --git a/sources b/sources index f30e35d..1dcbfa8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.3.tar.xz) = 4a4de22f8324d8459a7012faa49fb1503ad3b2f23af434a82381a73bf3f43a66f096bba7b0dfc8a61f416d9e02ce97c449ed1590a8a899279ac793798423c339 -SHA512 (knot-3.0.3.tar.xz.asc) = 4fccc5e97241556a36fc58d08dbe96666485f66e45bfb4ef59097a413f3409231f974a17c0c2f68207d8360c58e75769b08fac24d95d75d1f6da47c1974ea2ea +SHA512 (knot-3.0.4.tar.xz) = d674faaafcbe882539d28e53f1cd6cdda61ca8065f66dc0b9127f249f34b59a9d3d1ac206799c2974a2d38264842a2387db35f814bd05f3eaeac0b35b90b21ac +SHA512 (knot-3.0.4.tar.xz.asc) = b5f77494da6aa1b256feb3f38fcaac42811bd7e04644806c9e00fa09386f51503ac86163b6c4a85588a4eaf8990812ab8c48f751aaf04b00ab838b99bc9ed8f6 From 5220d486ba2f17c1bfa84d5829ef6f926a84964d 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 09/18] 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 83be108..853b4bd 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 @@ -237,6 +237,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 @@ -305,6 +307,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 705e20bdcb39cb9a392be344c068300a29df9a4f 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 10/18] 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 853b4bd..07ecca6 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 @@ -307,6 +307,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 c7969ecc0eef4b093f8bf284b1932739e13b563f 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 11/18] 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 07ecca6..0fb32bb 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 @@ -307,6 +307,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 0839feaaadd85db5bbe07fc955a7bc147bb91e3e 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 12/18] 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 0fb32bb..3bd51ce 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 @@ -190,7 +190,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 @@ -307,6 +307,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 d249dd0dc6e38d9698711045a6ca84f51a156acc 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 13/18] 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 | 28 ++++++++++++++++++++++++---- sources | 4 ++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/knot.spec b/knot.spec index 3bd51ce..30e96da 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,10 @@ 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) BuildRequires: pkgconfig(gnutls) >= 3.3 @@ -34,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) @@ -58,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 @@ -266,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 @@ -307,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 9fc6bc8da9562bb5463bdc0328c25004052407e0 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 14/18] 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 30e96da..0f3dc38 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 9d2fa2b1911e1807f7fc13bb6a0d4d5c06420480 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 15/18] 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 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 - 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 0e52a0b97002134c8392cc4b543f31f154578119 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 16/18] 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 1e27b79..15ef583 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 29f13f9d4148c82dcc0b6c6033e3e3abf900696e 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 17/18] 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 15ef583..48302ab 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 b40512cc03b757b98c64745726ed572e18fdbed8 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 18/18] 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 48302ab..f381339 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