From e4808c6aee5cdf4279e611414de0a21156988ff4 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 19 Feb 2015 22:57:38 +0100 Subject: [PATCH 01/65] update to 1.6.2 --- knot.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 15c0e3b..58ed6f9 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.6.1 -Release: 3%{?dist} +Version: 1.6.2 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -106,6 +106,11 @@ exit 0 %{_mandir}/man8/* %changelog +* Thu Feb 19 2015 Jan Vcelak 1.6.2-1 +- new upstream release: + + new config option 'max-tcp-clients' + + fix possible resource leak when terminating inactive TCP clients + * Tue Jan 20 2015 Jan Vcelak 1.6.1-3 - service file changes: + remove dependency on network.target diff --git a/sources b/sources index 2282554..32a88a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c726ebf12fd2f325da8407538a2124f2 knot-1.6.1.tar.xz +a1859b9e89c1719a764d95bcb8232197 knot-1.6.2.tar.xz From 97df65a7ad12de72ad8bf6bc352a8eaedb304e94 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 8 Apr 2015 15:16:52 +0200 Subject: [PATCH 02/65] update to 1.6.3 --- knot.spec | 11 ++++++++++- sources | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index 58ed6f9..1fe8c1d 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.6.2 +Version: 1.6.3 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -106,6 +106,15 @@ exit 0 %{_mandir}/man8/* %changelog +* Wed Apr 08 2015 Jan Vcelak 1.6.3-1 +- new upstream release: + + fix: performance drop for NSEC-signed zones + + fix: proper handling of TCP short-writes + + fix: possible out-of-bound reads in zone parser and packet parser + + feature: CDS and CDNSKEY support in zone parser + + improvement: add defaults for TCP config options into documentation + + improvement: detailed error message if zone reload fails + * Thu Feb 19 2015 Jan Vcelak 1.6.2-1 - new upstream release: + new config option 'max-tcp-clients' diff --git a/sources b/sources index 32a88a7..dfa7b1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1859b9e89c1719a764d95bcb8232197 knot-1.6.2.tar.xz +fe64a85f9d7965e9f78445a59019365a knot-1.6.3.tar.xz From 6da57a911f30758f7b69e9514e9f3142a9f53eef Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 18 Jun 2015 17:01:59 +0200 Subject: [PATCH 03/65] update to 1.6.4 --- knot.spec | 14 +++++++++++++- sources | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index 1fe8c1d..9e08b80 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.6.3 +Version: 1.6.4 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -18,6 +18,7 @@ Source2: %{name}.conf Source3: %{name}.tmpfiles BuildRequires: flex bison openssl-devel userspace-rcu-devel libcap-ng-devel libidn-devel systemd-devel lmdb-devel +BuildRequires: protobuf-c-devel fstrm-devel BuildRequires: systemd-units # ragel is optional, required only if .rl source files are modified #BuildRequires: ragel @@ -106,6 +107,17 @@ exit 0 %{_mandir}/man8/* %changelog +* Thu Jun 18 2015 Jan Vcelak 1.6.4-1 +- new upstream release: + + fix: lost NOTIFY message if received during zone transfer + + fix: kdig, record correct dnstap SocketProtocol when retrying over TCP + + fix: kdig, hide TSIG section with +noall + + fix: do not set AA flag for AXFR/IXFR queries + + feature: zone scanner, split long TXT/SPF strings into multiple strings + + feature: kdig, add +generic dump style option + + feature: try all servers on failure in multi-master environment + + improvement: zone dump, do not print class for SOA record for consistency + * Wed Apr 08 2015 Jan Vcelak 1.6.3-1 - new upstream release: + fix: performance drop for NSEC-signed zones diff --git a/sources b/sources index dfa7b1f..ed66010 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe64a85f9d7965e9f78445a59019365a knot-1.6.3.tar.xz +a8ac2be2dc7d22c6df1aa5387ae4096b knot-1.6.4.tar.xz From e3f8732ea62501fe74ef852120f250815e7ca538 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 2 Sep 2015 09:44:57 +0200 Subject: [PATCH 04/65] update to 1.6.5 --- knot.spec | 15 ++++++++++++++- sources | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index 9e08b80..ea26fc8 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.6.4 +Version: 1.6.5 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -107,6 +107,19 @@ exit 0 %{_mandir}/man8/* %changelog +* Wed Sep 02 2015 Jan Vcelak 1.6.5-1 +- new upstream release: + + fix: don't load expired zones on reload and startup + + fix: remove race condition in scheduling causing delaying of events + + fix: NSEC proof construction in zones with many delegations + + fix: TC flag setting in RRL slipped answers + + fix: disable domain name compression for root label + + fix: check if executed under systemd before using journald log sink + + feature: write persistent timers on server shutdown for better performance + + feature: support time unit specification for 'max-conn-idle', + 'max-conn-handshake', 'max-conn-reply', and 'notify-timeout' config options + + feature: add 'request-edns-config' config option + * Thu Jun 18 2015 Jan Vcelak 1.6.4-1 - new upstream release: + fix: lost NOTIFY message if received during zone transfer diff --git a/sources b/sources index ed66010..5654970 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8ac2be2dc7d22c6df1aa5387ae4096b knot-1.6.4.tar.xz +934b6feaeefd0df7b3be6709e39b19ce knot-1.6.5.tar.xz From 5eae6f12095ee640e45d91fa6b42021b26db287f Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 25 Nov 2015 13:36:22 +0100 Subject: [PATCH 05/65] update to 1.6.6 --- knot.spec | 7 ++++++- sources | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index ea26fc8..fc3322a 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.6.5 +Version: 1.6.6 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -107,6 +107,11 @@ exit 0 %{_mandir}/man8/* %changelog +* Wed Nov 25 2015 Jan Vcelak 1.6.6-1 +- new upstream release: + + security fix: out-of-bound read in packet parser for malformed NAPTR record + + fix: systemd startup notifications + * Wed Sep 02 2015 Jan Vcelak 1.6.5-1 - new upstream release: + fix: don't load expired zones on reload and startup diff --git a/sources b/sources index 5654970..31bbeea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -934b6feaeefd0df7b3be6709e39b19ce knot-1.6.5.tar.xz +232e243fdd9d7de8c4b3c0dccfb01737 knot-1.6.6.tar.xz From d5598d2a1de2c9768cd250a75244ff48acbf3e87 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 10 Feb 2016 20:39:39 +0100 Subject: [PATCH 06/65] new release (1.6.7) --- knot.spec | 9 ++++++++- sources | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index fc3322a..d6ee85d 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.6.6 +Version: 1.6.7 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -107,6 +107,13 @@ exit 0 %{_mandir}/man8/* %changelog +* Wed Feb 10 2016 Jan Vcelak 1.6.7-1 +- new upstream release: + + improvement: Log change of the zone serial number after IXFR transfer + + improvement: Document operational impact of various RRL settings + + improvement: Add support for rate-limit-slip zero + + improvement: Add 'timer-db' configuration option + * Wed Nov 25 2015 Jan Vcelak 1.6.6-1 - new upstream release: + security fix: out-of-bound read in packet parser for malformed NAPTR record diff --git a/sources b/sources index 31bbeea..3ec9ae3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -232e243fdd9d7de8c4b3c0dccfb01737 knot-1.6.6.tar.xz +7b08926aed12bb7ded765f21adb83ad8 knot-1.6.7.tar.xz From f707469cbb22c3502ccdd59eeb800ee27a17ca72 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Tue, 9 Aug 2016 19:49:50 +0200 Subject: [PATCH 07/65] new release (1.6.8) Resolves: #1353573 #1353575 --- knot.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index d6ee85d..5613248 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.6.7 +Version: 1.6.8 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -107,6 +107,10 @@ exit 0 %{_mandir}/man8/* %changelog +* Tue Aug 09 2016 Jan Vcelak - 1.6.8-1 +- new upstream release: + + feature: Zone size limit restriction for DDNS, AXFR, and IXFR (CVE-2016-6171) + * Wed Feb 10 2016 Jan Vcelak 1.6.7-1 - new upstream release: + improvement: Log change of the zone serial number after IXFR transfer diff --git a/sources b/sources index 3ec9ae3..3929581 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b08926aed12bb7ded765f21adb83ad8 knot-1.6.7.tar.xz +b32b90b9b79e0c7d36263aaaa9a83c14 knot-1.6.8.tar.xz From 5bd302fd8b64a709caf0333fa90403959fdc733c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Fri, 10 Mar 2017 13:43:19 +0100 Subject: [PATCH 08/65] new upstream release 2.4.1 Upstream does not support 1.6 anymore so we have to upgrade. Configuration will be automatically upgraded along with RPM package. --- .gitignore | 3 +- knot.spec | 194 ++++++++++++++++++++++++++++++++++++++++++----------- sources | 3 +- 3 files changed, 160 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 0fbcd24..9c1a046 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -/knot-*.tar.gz /knot-*.tar.xz +/knot-2.4.0.tar.xz.asc +/knot-2.4.1.tar.xz.asc diff --git a/knot.spec b/knot.spec index 5613248..5adac3e 100644 --- a/knot.spec +++ b/knot.spec @@ -1,112 +1,230 @@ %global _hardened_build 1 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -# TODO: -# - split into subpackages -# - documentation building - -Summary: An authoritative DNS daemon +Summary: High-performance authoritative DNS server Name: knot -Version: 1.6.8 +Version: 2.4.1 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz -Source1: %{name}.service -Source2: %{name}.conf -Source3: %{name}.tmpfiles +Source1: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz.asc +Source2: %{name}.service +Source3: %{name}.conf +Source4: %{name}.tmpfiles -BuildRequires: flex bison openssl-devel userspace-rcu-devel libcap-ng-devel libidn-devel systemd-devel lmdb-devel -BuildRequires: protobuf-c-devel fstrm-devel -BuildRequires: systemd-units -# ragel is optional, required only if .rl source files are modified -#BuildRequires: ragel +# Required dependencies +BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel pkgconfig(libedit) +# Optional dependencies +BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn) pkgconfig(libsystemd) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) -Requires(post): systemd +BuildRequires: systemd +Requires(post): systemd %{_sbindir}/runuser Requires(preun): systemd Requires(postun): systemd +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Obsoletes: %{name} < 2.0.0 + %description Knot DNS is a high-performance authoritative DNS server implementation. +%package libs +Summary: Libraries used by the Knot DNS server and client applications +Obsoletes: %{name} < 2.0.0 +Conflicts: %{name} < 2.0.0 + +%description libs +The package contains shared libraries used by the Knot DNS server and +utilities. + +%package devel +Summary: Development header files for the Knot DNS libraries +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Obsoletes: %{name} < 2.0.0 + +%description devel +The package contains development header files for the Knot DNS libraries +included in knot-libs package. + +%package utils +Summary: DNS client utilities shipped with the Knot DNS server +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Obsoletes: %{name} < 2.0.0 + +%description utils +The package contains DNS client utilities shipped with the Knot DNS server. + +%package doc +Summary: Documentation for the Knot DNS server +License: GPLv3 and BSD and MIT +Obsoletes: %{name} < 2.0.0 +BuildArch: noarch +%if 0%{?rhel} +BuildRequires: python-sphinx +%else +BuildRequires: python3-sphinx +%endif +Provides: bundled(jquery) + +%description doc +The package contains documentation for the Knot DNS server. + %prep %setup -q +# make sure embedded LMDB library is not used +rm -vr src/contrib/lmdb + %build # disable debug code (causes unused warnings) CFLAGS="%{optflags} -DNDEBUG -Wno-unused" -%configure + +%ifarch armv7hl i686 +# 32-bit architectures sometimes do not have sufficient amount of +# contiguous address space to handle default values +%define configure_db_sizes --with-conf-mapsize=64 --with-timer-mapsize=16 +%endif + +%configure %{configure_db_sizes} make %{?_smp_mflags} +make html %install make install DESTDIR=%{buildroot} +# install documentation +mkdir -p %{buildroot}%{_pkgdocdir} +cp -av doc/_build/html %{buildroot}%{_pkgdocdir} +[ -r %{buildroot}%{_pkgdocdir}/html/index.html ] || exit 1 +rm -f %{buildroot}%{_pkgdocdir}/html/.buildinfo + +# install shell completion scripts +install -p -m 0644 -D samples/keymgr-completion.sh %{buildroot}%{_datadir}/bash-completion/completions/keymgr +install -p -m 0644 -D samples/keymgr-completion.zsh %{buildroot}%{_datadir}/zsh/site-functions/_keymgr + # install customized configuration file rm %{buildroot}%{_sysconfdir}/%{name}/* -install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf +install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf # install service file and create rundir -install -p -m 0644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service -install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_tmpfilesdir}/%{name}.conf +install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service +install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name} # create storage dir and key dir mkdir -p %{buildroot}%{_sharedstatedir} install -d -m 0775 %{buildroot}%{_sharedstatedir}/%{name} -install -d -m 0750 %{buildroot}%{_sharedstatedir}/%{name}/keys +install -d -m 0770 %{buildroot}%{_sharedstatedir}/%{name}/keys # install config samples into docdir install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples for sample_file in knot.sample.conf example.com.zone; do - install -p -m 0644 samples/${sample_file} %{buildroot}%{_pkgdocdir}/samples + install -p -m 0644 samples/${sample_file} %{buildroot}%{_pkgdocdir}/samples done -# remove libarchive files +# remove static libraries and libarchive files +rm %{buildroot}%{_libdir}/*.a rm %{buildroot}%{_libdir}/*.la -# remove .so files, the headers are not available -rm %{buildroot}%{_libdir}/*.so - %check 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 \ --c "Knot DNS server" knot +getent passwd knot >/dev/null || useradd -r -g knot -d %{_sysconfdir}/knot -s /sbin/nologin -c "Knot DNS server" knot +if [ $1 -gt 1 ] ; then # upgrade, try to detect versions 1.x + if rpm -q --qf=%%{version} knot | grep -q "^1\." ; then + touch %{_localstatedir}/lib/rpm-state/knot.1x.upgrade + fi +fi exit 0 %post -/sbin/ldconfig %systemd_post knot.service +# initialize/upgrade KASP database +%{_sbindir}/runuser -u knot -- %{_sbindir}/keymgr --dir %{_sharedstatedir}/%{name}/keys --legacy init + +if [ -e %{_localstatedir}/lib/rpm-state/knot.1x.upgrade ] ; then + # upgrading from Knot 1.x, convert config file + cp /etc/knot/knot.conf /etc/knot/knot.conf.1x.rpmsave + rm %{_localstatedir}/lib/rpm-state/knot.1x.upgrade + %{_libexecdir}/knot1to2 -i /etc/knot/knot.conf.1x.rpmsave -o /etc/knot/knot.conf +fi %preun %systemd_preun knot.service %postun -/sbin/ldconfig -%systemd_postun +%systemd_postun_with_restart knot.service + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig %files -%doc COPYING AUTHORS NEWS README THANKS +%{_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(750,root,knot) %{_sharedstatedir}/%{name}/keys +%dir %attr(770,root,knot) %{_sharedstatedir}/%{name}/keys %dir %attr(-,knot,knot) %{_localstatedir}/run/%{name} %{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf -%{_bindir}/* -%{_sbindir}/* +%{_libexecdir}/knot1to2 +%{_bindir}/kjournalprint +%{_bindir}/kzonecheck +%{_sbindir}/keymgr +%{_sbindir}/knotc +%{_sbindir}/knotd +%{_mandir}/man1/knot1to2.* +%{_mandir}/man1/kjournalprint.* +%{_mandir}/man1/kzonecheck.* +%{_mandir}/man5/knot.conf.* +%{_mandir}/man8/keymgr.* +%{_mandir}/man8/knotc.* +%{_mandir}/man8/knotd.* +%{_datadir}/bash-completion/completions/keymgr +%{_datadir}/zsh/site-functions/_keymgr + +%files utils +%{_bindir}/kdig +%{_bindir}/khost +%{_bindir}/knsec3hash +%{_bindir}/knsupdate +%{_mandir}/man1/kdig.* +%{_mandir}/man1/khost.* +%{_mandir}/man1/knsec3hash.* +%{_mandir}/man1/knsupdate.* + +%files libs +%doc COPYING AUTHORS NEWS THANKS +%{_libdir}/libdnssec.so.* %{_libdir}/libknot.so.* %{_libdir}/libzscanner.so.* -%{_mandir}/man1/* -%{_mandir}/man5/* -%{_mandir}/man8/* + +%files devel +%{_includedir}/dnssec +%{_includedir}/libknot +%{_includedir}/zscanner +%{_libdir}/libdnssec.so +%{_libdir}/libknot.so +%{_libdir}/libzscanner.so +%{_libdir}/pkgconfig/libdnssec.pc +%{_libdir}/pkgconfig/libknot.pc +%{_libdir}/pkgconfig/libzscanner.pc + +%files doc +%dir %{_pkgdocdir} +%{_pkgdocdir}/html %changelog +* Mon Feb 27 2017 Petr Spacek - 2.4.1-1 +- new upstream release 2.4.1 replaces old 1.6.x series which is not supported +- configuration should be upgraded automatically using knot1to2 tool +- make sure you reviewed the new configuration in /etc/knot directory! + * Tue Aug 09 2016 Jan Vcelak - 1.6.8-1 - new upstream release: + feature: Zone size limit restriction for DDNS, AXFR, and IXFR (CVE-2016-6171) diff --git a/sources b/sources index 3929581..ddefb3a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -b32b90b9b79e0c7d36263aaaa9a83c14 knot-1.6.8.tar.xz +SHA512 (knot-2.4.1.tar.xz.asc) = c2c7fede20592922c4ec79bfbc05f7662f0fd68420d8e085cf20112f99392fb358db5896c008fae73d15671815f028504ac5ac335ffdee99d2ff40f2d2f3904f +SHA512 (knot-2.4.1.tar.xz) = 2b3e6c1a187538b218e3e915aaa91bc38ad4cdecb0f03f31b29bfa83c620d117c169a580ddcc8a33e6422109b422c72f3cf79f2a8d1e10e613edfe4437b4b29c From 5a87ac3c23c7e53963464161d3aa6c2ba508b6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Mon, 13 Mar 2017 13:36:57 +0100 Subject: [PATCH 09/65] Fix configuration checking to be compatible with Knot 2.4.x --- knot.service | 2 +- knot.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/knot.service b/knot.service index 431dc2d..789efcc 100644 --- a/knot.service +++ b/knot.service @@ -6,7 +6,7 @@ Type=notify ExecStart=/usr/sbin/knotd ExecReload=/usr/sbin/knotc reload Restart=on-abort -ExecStartPre=/usr/sbin/knotc checkconf +ExecStartPre=/usr/sbin/knotc conf-check # Breaks daemon reload #CapabilityBoundingSet=cap_net_bind_service cap_setuid cap_setgid diff --git a/knot.spec b/knot.spec index 5adac3e..1f31284 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -220,6 +220,9 @@ fi %{_pkgdocdir}/html %changelog +* Mon Mar 13 2017 Petr Spacek - 2.4.1-2 +- configuration checking was fixed to be compatible with Knot 2.4.x + * Mon Feb 27 2017 Petr Spacek - 2.4.1-1 - new upstream release 2.4.1 replaces old 1.6.x series which is not supported - configuration should be upgraded automatically using knot1to2 tool From 87bcd6ab8baa1dfad738959a2dd8d53c1d700992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Mon, 31 Jul 2017 15:43:29 +0200 Subject: [PATCH 10/65] new upstream release (2.5.3) Migration from < 2.5 is included. Migration from < 2.0 is not supported anymore, an error will be raised if somebody tries to do this update. fixes rhbz#1406194 - Knotd when HUP-reloading loads wrong symlink fixes rhbz#1455356 - knot: el7 release uses old config format fixes rhbz#1471119 - CVE-2017-11104 knot: TSIG authentication bypass due to improper TSIG validity period check --- .gitignore | 3 +- knot.conf | 42 +++++------ knot.spec | 201 ++++++++++++++++++++++++++++++++++++++++++++--------- sources | 4 +- 4 files changed, 190 insertions(+), 60 deletions(-) diff --git a/.gitignore b/.gitignore index 9c1a046..9ec35ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /knot-*.tar.xz -/knot-2.4.0.tar.xz.asc -/knot-2.4.1.tar.xz.asc +/knot-*.tar.xz.asc diff --git a/knot.conf b/knot.conf index 8923397..8d2dab6 100644 --- a/knot.conf +++ b/knot.conf @@ -1,31 +1,23 @@ -# # See knot.conf(5) manual page for documentation. -# -system { - rundir "/var/run/knot"; - user knot.knot; -} +server: + rundir: "/var/run/knot" + user: knot:knot + listen: [ 127.0.0.1@53, ::1@53 ] -interfaces { - local_ipv4 { address 127.0.0.1@53; } - local_ipv6 { address ::1@53; } -} +control: + listen: "knot.sock" -control { - listen-on "knot.sock"; -} +log: + - target: syslog + any: info -log { - syslog { any warning; } -} +template: + - id: default + storage: "/var/lib/knot" + file: "%s.zone" + kasp-db: "keys" + dnssec-signing: false -zones { - storage "/var/lib/knot"; - dnssec-keydir "keys"; - dnssec-enable off; - -# example.com { -# file "example.com.zone"; -# } -} +zone: +# - domain: example.com diff --git a/knot.spec b/knot.spec index 1f31284..af83207 100644 --- a/knot.spec +++ b/knot.spec @@ -3,8 +3,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.4.1 -Release: 2%{?dist} +Version: 2.5.3 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -17,23 +17,23 @@ Source4: %{name}.tmpfiles # Required dependencies BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel pkgconfig(libedit) # Optional dependencies -BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn) pkgconfig(libsystemd) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) - +BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn2) pkgconfig(libsystemd) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) BuildRequires: systemd + +Requires: python-lmdb + +Requires(post): python-lmdb Requires(post): systemd %{_sbindir}/runuser Requires(preun): systemd Requires(postun): systemd Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < 2.0.0 %description Knot DNS is a high-performance authoritative DNS server implementation. %package libs Summary: Libraries used by the Knot DNS server and client applications -Obsoletes: %{name} < 2.0.0 -Conflicts: %{name} < 2.0.0 %description libs The package contains shared libraries used by the Knot DNS server and @@ -42,7 +42,6 @@ utilities. %package devel Summary: Development header files for the Knot DNS libraries Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < 2.0.0 %description devel The package contains development header files for the Knot DNS libraries @@ -51,7 +50,6 @@ included in knot-libs package. %package utils Summary: DNS client utilities shipped with the Knot DNS server Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < 2.0.0 %description utils The package contains DNS client utilities shipped with the Knot DNS server. @@ -59,17 +57,17 @@ The package contains DNS client utilities shipped with the Knot DNS server. %package doc Summary: Documentation for the Knot DNS server License: GPLv3 and BSD and MIT -Obsoletes: %{name} < 2.0.0 BuildArch: noarch %if 0%{?rhel} BuildRequires: python-sphinx %else BuildRequires: python3-sphinx %endif -Provides: bundled(jquery) +Provides: bundled(jquery) = 3.1.0 %description doc The package contains documentation for the Knot DNS server. +On-line version is available on https://www.knot-dns.cz/documentation/ %prep %setup -q @@ -100,10 +98,6 @@ cp -av doc/_build/html %{buildroot}%{_pkgdocdir} [ -r %{buildroot}%{_pkgdocdir}/html/index.html ] || exit 1 rm -f %{buildroot}%{_pkgdocdir}/html/.buildinfo -# install shell completion scripts -install -p -m 0644 -D samples/keymgr-completion.sh %{buildroot}%{_datadir}/bash-completion/completions/keymgr -install -p -m 0644 -D samples/keymgr-completion.zsh %{buildroot}%{_datadir}/zsh/site-functions/_keymgr - # install customized configuration file rm %{buildroot}%{_sysconfdir}/%{name}/* install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf @@ -134,25 +128,30 @@ 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 -c "Knot DNS server" knot -if [ $1 -gt 1 ] ; then # upgrade, try to detect versions 1.x - if rpm -q --qf=%%{version} knot | grep -q "^1\." ; then - touch %{_localstatedir}/lib/rpm-state/knot.1x.upgrade - fi -fi exit 0 %post +/sbin/ldconfig %systemd_post knot.service -# initialize/upgrade KASP database -%{_sbindir}/runuser -u knot -- %{_sbindir}/keymgr --dir %{_sharedstatedir}/%{name}/keys --legacy init +if [ $1 -gt 1 ] ; then # upgrade + if rpm -q --qf=%%{version} knot | grep -q "^1\." ; then # detect versions 1.y.z + echo 'Automatic upgrade from Knot DNS versions 1.y.z is not supported anymore' + echo 'Contact https://www.knot-dns.cz/support/' + exit 1 + fi -if [ -e %{_localstatedir}/lib/rpm-state/knot.1x.upgrade ] ; then - # upgrading from Knot 1.x, convert config file - cp /etc/knot/knot.conf /etc/knot/knot.conf.1x.rpmsave - rm %{_localstatedir}/lib/rpm-state/knot.1x.upgrade - %{_libexecdir}/knot1to2 -i /etc/knot/knot.conf.1x.rpmsave -o /etc/knot/knot.conf + # 2.[0-4].z -> 2.5+.z migration + if rpm -q --qf=%%{version} knot | grep -q '^2.[0-4]\.' ; then + # rename modules + echo 'Migrating module names in configuration file /etc/knot/knot.conf' + sed -i.rpmsave -e 's/\bmod-online-sign\b/mod-onlinesign/' -e 's/\bmod-synth-record\b/mod-synthrecord/' /etc/knot/knot.conf + echo 'Migrating KASP database %{_sharedstatedir}/%{name}/keys from JSON files to LMDB database' + # migrate keys into LMDB + %{_sbindir}/runuser -u knot -- %{_sbindir}/pykeymgr -i %{_sharedstatedir}/%{name}/keys + fi fi + %preun %systemd_preun knot.service @@ -172,21 +171,19 @@ fi %dir %attr(-,knot,knot) %{_localstatedir}/run/%{name} %{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf -%{_libexecdir}/knot1to2 %{_bindir}/kjournalprint %{_bindir}/kzonecheck %{_sbindir}/keymgr %{_sbindir}/knotc %{_sbindir}/knotd -%{_mandir}/man1/knot1to2.* +%{_sbindir}/pykeymgr %{_mandir}/man1/kjournalprint.* %{_mandir}/man1/kzonecheck.* %{_mandir}/man5/knot.conf.* %{_mandir}/man8/keymgr.* %{_mandir}/man8/knotc.* %{_mandir}/man8/knotd.* -%{_datadir}/bash-completion/completions/keymgr -%{_datadir}/zsh/site-functions/_keymgr +%{_mandir}/man8/pykeymgr.* %files utils %{_bindir}/kdig @@ -206,11 +203,13 @@ fi %files devel %{_includedir}/dnssec +%{_includedir}/knot %{_includedir}/libknot %{_includedir}/zscanner %{_libdir}/libdnssec.so %{_libdir}/libknot.so %{_libdir}/libzscanner.so +%{_libdir}/pkgconfig/knotd.pc %{_libdir}/pkgconfig/libdnssec.pc %{_libdir}/pkgconfig/libknot.pc %{_libdir}/pkgconfig/libzscanner.pc @@ -220,6 +219,146 @@ fi %{_pkgdocdir}/html %changelog +* Mon Jul 31 2017 Petr Spacek - 2.5.3-1 +- new upstream release +WARNING: Automatic upgrade from versions 1.y.z is no longer possible. +To migrate, upgrade your packages gradually or use contacts listed on +https://www.knot-dns.cz/support/ (if you are in trouble). + +Knot DNS 2.5.3 (2017-07-14) +=========================== + +Features: +--------- + - CSK rollover support for Single-Type Signing Scheme + +Improvements: +------------- + - Allowed binding to non-local adresses for TCP (Thanks to Julian Brost!) + - New documentation section for manual DNSSEC key algorithm rollover + - Initial KSK also generated in the submission state + - The 'ds' keymgr command with no parameter uses all KSK keys + - New debug mode in kjournalprint + - Updated keymgr documentation + +Bugfixes: +--------- + - Sometimes missing RRSIG by KSK in submission state. + - Minor DNSSEC-related issues + +Knot DNS 2.5.2 (2017-06-23) +=========================== + +Security: +--------- + - CVE-2017-11104: Improper TSIG validity period check can allow TSIG forgery (Thanks to Synacktiv!) + +Improvements: +------------- + - Extended debug logging for TSIG errors + - Better error message for unknown module section in the configuration + - Module documentation compilation no longer depends on module configuration + - Extended policy section configuration semantic checks + - Improved python version compatibility in pykeymgr + - Extended migration section in the documentation + - Improved DNSSEC event timing on 32-bit systems + - New KSK rollover start log info message + - NULL qtype support in kdig + +Bugfixes: +--------- + - Failed to process included configuration + - dnskey_ttl policy option in the configuration has no effect on DNSKEY TTL + - Corner case journal fixes (huge changesets, OpenWRT operation) + - Confusing event timestamps in knotc zone-status output + - NSEC/NSEC3 bitmap not updated for CDS/CDNSKEY + - CDS/CDNSKEY RRSIG not updated + +Knot DNS 2.5.1 (2017-06-07) +=========================== + +Bugfixes: +--------- + - pykeymgr no longer crash on empty json files in the KASP DB directory + - pykeymgr no longer imports keys in the "removed" state + - Imported keys in the "removed" state no longer makes knotd to crash + - Including an empty configuration directory no longer makes knotd to crash + - pykeymgr is distributed and installed to the distribution tarball + +Knot DNS 2.5.0 (2017-06-05) +=========================== + +Features: +--------- + - KASP database switched from JSON files to LMDB database + - KSK rollover support using CDNSKEY and CDS in the automatic DNSSEC signing + - Dynamic module loading support with proper module API + - Journal can store full zone contents (not only differences) + - Zone freeze/thaw support + - Updated knotc zone-status output with optional column filters + - New '[no]crypto' option in kdig + - New keymgr implementation reflecting KASP database changes + - New pykeymgr for JSON-based KASP database migration + - Removed obsolete knot1to2 utility + +Improvements: +------------- + - Added libidn2 support to kdig (with libidn fallback) + - Maximum timer database switched from configure to the server configuration + +Knot DNS 2.4.4 (2017-06-05) +=========================== + +Improvements: +------------- + - Improved error handling in kjournalprint + +Bugfixes: +--------- + - Zone flush not replanned upon unsuccessful flush + - Journal inconsistency after deleting deleted zone + - Zone events not rescheduled upon server reload (Thanks to Mark Warren) + - Unreliable LMDB mapsize detection in kjournalprint + - Some minor issues found by AddressSanitizer + +Knot DNS 2.4.3 (2017-04-11) +=========================== + +Improvements: +------------- + - New 'journal-db-mode' optimization configuration option + - The default TSIG algorithm for utilities input is HMAC-SHA256 + - Implemented sensible default EDNS(0) padding policy (Thanks to D. K. Gillmor) + - Added some more semantic checks on the knotc configuration operations + +Bugfixes: +--------- + - Missing 'zone' keyword in the YAML output + - Missing trailing dot in the keymgr DS owner output + - Journal logs 'invalid parameter' in several cases + - Some minor journal-related problems + +Knot DNS 2.4.2 (2017-03-23) +=========================== + +Features: +--------- + - Zscanner can store record comments placed on the same line + - Knotc status extension with version, configure, and workers parameters + +Improvements: +------------- + - Significant incoming XFR speed-up in the case of many zones + +Bugfixes: +--------- + - Double OPT RR insertion when a global module returns KNOT_STATE_FAIL + - User-driven zscanner parsing logic inconsistency + - Lower serial at master doesn't trigger any errors + - Queries with too long DNAME substitution do not return YXDOMAIN response + - Incorrect elapsed time in the DDNS log + - Failed to process forwarded DDNS request with TSIG + * Mon Mar 13 2017 Petr Spacek - 2.4.1-2 - configuration checking was fixed to be compatible with Knot 2.4.x diff --git a/sources b/sources index ddefb3a..36cf54c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.4.1.tar.xz.asc) = c2c7fede20592922c4ec79bfbc05f7662f0fd68420d8e085cf20112f99392fb358db5896c008fae73d15671815f028504ac5ac335ffdee99d2ff40f2d2f3904f -SHA512 (knot-2.4.1.tar.xz) = 2b3e6c1a187538b218e3e915aaa91bc38ad4cdecb0f03f31b29bfa83c620d117c169a580ddcc8a33e6422109b422c72f3cf79f2a8d1e10e613edfe4437b4b29c +SHA512 (knot-2.5.3.tar.xz) = c93bfdd42c3f1e5b74de7a5bb46841bee75d5153b4c72eb876f11e193a290484620ea8f877bd039c40fc665a9d5d07905a712e8e085c3267da5db5208aa71f08 +SHA512 (knot-2.5.3.tar.xz.asc) = f9abdf02b1e0e8521b200266bfb82e6978599b5fcb374c210c847ad69b7ec4f9308b5a9e44c09eb4f6bc38ffcdbed25df9bc65ee772a2221f9da6e7ba883dd61 From f2ffa0ef81851a37d31cfb0d0046d10daf509e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Mon, 31 Jul 2017 16:44:31 +0200 Subject: [PATCH 11/65] disable dnstap on RHEL (depedencies are missing) --- knot.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index af83207..540b51b 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.5.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -17,8 +17,12 @@ Source4: %{name}.tmpfiles # Required dependencies BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel pkgconfig(libedit) # Optional dependencies -BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn2) pkgconfig(libsystemd) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) +BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn2) pkgconfig(libsystemd) BuildRequires: systemd +%{!?rhel: +# RHEL ships protobuf only for subset of arches so we disable it in RHEL completely to avoid architecture-dependent build +BuildRequires: pkgconfig(libfstrm) pkgconfig(libprotobuf-c) +} Requires: python-lmdb @@ -219,6 +223,9 @@ fi %{_pkgdocdir}/html %changelog +* Mon Jul 31 2017 Petr Spacek - 2.5.3-2 +- disable dnstap on RHEL (depedencies are missing) + * Mon Jul 31 2017 Petr Spacek - 2.5.3-1 - new upstream release WARNING: Automatic upgrade from versions 1.y.z is no longer possible. From dce33dc774bd799f62f5cc2743f6339a77236896 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Mon, 12 Feb 2018 16:54:32 +0100 Subject: [PATCH 12/65] fix changelog --- knot.spec | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/knot.spec b/knot.spec index 99753e7..dc6a94a 100644 --- a/knot.spec +++ b/knot.spec @@ -573,23 +573,6 @@ Bugfixes: - configuration should be upgraded automatically using knot1to2 tool - make sure you reviewed the new configuration in /etc/knot directory! -* Tue Aug 09 2016 Jan Vcelak - 1.6.8-1 -- new upstream release: - + fix: Transfer of a huge rrset goes into an infinite loop - + fix: Huge response over TCP contains useless TC bit instead of SERVFAIL - + fix: Failed to build utilities with disabled daemon - + fix: Memory leaks during keys removal - + fix: Rough TSIG packet reservation causes early truncation - + fix: Minor out-of-bounds string termination write in rrset dump - + fix: Server crash during stop if failed to open timers DB - + fix: Failed to compile on OS X older than Sierra - + fix: Poor minimum UDP-max-size configuration check - + fix: Failed to receive one-record-per-message IXFR-style AXFR - + fix: Kdig timeouts when receiving RCODE != NOERROR on subsequent transfer message - + improvement: Speed-up of rdata addition into a huge rrset - + improvement: Introduce check of minumum timeout for next refresh - + improvement: Dnsproxy module can forward all queries without local resolving - * Fri Feb 10 2017 Fedora Release Engineering - 2.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild @@ -673,6 +656,23 @@ Bugfixes: + improvement: Separate EDNS(0) payload size configuration for IPv4 and IPv6 + feature: Zone size limit restriction for DDNS, AXFR, and IXFR (CVE-2016-6171) +* Tue Aug 09 2016 Jan Vcelak - 1.6.8-1 +- new upstream release: + + fix: Transfer of a huge rrset goes into an infinite loop + + fix: Huge response over TCP contains useless TC bit instead of SERVFAIL + + fix: Failed to build utilities with disabled daemon + + fix: Memory leaks during keys removal + + fix: Rough TSIG packet reservation causes early truncation + + fix: Minor out-of-bounds string termination write in rrset dump + + fix: Server crash during stop if failed to open timers DB + + fix: Failed to compile on OS X older than Sierra + + fix: Poor minimum UDP-max-size configuration check + + fix: Failed to receive one-record-per-message IXFR-style AXFR + + fix: Kdig timeouts when receiving RCODE != NOERROR on subsequent transfer message + + improvement: Speed-up of rdata addition into a huge rrset + + improvement: Introduce check of minumum timeout for next refresh + + improvement: Dnsproxy module can forward all queries without local resolving + * Wed Feb 10 2016 Jan Vcelak 1.6.7-1 - new upstream release: + improvement: Log change of the zone serial number after IXFR transfer From d98580a163d9fcbeac5d6c082a80ebbea886c18f Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Mon, 1 Oct 2018 12:26:15 +0200 Subject: [PATCH 13/65] Revert "2.7.1-1: new upstream release" Use Knot DNS 2.6.x branch to keep compatibility with Knot Resolver < 3.0 in released distros. This reverts commit 6216b6570ba42c5478dcfaf18f827dec527f834c. --- knot.spec | 269 +++++++++++++++++++----------------------------------- sources | 4 +- 2 files changed, 96 insertions(+), 177 deletions(-) diff --git a/knot.spec b/knot.spec index 839bffe..c3872d7 100644 --- a/knot.spec +++ b/knot.spec @@ -1,98 +1,82 @@ %global _hardened_build 1 -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %define GPG_CHECK 1 -%define VERSION 2.7.1 -%define repodir %{_builddir}/%{name}-%{version} +%define VERSION 2.6.8 -Summary: High-performance authoritative DNS server -Name: knot -Version: %{VERSION} -Release: 1%{?dist} -License: GPLv3 -Group: System Environment/Daemons -URL: http://www.knot-dns.cz -Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz +Summary: High-performance authoritative DNS server +Name: knot +Version: %{VERSION} +Release: 2%{?dist} +License: GPLv3 +Group: System Environment/Daemons +URL: http://www.knot-dns.cz +Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz + +Source2: %{name}.service +Source3: %{name}.conf +Source4: %{name}.tmpfiles %if 0%{GPG_CHECK} -Source1: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz.asc +Source1: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz.asc # PGP keys used to sign upstream releases # Export with --armor using command from https://fedoraproject.org/wiki/PackagingDrafts:GPGSignatures # Don't forget to update %%prep section when adding/removing keys -Source100: gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc -BuildRequires: gnupg2 +Source100: gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc +BuildRequires: gnupg2 %endif # Required dependencies -BuildRequires: gcc -BuildRequires: pkgconfig(liburcu) -BuildRequires: pkgconfig(gnutls) >= 3.3 -BuildRequires: pkgconfig(libedit) - +BuildRequires: gcc +BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.3 pkgconfig(nettle) lmdb-devel pkgconfig(libedit) # Optional dependencies -BuildRequires: pkgconfig(libcap-ng) -BuildRequires: pkgconfig(libfstrm) -BuildRequires: pkgconfig(libidn2) -BuildRequires: pkgconfig(libmaxminddb) -BuildRequires: pkgconfig(libprotobuf-c) -BuildRequires: pkgconfig(libsystemd) -BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn2) pkgconfig(libsystemd) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) +BuildRequires: systemd -# Distro-dependent dependencies -%if 0%{?suse_version} -BuildRequires: python3-Sphinx -BuildRequires: lmdb-devel -BuildRequires: protobuf-c -Requires(pre): pwdutils -%endif -%if 0%{?rhel} -BuildRequires: python-sphinx -BuildRequires: lmdb-devel -%endif -%if 0%{?fedora} -BuildRequires: python3-sphinx -BuildRequires: pkgconfig(lmdb) -%endif +Requires: python2-lmdb -Requires(post): systemd %{_sbindir}/runuser -Requires(preun): systemd -Requires(postun): systemd +Requires(post): python2-lmdb +Requires(post): systemd %{_sbindir}/runuser +Requires(preun): systemd +Requires(postun): systemd -# Knot DNS 2.7+ isn't compatible with earlier knot-resolver -Conflicts: knot-resolver < 3.0.0 - -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description Knot DNS is a high-performance authoritative DNS server implementation. %package libs -Summary: Libraries used by the Knot DNS server and client applications +Summary: Libraries used by the Knot DNS server and client applications %description libs The package contains shared libraries used by the Knot DNS server and utilities. %package devel -Summary: Development header files for the Knot DNS libraries -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Summary: Development header files for the Knot DNS libraries +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel The package contains development header files for the Knot DNS libraries included in knot-libs package. %package utils -Summary: DNS client utilities shipped with the Knot DNS server -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Summary: DNS client utilities shipped with the Knot DNS server +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description utils The package contains DNS client utilities shipped with the Knot DNS server. %package doc -Summary: Documentation for the Knot DNS server -License: GPLv3 and BSD and MIT -BuildArch: noarch -Provides: bundled(jquery) = 3.1.0 +Summary: Documentation for the Knot DNS server +License: GPLv3 and BSD and MIT +BuildArch: noarch +%if 0%{?rhel} +BuildRequires: python-sphinx +%else +BuildRequires: python3-sphinx +%endif +Provides: bundled(jquery) = 3.1.0 %description doc The package contains documentation for the Knot DNS server. @@ -107,6 +91,9 @@ gpg2 --verify %{SOURCE1} %{SOURCE0} %endif %setup -q +# make sure embedded LMDB library is not used +rm -vr src/contrib/lmdb + %build # disable debug code (causes unused warnings) CFLAGS="%{optflags} -DNDEBUG -Wno-unused" @@ -114,19 +101,10 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused" %ifarch armv7hl i686 # 32-bit architectures sometimes do not have sufficient amount of # contiguous address space to handle default values -%define configure_db_sizes --with-conf-mapsize=64 +%define configure_db_sizes --with-conf-mapsize=64 --with-timer-mapsize=16 %endif -%configure \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - --libexecdir=/usr/lib/knot \ - --with-rundir=/run/knot \ - --with-storage=/var/lib/knot \ - %{?configure_db_sizes} \ - --disable-static \ - --enable-dnstap=yes \ - --with-module-dnstap=yes +%configure %{configure_db_sizes} --disable-fastparser # FIXME make %{?_smp_mflags} make html @@ -134,89 +112,96 @@ make html make install DESTDIR=%{buildroot} # install documentation -install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples -install -p -m 0644 -t %{buildroot}%{_pkgdocdir}/samples samples/*.zone* -install -p -m 0644 NEWS README %{buildroot}%{_pkgdocdir} +mkdir -p %{buildroot}%{_pkgdocdir} 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 customized configuration file rm %{buildroot}%{_sysconfdir}/%{name}/* -install -p -m 0644 -D %{repodir}/samples/%{name}.sample.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf +install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf -# install systemd files -install -p -m 0644 -D %{repodir}/distro/common/%{name}.service %{buildroot}%{_unitdir}/%{name}.service -install -p -m 0644 -D %{repodir}/distro/common/%{name}.tmpfiles %{buildroot}%{_tmpfilesdir}/%{name}.conf +# install service file and create rundir +install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service +install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf +install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name} # create storage dir and key dir -install -d %{buildroot}%{_sharedstatedir} -install -d -m 0775 -D %{buildroot}%{_sharedstatedir}/%{name} -install -d -m 0770 -D %{buildroot}%{_sharedstatedir}/%{name}/keys +mkdir -p %{buildroot}%{_sharedstatedir} +install -d -m 0775 %{buildroot}%{_sharedstatedir}/%{name} +install -d -m 0770 %{buildroot}%{_sharedstatedir}/%{name}/keys -# remove libarchive files -find %{buildroot} -type f -name "*.la" -delete -print +# install config samples into docdir +install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples +for sample_file in knot.sample.conf example.com.zone; do + install -p -m 0644 samples/${sample_file} %{buildroot}%{_pkgdocdir}/samples +done + +# remove static libraries and libarchive files +rm %{buildroot}%{_libdir}/*.a +rm %{buildroot}%{_libdir}/*.la %check 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 \ - -c "Knot DNS server" knot -%if 0%{?suse_version} -%service_add_pre knot.service -%endif +getent passwd knot >/dev/null || useradd -r -g knot -d %{_sysconfdir}/knot -s /sbin/nologin -c "Knot DNS server" knot +exit 0 %post -systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : -%if 0%{?suse_version} -%service_add_post knot.service -%else %systemd_post knot.service -%endif +if [ $1 -gt 1 ] ; then # upgrade + if rpm -q --qf=%%{version} knot | grep -q "^1\." ; then # detect versions 1.y.z + echo 'Automatic upgrade from Knot DNS versions 1.y.z is not supported anymore' + echo 'Contact https://www.knot-dns.cz/support/' + exit 1 + fi + + # 2.[0-4].z -> 2.5+.z migration + if rpm -q --qf=%%{version} knot | grep -q '^2.[0-4]\.' ; then + # rename modules + echo 'Migrating module names in configuration file /etc/knot/knot.conf' + sed -i.rpmsave -e 's/\bmod-online-sign\b/mod-onlinesign/' -e 's/\bmod-synth-record\b/mod-synthrecord/' /etc/knot/knot.conf + echo 'Migrating KASP database %{_sharedstatedir}/%{name}/keys from JSON files to LMDB database' + # migrate keys into LMDB + %{_sbindir}/runuser -u knot -- %{_sbindir}/pykeymgr -i %{_sharedstatedir}/%{name}/keys + fi +fi + %preun -%if 0%{?suse_version} -%service_del_preun knot.service -%else %systemd_preun knot.service -%endif %postun -%if 0%{?suse_version} -%service_del_postun knot.service -%else %systemd_postun_with_restart knot.service -%endif %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files -%license COPYING -%{_pkgdocdir}/NEWS -%{_pkgdocdir}/README %{_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 -%{_unitdir}/knot.service +%dir %attr(-,knot,knot) %{_localstatedir}/run/%{name} +%{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf +%{_bindir}/kjournalprint %{_bindir}/kzonecheck -%{_sbindir}/kjournalprint %{_sbindir}/keymgr %{_sbindir}/knotc %{_sbindir}/knotd +%{_sbindir}/pykeymgr +%{_mandir}/man1/kjournalprint.* %{_mandir}/man1/kzonecheck.* %{_mandir}/man5/knot.conf.* -%{_mandir}/man8/kjournalprint.* %{_mandir}/man8/keymgr.* %{_mandir}/man8/knotc.* %{_mandir}/man8/knotd.* +%{_mandir}/man8/pykeymgr.* %files utils %{_bindir}/kdig @@ -229,18 +214,16 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_mandir}/man1/knsupdate.* %files libs -%license COPYING -%doc NEWS -%doc README +%doc COPYING AUTHORS NEWS THANKS %{_libdir}/libdnssec.so.* %{_libdir}/libknot.so.* %{_libdir}/libzscanner.so.* %files devel -%{_includedir}/libdnssec +%{_includedir}/dnssec %{_includedir}/knot %{_includedir}/libknot -%{_includedir}/libzscanner +%{_includedir}/zscanner %{_libdir}/libdnssec.so %{_libdir}/libknot.so %{_libdir}/libzscanner.so @@ -254,70 +237,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog -* Wed Aug 15 2018 Tomas Krizek - 2.7.1-1 -Knot DNS 2.7.1 (2018-08-14) -=========================== - -Improvements: -------------- - - Added zone wire size information to zone loading log message - - Added debug log message for each unsuccessful remote address operation - - Various improvements for packaging - -Bugfixes: ---------- - - Incompatible handling of RRSIG TTL value when creating a DNS message - - Incorrect RRSIG TTL value in zone differences and knotc zone operation outputs - - Default configure prefix is ignored - -Knot DNS 2.7.0 (2018-08-03) -=========================== - -Features: ---------- - - New DNS Cookies module and related '+cookie' kdig option - - New module for response tailoring according to client's subnet or geographic location - - General EDNS Client Subnet support in the server - - OSS-Fuzz integration (Thanks to Jonathan Foote) - - New '+ednsopt' kdig option (Thanks to Jan Včelák) - - Online Signing support for automatic key rollover - - Non-normal file (e.g. pipe) loading support in zscanner #542 - - Automatic SOA serial incrementation if non-empty zone difference - - New zone file load option for ignoring zone file's SOA serial - - New build-time option for alternative malloc specification - - Structured logging for DNSSEC key submission event - - Empty QNAME support in kdig - -Improvements: -------------- - - Various library and server optimizations - - Reduced memory consumption of outgoing IXFR processing - - Linux capabilities use overhaul #546 (Thanks to Robert Edmonds) - - Online Signing properly signs delegations and CNAME records - - CDS/CDNSKEY rrset is signed with KSK instead of ZSK - - DNSSEC-related records are ignored when loading zone difference with signing enabled - - Minimum allowed RSA key length was increased to 1024 - - Removed explicit dependency on Nettle - -Bugfixes: ---------- - - Possible uninitialized address buffer use in zscanner - - Possible index overflow during multiline record parsing in zscanner - - kdig +tls sometimes consumes 100 % CPU #561 - - Single-Type Signing doesn't work with single ZSK key #566 - - Zone not flushed after re-signing during zone load #594 - - Server crashes when committing empty zone transaction - - Incoming IXFR with on-slave signing sometimes leads to memory corruption #595 - -Compatibility: --------------- - - Removed obsolete RRL configuration - - Removed obsolete module names 'mod-online-sign' and 'mod-synth-record' - - Removed obsolete 'ixfr-from-differences' configuration option - - Removed old journal migration - - Removed module rosedb - - * Fri Jul 13 2018 Fedora Release Engineering - 2.6.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index d5ae23c..88b26f8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.7.1.tar.xz) = 547a146abb882885ff2ba0fe070a03b29138400dad78119e9c550019369a01902bc1c8f0fd12ca19367e716e506e680acc27f4d7801a30fbdec3f4cf6f4105e7 -SHA512 (knot-2.7.1.tar.xz.asc) = 86b9c34be9fd24a153a3261551167273974b9bed06cc8e28b1ce0af02f905dc1b904a4ecc71f0f17475cd76f60ebdf8d288b4a27e5ad808bf13f39f32491e8e6 +SHA512 (knot-2.6.8.tar.xz) = 3300985bd4fbf88b58fbb5ba06bdd3dcbe7a50885baa89f9db47811c071a93994a2b17a0dbd27d185feade056ed5d65eef712eedb26de5a4101da363a7c24967 +SHA512 (knot-2.6.8.tar.xz.asc) = 70761db0b2b01a98d18acba4bb4ea4e5f4b49452631194a3dd0e26de272e317b1107382e24c15b2773f849b97a15ae72c55aacf524f643abf144c127127b62fe From 057ddf3696a552ed8dc3092d4179c519d74ce090 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Mon, 1 Oct 2018 12:25:04 +0200 Subject: [PATCH 14/65] new upstream relase: 2.6.9 --- knot.spec | 17 ++++++++++++++++- sources | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index c3872d7..7aae1a7 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %define GPG_CHECK 1 -%define VERSION 2.6.8 +%define VERSION 2.6.9 Summary: High-performance authoritative DNS server Name: knot @@ -237,6 +237,21 @@ fi %{_pkgdocdir}/html %changelog +* Mon Oct 01 2018 Tomas Krizek - 2.6.9-1 +Knot DNS 2.6.9 (2018-08-14) +=========================== + +Improvements: +------------- + - Added zone wire size to zone loading log message + - Added debug log message for each unsuccessful remote address operation + +Bugfixes: +--------- + - Zone not flushed after re-signing during zone load #594 + - Server crashes when committing empty zone transaction + - Incoming IXFR with on-slave signing sometimes leads to memory corruption #595 + * Fri Jul 13 2018 Fedora Release Engineering - 2.6.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 88b26f8..daedcdf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.6.8.tar.xz) = 3300985bd4fbf88b58fbb5ba06bdd3dcbe7a50885baa89f9db47811c071a93994a2b17a0dbd27d185feade056ed5d65eef712eedb26de5a4101da363a7c24967 -SHA512 (knot-2.6.8.tar.xz.asc) = 70761db0b2b01a98d18acba4bb4ea4e5f4b49452631194a3dd0e26de272e317b1107382e24c15b2773f849b97a15ae72c55aacf524f643abf144c127127b62fe +SHA512 (knot-2.6.9.tar.xz) = 80fcbef17c3e6685c09eb57e59001a5f298a083c18ce077dc2f2d1fadbe7c36e543c205c0820bc7971a8ed7547897aec408f51e1a9555a50dae82d047fac471b +SHA512 (knot-2.6.9.tar.xz.asc) = 33005006439e7609da39b615fb2e88b7da12178d12ca6965d32aa4d5bd294dc566698e6dbf937ee6fd8e008d9fb981729f4a4c9ce5d17f1325ba42ed932b71ee From 5ee4f5f7d65d2a826576525d80f2567795537e05 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Thu, 11 Jul 2019 10:40:39 +0200 Subject: [PATCH 15/65] rebase to latest upstream version 2.8.2 --- ..._net-disable-udp-send-on-unconnected.patch | 27 +++ knot.spec | 216 ++++++++++-------- 2 files changed, 148 insertions(+), 95 deletions(-) create mode 100644 01-test_net-disable-udp-send-on-unconnected.patch diff --git a/01-test_net-disable-udp-send-on-unconnected.patch b/01-test_net-disable-udp-send-on-unconnected.patch new file mode 100644 index 0000000..ddaceca --- /dev/null +++ b/01-test_net-disable-udp-send-on-unconnected.patch @@ -0,0 +1,27 @@ +commit 44b5e271a8564370efec3b9e95365aa039e0db61 +Author: Tomas Krizek +Date: 2019-02-28 14:26:56 +0100 + + test_net: disable UDP send on unconnected + + This test started to fail with 5.0 kernel in F30+ on aarch64 and s390x. + The functionality isn't used by Knot DNS, so disabling this test until + the issue is resolved should be safe. + + Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1675235 + +diff --git a/tests/contrib/test_net.c b/tests/contrib/test_net.c +index 006b9b9d6..140659b3e 100644 +--- a/tests/contrib/test_net.c ++++ b/tests/contrib/test_net.c +@@ -309,10 +309,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"); + +- struct sockaddr_storage server_addr = addr_from_socket(server); +- r = net_dgram_send(sock, buffer, buffer_len, (struct sockaddr *)&server_addr); +- ok(r == buffer_len, "UDP, send on defined address"); +- + close(sock); + + // TCP diff --git a/knot.spec b/knot.spec index e0fc3d3..d26a958 100644 --- a/knot.spec +++ b/knot.spec @@ -1,82 +1,100 @@ %global _hardened_build 1 -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.6.9 +%define VERSION 2.8.2 +%define repodir %{_builddir}/%{name}-%{version} -Summary: High-performance authoritative DNS server -Name: knot -Version: %{VERSION} -Release: 2%{?dist} -License: GPLv3 -Group: System Environment/Daemons -URL: http://www.knot-dns.cz -Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz - -Source2: %{name}.service -Source3: %{name}.conf -Source4: %{name}.tmpfiles +Summary: High-performance authoritative DNS server +Name: knot +Version: %{VERSION} +Release: 1%{?dist} +License: GPLv3 +URL: https://www.knot-dns.cz +Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz %if 0%{GPG_CHECK} -Source1: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz.asc +Source1: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz.asc # PGP keys used to sign upstream releases # Export with --armor using command from https://fedoraproject.org/wiki/PackagingDrafts:GPGSignatures # Don't forget to update %%prep section when adding/removing keys -Source100: gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc -BuildRequires: gnupg2 +Source100: gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc +BuildRequires: gnupg2 %endif +# Test fails on F30+ aarch/s390x for unknown reason, but it is not neccassary for Knot DNS +Patch1: 01-test_net-disable-udp-send-on-unconnected.patch + # Required dependencies -BuildRequires: gcc -BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.3 pkgconfig(nettle) lmdb-devel pkgconfig(libedit) +BuildRequires: gcc +BuildRequires: pkgconfig(liburcu) +BuildRequires: pkgconfig(gnutls) >= 3.3 +BuildRequires: pkgconfig(libedit) + # Optional dependencies -BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn2) pkgconfig(libsystemd) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) -BuildRequires: systemd +BuildRequires: pkgconfig(libcap-ng) +BuildRequires: pkgconfig(libfstrm) +BuildRequires: pkgconfig(libidn2) +BuildRequires: pkgconfig(libmaxminddb) +BuildRequires: pkgconfig(libprotobuf-c) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(systemd) -Requires: python2-lmdb +# Distro-dependent dependencies +%if 0%{?suse_version} +BuildRequires: python3-Sphinx +BuildRequires: lmdb-devel +BuildRequires: protobuf-c +Requires(pre): pwdutils +%endif +%if 0%{?rhel} +BuildRequires: python-sphinx +BuildRequires: lmdb-devel +%endif +%if 0%{?fedora} +BuildRequires: python3-sphinx +BuildRequires: pkgconfig(lmdb) +%endif -Requires(post): python2-lmdb -Requires(post): systemd %{_sbindir}/runuser -Requires(preun): systemd -Requires(postun): systemd +Requires(post): systemd %{_sbindir}/runuser +Requires(preun): systemd +Requires(postun): systemd -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +# Knot DNS 2.7+ isn't compatible with earlier knot-resolver +Conflicts: knot-resolver < 3.0.0 + +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description Knot DNS is a high-performance authoritative DNS server implementation. %package libs -Summary: Libraries used by the Knot DNS server and client applications +Summary: Libraries used by the Knot DNS server and client applications %description libs The package contains shared libraries used by the Knot DNS server and utilities. %package devel -Summary: Development header files for the Knot DNS libraries -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Summary: Development header files for the Knot DNS libraries +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel The package contains development header files for the Knot DNS libraries included in knot-libs package. %package utils -Summary: DNS client utilities shipped with the Knot DNS server -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Summary: DNS client utilities shipped with the Knot DNS server +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description utils The package contains DNS client utilities shipped with the Knot DNS server. %package doc -Summary: Documentation for the Knot DNS server -License: GPLv3 and BSD and MIT -BuildArch: noarch -%if 0%{?rhel} -BuildRequires: python-sphinx -%else -BuildRequires: python3-sphinx -%endif -Provides: bundled(jquery) = 3.1.0 +Summary: Documentation for the Knot DNS server +License: GPLv3 and BSD and MIT +BuildArch: noarch +Provides: bundled(jquery) = 3.1.0 %description doc The package contains documentation for the Knot DNS server. @@ -90,9 +108,7 @@ gpg2 --import %{SOURCE100} gpg2 --verify %{SOURCE1} %{SOURCE0} %endif %setup -q - -# make sure embedded LMDB library is not used -rm -vr src/contrib/lmdb +%patch1 -p1 %build # disable debug code (causes unused warnings) @@ -101,10 +117,19 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused" %ifarch armv7hl i686 # 32-bit architectures sometimes do not have sufficient amount of # contiguous address space to handle default values -%define configure_db_sizes --with-conf-mapsize=64 --with-timer-mapsize=16 +%define configure_db_sizes --with-conf-mapsize=64 %endif -%configure %{configure_db_sizes} --disable-fastparser # FIXME +%configure \ + --sysconfdir=/etc \ + --localstatedir=/var/lib \ + --libexecdir=/usr/lib/knot \ + --with-rundir=/run/knot \ + --with-storage=/var/lib/knot \ + %{?configure_db_sizes} \ + --disable-static \ + --enable-dnstap=yes \ + --with-module-dnstap=yes make %{?_smp_mflags} make html @@ -112,96 +137,92 @@ make html make install DESTDIR=%{buildroot} # install documentation -mkdir -p %{buildroot}%{_pkgdocdir} +install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples +install -p -m 0644 -t %{buildroot}%{_pkgdocdir}/samples samples/*.zone* +install -p -m 0644 NEWS README %{buildroot}%{_pkgdocdir} cp -av doc/_build/html %{buildroot}%{_pkgdocdir} [ -r %{buildroot}%{_pkgdocdir}/html/index.html ] || exit 1 rm -f %{buildroot}%{_pkgdocdir}/html/.buildinfo -# install customized configuration file +# install configuration file rm %{buildroot}%{_sysconfdir}/%{name}/* -install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf +install -p -m 0644 -D %{repodir}/samples/%{name}.sample.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf -# install service file and create rundir -install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service -install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf -install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name} +# install systemd files +install -p -m 0644 -D %{repodir}/distro/common/%{name}.service %{buildroot}%{_unitdir}/%{name}.service +install -p -m 0644 -D %{repodir}/distro/common/%{name}.tmpfiles %{buildroot}%{_tmpfilesdir}/%{name}.conf # create storage dir and key dir -mkdir -p %{buildroot}%{_sharedstatedir} -install -d -m 0775 %{buildroot}%{_sharedstatedir}/%{name} -install -d -m 0770 %{buildroot}%{_sharedstatedir}/%{name}/keys +install -d %{buildroot}%{_sharedstatedir} +install -d -m 0775 -D %{buildroot}%{_sharedstatedir}/%{name} +install -d -m 0770 -D %{buildroot}%{_sharedstatedir}/%{name}/keys -# install config samples into docdir -install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples -for sample_file in knot.sample.conf example.com.zone; do - install -p -m 0644 samples/${sample_file} %{buildroot}%{_pkgdocdir}/samples -done - -# remove static libraries and libarchive files -rm %{buildroot}%{_libdir}/*.a -rm %{buildroot}%{_libdir}/*.la +# remove libarchive files +find %{buildroot} -type f -name "*.la" -delete -print %check 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 -c "Knot DNS server" knot -exit 0 +getent passwd knot >/dev/null || \ + useradd -r -g knot -d %{_sysconfdir}/knot -s /sbin/nologin \ + -c "Knot DNS server" knot +%if 0%{?suse_version} +%service_add_pre knot.service +%endif %post +systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : +%if 0%{?suse_version} +%service_add_post knot.service +%else %systemd_post knot.service -if [ $1 -gt 1 ] ; then # upgrade - if rpm -q --qf=%%{version} knot | grep -q "^1\." ; then # detect versions 1.y.z - echo 'Automatic upgrade from Knot DNS versions 1.y.z is not supported anymore' - echo 'Contact https://www.knot-dns.cz/support/' - exit 1 - fi - - # 2.[0-4].z -> 2.5+.z migration - if rpm -q --qf=%%{version} knot | grep -q '^2.[0-4]\.' ; then - # rename modules - echo 'Migrating module names in configuration file /etc/knot/knot.conf' - sed -i.rpmsave -e 's/\bmod-online-sign\b/mod-onlinesign/' -e 's/\bmod-synth-record\b/mod-synthrecord/' /etc/knot/knot.conf - echo 'Migrating KASP database %{_sharedstatedir}/%{name}/keys from JSON files to LMDB database' - # migrate keys into LMDB - %{_sbindir}/runuser -u knot -- %{_sbindir}/pykeymgr -i %{_sharedstatedir}/%{name}/keys - fi -fi - +%endif %preun +%if 0%{?suse_version} +%service_del_preun knot.service +%else %systemd_preun knot.service +%endif %postun +%if 0%{?suse_version} +%service_del_postun knot.service +%else %systemd_postun_with_restart knot.service +%endif +%if 0%{?fedora} +# https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets +%else %post libs -p /sbin/ldconfig - %postun libs -p /sbin/ldconfig +%endif %files +%license COPYING +%{_pkgdocdir}/NEWS +%{_pkgdocdir}/README %{_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 -%dir %attr(-,knot,knot) %{_localstatedir}/run/%{name} -%{_unitdir}/%{name}.service +%{_unitdir}/knot.service %{_tmpfilesdir}/%{name}.conf -%{_bindir}/kjournalprint %{_bindir}/kzonecheck +%{_sbindir}/kjournalprint %{_sbindir}/keymgr %{_sbindir}/knotc %{_sbindir}/knotd -%{_sbindir}/pykeymgr -%{_mandir}/man1/kjournalprint.* %{_mandir}/man1/kzonecheck.* %{_mandir}/man5/knot.conf.* +%{_mandir}/man8/kjournalprint.* %{_mandir}/man8/keymgr.* %{_mandir}/man8/knotc.* %{_mandir}/man8/knotd.* -%{_mandir}/man8/pykeymgr.* %files utils %{_bindir}/kdig @@ -214,16 +235,18 @@ fi %{_mandir}/man1/knsupdate.* %files libs -%doc COPYING AUTHORS NEWS THANKS +%license COPYING +%doc NEWS +%doc README %{_libdir}/libdnssec.so.* %{_libdir}/libknot.so.* %{_libdir}/libzscanner.so.* %files devel -%{_includedir}/dnssec +%{_includedir}/libdnssec %{_includedir}/knot %{_includedir}/libknot -%{_includedir}/zscanner +%{_includedir}/libzscanner %{_libdir}/libdnssec.so %{_libdir}/libknot.so %{_libdir}/libzscanner.so @@ -237,6 +260,9 @@ fi %{_pkgdocdir}/html %changelog +* Thu Jul 11 2019 Tomas Krizek - 2.8.2-1 +- rebase to latest upstream version 2.8.2 + * Mon Oct 01 2018 Tomas Krizek - 2.6.9-1 Knot DNS 2.6.9 (2018-08-14) =========================== From 039ceb6ee5f01cfa1b9b478831f95273584d2c5b Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Thu, 11 Jul 2019 11:49:14 +0200 Subject: [PATCH 16/65] add 2.8.2 sources --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index daedcdf..6e0075c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.6.9.tar.xz) = 80fcbef17c3e6685c09eb57e59001a5f298a083c18ce077dc2f2d1fadbe7c36e543c205c0820bc7971a8ed7547897aec408f51e1a9555a50dae82d047fac471b -SHA512 (knot-2.6.9.tar.xz.asc) = 33005006439e7609da39b615fb2e88b7da12178d12ca6965d32aa4d5bd294dc566698e6dbf937ee6fd8e008d9fb981729f4a4c9ce5d17f1325ba42ed932b71ee +SHA512 (knot-2.8.2.tar.xz) = d7a045cc7b1a1f43b9536283d4202d7f8f36ac2160e0b985b40f318cc0041f3c3e977ff2db6f518dd37ea62d93d0d3f617bca1ac0dff81185bf5dcb9c1eac97b +SHA512 (knot-2.8.2.tar.xz.asc) = 6e0f6683ff5525184f1c69b430d0b3f2c8dc1a5df89ca7c5f4e3015e17d95015c08d5c7be89c85ebf91e6ad20c02c30332fc38437c3824c9c4854f5627d7a908 From 43fb3cfeb9d58f329b7731ce4c59041ea3982cba Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 21 Aug 2019 13:22:16 +0200 Subject: [PATCH 17/65] 2.8.3-1: new upstream release --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index d26a958..bb340b8 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.8.2 +%define VERSION 2.8.3 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server @@ -260,6 +260,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Wed Aug 21 2019 Tomas Krizek - 2.8.3-1 +- new upstream release 2.8.3 + * Thu Jul 11 2019 Tomas Krizek - 2.8.2-1 - rebase to latest upstream version 2.8.2 diff --git a/sources b/sources index 6e0075c..41e3d50 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.8.2.tar.xz) = d7a045cc7b1a1f43b9536283d4202d7f8f36ac2160e0b985b40f318cc0041f3c3e977ff2db6f518dd37ea62d93d0d3f617bca1ac0dff81185bf5dcb9c1eac97b -SHA512 (knot-2.8.2.tar.xz.asc) = 6e0f6683ff5525184f1c69b430d0b3f2c8dc1a5df89ca7c5f4e3015e17d95015c08d5c7be89c85ebf91e6ad20c02c30332fc38437c3824c9c4854f5627d7a908 +SHA512 (knot-2.8.3.tar.xz) = a5743181807b944c9b6dfce845f009c576125c114fbac7b87592129b724628466740fb77e41cabd8aaf9f046374a9337a1c97ea74b33afae1af6e39e21f8e662 +SHA512 (knot-2.8.3.tar.xz.asc) = d8a95c77392e8cdca03d053ba2d269e550507c73ace2aa119d514d93e1c02da8b7adc69912209bfe4b8aad118ad920dfb924d8fcf0f60497980358e1e3ff6295 From 68b915e3941c7ec5b76ce3da797a1b164f26002f Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 24 Sep 2019 12:55:49 +0200 Subject: [PATCH 18/65] 2.8.4-1: new upstream release --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index bb340b8..9e2f533 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.8.3 +%define VERSION 2.8.4 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server @@ -260,6 +260,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Tue Sep 24 2019 Tomas Krizek - 2.8.4-1 +- new upstream release 2.8.4 + * Wed Aug 21 2019 Tomas Krizek - 2.8.3-1 - new upstream release 2.8.3 diff --git a/sources b/sources index 41e3d50..d844027 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.8.3.tar.xz) = a5743181807b944c9b6dfce845f009c576125c114fbac7b87592129b724628466740fb77e41cabd8aaf9f046374a9337a1c97ea74b33afae1af6e39e21f8e662 -SHA512 (knot-2.8.3.tar.xz.asc) = d8a95c77392e8cdca03d053ba2d269e550507c73ace2aa119d514d93e1c02da8b7adc69912209bfe4b8aad118ad920dfb924d8fcf0f60497980358e1e3ff6295 +SHA512 (knot-2.8.4.tar.xz) = 8f826f0e2259b346c84212f9b58fe756044b2549ae84e42d929a0e01269d9f72bce1791c98327b02de375c739e77090d0ea9bacba9fa91ded5b2ea16154ac588 +SHA512 (knot-2.8.4.tar.xz.asc) = 7ff4f8ef1212a50a6b24d5719bac183a462b7dc72d329a230eef34faf8abce74b8fda1c4f7e4edf99eded59b3012edd1c7c33953101cc7cb913c22fd90388d9c From 1a9a99b4b8ae3fdf4b6d43551d98ccc55d8cd0d4 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Thu, 26 Sep 2019 16:24:22 +0200 Subject: [PATCH 19/65] remove obsolete files from git --- knot.conf | 23 ----------------------- knot.service | 15 --------------- knot.tmpfiles | 2 -- 3 files changed, 40 deletions(-) delete mode 100644 knot.conf delete mode 100644 knot.service delete mode 100644 knot.tmpfiles diff --git a/knot.conf b/knot.conf deleted file mode 100644 index 8d2dab6..0000000 --- a/knot.conf +++ /dev/null @@ -1,23 +0,0 @@ -# See knot.conf(5) manual page for documentation. - -server: - rundir: "/var/run/knot" - user: knot:knot - listen: [ 127.0.0.1@53, ::1@53 ] - -control: - listen: "knot.sock" - -log: - - target: syslog - any: info - -template: - - id: default - storage: "/var/lib/knot" - file: "%s.zone" - kasp-db: "keys" - dnssec-signing: false - -zone: -# - domain: example.com diff --git a/knot.service b/knot.service deleted file mode 100644 index 789efcc..0000000 --- a/knot.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Knot DNS server daemon - -[Service] -Type=notify -ExecStart=/usr/sbin/knotd -ExecReload=/usr/sbin/knotc reload -Restart=on-abort -ExecStartPre=/usr/sbin/knotc conf-check - -# Breaks daemon reload -#CapabilityBoundingSet=cap_net_bind_service cap_setuid cap_setgid - -[Install] -WantedBy=multi-user.target diff --git a/knot.tmpfiles b/knot.tmpfiles deleted file mode 100644 index 422c419..0000000 --- a/knot.tmpfiles +++ /dev/null @@ -1,2 +0,0 @@ -# Knot DNS runtime directory -d /var/run/knot 0755 knot knot - From bcadb8fc6ea070bba7f6bb18a073c4c7768526a1 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 12 Nov 2019 10:39:38 +0100 Subject: [PATCH 20/65] update PGP key and fix unsafe keyring permissions Fixes BZ#1756254 --- ...E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc | 75 ++++++++++--------- knot.spec | 7 +- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc b/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc index 7935cee..5e7bbef 100644 --- a/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc +++ b/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc @@ -11,41 +11,42 @@ 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 -xWbfbG7+n/h2cnUw3pqbHw== -=4CxJ +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 +FhTRDc+3LonY+arOEWs= +=t/98 -----END PGP PUBLIC KEY BLOCK----- diff --git a/knot.spec b/knot.spec index 9e2f533..197bc58 100644 --- a/knot.spec +++ b/knot.spec @@ -13,7 +13,7 @@ License: GPLv3 URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz -%if 0%{GPG_CHECK} +%if 0%{?GPG_CHECK} Source1: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz.asc # PGP keys used to sign upstream releases # Export with --armor using command from https://fedoraproject.org/wiki/PackagingDrafts:GPGSignatures @@ -101,9 +101,10 @@ The package contains documentation for the Knot DNS server. On-line version is available on https://www.knot-dns.cz/documentation/ %prep -%if 0%{GPG_CHECK} +%if 0%{?GPG_CHECK} export GNUPGHOME=./gpg-keyring -mkdir ${GNUPGHOME} +[ -d ${GNUPGHOME} ] && rm -r ${GNUPGHOME} +mkdir --mode=700 ${GNUPGHOME} gpg2 --import %{SOURCE100} gpg2 --verify %{SOURCE1} %{SOURCE0} %endif From bedc7b90c1a4886ea3cf4859bdb0657177cf682d Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 12 Nov 2019 12:02:10 +0100 Subject: [PATCH 21/65] new upstream release 2.9.1-1 --- 01-test_net-disable-udp-send-on-unconnected.patch | 6 +++--- knot.spec | 13 +++++++++---- sources | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/01-test_net-disable-udp-send-on-unconnected.patch b/01-test_net-disable-udp-send-on-unconnected.patch index ddaceca..07a2f3a 100644 --- a/01-test_net-disable-udp-send-on-unconnected.patch +++ b/01-test_net-disable-udp-send-on-unconnected.patch @@ -11,15 +11,15 @@ 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 006b9b9d6..140659b3e 100644 +index 99a9e3ee3..c8e5e0a25 100644 --- a/tests/contrib/test_net.c +++ b/tests/contrib/test_net.c -@@ -309,10 +309,6 @@ static void test_unconnected(void) +@@ -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"); - struct sockaddr_storage server_addr = addr_from_socket(server); -- r = net_dgram_send(sock, buffer, buffer_len, (struct sockaddr *)&server_addr); +- r = net_dgram_send(sock, buffer, buffer_len, &server_addr); - ok(r == buffer_len, "UDP, send on defined address"); - close(sock); diff --git a/knot.spec b/knot.spec index 197bc58..df5144f 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.8.4 +%define VERSION 2.9.1 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server @@ -47,11 +47,11 @@ BuildRequires: lmdb-devel BuildRequires: protobuf-c Requires(pre): pwdutils %endif -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: python-sphinx BuildRequires: lmdb-devel %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: python3-sphinx BuildRequires: pkgconfig(lmdb) %endif @@ -195,7 +195,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %systemd_postun_with_restart knot.service %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 # https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets %else %post libs -p /sbin/ldconfig @@ -261,6 +261,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Tue Nov 12 2019 Tomas Krizek - 2.9.1-1 +- New upstream release 2.9.1 +- add EPEL8 compatibility +- fix unsafe PGP keyring permissions + * Tue Sep 24 2019 Tomas Krizek - 2.8.4-1 - new upstream release 2.8.4 diff --git a/sources b/sources index d844027..8ee126b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.8.4.tar.xz) = 8f826f0e2259b346c84212f9b58fe756044b2549ae84e42d929a0e01269d9f72bce1791c98327b02de375c739e77090d0ea9bacba9fa91ded5b2ea16154ac588 -SHA512 (knot-2.8.4.tar.xz.asc) = 7ff4f8ef1212a50a6b24d5719bac183a462b7dc72d329a230eef34faf8abce74b8fda1c4f7e4edf99eded59b3012edd1c7c33953101cc7cb913c22fd90388d9c +SHA512 (knot-2.9.1.tar.xz) = 467de157894c6d09f5ba0864f6c637f31f2cf4bcc612e1aa94a9f72395ce2f42dfe024818f84be5f3519af3d6421c771ad08f2dbf7ede6ff9ec7ec2a885178ff +SHA512 (knot-2.9.1.tar.xz.asc) = c256e16882e129293407b8b75e3e2ffbfdd6610b7cce2c6ebd3aaec92ce7809eaabe8e556765522699aef8489580b9404cbddc85d72f5ff1119df743087668a8 From 5f9350275b0f2dd81e081b99683fedec6c09dbf0 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Fri, 13 Dec 2019 10:22:20 +0100 Subject: [PATCH 22/65] 2.9.2-1: new upstream release --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index df5144f..801c48b 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.9.1 +%define VERSION 2.9.2 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server @@ -261,6 +261,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Fri Dec 13 2019 Tomas Krizek - 2.9.2-1 +- new upstream release 2.9.2 + * Tue Nov 12 2019 Tomas Krizek - 2.9.1-1 - New upstream release 2.9.1 - add EPEL8 compatibility diff --git a/sources b/sources index 8ee126b..b762a17 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.9.1.tar.xz) = 467de157894c6d09f5ba0864f6c637f31f2cf4bcc612e1aa94a9f72395ce2f42dfe024818f84be5f3519af3d6421c771ad08f2dbf7ede6ff9ec7ec2a885178ff -SHA512 (knot-2.9.1.tar.xz.asc) = c256e16882e129293407b8b75e3e2ffbfdd6610b7cce2c6ebd3aaec92ce7809eaabe8e556765522699aef8489580b9404cbddc85d72f5ff1119df743087668a8 +SHA512 (knot-2.9.2.tar.xz) = 7e09cd6e587342b0a213f7a108704fff7535d02dd47d662e60b96ae5d75d9745d659131622253f964deb1607f28d172d1d46dc3b5f61e2f6c70e5002e746da68 +SHA512 (knot-2.9.2.tar.xz.asc) = cf78702e164f97f2e719af696d0d3e037c61bd297bb0de77e58a8174c56980ce71cd0bf125c866ee1e2fa32e6698600ca44bc346de21e888fe23786f87556614 From 7cf16083c46fede9d1e05e0e9f81b526bccc826e Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 3 Mar 2020 13:05:03 +0100 Subject: [PATCH 23/65] 2.9.3-1: new upstream release --- knot.spec | 15 ++++++++++++--- sources | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/knot.spec b/knot.spec index 801c48b..743bbf2 100644 --- a/knot.spec +++ b/knot.spec @@ -2,14 +2,14 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.9.2 +%define VERSION 2.9.3 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} Release: 1%{?dist} -License: GPLv3 +License: GPL-3.0-or-later URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz @@ -92,7 +92,6 @@ The package contains DNS client utilities shipped with the Knot DNS server. %package doc Summary: Documentation for the Knot DNS server -License: GPLv3 and BSD and MIT BuildArch: noarch Provides: bundled(jquery) = 3.1.0 @@ -152,6 +151,9 @@ install -p -m 0644 -D %{repodir}/samples/%{name}.sample.conf %{buildroot}%{_sysc # install systemd files install -p -m 0644 -D %{repodir}/distro/common/%{name}.service %{buildroot}%{_unitdir}/%{name}.service install -p -m 0644 -D %{repodir}/distro/common/%{name}.tmpfiles %{buildroot}%{_tmpfilesdir}/%{name}.conf +%if 0%{?suse_version} +ln -s service %{buildroot}/%{_sbindir}/rcknot +%endif # create storage dir and key dir install -d %{buildroot}%{_sharedstatedir} @@ -218,12 +220,16 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_sbindir}/keymgr %{_sbindir}/knotc %{_sbindir}/knotd +%if 0%{?suse_version} +%{_sbindir}/rcknot +%endif %{_mandir}/man1/kzonecheck.* %{_mandir}/man5/knot.conf.* %{_mandir}/man8/kjournalprint.* %{_mandir}/man8/keymgr.* %{_mandir}/man8/knotc.* %{_mandir}/man8/knotd.* +%ghost /run/knot %files utils %{_bindir}/kdig @@ -261,6 +267,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Tue Mar 03 2020 Tomas Krizek - 2.9.3-1 +- new upstream release 2.9.3 + * Fri Dec 13 2019 Tomas Krizek - 2.9.2-1 - new upstream release 2.9.2 diff --git a/sources b/sources index b762a17..10f8017 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.9.2.tar.xz) = 7e09cd6e587342b0a213f7a108704fff7535d02dd47d662e60b96ae5d75d9745d659131622253f964deb1607f28d172d1d46dc3b5f61e2f6c70e5002e746da68 -SHA512 (knot-2.9.2.tar.xz.asc) = cf78702e164f97f2e719af696d0d3e037c61bd297bb0de77e58a8174c56980ce71cd0bf125c866ee1e2fa32e6698600ca44bc346de21e888fe23786f87556614 +SHA512 (knot-2.9.3.tar.xz) = 69186b0d83ab548e46a7eed2703b1c3e29de36123c39a7ca461a8728488433bcc27dd5564ff3cb55d8490d4515098cebdd72aa732742fb0b9fceaca27f456e08 +SHA512 (knot-2.9.3.tar.xz.asc) = 2377668452d50fd58d67dc96352218a71eb42f689b4eb88b71da29eb55e2b73105e865ce235db2fcfce4b09c19f87a0c76c9d7a4071f9aaa66b76f02e0a77ab1 From 51d49dc7fb01d379b4aa461ef2db24588069cabe Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 5 May 2020 10:21:06 +0200 Subject: [PATCH 24/65] 2.9.4-1: new upstream release --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 743bbf2..e0e8684 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.9.3 +%define VERSION 2.9.4 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server @@ -267,6 +267,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Tue May 05 2020 Tomas Krizek - 2.9.4-1 +- new upstream release 2.9.4 + * Tue Mar 03 2020 Tomas Krizek - 2.9.3-1 - new upstream release 2.9.3 diff --git a/sources b/sources index 10f8017..acddbf1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.9.3.tar.xz) = 69186b0d83ab548e46a7eed2703b1c3e29de36123c39a7ca461a8728488433bcc27dd5564ff3cb55d8490d4515098cebdd72aa732742fb0b9fceaca27f456e08 -SHA512 (knot-2.9.3.tar.xz.asc) = 2377668452d50fd58d67dc96352218a71eb42f689b4eb88b71da29eb55e2b73105e865ce235db2fcfce4b09c19f87a0c76c9d7a4071f9aaa66b76f02e0a77ab1 +SHA512 (knot-2.9.4.tar.xz) = 05a2c492fe2efa541773d5ca01ed261447efa35842a56dc9fc1c82b70b8bec4b329461dc8a077d8b294247fff14cf9ab9aaac77160ccf9a5eb561c2c22f0399a +SHA512 (knot-2.9.4.tar.xz.asc) = 5b78952374156ae1e69ce96daddf657ab734f841f36584c3aaade0d2848ae38f28631eebe3dd2f97141c1d7bec0583fc39c600d20631f291d9054844783642b0 From ecce205a6d158c6e27a57b193faf4f4ea7579cdf Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Mon, 25 May 2020 10:58:01 +0200 Subject: [PATCH 25/65] 2.9.5-1: new upstream release --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index e0e8684..ac50b66 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.9.4 +%define VERSION 2.9.5 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server @@ -267,6 +267,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Mon May 25 2020 Tomas Krizek - 2.9.5-1 +- new upstream release 2.9.5 + * Tue May 05 2020 Tomas Krizek - 2.9.4-1 - new upstream release 2.9.4 diff --git a/sources b/sources index acddbf1..0c965bd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.9.4.tar.xz) = 05a2c492fe2efa541773d5ca01ed261447efa35842a56dc9fc1c82b70b8bec4b329461dc8a077d8b294247fff14cf9ab9aaac77160ccf9a5eb561c2c22f0399a -SHA512 (knot-2.9.4.tar.xz.asc) = 5b78952374156ae1e69ce96daddf657ab734f841f36584c3aaade0d2848ae38f28631eebe3dd2f97141c1d7bec0583fc39c600d20631f291d9054844783642b0 +SHA512 (knot-2.9.5.tar.xz) = 6bfd6a720eb512983f934c3bf853ac310391805a102546ed18b3e805d10339837569e970e0e51f64e9d938bc362c8f9d01acb15ca4dca0a66dea9deb6b59cc73 +SHA512 (knot-2.9.5.tar.xz.asc) = 7baa604b51c39625a9aef045417840b8a351a26a7cb04cdeedbb736038392bf838e7d966c5d96fe7feffff46c4231c233d4c6405cc2be5d869fb42a4efb9cc13 From 647969eef8397c2b902f816ee722737c798b1714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 2 Sep 2020 10:45:59 +0000 Subject: [PATCH 26/65] 2.9.6-1: new upstream release Changelog: - Update to 2.9.6 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index ac50b66..23d6445 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.9.5 +%define VERSION 2.9.6 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server @@ -267,6 +267,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Wed Sep 02 2020 Jakub Ružička 2.9.6-1 +- Update to 2.9.6 + * Mon May 25 2020 Tomas Krizek - 2.9.5-1 - new upstream release 2.9.5 diff --git a/sources b/sources index 0c965bd..dde21dd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.9.5.tar.xz) = 6bfd6a720eb512983f934c3bf853ac310391805a102546ed18b3e805d10339837569e970e0e51f64e9d938bc362c8f9d01acb15ca4dca0a66dea9deb6b59cc73 -SHA512 (knot-2.9.5.tar.xz.asc) = 7baa604b51c39625a9aef045417840b8a351a26a7cb04cdeedbb736038392bf838e7d966c5d96fe7feffff46c4231c233d4c6405cc2be5d869fb42a4efb9cc13 +SHA512 (knot-2.9.6.tar.xz) = 95164a8ec913b3e3f01355d7f41f08caf6048c39317e63b2968e2bf8cf2ed08791ea0136b1e721add07f183b81a241ab2c2b8779c44368079d8eac082f49e368 +SHA512 (knot-2.9.6.tar.xz.asc) = 0c6219730763b4f8f72c4569dce3cda871e1ac80728ff7165381a0a61296ef5493d0ca9f6b530c1132279c21d41fe796c3dfea2cb9fa40336d4375a79bdb383b From b20cc3495f730dfee2dc42b86f75fb3deb1e3498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 10 Sep 2020 17:17:39 +0200 Subject: [PATCH 27/65] knot-3.0.0-1: new major upstream release Changelog: - New major upstream release 3.0.0 - Sync packaging from upstream --- knot.spec | 30 ++++++++++++++++++++++++++---- sources | 4 ++-- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/knot.spec b/knot.spec index 23d6445..8eddb27 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.9.6 +%define VERSION 3.0.0 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server @@ -36,6 +36,7 @@ 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) @@ -55,6 +56,13 @@ BuildRequires: lmdb-devel BuildRequires: python3-sphinx BuildRequires: pkgconfig(lmdb) %endif +%if 0%{?rhel} >= 8 || 0%{?suse_version} +%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 Requires(preun): systemd @@ -127,6 +135,7 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused" --with-rundir=/run/knot \ --with-storage=/var/lib/knot \ %{?configure_db_sizes} \ + %{?configure_xdp} \ --disable-static \ --enable-dnstap=yes \ --with-module-dnstap=yes @@ -139,7 +148,7 @@ make install DESTDIR=%{buildroot} # install documentation install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples install -p -m 0644 -t %{buildroot}%{_pkgdocdir}/samples samples/*.zone* -install -p -m 0644 NEWS README %{buildroot}%{_pkgdocdir} +install -p -m 0644 NEWS README.md %{buildroot}%{_pkgdocdir} cp -av doc/_build/html %{buildroot}%{_pkgdocdir} [ -r %{buildroot}%{_pkgdocdir}/html/index.html ] || exit 1 rm -f %{buildroot}%{_pkgdocdir}/html/.buildinfo @@ -207,7 +216,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %files %license COPYING %{_pkgdocdir}/NEWS -%{_pkgdocdir}/README +%{_pkgdocdir}/README.md %{_pkgdocdir}/samples %dir %attr(750,root,knot) %{_sysconfdir}/%{name} %config(noreplace) %attr(640,root,knot) %{_sysconfdir}/%{name}/%{name}.conf @@ -216,6 +225,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_unitdir}/knot.service %{_tmpfilesdir}/%{name}.conf %{_bindir}/kzonecheck +%{_bindir}/kzonesign +%{_sbindir}/kcatalogprint %{_sbindir}/kjournalprint %{_sbindir}/keymgr %{_sbindir}/knotc @@ -224,11 +235,14 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_sbindir}/rcknot %endif %{_mandir}/man1/kzonecheck.* +%{_mandir}/man1/kzonesign.* %{_mandir}/man5/knot.conf.* +%{_mandir}/man8/kcatalogprint.* %{_mandir}/man8/kjournalprint.* %{_mandir}/man8/keymgr.* %{_mandir}/man8/knotc.* %{_mandir}/man8/knotd.* +%{_mandir}/man8/knotd.* %ghost /run/knot %files utils @@ -236,6 +250,10 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_bindir}/khost %{_bindir}/knsec3hash %{_bindir}/knsupdate +%if 0%{?rhel} >= 8 || 0%{?suse_version} || 0%{?fedora} >= 31 +%{_sbindir}/kxdpgun +%{_mandir}/man8/kxdpgun.* +%endif %{_mandir}/man1/kdig.* %{_mandir}/man1/khost.* %{_mandir}/man1/knsec3hash.* @@ -244,7 +262,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %files libs %license COPYING %doc NEWS -%doc README +%doc README.md %{_libdir}/libdnssec.so.* %{_libdir}/libknot.so.* %{_libdir}/libzscanner.so.* @@ -267,6 +285,10 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Thu Sep 10 2020 Jakub Ružička 3.0.0-1 +- New major upstream release 3.0.0 +- Sync packaging from upstream + * Wed Sep 02 2020 Jakub Ružička 2.9.6-1 - Update to 2.9.6 diff --git a/sources b/sources index dde21dd..46e6adf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.9.6.tar.xz) = 95164a8ec913b3e3f01355d7f41f08caf6048c39317e63b2968e2bf8cf2ed08791ea0136b1e721add07f183b81a241ab2c2b8779c44368079d8eac082f49e368 -SHA512 (knot-2.9.6.tar.xz.asc) = 0c6219730763b4f8f72c4569dce3cda871e1ac80728ff7165381a0a61296ef5493d0ca9f6b530c1132279c21d41fe796c3dfea2cb9fa40336d4375a79bdb383b +SHA512 (knot-3.0.0.tar.xz) = 286861e4127f8c70eeba1e76f2de82e8f89d4c15d2dc3733902f8d19103f6a44b9da97a91bc99168fd4f6024d60b8bc53a78580ed04a6e9cbf8c6ad921780c81 +SHA512 (knot-3.0.0.tar.xz.asc) = c3320ce2daf8f84e00ea40e08d89d07ec40530bc860f30e4489d44bcfa296c2954bcb431db793121c0b1aa2ff1f71a343f58492df87893f5fcf85f2470d70d13 From 66d206cc6d74189f37c7624f20470596072f23d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Fri, 25 Sep 2020 13:30:53 +0000 Subject: [PATCH 28/65] knot-3.0.0-2: rebuild Changelog: - Rebuild --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 8eddb27..b4bb5c6 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 +* Fri Sep 25 2020 Jakub Ružička 3.0.0-2 +- Rebuild + * Thu Sep 10 2020 Jakub Ružička 3.0.0-1 - New major upstream release 3.0.0 - Sync packaging from upstream From b1223a99f83e23c88375cca4275ba84162fbbe12 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 29/65] 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 97167d0a6189a3b258d248346b95e1b9293b9c6b 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 30/65] 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 b4bb5c6..431898c 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 + * Fri Sep 25 2020 Jakub Ružička 3.0.0-2 - Rebuild 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 b81c002609277411ff1994276770411da8718889 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 31/65] knot-3.0.2-1: new upstream release Changelog: - Update to 3.0.2 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 431898c..2067f55 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_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 @@ -281,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-1 +- Update to 3.0.2 + * Mon Oct 12 2020 Jakub Ružička - 3.0.1-1 - Update to 3.0.1 - Sync packaging from upstream 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 13998e347c3138b75cfec9208628ead87e09dd2e 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 32/65] knot-3.0.3-1 Changelog: - Update to 3.0.3 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 2067f55..0da7f62 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_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 @@ -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-1 - Update to 3.0.2 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 69a609119fd5ec74eed82e92c00b08f89e53e40b 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 33/65] 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 0da7f62..f376419 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 60e057aafefdfdce35d9b7e80525432446adbcc9 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 34/65] 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 f376419..70259e4 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 5a2b1a253be40522b8e6911e59cad6ca839e9ceb 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 35/65] 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 70259e4..4518d16 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 a69b85eb5ea4855fbb5b26b8bb8e7ec4870a7ae8 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 36/65] 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 4518d16..dd9e8f5 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 812da477073643ec8ccbe07cd473e830640587b3 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 37/65] 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 dd9e8f5..de071c1 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 099acdd8f9e96dd5f262315e62a40953a0190e71 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 38/65] 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 de071c1..3557459 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 dd92b14e1ad41b7321ae9684818de82fb11d1e57 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 39/65] 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 3557459..88b6174 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 1111700d3aadf8fab8084467c24a414f6c7b3be4 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 40/65] 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 88b6174..750696a 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 2c95e4c161cc8361889993e38c1567b4633604c6 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 41/65] 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 750696a..eea0963 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 74a0297b04fa9aa9db2e15f9ce60623f5f7349ea 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 42/65] 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 eea0963..d831e2a 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 0c3f03fb856047522b6da97c96073fd8f8df687c 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 43/65] 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 d831e2a..1596949 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 d81bc5692c8f3c753902814b0aa697bcc537fdd7 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 44/65] 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 1596949..bc0676b 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 a6c444b93b565135191c196f26d8e3906f4f2416 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 45/65] knot-3.1.6-1 Changelog: - Update to 3.1.6 - Use _sharedstatedir for home --- knot.spec | 16 +++++++++++++--- sources | 4 ++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/knot.spec b/knot.spec index bc0676b..3e6765b 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,10 @@ 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 +- 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 73e15e5ee9ee372a2c135075d7d892e912090696 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 46/65] 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 3e6765b..770518a 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 - Use _sharedstatedir for home 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 518ed05fa4f8195fc78c8e0e135289ffe1fe2943 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 47/65] 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 770518a..e3533c7 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.7 +Version: 3.1.8 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -326,6 +326,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Apr 28 2022 Jakub Ružička - 3.1.8-1 +- Update to 3.1.8 + * Wed Mar 30 2022 Jakub Ružička - 3.1.7-1 - Update to 3.1.7 diff --git a/sources b/sources index 93247ea..c031339 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.7.tar.xz) = 4b6982e8b44addbc77f42d0a1c435dd257cc8a8f112677c371d16063ee8e769b646a6425d54ef338cd21555f276d8d6f4faad2da2f24bf92437ce4af9ff1fb44 -SHA512 (knot-3.1.7.tar.xz.asc) = 41c597228e1f6fb57aeba22d4665c0e39fda7ce60d14c3b8bc4f3ab61ffc0e5cef395527d981c9342ceba8fd5e80d57b4962318e9f2b9aed2000e9ab5dd03ac9 +SHA512 (knot-3.1.8.tar.xz) = af72cbcc5b511dad148e7ce990819df00bdf99c110b44b3b521eddd8690a6ebd4c76c24e63d843956971d5f158bbfa851804616630d34f3a0ec06888c78ecf2c +SHA512 (knot-3.1.8.tar.xz.asc) = 1d2e1d11dda0f52041b6e43ba94860891624e25763ce35a4cdcf8fb30bf0713a3e6b9776278fdfa60381c8bd32a32cd83b98a6f5a8684946fc94868f5314fab0 From 7e6d1cd0e0c900508a11f9b76089e45e50283f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 22 Aug 2022 15:13:27 +0200 Subject: [PATCH 48/65] Release 3.2.0-1 --- ...sts-xdp-tcp-fix-under-32bit-platform.patch | 67 +++++++++++++++++++ 03-revert-distro-harden-systemd-service.patch | 31 +++++++++ 04-revert-AC_PROG_CC.patch | 18 +++++ knot.spec | 61 ++++++++++------- sources | 4 +- 5 files changed, 156 insertions(+), 25 deletions(-) create mode 100644 02-tests-xdp-tcp-fix-under-32bit-platform.patch create mode 100644 03-revert-distro-harden-systemd-service.patch create mode 100644 04-revert-AC_PROG_CC.patch diff --git a/02-tests-xdp-tcp-fix-under-32bit-platform.patch b/02-tests-xdp-tcp-fix-under-32bit-platform.patch new file mode 100644 index 0000000..06e45e5 --- /dev/null +++ b/02-tests-xdp-tcp-fix-under-32bit-platform.patch @@ -0,0 +1,67 @@ +From 2fc4c0fcc1b0f75413ceeb580472ad05ffffe3b6 Mon Sep 17 00:00:00 2001 +From: Libor Peltan +Date: Mon, 22 Aug 2022 15:07:50 +0200 +Subject: [PATCH] tests/xdp-tcp: fix under 32bit platform + +--- + tests/libknot/test_xdp_tcp.c | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/tests/libknot/test_xdp_tcp.c b/tests/libknot/test_xdp_tcp.c +index fb044aca4..64e3bdc95 100644 +--- a/tests/libknot/test_xdp_tcp.c ++++ b/tests/libknot/test_xdp_tcp.c +@@ -23,6 +23,8 @@ + #include "libknot/xdp/tcp_iobuf.c" + #include "libknot/xdp/bpf-user.h" + ++#define INFTY INT32_MAX ++ + knot_tcp_table_t *test_table = NULL; + knot_tcp_table_t *test_syn_table = NULL; + #define TEST_TABLE_SIZE 100 +@@ -148,7 +150,7 @@ static int mock_send2(_unused_ knot_xdp_socket_t *sock, const knot_xdp_msg_t msg + + static void clean_table(void) + { +- (void)tcp_cleanup(test_table, 0, UINT32_MAX); ++ (void)tcp_cleanup(test_table, 0, INFTY); + } + + static void clean_sent(void) +@@ -421,8 +423,8 @@ void test_many(void) + clean_sent(); + + knot_sweep_stats_t stats = { 0 }; +- ret = knot_tcp_sweep(test_table, timeout_time, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, +- UINT32_MAX, rls, CONNS, &stats); ++ ret = knot_tcp_sweep(test_table, timeout_time, INFTY, INFTY, INFTY, INFTY, ++ INFTY, rls, CONNS, &stats); + is_int(KNOT_EOK, ret, "many/timeout1: OK"); + is_int(CONNS - 1, stats.counters[KNOT_SWEEP_CTR_TIMEOUT], "many/timeout1: close count"); + is_int(0, stats.counters[KNOT_SWEEP_CTR_LIMIT_CONN], "may/timeout1: reset count"); +@@ -431,8 +433,8 @@ void test_many(void) + check_sent(0, 0, 0, CONNS - 1); + + knot_sweep_stats_reset(&stats); +- ret = knot_tcp_sweep(test_table, UINT32_MAX, timeout_time, UINT32_MAX, UINT32_MAX, UINT32_MAX, +- UINT32_MAX, rls, CONNS, &stats); ++ ret = knot_tcp_sweep(test_table, INFTY, timeout_time, INFTY, INFTY, INFTY, ++ INFTY, rls, CONNS, &stats); + is_int(KNOT_EOK, ret, "many/timeout2: OK"); + is_int(0, stats.counters[KNOT_SWEEP_CTR_TIMEOUT], "many/timeout2: close count"); + is_int(CONNS - 1, stats.counters[KNOT_SWEEP_CTR_LIMIT_CONN], "may/timeout2: reset count"); +@@ -502,8 +504,8 @@ void test_ibufs_size(void) + + // now free some + knot_sweep_stats_t stats = { 0 }; +- ret = knot_tcp_sweep(test_table, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, +- test_table->inbufs_total - 8, UINT32_MAX, rls, ++ ret = knot_tcp_sweep(test_table, INFTY, INFTY, INFTY, INFTY, ++ test_table->inbufs_total - 8, INFTY, rls, + CONNS, &stats); + is_int(KNOT_EOK, ret, "inbufs: timeout OK"); + ret = knot_tcp_send(test_sock, rls, CONNS, CONNS); +-- +2.37.1 + diff --git a/03-revert-distro-harden-systemd-service.patch b/03-revert-distro-harden-systemd-service.patch new file mode 100644 index 0000000..c4f5ce3 --- /dev/null +++ b/03-revert-distro-harden-systemd-service.patch @@ -0,0 +1,31 @@ +From 76b2e79356052753e0d5dc2c8daca2049b221e55 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= +Date: Wed, 24 Aug 2022 13:08:03 +0200 +Subject: [PATCH] Revert "distro: harden systemd service" + +This reverts commit e152a4c21e0f34bece12eb68af61e54ab2f30d8d. +--- + distro/common/knot.service | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/distro/common/knot.service b/distro/common/knot.service +index 39017de1e..a87292943 100644 +--- a/distro/common/knot.service ++++ b/distro/common/knot.service +@@ -21,13 +21,5 @@ Environment="KNOT_ZONE_LOAD_TIMEOUT_SEC=180" + # Maximum size (MiB) of a configuration database + Environment="KNOT_CONF_MAX_SIZE=512" + +-# Expected systemd >= v239 +-TemporaryFileSystem=/run:ro /var:ro +-BindPaths=/run/systemd +-RuntimeDirectory=knot +-StateDirectory=knot +-LogsDirectory=knot +-NoNewPrivileges=yes +- + [Install] + WantedBy=multi-user.target +-- +2.37.1 + diff --git a/04-revert-AC_PROG_CC.patch b/04-revert-AC_PROG_CC.patch new file mode 100644 index 0000000..fb49c00 --- /dev/null +++ b/04-revert-AC_PROG_CC.patch @@ -0,0 +1,18 @@ +From: Daniel Salzman +Date: Sun, 20 Feb 2022 20:38:35 +0100 +Subject: [PATCH] Revert "configure: upgrade from AC_PROG_CC_C99 to AC_PROG_CC" + +diff --git a/configure.ac b/configure.ac +index 6506197ed..c7df7f815 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,7 +38,8 @@ release_date=$($SED -n 's/^Knot DNS .* (\(.*\))/\1/p;q;' ${srcdir}/NEWS) + AC_SUBST([RELEASE_DATE], $release_date) + + # Set compiler compatibility flags +-AC_PROG_CC ++AC_PROG_CC_C99 # AC_PROG_CC not supported by CentOS 7 ++AM_PROG_CC_C_O # Needed by CentOS 7 + AC_PROG_CPP_WERROR + + # Set default CFLAGS diff --git a/knot.spec b/knot.spec index e3533c7..f9d42c6 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.8 +Version: 3.2.0 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -24,6 +24,12 @@ BuildRequires: gnupg2 # Test fails on F30+ aarch/s390x for unknown reason, but it is not neccassary for Knot DNS Patch1: 01-test_net-disable-udp-send-on-unconnected.patch +# Fix tests on 32bit platforms (merged upstream, drop on next release) +Patch2: 02-tests-xdp-tcp-fix-under-32bit-platform.patch +# Revert hardening of service file (problematic) +Patch3: 03-revert-distro-harden-systemd-service.patch +# Revert config improvement to support EL 7 +Patch4: 04-revert-AC_PROG_CC.patch # Required dependencies BuildRequires: autoconf @@ -64,21 +70,8 @@ BuildRequires: python3-sphinx BuildRequires: pkgconfig(lmdb) %endif -%if 0%{?centos} == 7 || 0%{?rhel} == 7 # disable XDP on old EL %define configure_xdp --enable-xdp=no -%else -%define use_xdp 1 -%if 0%{?rhel} >= 8 || 0%{?suse_version} -# enable XDP on recent EL using embedded libbpf -%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 Requires(post): systemd %{_sbindir}/runuser Requires(preun): systemd @@ -110,10 +103,19 @@ included in knot-libs package. %package utils Summary: DNS client utilities shipped with the Knot DNS server Requires: %{name}-libs%{?_isa} = %{version}-%{release} +# Debian package compat +Provides: %{name}-dnsutils = %{version}-%{release} %description utils The package contains DNS client utilities shipped with the Knot DNS server. +%package dnssecutils +Summary: DNSSEC tools shipped with the Knot DNS server +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description dnssecutils +The package contains DNSSEC tools shipped with the Knot DNS server. + %package module-dnstap Summary: dnstap module for Knot DNS Requires: %{name} = %{version}-%{release} @@ -131,7 +133,7 @@ The package contains geoip Knot DNS module for geography-based responses. %package doc Summary: Documentation for the Knot DNS server BuildArch: noarch -Provides: bundled(jquery) = 3.1.0 +Provides: bundled(jquery) %description doc The package contains documentation for the Knot DNS server. @@ -157,6 +159,8 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused" %define configure_db_sizes --with-conf-mapsize=64 %endif +autoreconf -if + %configure \ --sysconfdir=/etc \ --localstatedir=/var/lib \ @@ -192,8 +196,8 @@ install -p -m 0644 -D %{repodir}/distro/common/cz.nic.knotd.conf %{buildroot}%{_ %endif # install systemd files -install -p -m 0644 -D %{repodir}/distro/common/%{name}.service %{buildroot}%{_unitdir}/%{name}.service -install -p -m 0644 -D %{repodir}/distro/common/%{name}.tmpfiles %{buildroot}%{_tmpfilesdir}/%{name}.conf +install -p -m 0644 -D %{repodir}/distro/pkg/el-7/%{name}.service %{buildroot}%{_unitdir}/%{name}.service +install -p -m 0644 -D %{repodir}/distro/pkg/el-7/%{name}.tmpfiles %{buildroot}%{_tmpfilesdir}/%{name}.conf %if 0%{?suse_version} ln -s service %{buildroot}/%{_sbindir}/rcknot %endif @@ -260,8 +264,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %dir %{_libdir}/knot/modules-* %{_unitdir}/knot.service %{_tmpfilesdir}/knot.conf -%{_bindir}/kzonecheck -%{_bindir}/kzonesign %{_sbindir}/kcatalogprint %{_sbindir}/kjournalprint %{_sbindir}/keymgr @@ -270,8 +272,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %if 0%{?suse_version} %{_sbindir}/rcknot %endif -%{_mandir}/man1/kzonecheck.* -%{_mandir}/man1/kzonesign.* %{_mandir}/man5/knot.conf.* %{_mandir}/man8/kcatalogprint.* %{_mandir}/man8/kjournalprint.* @@ -283,7 +283,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %files utils %{_bindir}/kdig %{_bindir}/khost -%{_bindir}/knsec3hash %{_bindir}/knsupdate %if 0%{?use_xdp} %{_sbindir}/kxdpgun @@ -291,9 +290,16 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %endif %{_mandir}/man1/kdig.* %{_mandir}/man1/khost.* -%{_mandir}/man1/knsec3hash.* %{_mandir}/man1/knsupdate.* +%files dnssecutils +%{_bindir}/knsec3hash +%{_bindir}/kzonecheck +%{_bindir}/kzonesign +%{_mandir}/man1/knsec3hash.* +%{_mandir}/man1/kzonecheck.* +%{_mandir}/man1/kzonesign.* + %files module-dnstap %{_libdir}/knot/modules-*/dnstap.so @@ -326,6 +332,15 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Mon Aug 22 2022 Jakub Ružička - 3.2.0-1 +- Update to 3.2.0 +- Patch: fix tests on 32-bit platforms +- Patch: revert problematic hardening of service file +- Patch: revert config improvement to support EL 7 +- New knot-dnssecutils subpackage +- Debian compat (knot-utils vs knot-dnsutils) +- Remove bundled(jquery) version as it differes between distros + * Thu Apr 28 2022 Jakub Ružička - 3.1.8-1 - Update to 3.1.8 diff --git a/sources b/sources index c031339..d33dd09 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.8.tar.xz) = af72cbcc5b511dad148e7ce990819df00bdf99c110b44b3b521eddd8690a6ebd4c76c24e63d843956971d5f158bbfa851804616630d34f3a0ec06888c78ecf2c -SHA512 (knot-3.1.8.tar.xz.asc) = 1d2e1d11dda0f52041b6e43ba94860891624e25763ce35a4cdcf8fb30bf0713a3e6b9776278fdfa60381c8bd32a32cd83b98a6f5a8684946fc94868f5314fab0 +SHA512 (knot-3.2.0.tar.xz) = e007d633f1debb559d47a7646b055dc970502be11a1849063da3e3d28355f77e6cba41e34f06726bc5945e4e2ba3ecb84a4b39813a8079514d3bf584d7d565a2 +SHA512 (knot-3.2.0.tar.xz.asc) = 47546df3933d66229bdc4b059664cbc4cda3f988ac3d8b2b8d0d8edeb2d0b60eb7a2bbd00019092d872eb56ac8d25f7227c526ae90035814be31fff755255681 From edc56db18626fcb56ee7cae271852cd32baf7b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Fri, 9 Sep 2022 15:40:47 +0200 Subject: [PATCH 49/65] Release 3.2.1-1 --- ...ROG_CC.patch => 02-revert-AC_PROG_CC.patch | 0 ...sts-xdp-tcp-fix-under-32bit-platform.patch | 67 ------------------- 03-revert-distro-harden-systemd-service.patch | 31 --------- knot.spec | 18 ++--- sources | 4 +- 5 files changed, 11 insertions(+), 109 deletions(-) rename 04-revert-AC_PROG_CC.patch => 02-revert-AC_PROG_CC.patch (100%) delete mode 100644 02-tests-xdp-tcp-fix-under-32bit-platform.patch delete mode 100644 03-revert-distro-harden-systemd-service.patch diff --git a/04-revert-AC_PROG_CC.patch b/02-revert-AC_PROG_CC.patch similarity index 100% rename from 04-revert-AC_PROG_CC.patch rename to 02-revert-AC_PROG_CC.patch diff --git a/02-tests-xdp-tcp-fix-under-32bit-platform.patch b/02-tests-xdp-tcp-fix-under-32bit-platform.patch deleted file mode 100644 index 06e45e5..0000000 --- a/02-tests-xdp-tcp-fix-under-32bit-platform.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 2fc4c0fcc1b0f75413ceeb580472ad05ffffe3b6 Mon Sep 17 00:00:00 2001 -From: Libor Peltan -Date: Mon, 22 Aug 2022 15:07:50 +0200 -Subject: [PATCH] tests/xdp-tcp: fix under 32bit platform - ---- - tests/libknot/test_xdp_tcp.c | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/tests/libknot/test_xdp_tcp.c b/tests/libknot/test_xdp_tcp.c -index fb044aca4..64e3bdc95 100644 ---- a/tests/libknot/test_xdp_tcp.c -+++ b/tests/libknot/test_xdp_tcp.c -@@ -23,6 +23,8 @@ - #include "libknot/xdp/tcp_iobuf.c" - #include "libknot/xdp/bpf-user.h" - -+#define INFTY INT32_MAX -+ - knot_tcp_table_t *test_table = NULL; - knot_tcp_table_t *test_syn_table = NULL; - #define TEST_TABLE_SIZE 100 -@@ -148,7 +150,7 @@ static int mock_send2(_unused_ knot_xdp_socket_t *sock, const knot_xdp_msg_t msg - - static void clean_table(void) - { -- (void)tcp_cleanup(test_table, 0, UINT32_MAX); -+ (void)tcp_cleanup(test_table, 0, INFTY); - } - - static void clean_sent(void) -@@ -421,8 +423,8 @@ void test_many(void) - clean_sent(); - - knot_sweep_stats_t stats = { 0 }; -- ret = knot_tcp_sweep(test_table, timeout_time, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, -- UINT32_MAX, rls, CONNS, &stats); -+ ret = knot_tcp_sweep(test_table, timeout_time, INFTY, INFTY, INFTY, INFTY, -+ INFTY, rls, CONNS, &stats); - is_int(KNOT_EOK, ret, "many/timeout1: OK"); - is_int(CONNS - 1, stats.counters[KNOT_SWEEP_CTR_TIMEOUT], "many/timeout1: close count"); - is_int(0, stats.counters[KNOT_SWEEP_CTR_LIMIT_CONN], "may/timeout1: reset count"); -@@ -431,8 +433,8 @@ void test_many(void) - check_sent(0, 0, 0, CONNS - 1); - - knot_sweep_stats_reset(&stats); -- ret = knot_tcp_sweep(test_table, UINT32_MAX, timeout_time, UINT32_MAX, UINT32_MAX, UINT32_MAX, -- UINT32_MAX, rls, CONNS, &stats); -+ ret = knot_tcp_sweep(test_table, INFTY, timeout_time, INFTY, INFTY, INFTY, -+ INFTY, rls, CONNS, &stats); - is_int(KNOT_EOK, ret, "many/timeout2: OK"); - is_int(0, stats.counters[KNOT_SWEEP_CTR_TIMEOUT], "many/timeout2: close count"); - is_int(CONNS - 1, stats.counters[KNOT_SWEEP_CTR_LIMIT_CONN], "may/timeout2: reset count"); -@@ -502,8 +504,8 @@ void test_ibufs_size(void) - - // now free some - knot_sweep_stats_t stats = { 0 }; -- ret = knot_tcp_sweep(test_table, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, -- test_table->inbufs_total - 8, UINT32_MAX, rls, -+ ret = knot_tcp_sweep(test_table, INFTY, INFTY, INFTY, INFTY, -+ test_table->inbufs_total - 8, INFTY, rls, - CONNS, &stats); - is_int(KNOT_EOK, ret, "inbufs: timeout OK"); - ret = knot_tcp_send(test_sock, rls, CONNS, CONNS); --- -2.37.1 - diff --git a/03-revert-distro-harden-systemd-service.patch b/03-revert-distro-harden-systemd-service.patch deleted file mode 100644 index c4f5ce3..0000000 --- a/03-revert-distro-harden-systemd-service.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 76b2e79356052753e0d5dc2c8daca2049b221e55 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= -Date: Wed, 24 Aug 2022 13:08:03 +0200 -Subject: [PATCH] Revert "distro: harden systemd service" - -This reverts commit e152a4c21e0f34bece12eb68af61e54ab2f30d8d. ---- - distro/common/knot.service | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/distro/common/knot.service b/distro/common/knot.service -index 39017de1e..a87292943 100644 ---- a/distro/common/knot.service -+++ b/distro/common/knot.service -@@ -21,13 +21,5 @@ Environment="KNOT_ZONE_LOAD_TIMEOUT_SEC=180" - # Maximum size (MiB) of a configuration database - Environment="KNOT_CONF_MAX_SIZE=512" - --# Expected systemd >= v239 --TemporaryFileSystem=/run:ro /var:ro --BindPaths=/run/systemd --RuntimeDirectory=knot --StateDirectory=knot --LogsDirectory=knot --NoNewPrivileges=yes -- - [Install] - WantedBy=multi-user.target --- -2.37.1 - diff --git a/knot.spec b/knot.spec index f9d42c6..3f152e6 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.0 +Version: 3.2.1 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -24,12 +24,8 @@ BuildRequires: gnupg2 # Test fails on F30+ aarch/s390x for unknown reason, but it is not neccassary for Knot DNS Patch1: 01-test_net-disable-udp-send-on-unconnected.patch -# Fix tests on 32bit platforms (merged upstream, drop on next release) -Patch2: 02-tests-xdp-tcp-fix-under-32bit-platform.patch -# Revert hardening of service file (problematic) -Patch3: 03-revert-distro-harden-systemd-service.patch # Revert config improvement to support EL 7 -Patch4: 04-revert-AC_PROG_CC.patch +Patch2: 02-revert-AC_PROG_CC.patch # Required dependencies BuildRequires: autoconf @@ -77,9 +73,6 @@ Requires(post): systemd %{_sbindir}/runuser Requires(preun): systemd Requires(postun): systemd -# Knot DNS 2.7+ isn't compatible with earlier knot-resolver -Conflicts: knot-resolver < 3.0.0 - Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description @@ -87,6 +80,8 @@ Knot DNS is a high-performance authoritative DNS server implementation. %package libs Summary: Libraries used by the Knot DNS server and client applications +# Knot DNS 3.2+ isn't compatible with earlier knot-resolver +Conflicts: knot-resolver < 5.5.2 %description libs The package contains shared libraries used by the Knot DNS server and @@ -332,6 +327,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Fri Sep 09 2022 Jakub Ružička - 3.2.1-1 +- Update to 3.2.1 +- Remove patches included upstream +- Update Conflicts and move to knot-libs + * Mon Aug 22 2022 Jakub Ružička - 3.2.0-1 - Update to 3.2.0 - Patch: fix tests on 32-bit platforms diff --git a/sources b/sources index d33dd09..6466b75 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.0.tar.xz) = e007d633f1debb559d47a7646b055dc970502be11a1849063da3e3d28355f77e6cba41e34f06726bc5945e4e2ba3ecb84a4b39813a8079514d3bf584d7d565a2 -SHA512 (knot-3.2.0.tar.xz.asc) = 47546df3933d66229bdc4b059664cbc4cda3f988ac3d8b2b8d0d8edeb2d0b60eb7a2bbd00019092d872eb56ac8d25f7227c526ae90035814be31fff755255681 +SHA512 (knot-3.2.1.tar.xz) = 2f12750dc0db06fd915c1b322626780c1d66e10c0b8170dea57559e514f66ee105ed8dbbc0a5f8084fcf772e82c242a8b09ae449631960abf4d60af4a13a1ea0 +SHA512 (knot-3.2.1.tar.xz.asc) = 029a43329388db4f1ff66b1e6b887a6a69e728ee15671a2a57e2fc2ed324af10451afe9a01d4b85a87f8aae4bd5569a4875ea90c6150ff23c1bb2944599f972a From a7976041b7a85339c36760c89c407758d26059a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 1 Nov 2022 14:05:56 +0100 Subject: [PATCH 50/65] Release 3.2.2-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 3f152e6..4224c8a 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.1 +Version: 3.2.2 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -327,6 +327,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Tue Nov 01 2022 Jakub Ružička - 3.2.2-1 +- Update to 3.2.2 + * Fri Sep 09 2022 Jakub Ružička - 3.2.1-1 - Update to 3.2.1 - Remove patches included upstream diff --git a/sources b/sources index 6466b75..1f81a20 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.1.tar.xz) = 2f12750dc0db06fd915c1b322626780c1d66e10c0b8170dea57559e514f66ee105ed8dbbc0a5f8084fcf772e82c242a8b09ae449631960abf4d60af4a13a1ea0 -SHA512 (knot-3.2.1.tar.xz.asc) = 029a43329388db4f1ff66b1e6b887a6a69e728ee15671a2a57e2fc2ed324af10451afe9a01d4b85a87f8aae4bd5569a4875ea90c6150ff23c1bb2944599f972a +SHA512 (knot-3.2.2.tar.xz) = 29fadb96c1ea525c6183f9e7552f4ad370579b67d74aec1910a92d561cc2c5656fd7876015f29161d279a07c23643f6584308bf9fa0e74d351b17af54e5e9a7f +SHA512 (knot-3.2.2.tar.xz.asc) = 78289cffd9eca23539210ca9dc9b3a67d0cce6a86de1dc185b3f58aa10030fc73401bb50b4a0b9cc2c9122db69c461880c0c9166b85dadb15a117dbbd338ab75 From 77abc57d5b9b170c1b50ca7a37052c12c3d832e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 21 Nov 2022 14:38:58 +0100 Subject: [PATCH 51/65] Release 3.2.3-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 4224c8a..4122255 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.2 +Version: 3.2.3 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -327,6 +327,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Mon Nov 21 2022 Jakub Ružička - 3.2.3-1 +- Update to 3.2.3 + * Tue Nov 01 2022 Jakub Ružička - 3.2.2-1 - Update to 3.2.2 diff --git a/sources b/sources index 1f81a20..ad813ba 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.2.tar.xz) = 29fadb96c1ea525c6183f9e7552f4ad370579b67d74aec1910a92d561cc2c5656fd7876015f29161d279a07c23643f6584308bf9fa0e74d351b17af54e5e9a7f -SHA512 (knot-3.2.2.tar.xz.asc) = 78289cffd9eca23539210ca9dc9b3a67d0cce6a86de1dc185b3f58aa10030fc73401bb50b4a0b9cc2c9122db69c461880c0c9166b85dadb15a117dbbd338ab75 +SHA512 (knot-3.2.3.tar.xz) = 1696f90b14f9fe64491170738d69fd690c398daf938c838a497cf052b3601e2f0c4aacdf6087e054401869794e336ac9e49ce7d0b3025b41b6de11a374547bf3 +SHA512 (knot-3.2.3.tar.xz.asc) = a0ec79e055e77e96ff2ced914f82521c6cddc8f02c8bbd6591c92dfb59c31d6bb3c57eab03ff30a22af7b0112822aa16bda33c700848835b34c8e669e65a31be From 259317e431079522b16a00a77d7661c02cb4d396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 12 Dec 2022 13:53:40 +0100 Subject: [PATCH 52/65] Release 3.2.4-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 4122255..b5fa9b4 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.3 +Version: 3.2.4 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -327,6 +327,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Mon Dec 12 2022 Jakub Ružička - 3.2.4-1 +- Update to 3.2.4 + * Mon Nov 21 2022 Jakub Ružička - 3.2.3-1 - Update to 3.2.3 diff --git a/sources b/sources index ad813ba..680ec0f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.3.tar.xz) = 1696f90b14f9fe64491170738d69fd690c398daf938c838a497cf052b3601e2f0c4aacdf6087e054401869794e336ac9e49ce7d0b3025b41b6de11a374547bf3 -SHA512 (knot-3.2.3.tar.xz.asc) = a0ec79e055e77e96ff2ced914f82521c6cddc8f02c8bbd6591c92dfb59c31d6bb3c57eab03ff30a22af7b0112822aa16bda33c700848835b34c8e669e65a31be +SHA512 (knot-3.2.4.tar.xz) = 5a32ef5bd837324d99fdef4d3b378ed1b1df61ee9bad95ba51edce6f2da3c1c8c2b0b31b578e4cb7f9079a9b4db1363a8d984f29beb29fed4e91315ef9e0b77b +SHA512 (knot-3.2.4.tar.xz.asc) = 3db05f92b3e5bd5a1fd6e7b388c63fb0fd44f947a389bd68ddb44de3447bf5aed0d33389084b70fb7cac8943ae9d30c7c0be6fae8fac78ff1cc342894d8ae187 From 256ffce7e041ba8249e4bf1c803325401834ceda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 12 Dec 2022 14:30:55 +0100 Subject: [PATCH 53/65] Use devtoolset-12-gcc on EPEL 7 --- knot.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/knot.spec b/knot.spec index b5fa9b4..499424e 100644 --- a/knot.spec +++ b/knot.spec @@ -32,7 +32,11 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: make +%if 0%{?rhel} == 7 +BuildRequires: devtoolset-12-gcc +%else BuildRequires: gcc +%endif BuildRequires: pkgconfig(liburcu) BuildRequires: pkgconfig(gnutls) >= 3.3 BuildRequires: pkgconfig(libedit) @@ -145,6 +149,9 @@ gpg2 --verify %{SOURCE1} %{SOURCE0} %autosetup -p1 %build +%if 0%{?rhel} == 7 +. /opt/rh/devtoolset-12/enable +%endif # disable debug code (causes unused warnings) CFLAGS="%{optflags} -DNDEBUG -Wno-unused" @@ -205,6 +212,9 @@ install -d -m 0770 -D %{buildroot}%{_sharedstatedir}/knot find %{buildroot} -type f -name "*.la" -delete -print %check +%if 0%{?rhel} == 7 +. /opt/rh/devtoolset-12/enable +%endif V=1 make check %pre @@ -329,6 +339,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %changelog * Mon Dec 12 2022 Jakub Ružička - 3.2.4-1 - Update to 3.2.4 +- Use devtoolset-12-gcc on EPEL 7 * Mon Nov 21 2022 Jakub Ružička - 3.2.3-1 - Update to 3.2.3 From e462d3a8493e8bebd8b769987d87cefb3744897f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 2 Feb 2023 14:20:58 +0100 Subject: [PATCH 54/65] Release 3.2.5-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 499424e..bfdd629 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.4 +Version: 3.2.5 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -337,6 +337,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Feb 02 2023 Jakub Ružička - 3.2.5-1 +- Update to 3.2.5 + * Mon Dec 12 2022 Jakub Ružička - 3.2.4-1 - Update to 3.2.4 - Use devtoolset-12-gcc on EPEL 7 diff --git a/sources b/sources index 680ec0f..68ba26a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.4.tar.xz) = 5a32ef5bd837324d99fdef4d3b378ed1b1df61ee9bad95ba51edce6f2da3c1c8c2b0b31b578e4cb7f9079a9b4db1363a8d984f29beb29fed4e91315ef9e0b77b -SHA512 (knot-3.2.4.tar.xz.asc) = 3db05f92b3e5bd5a1fd6e7b388c63fb0fd44f947a389bd68ddb44de3447bf5aed0d33389084b70fb7cac8943ae9d30c7c0be6fae8fac78ff1cc342894d8ae187 +SHA512 (knot-3.2.5.tar.xz) = c73874b60970b4b1d14f141fa40d47d6620e475b1fb3a5f803956e3b6d8b670d7250b049b26679e1488bfba5bfcfa65ef75c68a494c94f36b60d697fa95048f7 +SHA512 (knot-3.2.5.tar.xz.asc) = ebbe9fa0c3c3d077ffeb63272ba64ede1d07c3a4b521f7f20be2f7093fe3fb93f078580dc3b107c896019ef92410ac005c792778a9c254bd72cb648717ea7c88 From a7a7e6dec7cb8cedb1a78021e8dd53f51d0b15cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 6 Apr 2023 19:12:37 +0200 Subject: [PATCH 55/65] Release 3.2.6-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index bfdd629..8b27113 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.5 +Version: 3.2.6 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -337,6 +337,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Apr 06 2023 Jakub Ružička - 3.2.6-1 +- Update to 3.2.6 + * Thu Feb 02 2023 Jakub Ružička - 3.2.5-1 - Update to 3.2.5 diff --git a/sources b/sources index 68ba26a..e9e70c8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.5.tar.xz) = c73874b60970b4b1d14f141fa40d47d6620e475b1fb3a5f803956e3b6d8b670d7250b049b26679e1488bfba5bfcfa65ef75c68a494c94f36b60d697fa95048f7 -SHA512 (knot-3.2.5.tar.xz.asc) = ebbe9fa0c3c3d077ffeb63272ba64ede1d07c3a4b521f7f20be2f7093fe3fb93f078580dc3b107c896019ef92410ac005c792778a9c254bd72cb648717ea7c88 +SHA512 (knot-3.2.6.tar.xz) = a7b87845105d43732972aab16d556ef9e1d46cbe0db441d5fbd8bb5f6793f276088d8ee9b4c2289caecf340be799b92fea84905a30a161ab5b3d77145977afff +SHA512 (knot-3.2.6.tar.xz.asc) = 0c63d767cd208b9713eddd1868f1e935e861168aba0e1c2ad4872091c20c5a24593e186528eeac3240e9f4c4fee4b2b4137ae3ae3f134465ef77b07fb01fc810 From 9f76c1bb5b9563d76523b0706ad775ea8c2e6629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 11 Apr 2023 14:55:35 +0200 Subject: [PATCH 56/65] Update upstream signing key pub rsa4096/0x10BB7AF6FEBBD6AB 2017-07-10 [SC] [expires: 2026-11-11] Key fingerprint = 742F A4E9 5829 B6C5 EAC6 B857 10BB 7AF6 FEBB D6AB uid Daniel Salzman --- ...E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc | 89 +++++++++++++------ 1 file changed, 63 insertions(+), 26 deletions(-) diff --git a/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc b/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc index 5e7bbef..be2545a 100644 --- a/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc +++ b/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc @@ -11,7 +11,19 @@ om9rg89Ih876PA53vUXBB+FWP9QOFDcOfz3nMjCrLbMzhTsAzrNFXxchzLq+66CL qsQQytDVFpLI+X++sKRTOHkq6vV1bAPjlljrannLnn1y/DvkOOkiHOdYyjmR7Dfk vxgcWh/3Gx4J9gipxZITOr7LamEYgHfElY/UWCtc1Vjt8Xvgt4dofDpvSwY9YzgR WxJKC5ewYdqTCI+zxL1f0fjkeiRYNi959UMMjgdcY7Zpi8oPPQmlyBw15QARAQAB -tCZEYW5pZWwgU2Fsem1hbiA8ZGFuaWVsLnNhbHptYW5AbmljLmN6PokCVAQTAQoA +tCZEYW5pZWwgU2Fsem1hbiA8ZGFuaWVsLnNhbHptYW5AbmljLmN6PokCPQQTAQoA +JwUCWWOUFwIbAwUJA8JnAAULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRAQu3r2 +/rvWq1+eEAClhOEK2MZOz+nwJSeX7iINKbw477Y+LSvYkKG81pve+xtblQEn7rI3 +cYnDrqlUb3bXdbMHujYrg1fPoccpCvf6d/JvlN6WXCE25R+GR6vxr6v7jycHdSOb +Fe4sTcwce6IViwiWiSizh4UCkz8285LjLcf3AnT2v6GJwHiZbPOeMQUNIRj6PEYL +SQsq0ZlqEx8LGKLTc5Ukrkoi4lN44SI1rzSwDPIqvlvrVnDXcDB8M7E2Ii51zU8/ +TVk920KeayUeCPxpmgQW3USI45NrE/jEgyodyxMGp5lg3OqzHT2wu9BVLWkQvTjF +fLfEsTay4K4kUSbYzbpS93b33J+I20rYLGBBYlTrN5417IgF6Bb8NzyrfVy1Wdqh +cggAEKX5EkOmZM8oduRxsHqiRLC/xKF8GqTo6t3GMS5i8RClNvmdq0WUkQUvld4b +OnXBCZ2QLbjV7sXjcr56ee+qdpiuRQjEidjHzpibcIBN8LVupVgXAZl9lsiBtoJX +OHsvSdU3VgGWnRGtzFjSHzl3TRPIsaVVqD7aCzQDfXDjrGlmhzgDfMwkqmBGgsku +8tSR3Ag0MRAouJFXiZrcM3XGeYVbHT6dt7UMAB27Xc5foc0kGRo5tzlK6rWG2sJI +lcQB7tKvwI/tE9lwJDjw+XNekEdIpcdcQ7mWa1COYkcYTre3oPmN+4kCVAQTAQoA PgIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBHQvpOlYKbbF6sa4VxC7evb+ u9arBQJcZrrTBQkGxY28AAoJEBC7evb+u9arU78QAJOVSul2YTXediwcY1YtpAli KtHcjOS5PzaezB4c+E89xw6x/XO76KLI6+7GFrcGallPPCHXQfseQh5FmlZ2VMMT @@ -24,29 +36,54 @@ HUH2N6rQP283fnFSrABHTk1laqKwXDMI7IdGChc/QtiHso5gjCi2OdVpuQfp19e6 8U7+ZWSq71HhFWsR9Y1QlXfV6ADEXtemV/iXA5No1TUTvUmvo7T2k7LBlrSWd+gJ MyxMn/aUroVm2InU3jPwRUPySUJcX1EZrbWgi/scbKcryJQoH5BEEdOr72V9vNt7 o6dlMgnYoSkv3JVpJW4T6+PY8HanVFuFNWqOg5fg7xM5CCL7gqVSuWExK1X0rfqu -aeq5Pvm92kMrx+XkzqqFuQINBFljlBcBEADpGfFgbzb9f4Dj2yuAdH3IjGUepKro -iE2f6IlDmWlWl94Ei04bg0O7gCrlfjWkAnc0rGwI9XraARqV38LuAmtMjmtqD/zs -ZgUWjpBGvAaxZUY5Eaz0bWkEXtlnCE8nAPcx5qAZk19ZnNHFd58vU/eauk7d61IQ -TAQ0e0KoQw/rH8keHdIqicoCUvjF+PcXnhoqPi6khyPEYEAkfy7rps3UaZiOy0HP -NsPhNY1PB8qCnXlfGOtOBtOEXLsIGg6BxoCmJhM8TsPmcHX4DKEaOc7dmU2DLVkg -dUMWTocRqRqooz1CWQmdmwHb5xOpeVXR62YVCx50KDaxSJ6vSGEisQ460ZBtjU/7 -S+/5VGho3KbeuK2X7vREbxaCsc0sxEdUZ4tGreA4We353/eHuZ4Aps5Fb9ljfRSn -C2G2VliByIXOgMkJbwF7WLVfi2iJRoyQWHv2N3thO9nzv4/gOWUL0w2yirlxj9sc -E1li1d/vLpepWpijYhsVRHdVcq3NI3l5iblikU9zPOaDVs2CXeLpYFw4XgQ8QkRW -Nn67Wvn0299UtDxdWH9CYugbvHygVy+FZy0zLXtV2bipmOlID4HWxChx6F2tr7FP -49ZXSRytimyrCRh4VFCckaoi6lYeei2oY4E0DJBYhyMrornLQJ6Kglmk03k57leW -gxexiaBexH6BNQARAQABiQI8BBgBCgAmAhsMFiEEdC+k6VgptsXqxrhXELt69v67 -1qsFAlxmuuMFCQbFjcwACgkQELt69v671qtQEw//d5Liq0sNZQXkdAn+/lBa97oh -kKNMegMBx6+rhoIHRECwZoQpxa28YKy50Fe6DXEdTIo7ZWyxnqbukU7jzTKMsAFA -bS4OBQXsPSZjOsfQ2+95LQxwqNAkvbZq3zknV4p2QEnEezYljltscV6BoFbaYvj5 -LidIQsWuMd21aOYmMwi2u7EAoKhnHxhG9HN8guQBevkJxlRpJxFXOPYFwk/nYvzs -fScbX4j2EyEukBse0CHHcmF4tH105qlCXeIynq5Ikcb5P7cAuiCCiH6zV9fNmfFn -lCK5q7dRl8sWSxchYDNdkEGvfAsnw48Mp1iwV4YrctlVZOdd4WoaNz2CzHzHv51b -u5HuNjDEYBQjrsaVMRkGK+G0+gUZgsjOzJO8hv51wzFQd5PiB1AlcezhidbZ3uTp -6XqKbH5BcikFOAVripB5J0pMOMadWvhhgiG3TYU1sf680Q8D0x/8qDBmOONjjdVX -8ICy5tHCBF9qBYt9BdnrW9ov2RgdA2pJxg6nFmNW7ij+MOG8CsRy/rJ14xWYfixv -yATajfmWwOvdFwYDQkrWo8z7bKEmT/SlM/DAgUdHpK+Zs5LNIleaDu+8sqMcHSDv -fdZu2nGmgIOyi0CleVsF6Ej8peQvnNkfQ3gfr93Np+3nMezPpRiezzlNc9qWo5ir -FhTRDc+3LonY+arOEWs= -=t/98 +aeq5Pvm92kMrx+XkzqqFiQJUBBMBCgA+AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4B +AheAFiEEdC+k6VgptsXqxrhXELt69v671qsFAl+r3lMFCQoKsTwACgkQELt69v67 +1qv/gw/+ILW7CAtgxuOI1h61sUq0YrjQRnnYlya3wk4tTlSqhBa+5fSjasHv5wZ8 +TduWt99yWCmGpDs0Vxffb/jTKKwI40FgTtnzFKPTFtEymLgC1sTTbol3dcrzpX4J +vXMlVDdSjdkChdsdx6mFQWA1ZvdvUtIvBeVrP76mfDQi2fsVMWRoAk98BSQT5Som +vcluc9mMNuVcjiRUdmSqM1TVZarambkhNWelWWYJN1paljugL//TEZKcsFQWJpbf +ECdEnyqXPi9/Fi53/WhS9xi7AdYO8rx8lCurb0JpQwltHXXZcm5mSr99w+7XoUvu +efkSkW2Y5XFXp35dP7x8QeZ8zhSeHL5d187G0q5YKtK2D2M+sEyEDF9WCHya8x8t +b+mMv3LVkHf4mj2LQNGWUtOId08a+AgdOd45wKqG+Z92LXs7l9NMoDLdJGwfu48R +L2LrHfyDHzowUChr0762mdcCiJrBH7Lwmt5j4wRhrPKaPj1XcXQIi6srGcJRbhFa +76E54kPANDa42VzJwS9/4K+bA7uDYWCmMlXF6Uh/EiSoE3CLS6IMgs9BaOHCx4Rq +1+7/U0LQDwseMT8UV+AK0YiYeXpfnGX96nS9yPZtlyE5+96h5c6Vts6QEZo8hcR1 +EXlVsf2NJleZxYELfvcLYPvIeS3qe5WNlCOSUvDAMh7fRwMkWL2JAlQEEwEKAD4C +GwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AWIQR0L6TpWCm2xerGuFcQu3r2/rvW +qwUCYadEKgUJEZClEwAKCRAQu3r2/rvWq3QvD/9zDhZM18VNgeNAvWByx/lVOaJr +pxvciARgWEbgYYbYHxwH2JGMZjr0XFz5JzXkf+N7Yx92D5V7GwX90eGg+fTAyMNM +4TAfk1shzC9T/qej4cTUVwiunmikV1vXfv7mnjJHuOoeqrY1at5z4gWirXyyMKhN +pg/ebgpcQ7f+DxsLgNJFihU+w1eIFMKnGalrSBh62NIIJWsk+hdVaPse9XMhjigo +gQ3s7/Sy7hADV+tnwPv/s6xj1jBV+BQNdJZwYsMOXEEFBvNTbq57rzm2CyT3RKfG +9hp5SdDDQHmyxz96hHrZYl1v2h6qH8ors8EgA75Iy2qsEefJSSEbnSBoAypAof2Q +9lAgUw1SwZuQv/mLoubCVqi09HuVObyyKLFxzgyFRMvYwvJpDKmLhvAnqi4iXhqJ +QTRM5aJc1odsnCaGUO4Rpve5jT9jEGs4CE2zeAu5vGO1nSeVdcisPJ+o8ji3hFUt +W/tINkfTygwvLWlR+KO8YM8eTOXeI8m0dt4nPb6Ne1s1i/ipu4heS7XDyjvPB1/m +5kpmWIgnC6wQyD1a7beDh64sIybXvJzpmX0Xp1JiPdqC7gH5YFq0eznZ5JU+j6wB +Dtl+55I6D+IgUY2BV4rGXjXSxhn89gRKD8nxVUGhWY1lsGw0UtqGKiH6+GkP2pL2 +k7Mz34W4LAKvwEtvnLkCDQRZY5QXARAA6RnxYG82/X+A49srgHR9yIxlHqSq6IhN +n+iJQ5lpVpfeBItOG4NDu4Aq5X41pAJ3NKxsCPV62gEald/C7gJrTI5rag/87GYF +Fo6QRrwGsWVGORGs9G1pBF7ZZwhPJwD3MeagGZNfWZzRxXefL1P3mrpO3etSEEwE +NHtCqEMP6x/JHh3SKonKAlL4xfj3F54aKj4upIcjxGBAJH8u66bN1GmYjstBzzbD +4TWNTwfKgp15XxjrTgbThFy7CBoOgcaApiYTPE7D5nB1+AyhGjnO3ZlNgy1ZIHVD +Fk6HEakaqKM9QlkJnZsB2+cTqXlV0etmFQsedCg2sUier0hhIrEOOtGQbY1P+0vv ++VRoaNym3ritl+70RG8WgrHNLMRHVGeLRq3gOFnt+d/3h7meAKbORW/ZY30Upwth +tlZYgciFzoDJCW8Be1i1X4toiUaMkFh79jd7YTvZ87+P4DllC9MNsoq5cY/bHBNZ +YtXf7y6XqVqYo2IbFUR3VXKtzSN5eYm5YpFPczzmg1bNgl3i6WBcOF4EPEJEVjZ+ +u1r59NvfVLQ8XVh/QmLoG7x8oFcvhWctMy17Vdm4qZjpSA+B1sQocehdra+xT+PW +V0kcrYpsqwkYeFRQnJGqIupWHnotqGOBNAyQWIcjK6K5y0CeioJZpNN5Oe5XloMX +sYmgXsR+gTUAEQEAAYkCPAQYAQoAJgIbDBYhBHQvpOlYKbbF6sa4VxC7evb+u9ar +BQJhp0RdBQkRkKVGAAoJEBC7evb+u9araZ8QAIzWIN8OhaTyyeG451OGeu7+5xnY +muP7jTGlFuP4Q64Vt5WAc54dhILCy2pRImMl/0Mfjq3WOOdqSQViaoJpHFkgjy8z +9MFX/hZqLC57oDmNnI8X/bG/ApGMQD7UoeAH4recf7jmtqRyLUeDd2wOEsSRICty +czH/m43Uct4kShXP2ui1vqAP8p9UtfdImgyNWV91J35SjxSiFvp+YAuNn+jsnDiV +BzYJAlk/rdN1h6E+cDfp/GYaXDjVxLy8bipuEN5icZGMH20tkiVsvPQ5J++AOSre +I830E62IJBKU9kwQa9iSbWxtcnxJmOEVBGN2gJ+2WAd2uA9ZCCJafTXiVe57Icxd +2P5zRqrDn0bAmIyl04NKnVAnthQG+b6hEuuaKhTkj2TvhmXkH84BcAvKC82yNBc1 +zrzxfLI/WPZJrh2IVhXWVhW13Yd6eUmqUk8p0hQ5ZhdL9D6fQJSXxkdiauMJov1C +njR/++NOtERBSk+7hbTb921q/brMZXgJ971u31b0sRoefybbbjHSWjNVSP6ENn44 +eQfS06CUmc7oN18bGhHmlmhK4az9i5eQ4HlUE5K9f4z7yQRTM6XfIpzDrWOfFfaY +vYkcC6CbR8xnb+LOlqwKHzKVwoWGLSreeShqPfazQEjR3V52XdFmyVIrltj7JRxi +tW29kqO09AEalR9l +=t42C -----END PGP PUBLIC KEY BLOCK----- From ab1229d18a9c95f089795f45daaca3e59a65a661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 6 Jun 2023 22:18:49 +0200 Subject: [PATCH 57/65] Release 3.2.7-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 8b27113..4232b81 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.6 +Version: 3.2.7 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -337,6 +337,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Tue Jun 06 2023 Jakub Ružička - 3.2.7-1 +- Update to 3.2.7 + * Thu Apr 06 2023 Jakub Ružička - 3.2.6-1 - Update to 3.2.6 diff --git a/sources b/sources index e9e70c8..133e413 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.6.tar.xz) = a7b87845105d43732972aab16d556ef9e1d46cbe0db441d5fbd8bb5f6793f276088d8ee9b4c2289caecf340be799b92fea84905a30a161ab5b3d77145977afff -SHA512 (knot-3.2.6.tar.xz.asc) = 0c63d767cd208b9713eddd1868f1e935e861168aba0e1c2ad4872091c20c5a24593e186528eeac3240e9f4c4fee4b2b4137ae3ae3f134465ef77b07fb01fc810 +SHA512 (knot-3.2.7.tar.xz) = 8fc31c40ba9953401ef7bf4227bd56250e02a72fc60bdb10b4066254a1f0a24ecb68b16e710126beb58f06e4adb247f7c77aa042b4b14abd92a024fe92d6e5f8 +SHA512 (knot-3.2.7.tar.xz.asc) = 003868a58a29505887f6c85438def4cbfe15720c5f5f7c409efbed54afd3ce95e6704896f5416f0464c5952f6425d7b66f18c9784e02f33b040cf965f85e01e1 From b0f0072617b0135409e73d8da1230fe34fbe5f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 26 Jun 2023 16:00:51 +0200 Subject: [PATCH 58/65] Release 3.2.8-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 4232b81..0d0e186 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.7 +Version: 3.2.8 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -337,6 +337,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Mon Jun 26 2023 Jakub Ružička - 3.2.8-1 +- Update to 3.2.8 + * Tue Jun 06 2023 Jakub Ružička - 3.2.7-1 - Update to 3.2.7 diff --git a/sources b/sources index 133e413..f6e58f7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.7.tar.xz) = 8fc31c40ba9953401ef7bf4227bd56250e02a72fc60bdb10b4066254a1f0a24ecb68b16e710126beb58f06e4adb247f7c77aa042b4b14abd92a024fe92d6e5f8 -SHA512 (knot-3.2.7.tar.xz.asc) = 003868a58a29505887f6c85438def4cbfe15720c5f5f7c409efbed54afd3ce95e6704896f5416f0464c5952f6425d7b66f18c9784e02f33b040cf965f85e01e1 +SHA512 (knot-3.2.8.tar.xz) = 792e7d062ef018530594abc26b90fcd023758cb88b77f971460ca73de36121d1faf84fe55d5f24e72cc07adcc48115c24b6c60817d90f5620cdca13f7782e67d +SHA512 (knot-3.2.8.tar.xz.asc) = 6fbfdd7618787f73fabb15f1e5709b78c2ea9e305588bfa9ff1803d4af397b121d8b75d82bf8ed225d30af489aa376806c90daf926b2dbabb0d4f8cc85030658 From 33b3474bf629e404791f077ad10c776c8035b1fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 27 Jul 2023 17:59:19 +0200 Subject: [PATCH 59/65] Release 3.2.9-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 0d0e186..4647cc5 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.8 +Version: 3.2.9 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -337,6 +337,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Jul 27 2023 Jakub Ružička - 3.2.9-1 +- Update to 3.2.9 + * Mon Jun 26 2023 Jakub Ružička - 3.2.8-1 - Update to 3.2.8 diff --git a/sources b/sources index f6e58f7..fdd401d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.8.tar.xz) = 792e7d062ef018530594abc26b90fcd023758cb88b77f971460ca73de36121d1faf84fe55d5f24e72cc07adcc48115c24b6c60817d90f5620cdca13f7782e67d -SHA512 (knot-3.2.8.tar.xz.asc) = 6fbfdd7618787f73fabb15f1e5709b78c2ea9e305588bfa9ff1803d4af397b121d8b75d82bf8ed225d30af489aa376806c90daf926b2dbabb0d4f8cc85030658 +SHA512 (knot-3.2.9.tar.xz) = baf8da222e38198c85fa62e45e71b29ddac7c90433b811710ace1e0395e6e7b5d63547ce8f3a62792ee11259ec2e36d6ddd8fff999416f9171671444a95086cf +SHA512 (knot-3.2.9.tar.xz.asc) = 77f8b57251bd31b5feac45cbd13b775c9817ca2caf84ce196537e99e92d089954a24ee10c37de5f8c5f7a029a53ae5b5d7fd0214984db0809609363285d6e190 From 2868beb1450b67dae086b1357065d24474bc0989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 28 Aug 2023 16:10:32 +0200 Subject: [PATCH 60/65] Release 3.3.0-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 4647cc5..bbe9e6b 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.9 +Version: 3.3.0 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -337,6 +337,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Mon Aug 28 2023 Jakub Ružička - 3.3.0-1 +- Update to 3.3.0 + * Thu Jul 27 2023 Jakub Ružička - 3.2.9-1 - Update to 3.2.9 diff --git a/sources b/sources index fdd401d..dda0882 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.9.tar.xz) = baf8da222e38198c85fa62e45e71b29ddac7c90433b811710ace1e0395e6e7b5d63547ce8f3a62792ee11259ec2e36d6ddd8fff999416f9171671444a95086cf -SHA512 (knot-3.2.9.tar.xz.asc) = 77f8b57251bd31b5feac45cbd13b775c9817ca2caf84ce196537e99e92d089954a24ee10c37de5f8c5f7a029a53ae5b5d7fd0214984db0809609363285d6e190 +SHA512 (knot-3.3.0.tar.xz) = 695248838655e80df036a341729fc3b120908f30604b9ce5a6ea16da91cf8342cb1afdc10cffa3181a8045d1d9aaaea5705837787675ac6efcf0f4beb411f0e1 +SHA512 (knot-3.3.0.tar.xz.asc) = 85f1641832035d84cfaf9920bb66d4e76e6f13ebceb668458259771fb6a4e8d17a708fd52b63653cf4fec11f336395157d0964ff1190c7d5839525b9918d7e6b From 13b40714b1e66cb2ecaea9c24795589a2268d103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 12 Sep 2023 11:19:48 +0200 Subject: [PATCH 61/65] Release 3.3.1-1 --- knot.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/knot.spec b/knot.spec index bbe9e6b..207755b 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.3.0 +Version: 3.3.1 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -84,8 +84,8 @@ Knot DNS is a high-performance authoritative DNS server implementation. %package libs Summary: Libraries used by the Knot DNS server and client applications -# Knot DNS 3.2+ isn't compatible with earlier knot-resolver -Conflicts: knot-resolver < 5.5.2 +# Knot DNS 3.3+ isn't compatible with earlier knot-resolver +Conflicts: knot-resolver < 5.7.0 %description libs The package contains shared libraries used by the Knot DNS server and @@ -337,6 +337,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Tue Sep 12 2023 Jakub Ružička - 3.3.1-1 +- Update to 3.3.1 + * Mon Aug 28 2023 Jakub Ružička - 3.3.0-1 - Update to 3.3.0 diff --git a/sources b/sources index dda0882..f59e717 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.3.0.tar.xz) = 695248838655e80df036a341729fc3b120908f30604b9ce5a6ea16da91cf8342cb1afdc10cffa3181a8045d1d9aaaea5705837787675ac6efcf0f4beb411f0e1 -SHA512 (knot-3.3.0.tar.xz.asc) = 85f1641832035d84cfaf9920bb66d4e76e6f13ebceb668458259771fb6a4e8d17a708fd52b63653cf4fec11f336395157d0964ff1190c7d5839525b9918d7e6b +SHA512 (knot-3.3.1.tar.xz) = 3ccf53135b2a3c01123e3445b226fc0e348b7378800759f4ca37a0cbce1a1015e46ef096b82e8ece253ed040791bbc235767ccbbcbca2bd0e04c319a55a4c6d4 +SHA512 (knot-3.3.1.tar.xz.asc) = 7c92a27a955fcda33273ab24a09d9fe091449b54df1d33918fcc715fe4c264a5a0f4d9c012c7ed2965778bed444f9cfc4b74d9ccdc70bf06eb0e910bfbd20710 From efc043ec2b76c68d1e52b19217621b0fdbedb046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 12 Sep 2023 13:57:43 +0200 Subject: [PATCH 62/65] Release 3.2.10-1 Keep EPEL 7 at Knot 3.2.x --- knot.spec | 11 +++-------- sources | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/knot.spec b/knot.spec index 207755b..f735fdb 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.3.1 +Version: 3.2.10 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -84,8 +84,6 @@ Knot DNS is a high-performance authoritative DNS server implementation. %package libs Summary: Libraries used by the Knot DNS server and client applications -# Knot DNS 3.3+ isn't compatible with earlier knot-resolver -Conflicts: knot-resolver < 5.7.0 %description libs The package contains shared libraries used by the Knot DNS server and @@ -337,11 +335,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog -* Tue Sep 12 2023 Jakub Ružička - 3.3.1-1 -- Update to 3.3.1 - -* Mon Aug 28 2023 Jakub Ružička - 3.3.0-1 -- Update to 3.3.0 +* Tue Sep 12 2023 Jakub Ružička - 3.2.10-1 +- Update to 3.2.10 * Thu Jul 27 2023 Jakub Ružička - 3.2.9-1 - Update to 3.2.9 diff --git a/sources b/sources index f59e717..8b9201f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.3.1.tar.xz) = 3ccf53135b2a3c01123e3445b226fc0e348b7378800759f4ca37a0cbce1a1015e46ef096b82e8ece253ed040791bbc235767ccbbcbca2bd0e04c319a55a4c6d4 -SHA512 (knot-3.3.1.tar.xz.asc) = 7c92a27a955fcda33273ab24a09d9fe091449b54df1d33918fcc715fe4c264a5a0f4d9c012c7ed2965778bed444f9cfc4b74d9ccdc70bf06eb0e910bfbd20710 +SHA512 (knot-3.2.10.tar.xz) = 34279d5b812e6fdd08bca5cb3c16cedff709d0b14a0b2c84697a01cbadbf5d016a094a0cb5b6c6aa73cc623d0b2550d91cf07aa2715ab30eb911b530b28b50b3 +SHA512 (knot-3.2.10.tar.xz.asc) = bbfb91376d79e00f39a216b021501c9703dc4e3c292ce38c7b3d03028c90c7a5973985f5cc70d05b857760208efae89b384e322f3a76c33f68fee42f35d0ae86 From cb36a9492055d178d2db593fa18b56edeb257273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 30 Oct 2023 11:32:00 +0100 Subject: [PATCH 63/65] Release 3.2.11-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index f735fdb..4dd6dac 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.10 +Version: 3.2.11 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -335,6 +335,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Mon Oct 30 2023 Jakub Ružička - 3.2.11-1 +- Update to 3.2.11 + * Tue Sep 12 2023 Jakub Ružička - 3.2.10-1 - Update to 3.2.10 diff --git a/sources b/sources index 8b9201f..362c93f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.10.tar.xz) = 34279d5b812e6fdd08bca5cb3c16cedff709d0b14a0b2c84697a01cbadbf5d016a094a0cb5b6c6aa73cc623d0b2550d91cf07aa2715ab30eb911b530b28b50b3 -SHA512 (knot-3.2.10.tar.xz.asc) = bbfb91376d79e00f39a216b021501c9703dc4e3c292ce38c7b3d03028c90c7a5973985f5cc70d05b857760208efae89b384e322f3a76c33f68fee42f35d0ae86 +SHA512 (knot-3.2.11.tar.xz) = 19359c45ae0be7554d7367e3f34de0a4fc1ebf2ccad5715af88c4422942c609c09496497741cced5b9e01f77cf85cd8b766757d48d3f310d371efb0b8c247b19 +SHA512 (knot-3.2.11.tar.xz.asc) = afd87fe80f58f5850ca40c031d5d53004fcd81a92af0429c337f58514a8d0263d8f6350f35c5268963b1299b7f0f32a5e2dea6289a664e770d1ed3a9b31ee889 From ee43c66dd26c1a1eb2d6bed427002ca16dd1f407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 24 Jan 2024 15:19:04 +0100 Subject: [PATCH 64/65] Release 3.2.12-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 4dd6dac..6df77b2 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.11 +Version: 3.2.12 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -335,6 +335,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Wed Jan 24 2024 Jakub Ružička - 3.2.12-1 +- Update to 3.2.12 + * Mon Oct 30 2023 Jakub Ružička - 3.2.11-1 - Update to 3.2.11 diff --git a/sources b/sources index 362c93f..675ab8f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.11.tar.xz) = 19359c45ae0be7554d7367e3f34de0a4fc1ebf2ccad5715af88c4422942c609c09496497741cced5b9e01f77cf85cd8b766757d48d3f310d371efb0b8c247b19 -SHA512 (knot-3.2.11.tar.xz.asc) = afd87fe80f58f5850ca40c031d5d53004fcd81a92af0429c337f58514a8d0263d8f6350f35c5268963b1299b7f0f32a5e2dea6289a664e770d1ed3a9b31ee889 +SHA512 (knot-3.2.12.tar.xz) = 13b0c1187e0a24c55942f624b5b217606de6ecbd273b9a02ff9d8154a0b69ef91fb2c3aab9fbb2c2e6c644e6b9358e5251700f2184cbde4469b43a02e2ecc261 +SHA512 (knot-3.2.12.tar.xz.asc) = db7585e94e61b4c4bc84e0e3577da08ddb94bb899e67f630205bd06fe5ae66fb4055d18562399d35cd8f24a04bfd03c4ba390971775e5b2df75e5092de3930ce From 6588aa46a89673f2aec3feada4fcbc0d76911e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 25 Jun 2024 18:18:28 +0200 Subject: [PATCH 65/65] Release 3.2.13-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 6df77b2..49320d8 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.12 +Version: 3.2.13 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -335,6 +335,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Tue Jun 25 2024 Jakub Ružička - 3.2.13-1 +- Update to 3.2.13 + * Wed Jan 24 2024 Jakub Ružička - 3.2.12-1 - Update to 3.2.12 diff --git a/sources b/sources index 675ab8f..bfd502b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.12.tar.xz) = 13b0c1187e0a24c55942f624b5b217606de6ecbd273b9a02ff9d8154a0b69ef91fb2c3aab9fbb2c2e6c644e6b9358e5251700f2184cbde4469b43a02e2ecc261 -SHA512 (knot-3.2.12.tar.xz.asc) = db7585e94e61b4c4bc84e0e3577da08ddb94bb899e67f630205bd06fe5ae66fb4055d18562399d35cd8f24a04bfd03c4ba390971775e5b2df75e5092de3930ce +SHA512 (knot-3.2.13.tar.xz) = ed68faa1d8eba375ca7e22599bafab782f82c3510ec4e3d8a063cbf55c4ee5d5be91a1a045d71e53a36769ec099e252c959471cbc70c1afee2bee4d453732f10 +SHA512 (knot-3.2.13.tar.xz.asc) = e5c58e06fa637b0a3e020383e7bd8ebca47d094085680a5c65ff4fbbbce47453c887e0ebd4cd05947a704ce1eac2268cdfda27c32c35db7d1ac5b0cb644f311e