From 2c1e7ad24afd89a6766e961e81a4dc3172148bf8 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Thu, 20 Dec 2012 09:38:52 -0500 Subject: [PATCH 001/214] * Initial package --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index e69de29..27cd025 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/knot-1.1.3.tar.gz diff --git a/sources b/sources index e69de29..28bb2f6 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b3b0eb91ce2e54fbb22a06b338e45161 knot-1.1.3.tar.gz From 4539ee4484e3e901d208899a327791e6da21d8db Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Thu, 20 Dec 2012 09:45:52 -0500 Subject: [PATCH 002/214] * add spec --- knot.spec | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 knot.spec diff --git a/knot.spec b/knot.spec new file mode 100644 index 0000000..6663eda --- /dev/null +++ b/knot.spec @@ -0,0 +1,148 @@ +Summary: An authoritative DNS daemon +Name: knot +Version: 1.1.3 +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.gz +Source1: %{name}.service +Source2: %{name}.conf + +BuildRequires: flex userspace-rcu-devel openssl-devel +BuildRequires: bison systemd-units libcap-ng-devel +BuildRequires: texinfo + +Requires(post): systemd-units info +Requires(preun): systemd-units info +Requires(postun): systemd-units + +%description +KNOT DNS is a high-performance authoritative DNS server implementation. + +%prep +%setup -q -n %{name}-%{version} + +%build +CFLAGS="%{optflags} -lgcc_eh" CXXFLAGS="%{optflags} -lgcc_eh" \ +./configure --prefix=%{_prefix} \ + --sysconfdir=%{_sysconfdir}/%{name} \ + --localstatedir=%{_sharedstatedir} \ + --libdir=%{_libdir} --libexecdir=%{_libexecdir}/%{name} +make %{?_smp_mflags} + +%install +make install DESTDIR=%{buildroot} +rm %{buildroot}/%{_datadir}/info/dir +install -d %{buildroot}/%{_sharedstatedir}/%{name} +install -d %{buildroot}/%{_unitdir} +install -p -m644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}.service +install -p -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf + +%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 + +%post +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : +if [ $1 -eq 1 ]; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi + +%preun +if [ $1 -eq 0 ] ; then + # run before a package is removed + /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || : + /bin/systemctl stop %{name}.service > /dev/null 2>&1 || : + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : +fi + +%postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # run after a package is removed + /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +%files +%defattr(-,root,root) +%dir %attr(750,root,root) %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%exclude %{_sysconfdir}/%{name}/example.com.zone +%exclude %{_sysconfdir}/%{name}/knot.sample.conf +%{_sbindir}/* +%{_libexecdir}/%{name} +%exclude %{_libexecdir}/%{name}/unittests* +%{_mandir}/man8/%{name}*.8* +%{_mandir}/man5/%{name}*.5* +%{_unitdir}/%{name}.service +%dir %{_sharedstatedir}/%{name} +%doc COPYING AUTHORS RELNOTES KNOWN_ISSUES README +%doc samples/bogus25.com.zone samples/example.com.zone.signed samples/knot.full.conf +%doc samples/example.com.zone samples/example.com.zone.signed.nsec3 samples/knot.min.conf +%doc %{_infodir}/knot.info.gz + +%changelog +* Thu Dec 20 2012 Paul Wouters - 1.1.3-1 +- Initial build for Fedora + +* Thu Nov 22 2012 Ondřej Surý - 1.1.2-1 +- Update to 1.1.2 + +* Wed Nov 7 2012 Stanislav Petr - 1.1.1-1 +- Fixed build problem +- Update to 1.1.1 +- Add man5 directory +- Add knot.info.gz to infodir + +* Mon Aug 27 2012 Stanislav Petr - 1.1.0-1 +- Update to 1.1.0-rc2 +- Fix default knot.conf +- Add build dependency to texinfo + +* Fri May 15 2012 Stanislav Petr - 1.0.6-2 +- Try to fix compilation problem on some systems - force add -lgcc_eh to gcc flags + +* Wed May 13 2012 Stanislav Petr - 1.0.6-1 +- Update to versio 1.0.6 +- Change attrs to 750 on /etc/knot - only for root (knot configuration can contain DNS keys for zone updates) +- Clean content in /etc/knot + +* Thu May 1 2012 Stanislav Petr - 1.0.5-1 +- Update to version 1.0.5 + +* Wed Apr 18 2012 Stanislav Petr - 1.0.3-1 +- Fixed knot directory ownership. +- Update to version 1.0.3 +- Merget changes from Paul Wouters +- Removed unnecessary commands pro %%post script +- Add knot user +- More configuration samples in /usr/share/doc/knot + +* Thu Mar 1 2012 Stanislav Petr - 1.0.0-4 +- Update to upstream version 1.0.0 +- Fix %%{_sharedstatedir} usage in .spec. +- Fix file and directories ownership +- Fix service upgrade in postun in rpm. +- Do not install unittests. + +* Wed Jan 25 2012 Stanislav Petr - 0.9.1-3 +- Update to upstream version 0.9.1 + +* Mon Dec 12 2011 Stanislav Petr - 0.8.1-3 +- Add docs (COPYING AUTHORS RELNOTES KNOWN_ISSUES) +- Update rpm building options. + Use %%{_sharedstatedir} instead of %%{_var}/lib, + dafault value for %%{buildroot} path +- Remove ldconfig from post and postun in rpm. +- Update licence to GPLv3+ + +* Wed Dec 07 2011 Stanislav Petr - 0.8.1-2 +- RPM build fix + +* Mon Dec 05 2011 Stanislav Petr - 0.8.1-1 +- Create From b48f66eb026962198836fb23e8f06858652930b7 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Thu, 20 Dec 2012 10:04:57 -0500 Subject: [PATCH 003/214] * knot files --- knot.conf | 16 ++++++++++++++++ knot.service | 13 +++++++++++++ knot.sysconfig | 4 ++++ 3 files changed, 33 insertions(+) create mode 100644 knot.conf create mode 100644 knot.service create mode 100644 knot.sysconfig diff --git a/knot.conf b/knot.conf new file mode 100644 index 0000000..4bd9636 --- /dev/null +++ b/knot.conf @@ -0,0 +1,16 @@ +system { + storage "/var/lib/knot"; + pidfile "/var/run/knot.pid"; +} + +interfaces { + my-lo { + address 127.0.0.1; + port 53; + } +} + +log { + syslog { any warning, error; } +} + diff --git a/knot.service b/knot.service new file mode 100644 index 0000000..763846b --- /dev/null +++ b/knot.service @@ -0,0 +1,13 @@ +[Unit] +Description=Knot DNS server daemon +After=syslog.target network.target auditd.service + +[Service] +#EnvironmentFile=/etc/sysconfig/knot +ExecStart=/usr/sbin/knotd $OPTIONS +ExecReload=/usr/sbin/knotc reload +Restart=on-abort + +[Install] +WantedBy=multi-user.target + diff --git a/knot.sysconfig b/knot.sysconfig new file mode 100644 index 0000000..b365b4b --- /dev/null +++ b/knot.sysconfig @@ -0,0 +1,4 @@ +# Settings for the KNOT DNS daemon. +# KNOTARGS= : any extra command-line startup arguments for knot dns +KNOTARGS="" + From 08134e654392cdefc28f01162f28035abfeda4f9 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Thu, 20 Dec 2012 13:11:51 -0500 Subject: [PATCH 004/214] * use new systemd macros --- knot.spec | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/knot.spec b/knot.spec index 6663eda..7cb7ac0 100644 --- a/knot.spec +++ b/knot.spec @@ -1,7 +1,7 @@ Summary: An authoritative DNS daemon Name: knot Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -13,9 +13,9 @@ BuildRequires: flex userspace-rcu-devel openssl-devel BuildRequires: bison systemd-units libcap-ng-devel BuildRequires: texinfo -Requires(post): systemd-units info -Requires(preun): systemd-units info -Requires(postun): systemd-units +Requires(post): systemd info +Requires(preun): systemd info +Requires(postun): systemd %description KNOT DNS is a high-performance authoritative DNS server implementation. @@ -48,25 +48,16 @@ exit 0 %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : -if [ $1 -eq 1 ]; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post knot.service %preun +%systemd_preun knot.service if [ $1 -eq 0 ] ; then - # run before a package is removed - /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || : - /bin/systemctl stop %{name}.service > /dev/null 2>&1 || : /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # run after a package is removed - /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : -fi +%systemd_postun %files %defattr(-,root,root) @@ -87,6 +78,9 @@ fi %doc %{_infodir}/knot.info.gz %changelog +* Thu Dec 20 2012 Paul Wouters - 1.1.3-2 +- Use new systemd macros + * Thu Dec 20 2012 Paul Wouters - 1.1.3-1 - Initial build for Fedora From a4342680a1eecb90322092fd7dc0a4100a3d4eb1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 21:28:05 -0600 Subject: [PATCH 005/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 7cb7ac0..f08ae85 100644 --- a/knot.spec +++ b/knot.spec @@ -1,7 +1,7 @@ Summary: An authoritative DNS daemon Name: knot Version: 1.1.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -78,6 +78,9 @@ fi %doc %{_infodir}/knot.info.gz %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Dec 20 2012 Paul Wouters - 1.1.3-2 - Use new systemd macros From 402c5781a209bbcae19aba89a514cc0866f7ade5 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Fri, 5 Apr 2013 13:05:45 -0400 Subject: [PATCH 006/214] * Fri Apr 05 2013 Paul Wouters - 1.2.0-1 - Updated to 1.2.0-1 - Enabled hardening/relro/pie protection --- .gitignore | 1 + knot.spec | 19 ++++++++++++------- sources | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 27cd025..6f74995 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /knot-1.1.3.tar.gz +/knot-1.2.0.tar.gz diff --git a/knot.spec b/knot.spec index f08ae85..87fb7d3 100644 --- a/knot.spec +++ b/knot.spec @@ -1,7 +1,9 @@ +%global _hardened_build 1 + Summary: An authoritative DNS daemon Name: knot -Version: 1.1.3 -Release: 3%{?dist} +Version: 1.2.0 +Release: 1%{?dist} License: GPLv3+ Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -24,11 +26,10 @@ KNOT DNS is a high-performance authoritative DNS server implementation. %setup -q -n %{name}-%{version} %build -CFLAGS="%{optflags} -lgcc_eh" CXXFLAGS="%{optflags} -lgcc_eh" \ -./configure --prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir}/%{name} \ - --localstatedir=%{_sharedstatedir} \ - --libdir=%{_libdir} --libexecdir=%{_libexecdir}/%{name} +export CFLAGS="%{optflags} -fPIC -Wall -lgcc_eh" CXXFLAGS="%{optflags} -lgcc_eh" +export DFLAGS="$RPM_OPT_FLAGS -g " +export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" +%configure --sysconfdir=%{_sysconfdir}/%{name} --libexecdir=%{_libexecdir}/%{name} make %{?_smp_mflags} %install @@ -78,6 +79,10 @@ fi %doc %{_infodir}/knot.info.gz %changelog +* Fri Apr 05 2013 Paul Wouters - 1.2.0-1 +- Updated to 1.2.0-1 +- Enabled hardening/relro/pie protection + * Thu Feb 14 2013 Fedora Release Engineering - 1.1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 28bb2f6..4a19565 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b3b0eb91ce2e54fbb22a06b338e45161 knot-1.1.3.tar.gz +c64f1078a37ff04c157e5ad458340ebc knot-1.2.0.tar.gz From 025b2fd7d603fc7a8d7cdbcae172f3b77fa0b07f Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 3 Jul 2013 12:58:12 +0200 Subject: [PATCH 007/214] fix wrong dates in changelog --- knot.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 87fb7d3..ec3168a 100644 --- a/knot.spec +++ b/knot.spec @@ -106,15 +106,15 @@ fi - Fix default knot.conf - Add build dependency to texinfo -* Fri May 15 2012 Stanislav Petr - 1.0.6-2 +* Tue May 15 2012 Stanislav Petr - 1.0.6-2 - Try to fix compilation problem on some systems - force add -lgcc_eh to gcc flags -* Wed May 13 2012 Stanislav Petr - 1.0.6-1 +* Sun May 13 2012 Stanislav Petr - 1.0.6-1 - Update to versio 1.0.6 - Change attrs to 750 on /etc/knot - only for root (knot configuration can contain DNS keys for zone updates) - Clean content in /etc/knot -* Thu May 1 2012 Stanislav Petr - 1.0.5-1 +* Tue May 1 2012 Stanislav Petr - 1.0.5-1 - Update to version 1.0.5 * Wed Apr 18 2012 Stanislav Petr - 1.0.3-1 From 56367262d1a3be4526ea1e4a876138ef5e5667d6 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 3 Jul 2013 13:00:25 +0200 Subject: [PATCH 008/214] update to 1.3.0-rc3 - update to 1.3.0-rc3 - update configuration - disable assertions in the code (define NDEBUG) - enable unit tests as a part of RPM build process - enable fast zone parser - fix wrong dates in changelog --- knot.conf | 30 +++++++++++++----- knot.service | 4 +-- knot.spec | 84 +++++++++++++++++++++++++++++++------------------- knot.sysconfig | 4 --- knot.tmpfiles | 2 ++ 5 files changed, 79 insertions(+), 45 deletions(-) delete mode 100644 knot.sysconfig create mode 100644 knot.tmpfiles diff --git a/knot.conf b/knot.conf index 4bd9636..26b9d2e 100644 --- a/knot.conf +++ b/knot.conf @@ -1,16 +1,32 @@ +# +# Documentation: +# - /usr/share/doc/knot-*/samples/knot.full.conf +# - man knot.conf +# - info Knot +# + system { - storage "/var/lib/knot"; - pidfile "/var/run/knot.pid"; + storage "/var/lib/knot"; + rundir "/var/run/knot"; } interfaces { - my-lo { - address 127.0.0.1; - port 53; - } + local { + address 127.0.0.1; + port 53; + } +} + +control { + listen-on "knot.sock"; } log { - syslog { any warning, error; } + syslog { any warning, error; } } +zones { +# example.com { +# file "example.com.zone"; +# } +} diff --git a/knot.service b/knot.service index 763846b..40ae622 100644 --- a/knot.service +++ b/knot.service @@ -3,11 +3,9 @@ Description=Knot DNS server daemon After=syslog.target network.target auditd.service [Service] -#EnvironmentFile=/etc/sysconfig/knot -ExecStart=/usr/sbin/knotd $OPTIONS +ExecStart=/usr/sbin/knotd ExecReload=/usr/sbin/knotc reload Restart=on-abort [Install] WantedBy=multi-user.target - diff --git a/knot.spec b/knot.spec index ec3168a..96240a4 100644 --- a/knot.spec +++ b/knot.spec @@ -1,44 +1,61 @@ %global _hardened_build 1 +%global alphatag rc3 Summary: An authoritative DNS daemon Name: knot -Version: 1.2.0 -Release: 1%{?dist} +Version: 1.3.0 +Release: 0.1.%{alphatag}%{?dist} License: GPLv3+ Group: System Environment/Daemons URL: http://www.knot-dns.cz -Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.gz +Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}-%{alphatag}.tar.gz Source1: %{name}.service Source2: %{name}.conf +Source3: %{name}.tmpfiles -BuildRequires: flex userspace-rcu-devel openssl-devel -BuildRequires: bison systemd-units libcap-ng-devel +BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel libcap-ng-devel BuildRequires: texinfo +BuildRequires: systemd-units Requires(post): systemd info Requires(preun): systemd info Requires(postun): systemd %description -KNOT DNS is a high-performance authoritative DNS server implementation. +Knot DNS is a high-performance authoritative DNS server implementation. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}-%{alphatag} %build -export CFLAGS="%{optflags} -fPIC -Wall -lgcc_eh" CXXFLAGS="%{optflags} -lgcc_eh" -export DFLAGS="$RPM_OPT_FLAGS -g " -export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" -%configure --sysconfdir=%{_sysconfdir}/%{name} --libexecdir=%{_libexecdir}/%{name} +# disable debug code (causes unused warnings) +CFLAGS="%{optflags} -DNDEBUG -Wno-unused" +%configure --sysconfdir=%{_sysconfdir}/%{name} --enable-fastparser make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -rm %{buildroot}/%{_datadir}/info/dir -install -d %{buildroot}/%{_sharedstatedir}/%{name} -install -d %{buildroot}/%{_unitdir} -install -p -m644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}.service -install -p -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf + +# info database is updated at install time +rm %{buildroot}%{_datadir}/info/dir + +# install customized configuration file +rm %{buildroot}%{_sysconfdir}/%{name}/* +install -p -m 0644 -D %{SOURCE2} %{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 -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name} + +# install config samples into docdir +install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}/samples +for sample_file in knot.full.conf knot.keys.conf example.com.zone; do + install -p -m 0644 samples/${sample_file} %{buildroot}%{_docdir}/%{name}-%{version}/samples +done + +%check +make check %pre getent group knot >/dev/null || groupadd -r knot @@ -61,24 +78,29 @@ fi %systemd_postun %files -%defattr(-,root,root) -%dir %attr(750,root,root) %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf -%exclude %{_sysconfdir}/%{name}/example.com.zone -%exclude %{_sysconfdir}/%{name}/knot.sample.conf -%{_sbindir}/* -%{_libexecdir}/%{name} -%exclude %{_libexecdir}/%{name}/unittests* -%{_mandir}/man8/%{name}*.8* -%{_mandir}/man5/%{name}*.5* +%doc COPYING AUTHORS NEWS README THANKS +%dir %attr(750,root,knot) %{_sysconfdir}/%{name} +%config(noreplace) %attr(640,root,knot) %{_sysconfdir}/%{name}/%{name}.conf +%dir %attr(-,knot,knot) %{_sharedstatedir}/%{name} +%dir %attr(-,knot,knot) %{_localstatedir}/run/%{name} %{_unitdir}/%{name}.service -%dir %{_sharedstatedir}/%{name} -%doc COPYING AUTHORS RELNOTES KNOWN_ISSUES README -%doc samples/bogus25.com.zone samples/example.com.zone.signed samples/knot.full.conf -%doc samples/example.com.zone samples/example.com.zone.signed.nsec3 samples/knot.min.conf -%doc %{_infodir}/knot.info.gz +%{_tmpfilesdir}/%{name}.conf +%{_bindir}/* +%{_sbindir}/* +%{_mandir}/man1/* +%{_mandir}/man5/* +%{_mandir}/man8/* +%doc %{_infodir}/%{name}.info.gz %changelog +* Wed Jul 03 2013 Jan Vcelak 1.3.0-0.1.rc3 +- update to 1.3.0-rc3 +- update configuration +- disable assertions in the code (define NDEBUG) +- enable unit tests as a part of RPM build process +- enable fast zone parser +- fix wrong dates in changelog + * Fri Apr 05 2013 Paul Wouters - 1.2.0-1 - Updated to 1.2.0-1 - Enabled hardening/relro/pie protection diff --git a/knot.sysconfig b/knot.sysconfig deleted file mode 100644 index b365b4b..0000000 --- a/knot.sysconfig +++ /dev/null @@ -1,4 +0,0 @@ -# Settings for the KNOT DNS daemon. -# KNOTARGS= : any extra command-line startup arguments for knot dns -KNOTARGS="" - diff --git a/knot.tmpfiles b/knot.tmpfiles new file mode 100644 index 0000000..422c419 --- /dev/null +++ b/knot.tmpfiles @@ -0,0 +1,2 @@ +# Knot DNS runtime directory +d /var/run/knot 0755 knot knot - From 2491b7a2f644cdeac9fa1f44cb0d72778961ded2 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 3 Jul 2013 18:27:01 +0200 Subject: [PATCH 009/214] upload knot-1.3.0-rc3.tar.gz --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6f74995..208673a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /knot-1.1.3.tar.gz /knot-1.2.0.tar.gz +/knot-1.3.0-rc3.tar.gz diff --git a/sources b/sources index 4a19565..997b7c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c64f1078a37ff04c157e5ad458340ebc knot-1.2.0.tar.gz +6ab52df20e93c4a9ccb66fafde74551f knot-1.3.0-rc3.tar.gz From 7c235c00e4756821c7d309449b813a08154a2896 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 15 Jul 2013 14:27:36 +0200 Subject: [PATCH 010/214] update to 1.3.0-rc4 --- .gitignore | 1 + ...default-configuration-file-load-path.patch | 25 +++++++++++++++++++ knot.spec | 13 +++++++--- sources | 2 +- 4 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 0001-config-fix-default-configuration-file-load-path.patch diff --git a/.gitignore b/.gitignore index 208673a..2b926a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /knot-1.1.3.tar.gz /knot-1.2.0.tar.gz /knot-1.3.0-rc3.tar.gz +/knot-1.3.0-rc4.tar.gz diff --git a/0001-config-fix-default-configuration-file-load-path.patch b/0001-config-fix-default-configuration-file-load-path.patch new file mode 100644 index 0000000..0184bcc --- /dev/null +++ b/0001-config-fix-default-configuration-file-load-path.patch @@ -0,0 +1,25 @@ +From 432027f7cd31be315d267e073e1034c9737fc419 Mon Sep 17 00:00:00 2001 +From: Jan Vcelak +Date: Mon, 15 Jul 2013 14:14:49 +0200 +Subject: [PATCH] config: fix default configuration file load path + +--- + src/knot/conf/conf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/knot/conf/conf.c b/src/knot/conf/conf.c +index 9830c04..87c9a00 100644 +--- a/src/knot/conf/conf.c ++++ b/src/knot/conf/conf.c +@@ -37,7 +37,7 @@ + + /*! \brief Default config paths. */ + static const char *DEFAULT_CONFIG[] = { +- SYSCONFDIR "/" "knot.conf", ++ CONFIG_DIR "/" "knot.conf", + }; + + #define DEFAULT_CONF_COUNT 1 /*!< \brief Number of default config paths. */ +-- +1.8.3.1 + diff --git a/knot.spec b/knot.spec index 96240a4..6535086 100644 --- a/knot.spec +++ b/knot.spec @@ -1,17 +1,18 @@ %global _hardened_build 1 -%global alphatag rc3 +%global alphatag rc4 Summary: An authoritative DNS daemon Name: knot Version: 1.3.0 -Release: 0.1.%{alphatag}%{?dist} -License: GPLv3+ +Release: 0.2.%{alphatag}%{?dist} +License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}-%{alphatag}.tar.gz Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles +Patch0: 0001-config-fix-default-configuration-file-load-path.patch BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel libcap-ng-devel BuildRequires: texinfo @@ -26,11 +27,12 @@ Knot DNS is a high-performance authoritative DNS server implementation. %prep %setup -q -n %{name}-%{version}-%{alphatag} +%patch0 -p1 %build # disable debug code (causes unused warnings) CFLAGS="%{optflags} -DNDEBUG -Wno-unused" -%configure --sysconfdir=%{_sysconfdir}/%{name} --enable-fastparser +%configure --enable-fastparser make %{?_smp_mflags} %install @@ -93,6 +95,9 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Mon Jul 15 2013 Jan Vcelak 1.3.0-0.2.rc4 +- update to 1.3.0-rc4 + * Wed Jul 03 2013 Jan Vcelak 1.3.0-0.1.rc3 - update to 1.3.0-rc3 - update configuration diff --git a/sources b/sources index 997b7c1..81650fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ab52df20e93c4a9ccb66fafde74551f knot-1.3.0-rc3.tar.gz +e9175391abd6e0da0076179f92461457 knot-1.3.0-rc4.tar.gz From cd6c4e50b489ef64a7d61f52b73c47423da9c02c Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 15 Jul 2013 13:38:34 -0400 Subject: [PATCH 011/214] * Mon Jul 15 2013 Paul Wouters - 1.3.0-0.3.rc4 - Added Alias=knotd.service alias to service file - Added ExecStartPre=/usr/sbin/knotc checkconf to service file --- knot.service | 2 ++ knot.spec | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/knot.service b/knot.service index 40ae622..63126b7 100644 --- a/knot.service +++ b/knot.service @@ -6,6 +6,8 @@ After=syslog.target network.target auditd.service ExecStart=/usr/sbin/knotd ExecReload=/usr/sbin/knotc reload Restart=on-abort +ExecStartPre=/usr/sbin/knotc checkconf [Install] WantedBy=multi-user.target +Alias=knotd.service diff --git a/knot.spec b/knot.spec index 6535086..351742b 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: An authoritative DNS daemon Name: knot Version: 1.3.0 -Release: 0.2.%{alphatag}%{?dist} +Release: 0.3.%{alphatag}%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -95,6 +95,10 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Mon Jul 15 2013 Paul Wouters - 1.3.0-0.3.rc4 +- Added Alias=knotd.service alias to service file +- Added ExecStartPre=/usr/sbin/knotc checkconf to service file + * Mon Jul 15 2013 Jan Vcelak 1.3.0-0.2.rc4 - update to 1.3.0-rc4 From 12d2e725c5c130f3446be1982f5d9c9f1f511737 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 29 Jul 2013 17:54:52 +0200 Subject: [PATCH 012/214] update to 1.3.0-rc5 --- .gitignore | 1 + ...default-configuration-file-load-path.patch | 25 ------------------- knot.spec | 9 ++++--- sources | 2 +- 4 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 0001-config-fix-default-configuration-file-load-path.patch diff --git a/.gitignore b/.gitignore index 2b926a4..4bb7d64 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /knot-1.2.0.tar.gz /knot-1.3.0-rc3.tar.gz /knot-1.3.0-rc4.tar.gz +/knot-1.3.0-rc5.tar.gz diff --git a/0001-config-fix-default-configuration-file-load-path.patch b/0001-config-fix-default-configuration-file-load-path.patch deleted file mode 100644 index 0184bcc..0000000 --- a/0001-config-fix-default-configuration-file-load-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 432027f7cd31be315d267e073e1034c9737fc419 Mon Sep 17 00:00:00 2001 -From: Jan Vcelak -Date: Mon, 15 Jul 2013 14:14:49 +0200 -Subject: [PATCH] config: fix default configuration file load path - ---- - src/knot/conf/conf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/knot/conf/conf.c b/src/knot/conf/conf.c -index 9830c04..87c9a00 100644 ---- a/src/knot/conf/conf.c -+++ b/src/knot/conf/conf.c -@@ -37,7 +37,7 @@ - - /*! \brief Default config paths. */ - static const char *DEFAULT_CONFIG[] = { -- SYSCONFDIR "/" "knot.conf", -+ CONFIG_DIR "/" "knot.conf", - }; - - #define DEFAULT_CONF_COUNT 1 /*!< \brief Number of default config paths. */ --- -1.8.3.1 - diff --git a/knot.spec b/knot.spec index 351742b..be435d6 100644 --- a/knot.spec +++ b/knot.spec @@ -1,10 +1,10 @@ %global _hardened_build 1 -%global alphatag rc4 +%global alphatag rc5 Summary: An authoritative DNS daemon Name: knot Version: 1.3.0 -Release: 0.3.%{alphatag}%{?dist} +Release: 0.4.%{alphatag}%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -12,7 +12,6 @@ Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}-%{alphatag}.tar. Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles -Patch0: 0001-config-fix-default-configuration-file-load-path.patch BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel libcap-ng-devel BuildRequires: texinfo @@ -27,7 +26,6 @@ Knot DNS is a high-performance authoritative DNS server implementation. %prep %setup -q -n %{name}-%{version}-%{alphatag} -%patch0 -p1 %build # disable debug code (causes unused warnings) @@ -95,6 +93,9 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Mon Jul 29 2013 Jan Vcelak 1.3.0-0.4.rc5 +- update to 1.3.0-rc5 + * Mon Jul 15 2013 Paul Wouters - 1.3.0-0.3.rc4 - Added Alias=knotd.service alias to service file - Added ExecStartPre=/usr/sbin/knotc checkconf to service file diff --git a/sources b/sources index 81650fd..26e73fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e9175391abd6e0da0076179f92461457 knot-1.3.0-rc4.tar.gz +adf0c359488a8994aacb64d66ba9ecd8 knot-1.3.0-rc5.tar.gz From 61b93d096f4e83c6790d5c03f33339a628f0ce4e Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 29 Jul 2013 19:24:54 +0200 Subject: [PATCH 013/214] fix build on rawhide Add directory with sample configuration files into %files section. It was not needed in F19 from some reason. --- knot.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/knot.spec b/knot.spec index be435d6..b105069 100644 --- a/knot.spec +++ b/knot.spec @@ -79,6 +79,7 @@ fi %files %doc COPYING AUTHORS NEWS README THANKS +%doc %{_docdir}/%{name}-%{version}/samples %dir %attr(750,root,knot) %{_sysconfdir}/%{name} %config(noreplace) %attr(640,root,knot) %{_sysconfdir}/%{name}/%{name}.conf %dir %attr(-,knot,knot) %{_sharedstatedir}/%{name} From 9a89f45eb13ac0d1db6ae5ab0ee2135ffce5776e Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Sun, 1 Sep 2013 18:10:32 +0200 Subject: [PATCH 014/214] update to 1.3.1 --- .gitignore | 6 +----- knot.spec | 12 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 4bb7d64..0209c54 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -/knot-1.1.3.tar.gz -/knot-1.2.0.tar.gz -/knot-1.3.0-rc3.tar.gz -/knot-1.3.0-rc4.tar.gz -/knot-1.3.0-rc5.tar.gz +/knot-*.tar.gz diff --git a/knot.spec b/knot.spec index b105069..4d1dadb 100644 --- a/knot.spec +++ b/knot.spec @@ -1,14 +1,13 @@ %global _hardened_build 1 -%global alphatag rc5 Summary: An authoritative DNS daemon Name: knot -Version: 1.3.0 -Release: 0.4.%{alphatag}%{?dist} +Version: 1.3.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}-%{alphatag}.tar.gz +Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.gz Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles @@ -25,7 +24,7 @@ Requires(postun): systemd Knot DNS is a high-performance authoritative DNS server implementation. %prep -%setup -q -n %{name}-%{version}-%{alphatag} +%setup -q %build # disable debug code (causes unused warnings) @@ -94,6 +93,9 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Sun Sep 01 2013 Jan Vcelak 1.3.1-1 +- update to 1.3.1 + * Mon Jul 29 2013 Jan Vcelak 1.3.0-0.4.rc5 - update to 1.3.0-rc5 diff --git a/sources b/sources index 26e73fd..af9e0ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -adf0c359488a8994aacb64d66ba9ecd8 knot-1.3.0-rc5.tar.gz +9230b08b21cd2c38e0292d7620c1380f knot-1.3.1.tar.gz From 7bcbcaf1f88f0059d0fc397d7475824f758e56da Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Sun, 1 Sep 2013 18:10:47 +0200 Subject: [PATCH 015/214] use unversioned documentation directory https://fedoraproject.org/wiki/Changes/UnversionedDocdirs Resolves: #993904 --- knot.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 4d1dadb..193ab7b 100644 --- a/knot.spec +++ b/knot.spec @@ -1,4 +1,5 @@ %global _hardened_build 1 +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Summary: An authoritative DNS daemon Name: knot @@ -48,9 +49,9 @@ install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_tmpfilesdir}/%{name}.conf install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name} # install config samples into docdir -install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}/samples +install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples for sample_file in knot.full.conf knot.keys.conf example.com.zone; do - install -p -m 0644 samples/${sample_file} %{buildroot}%{_docdir}/%{name}-%{version}/samples + install -p -m 0644 samples/${sample_file} %{buildroot}%{_pkgdocdir}/samples done %check @@ -78,7 +79,6 @@ fi %files %doc COPYING AUTHORS NEWS README THANKS -%doc %{_docdir}/%{name}-%{version}/samples %dir %attr(750,root,knot) %{_sysconfdir}/%{name} %config(noreplace) %attr(640,root,knot) %{_sysconfdir}/%{name}/%{name}.conf %dir %attr(-,knot,knot) %{_sharedstatedir}/%{name} From 8eff4beb40b5ba90ea0224ae1b85135297b78e17 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Tue, 1 Oct 2013 09:26:46 +0200 Subject: [PATCH 016/214] update to 1.3.2 --- knot.spec | 8 +++++++- sources | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index 193ab7b..99a107f 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -93,6 +93,12 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Tue Oct 01 2013 Jan Vcelak 1.3.2-1 +- update to 1.3.2 + + possibility to set max UDP payload in EDNS0 + + fixed bug limiting payload size in some TCP responses + + fixed closing of file descriptors for included files in config + * Sun Sep 01 2013 Jan Vcelak 1.3.1-1 - update to 1.3.1 diff --git a/sources b/sources index af9e0ce..aada82e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9230b08b21cd2c38e0292d7620c1380f knot-1.3.1.tar.gz +0c49d0ab18b975132c138db6e4cf9f66 knot-1.3.2.tar.gz From 5f6eb395ca08a77a28380e59de99511e4d2b7094 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Tue, 8 Oct 2013 15:06:25 +0200 Subject: [PATCH 017/214] fix failing wire reading/writing tests on big endian Resolves: #1015976 --- 0001-update-wire-read-write-tests.patch | 126 ++++++++++++++++++++++++ knot.spec | 8 +- 2 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 0001-update-wire-read-write-tests.patch diff --git a/0001-update-wire-read-write-tests.patch b/0001-update-wire-read-write-tests.patch new file mode 100644 index 0000000..0b8e3eb --- /dev/null +++ b/0001-update-wire-read-write-tests.patch @@ -0,0 +1,126 @@ +From d71f8493fdb43c9522924efdd970b0e799cf0f84 Mon Sep 17 00:00:00 2001 +From: Jan Vcelak +Date: Tue, 8 Oct 2013 13:54:42 +0200 +Subject: [PATCH] update wire read/write tests + +Tests were failing on big-endian machines. + +refs #178 +--- + src/tests/libknot/wire_tests.c | 93 +++++++++--------------------------------- + 1 file changed, 19 insertions(+), 74 deletions(-) + +diff --git a/src/tests/libknot/wire_tests.c b/src/tests/libknot/wire_tests.c +index 7e4d001..51969ca 100644 +--- a/src/tests/libknot/wire_tests.c ++++ b/src/tests/libknot/wire_tests.c +@@ -27,87 +27,32 @@ unit_api wire_tests_api = { + &wire_tests_run + }; + ++#define write_test(size, value, ...) { \ ++ const uint8_t expect[] = { __VA_ARGS__ }; \ ++ uint8_t wdata[sizeof(expect)] = { 0x00 }; \ ++ knot_wire_write_u ## size(wdata, value); \ ++ ok(memcmp(wdata, expect, sizeof(expect)) == 0, "%d-bit write", size); \ ++} ++ + static int wire_tests_count(int argc, char *argv[]) + { + return 8; + } + +-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +- #define ENDIAN_MATCH(expression, match_little, match_big) \ +- ((expression) == (match_little)) +-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +- #define ENDIAN_MATCH(expression, match_little, match_big) \ +- ((expression) == (match_big)) +-#else +- #error Unsupported byte order. +-#endif +- + static int wire_tests_run(int argc, char *argv[]) + { +- // 1. - 16-bit read +- { +- uint16_t data = 0xAABB; +- ok(ENDIAN_MATCH(knot_wire_read_u16((uint8_t *)&data), +- 0xBBAA, 0xAABB), "16-bit read"); +- } +- +- // 2. - 16-bit read +- { +- uint16_t data_in = 0xAABB; +- uint64_t data_out = 0xFF0000; +- knot_wire_write_u16((uint8_t *)&data_out, data_in); +- ok(ENDIAN_MATCH(data_out, +- 0xFFBBAA, 0xFFAABB), "16-bit write"); +- } +- +- // 3. - 32-bit read +- { +- uint32_t data = 0xAABBCCDD; +- ok(ENDIAN_MATCH(knot_wire_read_u32((uint8_t *)&data), +- 0xDDCCBBAA, 0xAABBCCDD), "32-bit read"); +- } +- +- // 4. - 32-bit write +- { +- uint32_t data_in = 0xAABBCCDD; +- uint64_t data_out = 0xFF00000000; +- knot_wire_write_u32((uint8_t *)&data_out, data_in); +- ok(ENDIAN_MATCH(data_out, +- 0xFFDDCCBBAA, 0xFFAABBCCDD), "32-bit write"); +- +- } +- +- // 5. - 48-bit read +- { +- uint64_t data = 0x81AABBCCDDEEFF; +- ok(ENDIAN_MATCH(knot_wire_read_u48((uint8_t *)&data), +- 0xFFEEDDCCBBAA, 0xAABBCCDDEEFF), "48-bit read"); +- } +- +- // 6. - 48-bit write +- { +- uint64_t data_in = 0x81AABBCCDDEEFF; +- uint64_t data_out = 0xDD000000000000; +- knot_wire_write_u48((uint8_t *)&data_out, data_in); +- ok(ENDIAN_MATCH(data_out, +- 0xDDFFEEDDCCBBAA, 0xDDAABBCCDDEEFF), "48-bit write"); +- } +- +- // 7. - 64-bit read +- { +- uint64_t data = 0x8899AABBCCDDEEFF; +- ok(ENDIAN_MATCH(knot_wire_read_u64((uint8_t *)&data), +- 0xFFEEDDCCBBAA9988, 0x8899AABBCCDDEEFF), "64-bit read"); +- } +- +- // 8. - 64-bit write +- { +- uint64_t data_in = 0x8899AABBCCDDEEFF; +- uint64_t data_out = 0x0; +- knot_wire_write_u64((uint8_t *)&data_out, data_in); +- ok(ENDIAN_MATCH(data_out, +- 0xFFEEDDCCBBAA9988, 0x8899AABBCCDDEEFF), "64-bit write"); +- } ++ const uint8_t rdata[] = { 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff }; ++ ++ ok(knot_wire_read_u16(rdata) == 0x8899, "16-bit read"); ++ ok(knot_wire_read_u32(rdata) == 0x8899aabb, "32-bit read"); ++ ok(knot_wire_read_u48(rdata) == 0x8899aabbccdd, "48-bit read"); ++ ok(knot_wire_read_u64(rdata) == 0x8899aabbccddeeff, "64-bit read"); ++ ++ write_test(16, 0x1122, 0x11, 0x22); ++ write_test(32, 0x66778899, 0x66, 0x77, 0x88, 0x99); ++ write_test(48, 0xbbccdd778899, 0xbb, 0xcc, 0xdd, 0x77, 0x88, 0x99); ++ write_test(64, 0xbbccddee66778899, 0xbb, 0xcc, 0xdd, 0xee, ++ 0x66, 0x77, 0x88, 0x99); + + return 0; + } +-- +1.8.3.1 + diff --git a/knot.spec b/knot.spec index 99a107f..af6f510 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: An authoritative DNS daemon Name: knot Version: 1.3.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -13,6 +13,8 @@ Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles +Patch1: 0001-update-wire-read-write-tests.patch + BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel libcap-ng-devel BuildRequires: texinfo BuildRequires: systemd-units @@ -26,6 +28,7 @@ Knot DNS is a high-performance authoritative DNS server implementation. %prep %setup -q +%patch1 -p1 %build # disable debug code (causes unused warnings) @@ -93,6 +96,9 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Tue Oct 08 2013 Jan Vcelak 1.3.2-2 +- fix failing wire reading/writing tests on big endian (#1015976) + * Tue Oct 01 2013 Jan Vcelak 1.3.2-1 - update to 1.3.2 + possibility to set max UDP payload in EDNS0 From 996ed11186cb1d6d4d9b00e6db9596cdea2b16e1 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Tue, 26 Nov 2013 21:44:24 +0100 Subject: [PATCH 018/214] update to 1.4.0-rc1 - update sources, remove old patches - create directory for DNSSEC keys - update configuration file --- 0001-update-wire-read-write-tests.patch | 126 ------------------------ knot.conf | 11 ++- knot.spec | 25 +++-- sources | 1 + 4 files changed, 23 insertions(+), 140 deletions(-) delete mode 100644 0001-update-wire-read-write-tests.patch diff --git a/0001-update-wire-read-write-tests.patch b/0001-update-wire-read-write-tests.patch deleted file mode 100644 index 0b8e3eb..0000000 --- a/0001-update-wire-read-write-tests.patch +++ /dev/null @@ -1,126 +0,0 @@ -From d71f8493fdb43c9522924efdd970b0e799cf0f84 Mon Sep 17 00:00:00 2001 -From: Jan Vcelak -Date: Tue, 8 Oct 2013 13:54:42 +0200 -Subject: [PATCH] update wire read/write tests - -Tests were failing on big-endian machines. - -refs #178 ---- - src/tests/libknot/wire_tests.c | 93 +++++++++--------------------------------- - 1 file changed, 19 insertions(+), 74 deletions(-) - -diff --git a/src/tests/libknot/wire_tests.c b/src/tests/libknot/wire_tests.c -index 7e4d001..51969ca 100644 ---- a/src/tests/libknot/wire_tests.c -+++ b/src/tests/libknot/wire_tests.c -@@ -27,87 +27,32 @@ unit_api wire_tests_api = { - &wire_tests_run - }; - -+#define write_test(size, value, ...) { \ -+ const uint8_t expect[] = { __VA_ARGS__ }; \ -+ uint8_t wdata[sizeof(expect)] = { 0x00 }; \ -+ knot_wire_write_u ## size(wdata, value); \ -+ ok(memcmp(wdata, expect, sizeof(expect)) == 0, "%d-bit write", size); \ -+} -+ - static int wire_tests_count(int argc, char *argv[]) - { - return 8; - } - --#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -- #define ENDIAN_MATCH(expression, match_little, match_big) \ -- ((expression) == (match_little)) --#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -- #define ENDIAN_MATCH(expression, match_little, match_big) \ -- ((expression) == (match_big)) --#else -- #error Unsupported byte order. --#endif -- - static int wire_tests_run(int argc, char *argv[]) - { -- // 1. - 16-bit read -- { -- uint16_t data = 0xAABB; -- ok(ENDIAN_MATCH(knot_wire_read_u16((uint8_t *)&data), -- 0xBBAA, 0xAABB), "16-bit read"); -- } -- -- // 2. - 16-bit read -- { -- uint16_t data_in = 0xAABB; -- uint64_t data_out = 0xFF0000; -- knot_wire_write_u16((uint8_t *)&data_out, data_in); -- ok(ENDIAN_MATCH(data_out, -- 0xFFBBAA, 0xFFAABB), "16-bit write"); -- } -- -- // 3. - 32-bit read -- { -- uint32_t data = 0xAABBCCDD; -- ok(ENDIAN_MATCH(knot_wire_read_u32((uint8_t *)&data), -- 0xDDCCBBAA, 0xAABBCCDD), "32-bit read"); -- } -- -- // 4. - 32-bit write -- { -- uint32_t data_in = 0xAABBCCDD; -- uint64_t data_out = 0xFF00000000; -- knot_wire_write_u32((uint8_t *)&data_out, data_in); -- ok(ENDIAN_MATCH(data_out, -- 0xFFDDCCBBAA, 0xFFAABBCCDD), "32-bit write"); -- -- } -- -- // 5. - 48-bit read -- { -- uint64_t data = 0x81AABBCCDDEEFF; -- ok(ENDIAN_MATCH(knot_wire_read_u48((uint8_t *)&data), -- 0xFFEEDDCCBBAA, 0xAABBCCDDEEFF), "48-bit read"); -- } -- -- // 6. - 48-bit write -- { -- uint64_t data_in = 0x81AABBCCDDEEFF; -- uint64_t data_out = 0xDD000000000000; -- knot_wire_write_u48((uint8_t *)&data_out, data_in); -- ok(ENDIAN_MATCH(data_out, -- 0xDDFFEEDDCCBBAA, 0xDDAABBCCDDEEFF), "48-bit write"); -- } -- -- // 7. - 64-bit read -- { -- uint64_t data = 0x8899AABBCCDDEEFF; -- ok(ENDIAN_MATCH(knot_wire_read_u64((uint8_t *)&data), -- 0xFFEEDDCCBBAA9988, 0x8899AABBCCDDEEFF), "64-bit read"); -- } -- -- // 8. - 64-bit write -- { -- uint64_t data_in = 0x8899AABBCCDDEEFF; -- uint64_t data_out = 0x0; -- knot_wire_write_u64((uint8_t *)&data_out, data_in); -- ok(ENDIAN_MATCH(data_out, -- 0xFFEEDDCCBBAA9988, 0x8899AABBCCDDEEFF), "64-bit write"); -- } -+ const uint8_t rdata[] = { 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff }; -+ -+ ok(knot_wire_read_u16(rdata) == 0x8899, "16-bit read"); -+ ok(knot_wire_read_u32(rdata) == 0x8899aabb, "32-bit read"); -+ ok(knot_wire_read_u48(rdata) == 0x8899aabbccdd, "48-bit read"); -+ ok(knot_wire_read_u64(rdata) == 0x8899aabbccddeeff, "64-bit read"); -+ -+ write_test(16, 0x1122, 0x11, 0x22); -+ write_test(32, 0x66778899, 0x66, 0x77, 0x88, 0x99); -+ write_test(48, 0xbbccdd778899, 0xbb, 0xcc, 0xdd, 0x77, 0x88, 0x99); -+ write_test(64, 0xbbccddee66778899, 0xbb, 0xcc, 0xdd, 0xee, -+ 0x66, 0x77, 0x88, 0x99); - - return 0; - } --- -1.8.3.1 - diff --git a/knot.conf b/knot.conf index 26b9d2e..ee8b888 100644 --- a/knot.conf +++ b/knot.conf @@ -1,6 +1,6 @@ # # Documentation: -# - /usr/share/doc/knot-*/samples/knot.full.conf +# - /usr/share/doc/knot/samples/knot.full.conf # - man knot.conf # - info Knot # @@ -11,10 +11,8 @@ system { } interfaces { - local { - address 127.0.0.1; - port 53; - } + local_ipv4 { address 127.0.0.1@53; } + local_ipv6 { address ::1@53; } } control { @@ -26,6 +24,9 @@ log { } zones { + dnssec-keydir "keys"; + dnssec-enable off; + # example.com { # file "example.com.zone"; # } diff --git a/knot.spec b/knot.spec index af6f510..4314be4 100644 --- a/knot.spec +++ b/knot.spec @@ -1,20 +1,19 @@ %global _hardened_build 1 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%global alphatag rc1 Summary: An authoritative DNS daemon Name: knot -Version: 1.3.2 -Release: 2%{?dist} +Version: 1.4.0 +Release: 0.1.%{alphatag}%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz -Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.gz +Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}-%{alphatag}.tar.gz Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles -Patch1: 0001-update-wire-read-write-tests.patch - BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel libcap-ng-devel BuildRequires: texinfo BuildRequires: systemd-units @@ -27,13 +26,12 @@ Requires(postun): systemd Knot DNS is a high-performance authoritative DNS server implementation. %prep -%setup -q -%patch1 -p1 +%setup -q -n %{name}-%{version}-%{alphatag} %build # disable debug code (causes unused warnings) CFLAGS="%{optflags} -DNDEBUG -Wno-unused" -%configure --enable-fastparser +%configure make %{?_smp_mflags} %install @@ -51,6 +49,11 @@ install -p -m 0644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service install -p -m 0644 -D %{SOURCE3} %{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 config samples into docdir install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples for sample_file in knot.full.conf knot.keys.conf example.com.zone; do @@ -84,7 +87,8 @@ fi %doc COPYING AUTHORS NEWS README THANKS %dir %attr(750,root,knot) %{_sysconfdir}/%{name} %config(noreplace) %attr(640,root,knot) %{_sysconfdir}/%{name}/%{name}.conf -%dir %attr(-,knot,knot) %{_sharedstatedir}/%{name} +%dir %attr(775,root,knot) %{_sharedstatedir}/%{name} +%dir %attr(750,root,knot) %{_sharedstatedir}/%{name}/keys %dir %attr(-,knot,knot) %{_localstatedir}/run/%{name} %{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf @@ -96,6 +100,9 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Tue Nov 26 2013 Jan Vcelak 1.4.0-0.1.rc1 +- update to 1.4.0-rc1 + * Tue Oct 08 2013 Jan Vcelak 1.3.2-2 - fix failing wire reading/writing tests on big endian (#1015976) diff --git a/sources b/sources index aada82e..5037b05 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 0c49d0ab18b975132c138db6e4cf9f66 knot-1.3.2.tar.gz +314d441162540bc2b3dd6cc7e8a35503 knot-1.4.0-rc1.tar.gz From b09f21860da4d42448a30f8f099718834d12b6a1 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 13 Dec 2013 21:24:19 +0100 Subject: [PATCH 019/214] update to 1.4.0-rc2 --- knot.conf | 2 +- knot.spec | 7 +++++-- sources | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/knot.conf b/knot.conf index ee8b888..add902d 100644 --- a/knot.conf +++ b/knot.conf @@ -6,7 +6,6 @@ # system { - storage "/var/lib/knot"; rundir "/var/run/knot"; } @@ -24,6 +23,7 @@ log { } zones { + storage "/var/lib/knot"; dnssec-keydir "keys"; dnssec-enable off; diff --git a/knot.spec b/knot.spec index 4314be4..2783d58 100644 --- a/knot.spec +++ b/knot.spec @@ -1,11 +1,11 @@ %global _hardened_build 1 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -%global alphatag rc1 +%global alphatag rc2 Summary: An authoritative DNS daemon Name: knot Version: 1.4.0 -Release: 0.1.%{alphatag}%{?dist} +Release: 0.2.%{alphatag}%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -100,6 +100,9 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Fri Dec 13 2013 Jan Vcelak 1.4.0-0.2.rc2 +- update to 1.4.0-rc2 + * Tue Nov 26 2013 Jan Vcelak 1.4.0-0.1.rc1 - update to 1.4.0-rc1 diff --git a/sources b/sources index 5037b05..fac8dfd 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -0c49d0ab18b975132c138db6e4cf9f66 knot-1.3.2.tar.gz -314d441162540bc2b3dd6cc7e8a35503 knot-1.4.0-rc1.tar.gz +39f10b2332ed37ab642fc768c83fd23f knot-1.4.0-rc2.tar.gz From 7b448b538b4bb494c3b4dc900784a5c0f73250aa Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 13 Dec 2013 21:36:36 +0100 Subject: [PATCH 020/214] update to 1.3.4 --- 0001-update-wire-read-write-tests.patch | 126 ------------------------ knot.spec | 19 +++- sources | 2 +- 3 files changed, 15 insertions(+), 132 deletions(-) delete mode 100644 0001-update-wire-read-write-tests.patch diff --git a/0001-update-wire-read-write-tests.patch b/0001-update-wire-read-write-tests.patch deleted file mode 100644 index 0b8e3eb..0000000 --- a/0001-update-wire-read-write-tests.patch +++ /dev/null @@ -1,126 +0,0 @@ -From d71f8493fdb43c9522924efdd970b0e799cf0f84 Mon Sep 17 00:00:00 2001 -From: Jan Vcelak -Date: Tue, 8 Oct 2013 13:54:42 +0200 -Subject: [PATCH] update wire read/write tests - -Tests were failing on big-endian machines. - -refs #178 ---- - src/tests/libknot/wire_tests.c | 93 +++++++++--------------------------------- - 1 file changed, 19 insertions(+), 74 deletions(-) - -diff --git a/src/tests/libknot/wire_tests.c b/src/tests/libknot/wire_tests.c -index 7e4d001..51969ca 100644 ---- a/src/tests/libknot/wire_tests.c -+++ b/src/tests/libknot/wire_tests.c -@@ -27,87 +27,32 @@ unit_api wire_tests_api = { - &wire_tests_run - }; - -+#define write_test(size, value, ...) { \ -+ const uint8_t expect[] = { __VA_ARGS__ }; \ -+ uint8_t wdata[sizeof(expect)] = { 0x00 }; \ -+ knot_wire_write_u ## size(wdata, value); \ -+ ok(memcmp(wdata, expect, sizeof(expect)) == 0, "%d-bit write", size); \ -+} -+ - static int wire_tests_count(int argc, char *argv[]) - { - return 8; - } - --#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -- #define ENDIAN_MATCH(expression, match_little, match_big) \ -- ((expression) == (match_little)) --#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -- #define ENDIAN_MATCH(expression, match_little, match_big) \ -- ((expression) == (match_big)) --#else -- #error Unsupported byte order. --#endif -- - static int wire_tests_run(int argc, char *argv[]) - { -- // 1. - 16-bit read -- { -- uint16_t data = 0xAABB; -- ok(ENDIAN_MATCH(knot_wire_read_u16((uint8_t *)&data), -- 0xBBAA, 0xAABB), "16-bit read"); -- } -- -- // 2. - 16-bit read -- { -- uint16_t data_in = 0xAABB; -- uint64_t data_out = 0xFF0000; -- knot_wire_write_u16((uint8_t *)&data_out, data_in); -- ok(ENDIAN_MATCH(data_out, -- 0xFFBBAA, 0xFFAABB), "16-bit write"); -- } -- -- // 3. - 32-bit read -- { -- uint32_t data = 0xAABBCCDD; -- ok(ENDIAN_MATCH(knot_wire_read_u32((uint8_t *)&data), -- 0xDDCCBBAA, 0xAABBCCDD), "32-bit read"); -- } -- -- // 4. - 32-bit write -- { -- uint32_t data_in = 0xAABBCCDD; -- uint64_t data_out = 0xFF00000000; -- knot_wire_write_u32((uint8_t *)&data_out, data_in); -- ok(ENDIAN_MATCH(data_out, -- 0xFFDDCCBBAA, 0xFFAABBCCDD), "32-bit write"); -- -- } -- -- // 5. - 48-bit read -- { -- uint64_t data = 0x81AABBCCDDEEFF; -- ok(ENDIAN_MATCH(knot_wire_read_u48((uint8_t *)&data), -- 0xFFEEDDCCBBAA, 0xAABBCCDDEEFF), "48-bit read"); -- } -- -- // 6. - 48-bit write -- { -- uint64_t data_in = 0x81AABBCCDDEEFF; -- uint64_t data_out = 0xDD000000000000; -- knot_wire_write_u48((uint8_t *)&data_out, data_in); -- ok(ENDIAN_MATCH(data_out, -- 0xDDFFEEDDCCBBAA, 0xDDAABBCCDDEEFF), "48-bit write"); -- } -- -- // 7. - 64-bit read -- { -- uint64_t data = 0x8899AABBCCDDEEFF; -- ok(ENDIAN_MATCH(knot_wire_read_u64((uint8_t *)&data), -- 0xFFEEDDCCBBAA9988, 0x8899AABBCCDDEEFF), "64-bit read"); -- } -- -- // 8. - 64-bit write -- { -- uint64_t data_in = 0x8899AABBCCDDEEFF; -- uint64_t data_out = 0x0; -- knot_wire_write_u64((uint8_t *)&data_out, data_in); -- ok(ENDIAN_MATCH(data_out, -- 0xFFEEDDCCBBAA9988, 0x8899AABBCCDDEEFF), "64-bit write"); -- } -+ const uint8_t rdata[] = { 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff }; -+ -+ ok(knot_wire_read_u16(rdata) == 0x8899, "16-bit read"); -+ ok(knot_wire_read_u32(rdata) == 0x8899aabb, "32-bit read"); -+ ok(knot_wire_read_u48(rdata) == 0x8899aabbccdd, "48-bit read"); -+ ok(knot_wire_read_u64(rdata) == 0x8899aabbccddeeff, "64-bit read"); -+ -+ write_test(16, 0x1122, 0x11, 0x22); -+ write_test(32, 0x66778899, 0x66, 0x77, 0x88, 0x99); -+ write_test(48, 0xbbccdd778899, 0xbb, 0xcc, 0xdd, 0x77, 0x88, 0x99); -+ write_test(64, 0xbbccddee66778899, 0xbb, 0xcc, 0xdd, 0xee, -+ 0x66, 0x77, 0x88, 0x99); - - return 0; - } --- -1.8.3.1 - diff --git a/knot.spec b/knot.spec index af6f510..a519538 100644 --- a/knot.spec +++ b/knot.spec @@ -3,8 +3,8 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.3.2 -Release: 2%{?dist} +Version: 1.3.4 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -13,8 +13,6 @@ Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles -Patch1: 0001-update-wire-read-write-tests.patch - BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel libcap-ng-devel BuildRequires: texinfo BuildRequires: systemd-units @@ -28,7 +26,6 @@ Knot DNS is a high-performance authoritative DNS server implementation. %prep %setup -q -%patch1 -p1 %build # disable debug code (causes unused warnings) @@ -96,6 +93,18 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Fri Dec 13 2013 Jan Vcelak 1.3.4-1 +- update to 1.3.4 + + improved zone loading error messages + + correct control socket permissions + + improved log syntax documentation + + fixed wrong assertions in DDNS prerequisites checking + + fixed processing of some malformed DNS packets + + fixed notify messages being ignored in some cases + + fix crash in particular additionals processing + + race condition in event cancelation + + journal corruption after failed transactions + * Tue Oct 08 2013 Jan Vcelak 1.3.2-2 - fix failing wire reading/writing tests on big endian (#1015976) diff --git a/sources b/sources index aada82e..6d59643 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c49d0ab18b975132c138db6e4cf9f66 knot-1.3.2.tar.gz +4b0012d0aeca38b5b4823a8b4c23511b knot-1.3.4.tar.gz From 40820d52eabd2aaa61edc9d4443657f50f4d2c82 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 6 Jan 2014 13:34:17 +0100 Subject: [PATCH 021/214] update to 1.4.0 --- knot.spec | 10 ++++++---- sources | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/knot.spec b/knot.spec index 2783d58..a46fc95 100644 --- a/knot.spec +++ b/knot.spec @@ -1,15 +1,14 @@ %global _hardened_build 1 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -%global alphatag rc2 Summary: An authoritative DNS daemon Name: knot Version: 1.4.0 -Release: 0.2.%{alphatag}%{?dist} +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}-%{alphatag}.tar.gz +Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.gz Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles @@ -26,7 +25,7 @@ Requires(postun): systemd Knot DNS is a high-performance authoritative DNS server implementation. %prep -%setup -q -n %{name}-%{version}-%{alphatag} +%setup -q %build # disable debug code (causes unused warnings) @@ -100,6 +99,9 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Mon Jan 06 2014 Jan Vcelak 1.4.0-1 +- update to 1.4.0 + * Fri Dec 13 2013 Jan Vcelak 1.4.0-0.2.rc2 - update to 1.4.0-rc2 diff --git a/sources b/sources index fac8dfd..8a80d83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -39f10b2332ed37ab642fc768c83fd23f knot-1.4.0-rc2.tar.gz +1f3d54d0d9290553aa02811ba73e962e knot-1.4.0.tar.gz From 2265012936020c477362c387f3fcac71193e7c54 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 13 Jan 2014 19:14:56 +0100 Subject: [PATCH 022/214] update to 1.4.1 --- knot.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index a46fc95..d0ab4ba 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -99,6 +99,9 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Mon Jan 13 2014 Jan Vcelak 1.4.1-1 +- update to 1.4.1 + * Mon Jan 06 2014 Jan Vcelak 1.4.0-1 - update to 1.4.0 diff --git a/sources b/sources index 8a80d83..6117969 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f3d54d0d9290553aa02811ba73e962e knot-1.4.0.tar.gz +8673d343b93815cb0ba0ad83104e2f54 knot-1.4.1.tar.gz From 4cd8c73a797cf3cd082a8c2ddaa9989831d586be Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 27 Jan 2014 19:22:18 +0100 Subject: [PATCH 023/214] update to 1.4.2 --- knot.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index d0ab4ba..15cbc6b 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.4.1 +Version: 1.4.2 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -99,6 +99,9 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Mon Jan 27 2014 Jan Vcelak 1.4.2-1 +- update to 1.4.2 + * Mon Jan 13 2014 Jan Vcelak 1.4.1-1 - update to 1.4.1 diff --git a/sources b/sources index 6117969..b45dcbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8673d343b93815cb0ba0ad83104e2f54 knot-1.4.1.tar.gz +35d77a1d6735e7ca13ccd071ff605b75 knot-1.4.2.tar.gz From 8b5ce0ddd47a60dd2eb764d60380aaae82fc6a61 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 27 Jan 2014 19:49:43 +0100 Subject: [PATCH 024/214] enable IDN support --- knot.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index 15cbc6b..002d048 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: An authoritative DNS daemon Name: knot Version: 1.4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -13,7 +13,7 @@ Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles -BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel libcap-ng-devel +BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel libcap-ng-devel libidn-devel BuildRequires: texinfo BuildRequires: systemd-units @@ -99,6 +99,9 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Mon Jan 27 2014 Jan Vcelak 1.4.2-2 +- enable IDN support in domain names + * Mon Jan 27 2014 Jan Vcelak 1.4.2-1 - update to 1.4.2 From 3e8e95629e77af6e1d180ea20ddccf726c199590 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 5 Feb 2014 12:50:21 +0100 Subject: [PATCH 025/214] BuildRequires: remove ragel Ragel is optional and required only if .rl files are modified, upstream ships precompiled .c files. --- knot.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 002d048..31b665f 100644 --- a/knot.spec +++ b/knot.spec @@ -13,9 +13,11 @@ Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles -BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel libcap-ng-devel libidn-devel +BuildRequires: flex bison openssl-devel userspace-rcu-devel libcap-ng-devel libidn-devel BuildRequires: texinfo BuildRequires: systemd-units +# ragel is optional, required only if .rl source files are modified +#BuildRequires: ragel Requires(post): systemd info Requires(preun): systemd info From 629afabc36b83f725da188d686685fb91a5fdec6 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 12 Feb 2014 14:06:55 +0100 Subject: [PATCH 026/214] rebuild with new userspace-rcu --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 31b665f..a3b519a 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: An authoritative DNS daemon Name: knot Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -101,6 +101,9 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Wed Feb 12 2014 Jan Vcelak 1.4.2-3 +- rebuild with new userspace-rcu + * Mon Jan 27 2014 Jan Vcelak 1.4.2-2 - enable IDN support in domain names From bb85c68974cf346d45bb2fa85d873f28a8360e2e Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Tue, 18 Feb 2014 15:26:10 +0100 Subject: [PATCH 027/214] update to 1.4.3 --- knot.spec | 11 +++++++++-- sources | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index a3b519a..b9327ec 100644 --- a/knot.spec +++ b/knot.spec @@ -3,8 +3,8 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.4.2 -Release: 3%{?dist} +Version: 1.4.3 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -101,6 +101,13 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Tue Feb 18 2014 Jan Vcelak 1.4.3-1 +- update to 1.4.3 + + DNSSEC: fixes in authenticated denial proofs + + zone parser: case insensitive comparison of $ORIGIN + + journal: fix corruption if zone loading fails + + config: add support for includes of directories + * Wed Feb 12 2014 Jan Vcelak 1.4.2-3 - rebuild with new userspace-rcu diff --git a/sources b/sources index b45dcbc..39d1044 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -35d77a1d6735e7ca13ccd071ff605b75 knot-1.4.2.tar.gz +8a950ac0f2148944e25421c635727003 knot-1.4.3.tar.gz From 6c0aae7184a15c7f7acdd9f4eb33838447bcd2a3 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 27 Mar 2014 17:06:28 +0100 Subject: [PATCH 028/214] update to 1.4.4 --- knot.spec | 15 ++++++++++++++- sources | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index b9327ec..424f238 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.4.3 +Version: 1.4.4 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -101,6 +101,19 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Thu Mar 27 2014 Jan Vcelak 1.4.4-1 +- update to 1.4.4 + + server is logging remote control commands + + 'knotc reload' doesn't refresh unchanged zones + + 'knotc -f refresh' forces zone retransfer + + missing notifications after DDNS/automatic resign + + zone is rebootstrapped if the zone file is unreadable + + progressive bootstrap retry backoff + + zone file parser allows asterisk as part of the label + + journal maximum entry size fixes + + sign DNSKEYs in non-apex nodes as regular RR sets + + various spelling and typo fixes + * Tue Feb 18 2014 Jan Vcelak 1.4.3-1 - update to 1.4.3 + DNSSEC: fixes in authenticated denial proofs diff --git a/sources b/sources index 39d1044..ba284c5 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 8a950ac0f2148944e25421c635727003 knot-1.4.3.tar.gz +3b54aa789c2f780e59264c012a055ec9 knot-1.4.4.tar.gz From d1a58ba9a707b26929d308baacca9ad05149d396 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 14 Apr 2014 21:50:20 +0200 Subject: [PATCH 029/214] update to 1.4.5 --- knot.spec | 6 +++++- sources | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 424f238..e298a70 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -101,6 +101,10 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Mon Apr 14 2014 Jan Vcelak 1.4.5-1 +- update to 1.4.5 + + fix weakness in TSIG digest checking + * Thu Mar 27 2014 Jan Vcelak 1.4.4-1 - update to 1.4.4 + server is logging remote control commands diff --git a/sources b/sources index ba284c5..392298f 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -8a950ac0f2148944e25421c635727003 knot-1.4.3.tar.gz -3b54aa789c2f780e59264c012a055ec9 knot-1.4.4.tar.gz +4b69529d45040e5e839e0c61b6b7aebb knot-1.4.5.tar.gz From 863ace1577e89df2397cb758a47088e6d3036943 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 22 May 2014 13:40:00 +0200 Subject: [PATCH 030/214] update to 1.4.6 --- knot.spec | 7 ++++++- sources | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index e298a70..4658260 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.4.5 +Version: 1.4.6 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -101,6 +101,11 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Thu May 22 2014 Jan Vcelak 1.4.6-1 +- update to 1.4.6 + + DNSSEC: fix possible signing loop when doing key rollover + + RRL: fixed sending of malformed UDP empty responses + * Mon Apr 14 2014 Jan Vcelak 1.4.5-1 - update to 1.4.5 + fix weakness in TSIG digest checking diff --git a/sources b/sources index 392298f..6a12918 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b69529d45040e5e839e0c61b6b7aebb knot-1.4.5.tar.gz +993afafe20d7eb8b0a7653ffed21f107 knot-1.4.6.tar.gz From f581302ef46cbb8d0470e64da8ca754c31f01c34 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 22 May 2014 15:59:08 +0200 Subject: [PATCH 031/214] rebuild with correct archive --- knot.spec | 4 ++-- sources | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 4658260..2ca52c3 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: An authoritative DNS daemon Name: knot Version: 1.4.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -101,7 +101,7 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog -* Thu May 22 2014 Jan Vcelak 1.4.6-1 +* Thu May 22 2014 Jan Vcelak 1.4.6-2 - update to 1.4.6 + DNSSEC: fix possible signing loop when doing key rollover + RRL: fixed sending of malformed UDP empty responses diff --git a/sources b/sources index 6a12918..3c08bf0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -993afafe20d7eb8b0a7653ffed21f107 knot-1.4.6.tar.gz +cb53ff4f20f9f9e6cbf4dc5d5a4f01ef knot-1.4.6.tar.gz From 8dd156b6b7c2a1e60d2053ef5e2b01b1e7d11f35 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 4 Jun 2014 10:37:13 +0200 Subject: [PATCH 032/214] update to 1.5.0-rc1 --- knot.spec | 52 +++++++++++++++++++++++++++++++++++++--------------- sources | 2 +- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/knot.spec b/knot.spec index 2ca52c3..e7bdf5d 100644 --- a/knot.spec +++ b/knot.spec @@ -1,33 +1,37 @@ %global _hardened_build 1 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%global alphatag rc1 + +# TODO: +# - split into subpackages +# - documentation building Summary: An authoritative DNS daemon Name: knot -Version: 1.4.6 -Release: 2%{?dist} +Version: 1.5.0 +Release: 0.1.%{alphatag}%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz -Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.gz +Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}-%{alphatag}.tar.gz Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles BuildRequires: flex bison openssl-devel userspace-rcu-devel libcap-ng-devel libidn-devel -BuildRequires: texinfo BuildRequires: systemd-units # ragel is optional, required only if .rl source files are modified #BuildRequires: ragel -Requires(post): systemd info -Requires(preun): systemd info +Requires(post): systemd +Requires(preun): systemd Requires(postun): systemd %description Knot DNS is a high-performance authoritative DNS server implementation. %prep -%setup -q +%setup -q -n %{name}-%{version}-%{alphatag} %build # disable debug code (causes unused warnings) @@ -38,9 +42,6 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -# info database is updated at install time -rm %{buildroot}%{_datadir}/info/dir - # install customized configuration file rm %{buildroot}%{_sysconfdir}/%{name}/* install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf @@ -61,6 +62,12 @@ for sample_file in knot.full.conf knot.keys.conf example.com.zone; do install -p -m 0644 samples/${sample_file} %{buildroot}%{_pkgdocdir}/samples done +# remove libarchive files +rm %{buildroot}%{_libdir}/*.la + +# remove .so files, the headers are not available +rm %{buildroot}%{_libdir}/*.so + %check make check @@ -72,16 +79,14 @@ useradd -r -g knot -d %{_sysconfdir}/knot -s /sbin/nologin \ exit 0 %post -/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : +/sbin/ldconfig %systemd_post knot.service %preun %systemd_preun knot.service -if [ $1 -eq 0 ] ; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : -fi %postun +/sbin/ldconfig %systemd_postun %files @@ -95,12 +100,29 @@ fi %{_tmpfilesdir}/%{name}.conf %{_bindir}/* %{_sbindir}/* +%{_libdir}/libknot.so.* +%{_libdir}/libzscanner.so.* %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* -%doc %{_infodir}/%{name}.info.gz %changelog +* Wed Jun 04 2014 Jan Vcelak 1.5.0-0.1.rc1 +- update to 1.5.0-rc1 + + Pluggable query processing modules + + Synthetic IPv4/IPv6 reverse/forward records (optional module) + + Dnstap support in both utilities & server (optional module) + + NOTIFY message support and new TSIG section in kdig + + Multi-master support + + Query processing and core functionality overhaul + + Performance and reduced memory footprint + + Faster zone events scheduling + + RFC compliant queries/responses in some corner cases + + Log messages + + New documentation (Sphinx) +- enabled dynamic linking +- removed info pages + * Thu May 22 2014 Jan Vcelak 1.4.6-2 - update to 1.4.6 + DNSSEC: fix possible signing loop when doing key rollover diff --git a/sources b/sources index 3c08bf0..10ae579 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb53ff4f20f9f9e6cbf4dc5d5a4f01ef knot-1.4.6.tar.gz +a6326c862aa861a2fbaa67c10b186fd3 knot-1.5.0-rc1.tar.gz From 27cd64dd3acdf1ae9c2f74df75c2452889ee3894 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:10:20 -0500 Subject: [PATCH 033/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index e7bdf5d..bf76637 100644 --- a/knot.spec +++ b/knot.spec @@ -9,7 +9,7 @@ Summary: An authoritative DNS daemon Name: knot Version: 1.5.0 -Release: 0.1.%{alphatag}%{?dist} +Release: 0.2.%{alphatag}%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -107,6 +107,9 @@ exit 0 %{_mandir}/man8/* %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.5.0-0.2.rc1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Jun 04 2014 Jan Vcelak 1.5.0-0.1.rc1 - update to 1.5.0-rc1 + Pluggable query processing modules From c9b45f4989e4d97032ecfc043ea07bbc1fc3a299 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 18 Jun 2014 17:29:57 +0200 Subject: [PATCH 034/214] update to 1.5.0-rc2 --- knot.spec | 14 ++++++++++++-- sources | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index bf76637..73ee941 100644 --- a/knot.spec +++ b/knot.spec @@ -1,6 +1,6 @@ %global _hardened_build 1 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -%global alphatag rc1 +%global alphatag rc2 # TODO: # - split into subpackages @@ -9,7 +9,7 @@ Summary: An authoritative DNS daemon Name: knot Version: 1.5.0 -Release: 0.2.%{alphatag}%{?dist} +Release: 0.3.%{alphatag}%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -107,6 +107,16 @@ exit 0 %{_mandir}/man8/* %changelog +* Wed Jun 18 2014 Jan Vcelak 1.5.0-0.3.rc2 +- update to 1.5.0-rc2 + + edns-client-subnet support in kdig + + optional asynchronous startup (config 'asynchronous-start') + + preempt task queue for faster reload + + lazy zone file write after zone transfer (config 'zonefile-sync') + + close zone transfer after SERVFAIL response + + incremental to full zone transfer fallback, wrong log message + + zone events corner cases, reload replanning + * Sun Jun 08 2014 Fedora Release Engineering - 1.5.0-0.2.rc1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 10ae579..14f7b11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a6326c862aa861a2fbaa67c10b186fd3 knot-1.5.0-rc1.tar.gz +9a93226c200813ee7bfe27dcf7b6cbc9 knot-1.5.0-rc2.tar.gz From b62d6e46e7d92b634ee868cd68e555483da45053 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 18 Jun 2014 17:34:28 +0200 Subject: [PATCH 035/214] update to 1.4.7 --- knot.spec | 12 ++++++++++-- sources | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 2ca52c3..231f3f3 100644 --- a/knot.spec +++ b/knot.spec @@ -3,8 +3,8 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.4.6 -Release: 2%{?dist} +Version: 1.4.7 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -101,6 +101,14 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Wed Jun 18 2014 Jan Vcelak 1.4.7-1 +- update to 1.4.7 + + Fixed DDNS corner cases + + Fixed zone EXPIRE timer + + Fixed semantic checks false positives + + Fixed sending malformed IXFR with automatic DNSSEC + + Fixed NAPTR record serialization + * Thu May 22 2014 Jan Vcelak 1.4.6-2 - update to 1.4.6 + DNSSEC: fix possible signing loop when doing key rollover diff --git a/sources b/sources index 3c08bf0..7f58b9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb53ff4f20f9f9e6cbf4dc5d5a4f01ef knot-1.4.6.tar.gz +6d6ac6f346c1aee9212dfbf4229ff958 knot-1.4.7.tar.gz From e4487ce5b3326703032561ce13fb7f81a387ee6b Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 18 Jun 2014 18:59:03 +0200 Subject: [PATCH 036/214] removed samples installation fix --- knot.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 73ee941..540bc39 100644 --- a/knot.spec +++ b/knot.spec @@ -58,7 +58,7 @@ install -d -m 0750 %{buildroot}%{_sharedstatedir}/%{name}/keys # install config samples into docdir install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples -for sample_file in knot.full.conf knot.keys.conf example.com.zone; do +for sample_file in knot.conf example.com.zone; do install -p -m 0644 samples/${sample_file} %{buildroot}%{_pkgdocdir}/samples done From c5a8b7166c7b020f13d707a8f492af33a747c2fa Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 18 Jun 2014 19:01:35 +0200 Subject: [PATCH 037/214] fix reference to documentation in config file --- knot.conf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/knot.conf b/knot.conf index add902d..a30fc55 100644 --- a/knot.conf +++ b/knot.conf @@ -1,8 +1,5 @@ # -# Documentation: -# - /usr/share/doc/knot/samples/knot.full.conf -# - man knot.conf -# - info Knot +# See knot.conf(5) manual page for documentation. # system { From 5265fd21fe4c1fb6fc90e608dce7241f063c2931 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 18 Jun 2014 19:09:31 +0200 Subject: [PATCH 038/214] fix typo --- knot.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 540bc39..7b2d543 100644 --- a/knot.spec +++ b/knot.spec @@ -58,7 +58,7 @@ install -d -m 0750 %{buildroot}%{_sharedstatedir}/%{name}/keys # install config samples into docdir install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples -for sample_file in knot.conf example.com.zone; do +for sample_file in knot.sample.conf example.com.zone; do install -p -m 0644 samples/${sample_file} %{buildroot}%{_pkgdocdir}/samples done From 6bfc71f6bd9fab99185aef121e93352c104425e0 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 10 Jul 2014 00:20:03 +0200 Subject: [PATCH 039/214] update to 1.5.0 --- knot.spec | 16 ++++++++++++---- sources | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/knot.spec b/knot.spec index 7b2d543..b53ae4b 100644 --- a/knot.spec +++ b/knot.spec @@ -1,6 +1,5 @@ %global _hardened_build 1 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -%global alphatag rc2 # TODO: # - split into subpackages @@ -9,11 +8,11 @@ Summary: An authoritative DNS daemon Name: knot Version: 1.5.0 -Release: 0.3.%{alphatag}%{?dist} +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}-%{alphatag}.tar.gz +Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.gz Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles @@ -31,7 +30,7 @@ Requires(postun): systemd Knot DNS is a high-performance authoritative DNS server implementation. %prep -%setup -q -n %{name}-%{version}-%{alphatag} +%setup -q %build # disable debug code (causes unused warnings) @@ -107,6 +106,15 @@ exit 0 %{_mandir}/man8/* %changelog +* Thu Jul 10 2014 Jan Vcelak 1.5.0-1 +- update to 1.5.0 + + reimplemented DDNS forwarding + + transfer sizes logged in bytes + + logging of outgoing/incoming NOTIFY messages + + zone flush planning after bootstrap + + DDNS signing changes freeing + + knotc key handling + * Wed Jun 18 2014 Jan Vcelak 1.5.0-0.3.rc2 - update to 1.5.0-rc2 + edns-client-subnet support in kdig diff --git a/sources b/sources index 14f7b11..1c8f30b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a93226c200813ee7bfe27dcf7b6cbc9 knot-1.5.0-rc2.tar.gz +d677de99c19afea3b1e8ef075a9d5a8b knot-1.5.0.tar.gz From a26646e8027c2752abba14f0fa3e580a303628e8 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 10 Jul 2014 00:55:03 +0200 Subject: [PATCH 040/214] merge 1.5.0 changelog entries --- knot.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/knot.spec b/knot.spec index 5cd4149..8cf20e0 100644 --- a/knot.spec +++ b/knot.spec @@ -114,8 +114,6 @@ exit 0 + zone flush planning after bootstrap + DDNS signing changes freeing + knotc key handling - -* Wed Jun 18 2014 Jan Vcelak 1.5.0-0.3.rc2 - update to 1.5.0-rc2 + edns-client-subnet support in kdig + optional asynchronous startup (config 'asynchronous-start') @@ -124,11 +122,6 @@ exit 0 + close zone transfer after SERVFAIL response + incremental to full zone transfer fallback, wrong log message + zone events corner cases, reload replanning - -* Sun Jun 08 2014 Fedora Release Engineering - 1.5.0-0.2.rc1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Jun 04 2014 Jan Vcelak 1.5.0-0.1.rc1 - update to 1.5.0-rc1 + Pluggable query processing modules + Synthetic IPv4/IPv6 reverse/forward records (optional module) From 12b9e9e8324d70ac8f4c24d1a0e07b823412f577 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 00:34:57 +0000 Subject: [PATCH 041/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 8cf20e0..82245bc 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: An authoritative DNS daemon Name: knot Version: 1.5.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -106,6 +106,9 @@ exit 0 %{_mandir}/man8/* %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Thu Jul 10 2014 Jan Vcelak 1.5.0-1 - update to 1.5.0 + reimplemented DDNS forwarding From 1d564ad9b99f009707da951f21d68b90ea8299ad Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Tue, 19 Aug 2014 19:07:39 +0200 Subject: [PATCH 042/214] update to 1.5.1 --- knot.spec | 18 +++++++++++++++--- sources | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 82245bc..943bdf4 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.5.0 -Release: 2%{?dist} +Version: 1.5.1 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -17,7 +17,7 @@ Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles -BuildRequires: flex bison openssl-devel userspace-rcu-devel libcap-ng-devel libidn-devel +BuildRequires: flex bison openssl-devel userspace-rcu-devel libcap-ng-devel libidn-devel systemd-devel BuildRequires: systemd-units # ragel is optional, required only if .rl source files are modified #BuildRequires: ragel @@ -106,6 +106,18 @@ exit 0 %{_mandir}/man8/* %changelog +* Tue Aug 19 2014 Jan Vcelak 1.5.1-1 +- new upstream release: + + logging: unified logging messages + + logging: support for systemd journal + + DDNS: processing updates in bulk + + DDNS: fix signing of responses with TSIG + + DDNS: fix prerequisites checking in apex node + + DNSSEC: fix domain names conversion to canonical format before signing + + DNSSEC: semantic checks for signing keys + + EDNS: fix inclusion of OPT record into some packets + + knsupdate: fix use of zone origin for deletions + * Sun Aug 17 2014 Fedora Release Engineering - 1.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 1c8f30b..7026403 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d677de99c19afea3b1e8ef075a9d5a8b knot-1.5.0.tar.gz +4109648a538d35babea8379993c34996 knot-1.5.1.tar.gz From ffd3f6ec2c23b3468e6f5789f007d0c281ecdd61 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 8 Sep 2014 23:06:02 +0200 Subject: [PATCH 043/214] update to 1.5.2 --- knot.spec | 8 +++++++- sources | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 943bdf4..8f4a3ac 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.5.1 +Version: 1.5.2 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -106,6 +106,12 @@ exit 0 %{_mandir}/man8/* %changelog +* Mon Sep 08 2014 Jan Vcelak 1.5.2-1 +- new upstream release: + + CVE-2014-0486: remote crash using crafted DNS message + + transfers: do not refuse AXFR answers to IXFR queries + + fix storing of hash character '#' in zone file + * Tue Aug 19 2014 Jan Vcelak 1.5.1-1 - new upstream release: + logging: unified logging messages diff --git a/sources b/sources index 7026403..1e0e574 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 4109648a538d35babea8379993c34996 knot-1.5.1.tar.gz +cc7e679c8857fd70df7ab14f96a2f1a7 knot-1.5.2.tar.gz From ecc65e71c662744973290f2458e6669554fd2e61 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 15 Sep 2014 20:59:37 +0200 Subject: [PATCH 044/214] update to 1.5.3 --- knot.spec | 10 +++++++++- sources | 3 +-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 8f4a3ac..67c3a03 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.5.2 +Version: 1.5.3 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -106,6 +106,14 @@ exit 0 %{_mandir}/man8/* %changelog +* Mon Sep 15 2014 Jan Vcelak 1.5.3-1 +- new upstream release: + + fix crash on specific incoming IXFR message + + fix rare synchronization error during server reload + + fix crash in reverse record synthesis module on DNSSEC signed zones + + fix message ID and opcode for AXFR-style IXFR responses + + fix sending of large responses to remote control commands + * Mon Sep 08 2014 Jan Vcelak 1.5.2-1 - new upstream release: + CVE-2014-0486: remote crash using crafted DNS message diff --git a/sources b/sources index 1e0e574..48b18bf 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -4109648a538d35babea8379993c34996 knot-1.5.1.tar.gz -cc7e679c8857fd70df7ab14f96a2f1a7 knot-1.5.2.tar.gz +bab73ec83ad7f1d64bb765bf0c72caae knot-1.5.3.tar.gz From 030326e59968b99a5dd1f94698c6504e61b2f421 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Tue, 16 Sep 2014 12:49:42 +0200 Subject: [PATCH 045/214] default config, fix deprecation warning --- knot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knot.conf b/knot.conf index a30fc55..f364110 100644 --- a/knot.conf +++ b/knot.conf @@ -16,7 +16,7 @@ control { } log { - syslog { any warning, error; } + syslog { any warning; } } zones { From 66d0026571ca8c5536fac6209cb0c317cc3bfc68 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 24 Oct 2014 00:05:50 +0200 Subject: [PATCH 046/214] update to 1.6.0 --- .gitignore | 1 + knot.spec | 15 ++++++++++++--- sources | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0209c54..0fbcd24 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /knot-*.tar.gz +/knot-*.tar.xz diff --git a/knot.spec b/knot.spec index 67c3a03..31c2ee7 100644 --- a/knot.spec +++ b/knot.spec @@ -7,17 +7,17 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.5.3 +Version: 1.6.0 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.gz +Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles -BuildRequires: flex bison openssl-devel userspace-rcu-devel libcap-ng-devel libidn-devel systemd-devel +BuildRequires: flex bison openssl-devel userspace-rcu-devel libcap-ng-devel libidn-devel systemd-devel lmdb-devel BuildRequires: systemd-units # ragel is optional, required only if .rl source files are modified #BuildRequires: ragel @@ -106,6 +106,15 @@ exit 0 %{_mandir}/man8/* %changelog +* Thu Oct 23 2014 Jan Vcelak 1.6.0-1 +- new upstream release: + + support for persistent zone timers (expire, refresh, and flush) + + DNSSEC: RFC-compliant processing of letter case in RDATA domain names + + EDNS: return minimal response for queries with unsupported version + + EDNS: fix interpretation of Extended RCODE + + transfers: fix forced zone retransfer + + timers: properly expire zone when transfer is being refused by master + * Mon Sep 15 2014 Jan Vcelak 1.5.3-1 - new upstream release: + fix crash on specific incoming IXFR message diff --git a/sources b/sources index 48b18bf..45c48ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bab73ec83ad7f1d64bb765bf0c72caae knot-1.5.3.tar.gz +63cd27658e05a7cd4f950b7e0b5c723a knot-1.6.0.tar.xz From b0bf798c436f8d3d8bddb28684f762d497dc71a5 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 30 Oct 2014 17:27:13 +0100 Subject: [PATCH 047/214] default config: run server as unprivileged user --- knot.conf | 1 + knot.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/knot.conf b/knot.conf index f364110..8923397 100644 --- a/knot.conf +++ b/knot.conf @@ -4,6 +4,7 @@ system { rundir "/var/run/knot"; + user knot.knot; } interfaces { diff --git a/knot.spec b/knot.spec index 31c2ee7..ef2fae7 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: An authoritative DNS daemon Name: knot Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -106,6 +106,9 @@ exit 0 %{_mandir}/man8/* %changelog +* Thu Oct 30 2014 Jan Vcelak 1.6.0-2 +- default config: run server as unprivileged user + * Thu Oct 23 2014 Jan Vcelak 1.6.0-1 - new upstream release: + support for persistent zone timers (expire, refresh, and flush) From 57c40253897d8192d8e41b302755e383850d19ff Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 30 Oct 2014 17:27:27 +0100 Subject: [PATCH 048/214] service file: remove useless startup dependencies --- knot.service | 2 +- knot.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/knot.service b/knot.service index 63126b7..0deac83 100644 --- a/knot.service +++ b/knot.service @@ -1,6 +1,6 @@ [Unit] Description=Knot DNS server daemon -After=syslog.target network.target auditd.service +After=network.target [Service] ExecStart=/usr/sbin/knotd diff --git a/knot.spec b/knot.spec index ef2fae7..59c259a 100644 --- a/knot.spec +++ b/knot.spec @@ -108,6 +108,7 @@ exit 0 %changelog * Thu Oct 30 2014 Jan Vcelak 1.6.0-2 - default config: run server as unprivileged user +- service file: remove useless startup dependencies * Thu Oct 23 2014 Jan Vcelak 1.6.0-1 - new upstream release: From ff0f55182bcb2eb6a1d66538ab27be540c409d8d Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 30 Oct 2014 17:27:35 +0100 Subject: [PATCH 049/214] service file: add bounding capabilities --- knot.service | 2 ++ knot.spec | 1 + 2 files changed, 3 insertions(+) diff --git a/knot.service b/knot.service index 0deac83..856d181 100644 --- a/knot.service +++ b/knot.service @@ -8,6 +8,8 @@ ExecReload=/usr/sbin/knotc reload Restart=on-abort ExecStartPre=/usr/sbin/knotc checkconf +CapabilityBoundingSet=cap_net_bind_service cap_setuid cap_setgid + [Install] WantedBy=multi-user.target Alias=knotd.service diff --git a/knot.spec b/knot.spec index 59c259a..66e2783 100644 --- a/knot.spec +++ b/knot.spec @@ -109,6 +109,7 @@ exit 0 * Thu Oct 30 2014 Jan Vcelak 1.6.0-2 - default config: run server as unprivileged user - service file: remove useless startup dependencies +- service file: add bounding capabilities * Thu Oct 23 2014 Jan Vcelak 1.6.0-1 - new upstream release: From 95da4f22cefc1d3a48bcd2402966b85f0423d1c2 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Sat, 13 Dec 2014 19:47:45 +0100 Subject: [PATCH 050/214] service file: set service type to notify --- knot.service | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/knot.service b/knot.service index 856d181..fdce752 100644 --- a/knot.service +++ b/knot.service @@ -3,6 +3,7 @@ Description=Knot DNS server daemon After=network.target [Service] +Type=notify ExecStart=/usr/sbin/knotd ExecReload=/usr/sbin/knotc reload Restart=on-abort diff --git a/sources b/sources index 45c48ef..2282554 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -63cd27658e05a7cd4f950b7e0b5c723a knot-1.6.0.tar.xz +c726ebf12fd2f325da8407538a2124f2 knot-1.6.1.tar.xz From 22f16959af199b081d52a35cd97c6ba9b3c11edd Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Sat, 13 Dec 2014 19:47:52 +0100 Subject: [PATCH 051/214] update to 1.6.1 --- knot.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 66e2783..c5d4a37 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: An authoritative DNS daemon Name: knot -Version: 1.6.0 +Version: 1.6.1 Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -106,6 +106,15 @@ exit 0 %{_mandir}/man8/* %changelog +* Sat Dec 13 2014 Jan Vcelak 1.6.1-2 +- new upstream release: + + DNSSEC: support for Single-Type Signing Scheme + + fix: journal file growing over configured limit +- service file changes: + + run as 'knot' user and group + + set security bounding capabilities + + change Type to 'notify' + * Thu Oct 30 2014 Jan Vcelak 1.6.0-2 - default config: run server as unprivileged user - service file: remove useless startup dependencies From 7be817cf16e26ecc78a4e6fe5adf0ade204000c3 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Tue, 20 Jan 2015 00:10:28 +0100 Subject: [PATCH 052/214] service file: remove bounding capabilities --- knot.service | 5 ++--- knot.spec | 7 ++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/knot.service b/knot.service index fdce752..431dc2d 100644 --- a/knot.service +++ b/knot.service @@ -1,6 +1,5 @@ [Unit] Description=Knot DNS server daemon -After=network.target [Service] Type=notify @@ -9,8 +8,8 @@ ExecReload=/usr/sbin/knotc reload Restart=on-abort ExecStartPre=/usr/sbin/knotc checkconf -CapabilityBoundingSet=cap_net_bind_service cap_setuid cap_setgid +# Breaks daemon reload +#CapabilityBoundingSet=cap_net_bind_service cap_setuid cap_setgid [Install] WantedBy=multi-user.target -Alias=knotd.service diff --git a/knot.spec b/knot.spec index c5d4a37..15c0e3b 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: An authoritative DNS daemon Name: knot Version: 1.6.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -106,6 +106,11 @@ exit 0 %{_mandir}/man8/* %changelog +* Tue Jan 20 2015 Jan Vcelak 1.6.1-3 +- service file changes: + + remove dependency on network.target + + remove bounding capabilities (breaks reload) + * Sat Dec 13 2014 Jan Vcelak 1.6.1-2 - new upstream release: + DNSSEC: support for Single-Type Signing Scheme From 98560d4fb8c9f8dff355ff3cf3d1e11fbddf1bdd Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 13 Feb 2015 18:59:18 +0100 Subject: [PATCH 053/214] update dependencies for 1.99.1 --- knot.spec | 15 +++++++++------ sources | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/knot.spec b/knot.spec index 15c0e3b..05cbd48 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.99.1 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -17,11 +17,14 @@ Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles -BuildRequires: flex bison openssl-devel userspace-rcu-devel libcap-ng-devel libidn-devel systemd-devel lmdb-devel -BuildRequires: systemd-units -# ragel is optional, required only if .rl source files are modified -#BuildRequires: ragel +# Required utilities +BuildRequires: flex bison +# Required dependencies +BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel +# Optional dependencies +BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn) pkgconfig(systemd) +BuildRequires: systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd diff --git a/sources b/sources index 2282554..5541c8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c726ebf12fd2f325da8407538a2124f2 knot-1.6.1.tar.xz +a37dfc4a4691c7fffb513abe0b2266ee knot-1.99.1.tar.xz From efcdac2abc36dc7f48ee286ac8cdf8cc04b4a54d Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 13 Feb 2015 19:02:22 +0100 Subject: [PATCH 054/214] split into subpackages --- knot.spec | 84 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 67 insertions(+), 17 deletions(-) diff --git a/knot.spec b/knot.spec index 05cbd48..87a06c1 100644 --- a/knot.spec +++ b/knot.spec @@ -1,11 +1,10 @@ %global _hardened_build 1 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +Summary: High-performance authoritative DNS server # TODO: -# - split into subpackages # - documentation building -Summary: An authoritative DNS daemon Name: knot Version: 1.99.1 Release: 1%{?dist} @@ -29,9 +28,33 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +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 + +%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} + +%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} + +%description utils +The package contains DNS client utilities shipped with the Knot DNS server. + %prep %setup -q @@ -64,12 +87,10 @@ for sample_file in knot.sample.conf example.com.zone; do 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 @@ -81,18 +102,20 @@ useradd -r -g knot -d %{_sysconfdir}/knot -s /sbin/nologin \ exit 0 %post -/sbin/ldconfig %systemd_post knot.service %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} @@ -100,13 +123,40 @@ exit 0 %dir %attr(-,knot,knot) %{_localstatedir}/run/%{name} %{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf -%{_bindir}/* -%{_sbindir}/* -%{_libdir}/libknot.so.* -%{_libdir}/libzscanner.so.* -%{_mandir}/man1/* -%{_mandir}/man5/* -%{_mandir}/man8/* +%{_bindir}/keymgr +%{_sbindir}/knotc +%{_sbindir}/knotd +%{_mandir}/man5/knot.conf.* +%{_mandir}/man8/keymgr.* +%{_mandir}/man8/knotc.* +%{_mandir}/man8/knotd.* + +%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}/libknot*.so.* +%{_libdir}/libzscanner*.so.* +%{_libdir}/libdnssec*.so.* + +%files devel +%{_includedir}/dnssec +%{_includedir}/libknot +%{_libdir}/libknot.so +%{_libdir}/libknot-int.so +%{_libdir}/libzscanner.so +%{_libdir}/libdnssec.so +%{_libdir}/pkgconfig/libknot.pc +%{_libdir}/pkgconfig/libknot-int.pc +%{_libdir}/pkgconfig/libdnssec.pc %changelog * Tue Jan 20 2015 Jan Vcelak 1.6.1-3 From 0d2dc087945599609de33776349725d897b6d243 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 13 Feb 2015 19:03:06 +0100 Subject: [PATCH 055/214] enable documentation building --- knot.spec | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 87a06c1..3a0f9a7 100644 --- a/knot.spec +++ b/knot.spec @@ -2,9 +2,6 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Summary: High-performance authoritative DNS server -# TODO: -# - documentation building - Name: knot Version: 1.99.1 Release: 1%{?dist} @@ -55,6 +52,15 @@ 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 +BuildArch: noarch +BuildRequires: python3-sphinx +Provides: bundled(jquery) + +%description doc +The package contains documentation for the Knot DNS server. + %prep %setup -q @@ -63,10 +69,15 @@ The package contains DNS client utilities shipped with the Knot DNS server. CFLAGS="%{optflags} -DNDEBUG -Wno-unused" %configure make %{?_smp_mflags} +make html %install make install DESTDIR=%{buildroot} +# install documentation +mkdir -p %{buildroot}%{_pkgdocdir} +cp -av doc/_build/html %{buildroot}%{_pkgdocdir} + # install customized configuration file rm %{buildroot}%{_sysconfdir}/%{name}/* install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf @@ -158,6 +169,10 @@ exit 0 %{_libdir}/pkgconfig/libknot-int.pc %{_libdir}/pkgconfig/libdnssec.pc +%files doc +%dir %{_pkgdocdir} +%{_pkgdocdir}/html + %changelog * Tue Jan 20 2015 Jan Vcelak 1.6.1-3 - service file changes: From 52c59a3fc64cb5dada0435bb80132d163bc88e7f Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 13 Feb 2015 19:03:29 +0100 Subject: [PATCH 056/214] ensure that builtin lmdb is not used --- knot.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/knot.spec b/knot.spec index 3a0f9a7..a8b22aa 100644 --- a/knot.spec +++ b/knot.spec @@ -64,6 +64,11 @@ The package contains documentation for the Knot DNS server. %prep %setup -q +# make sure embedded LMDB library is not used +for file in lmdb.h lmdb.c midl.h midl.c; do + rm -fv "src/libknot/internal/$file" +done + %build # disable debug code (causes unused warnings) CFLAGS="%{optflags} -DNDEBUG -Wno-unused" From 4bea6d5b0ffb02d05cd19f1992c2c9cc4515fad9 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 13 Feb 2015 19:03:43 +0100 Subject: [PATCH 057/214] make key database writable for server --- knot.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index a8b22aa..79c757a 100644 --- a/knot.spec +++ b/knot.spec @@ -95,7 +95,7 @@ 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 @@ -135,7 +135,7 @@ exit 0 %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 From aa9d5fe0794ffbc90d7c24c6c6e90555d6fe87b1 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 13 Feb 2015 19:06:26 +0100 Subject: [PATCH 058/214] add changelog entry --- knot.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/knot.spec b/knot.spec index 79c757a..36e0bad 100644 --- a/knot.spec +++ b/knot.spec @@ -179,6 +179,14 @@ exit 0 %{_pkgdocdir}/html %changelog +* Fri Feb 13 2015 Jan Vcelak 1.99.1-1 +- new upstream pre-release version: + + DNSSEC: switch from OpenSSL to GnuTLS + + DNSSEC: initial support for KASP +- split package into subpackages +- add documentation building +- restart daemon on updated + * Tue Jan 20 2015 Jan Vcelak 1.6.1-3 - service file changes: + remove dependency on network.target From 41c4143f35ef349c3771079e1d33810d939164d5 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 13 Feb 2015 19:16:07 +0100 Subject: [PATCH 059/214] knot-doc package: add BSD and MIT licences due to bundled js libs --- knot.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/knot.spec b/knot.spec index 36e0bad..35410b6 100644 --- a/knot.spec +++ b/knot.spec @@ -54,6 +54,7 @@ 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 BuildRequires: python3-sphinx Provides: bundled(jquery) From afb887264fb365a8ef671f9a4b9b4a1d81a6cc18 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 13 Feb 2015 19:25:52 +0100 Subject: [PATCH 060/214] use spaces instead of tabs --- knot.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index 35410b6..37e8648 100644 --- a/knot.spec +++ b/knot.spec @@ -67,7 +67,7 @@ The package contains documentation for the Knot DNS server. # make sure embedded LMDB library is not used for file in lmdb.h lmdb.c midl.h midl.c; do - rm -fv "src/libknot/internal/$file" + rm -fv "src/libknot/internal/$file" done %build @@ -101,7 +101,7 @@ 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 static libraries and libarchive files From 457b287128c42f2ad56e580ea6ab9c4ad129313b Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 13 Feb 2015 19:26:09 +0100 Subject: [PATCH 061/214] knot-doc: ensure documentation is installed, remove .buildinfo --- knot.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/knot.spec b/knot.spec index 37e8648..5173c34 100644 --- a/knot.spec +++ b/knot.spec @@ -83,6 +83,8 @@ 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 customized configuration file rm %{buildroot}%{_sysconfdir}/%{name}/* From 9964400c5ee399ad06ebc98d84537c412d4ba85f Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 13 Feb 2015 23:18:35 +0100 Subject: [PATCH 062/214] fix build requires for systemd --- knot.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index 5173c34..f940b40 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 1.99.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -18,7 +18,7 @@ BuildRequires: flex bison # Required dependencies BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel # Optional dependencies -BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn) pkgconfig(systemd) +BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn) pkgconfig(libsystemd-daemon) pkgconfig(libsystemd-journal) BuildRequires: systemd Requires(post): systemd @@ -182,6 +182,9 @@ exit 0 %{_pkgdocdir}/html %changelog +* Fri Feb 13 2015 Jan Vcelak 1.99.1-2 +- fix BuildRequires for systemd integration + * Fri Feb 13 2015 Jan Vcelak 1.99.1-1 - new upstream pre-release version: + DNSSEC: switch from OpenSSL to GnuTLS From 1f7394d3dc6355fb25b0a761a5581e5268d73af1 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 4 May 2015 14:48:29 +0200 Subject: [PATCH 063/214] Rebuilt for nettle soname bump --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index f940b40..cbb5794 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 1.99.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -182,6 +182,9 @@ exit 0 %{_pkgdocdir}/html %changelog +* Mon May 04 2015 Kalev Lember - 1.99.1-3 +- Rebuilt for nettle soname bump + * Fri Feb 13 2015 Jan Vcelak 1.99.1-2 - fix BuildRequires for systemd integration From 62c3287aa5bfc8d4ebe2fc83fb2ef133553a55ee Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 13:32:23 +0000 Subject: [PATCH 064/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index cbb5794..b7a43c4 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 1.99.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -182,6 +182,9 @@ exit 0 %{_pkgdocdir}/html %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.99.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon May 04 2015 Kalev Lember - 1.99.1-3 - Rebuilt for nettle soname bump From 87d8a4b6ba096793a16914da8f967ceac3446a29 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 18 Jun 2015 17:16:37 +0200 Subject: [PATCH 065/214] new upstream pre-release (2.0.0-rc1) --- knot.spec | 51 +++++++++++++++++++++++++++++++++++---------------- sources | 2 +- 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/knot.spec b/knot.spec index b7a43c4..45be487 100644 --- a/knot.spec +++ b/knot.spec @@ -3,22 +3,21 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 1.99.1 -Release: 4%{?dist} +Version: 2.0.0 +Release: 0.1.rc1%{?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 +Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}-rc1.tar.xz Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles -# Required utilities -BuildRequires: flex bison # Required dependencies BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel # Optional dependencies -BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn) pkgconfig(libsystemd-daemon) pkgconfig(libsystemd-journal) +BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn) pkgconfig(libsystemd-daemon) pkgconfig(libsystemd-journal) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) +BuildRequires: pkgconfig(bash-completion) BuildRequires: systemd Requires(post): systemd @@ -63,7 +62,7 @@ Provides: bundled(jquery) The package contains documentation for the Knot DNS server. %prep -%setup -q +%setup -q -n %{name}-%{version}-rc1 # make sure embedded LMDB library is not used for file in lmdb.h lmdb.c midl.h midl.c; do @@ -142,13 +141,16 @@ exit 0 %dir %attr(-,knot,knot) %{_localstatedir}/run/%{name} %{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf -%{_bindir}/keymgr +%{_libexecdir}/knot1to2 +%{_sbindir}/keymgr %{_sbindir}/knotc %{_sbindir}/knotd +%{_mandir}/man1/knot1to2.* %{_mandir}/man5/knot.conf.* %{_mandir}/man8/keymgr.* %{_mandir}/man8/knotc.* %{_mandir}/man8/knotd.* +%{_datadir}/bash-completion/completions/keymgr %files utils %{_bindir}/kdig @@ -162,26 +164,43 @@ exit 0 %files libs %doc COPYING AUTHORS NEWS THANKS -%{_libdir}/libknot*.so.* -%{_libdir}/libzscanner*.so.* -%{_libdir}/libdnssec*.so.* +%{_libdir}/libdnssec.so.* +%{_libdir}/libknot.so.* +%{_libdir}/libzscanner.so.* %files devel %{_includedir}/dnssec %{_includedir}/libknot -%{_libdir}/libknot.so -%{_libdir}/libknot-int.so -%{_libdir}/libzscanner.so %{_libdir}/libdnssec.so -%{_libdir}/pkgconfig/libknot.pc -%{_libdir}/pkgconfig/libknot-int.pc +%{_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 +* Thu Jun 18 2015 Jan Vcelak 2.0.0-0.1.rc1 +- new upstream pre-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: new configuration format in YAML, binary store im LMDB + + feature: DNSSEC, separate library, switch to GnuTLS, new utilities + + feature: DNSSEC, basic KASP support (generate initial keys, ZSK rollover) + + feature: zone parser, split long TXT/SPF strings into multiple strings + + feature: kdig, add generic dump style option (+generic) + + feature: try all master servers on failure in multi-master environment + + feature: improved remotes and ACLs (multiple addresses, multiple keys) + + feature: basic support for zone file patterns (%s to substitute zone name) + + improvement: do not write class for SOA record (unified with other RR types) + + improvement: do not write master server address into the zone file + + documentation: manual pages also in HTML and PDF format + * Wed Jun 17 2015 Fedora Release Engineering - 1.99.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 5541c8a..0a1edb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a37dfc4a4691c7fffb513abe0b2266ee knot-1.99.1.tar.xz +c16c2926ed76078869c1b1cec804e418 knot-2.0.0-rc1.tar.xz From fad377531a4584fd1cbd77674637236c9d1f9186 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 20 Jul 2015 09:59:09 +0200 Subject: [PATCH 066/214] new upstream release --- knot.spec | 12 +++++++++--- sources | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 45be487..b65358d 100644 --- a/knot.spec +++ b/knot.spec @@ -4,11 +4,11 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.0.0 -Release: 0.1.rc1%{?dist} +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}-rc1.tar.xz +Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles @@ -62,7 +62,7 @@ Provides: bundled(jquery) The package contains documentation for the Knot DNS server. %prep -%setup -q -n %{name}-%{version}-rc1 +%setup -q # make sure embedded LMDB library is not used for file in lmdb.h lmdb.c midl.h midl.c; do @@ -183,6 +183,12 @@ exit 0 %{_pkgdocdir}/html %changelog +* Mon Jul 20 2015 Jan Vcelak 2.0.0-1 +- new upstream release: + + feature: possibility to disable zone file synchronization + + feature: knsupdate, add input prompt in interactive mode + + feature: knsupdate, TSIG algorithm specification in interactive mode + * Thu Jun 18 2015 Jan Vcelak 2.0.0-0.1.rc1 - new upstream pre-release: + fix: lost NOTIFY message if received during zone transfer diff --git a/sources b/sources index 0a1edb2..9dafa47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c16c2926ed76078869c1b1cec804e418 knot-2.0.0-rc1.tar.xz +5d74b864640c32af3e125995a560fb38 knot-2.0.0.tar.xz From a7b58878341c84efa574896e5bb8311cb16ce393 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 3 Sep 2015 09:48:24 +0200 Subject: [PATCH 067/214] new upstream release (2.0.1) --- knot.spec | 35 +++++++++++++++++++++++++++++++++-- sources | 2 +- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index b65358d..33bfe3a 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.0.0 +Version: 2.0.1 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -17,7 +17,6 @@ Source3: %{name}.tmpfiles BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel # Optional dependencies BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn) pkgconfig(libsystemd-daemon) pkgconfig(libsystemd-journal) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) -BuildRequires: pkgconfig(bash-completion) BuildRequires: systemd Requires(post): systemd @@ -85,6 +84,10 @@ 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 @@ -151,6 +154,7 @@ exit 0 %{_mandir}/man8/knotc.* %{_mandir}/man8/knotd.* %{_datadir}/bash-completion/completions/keymgr +%{_datadir}/zsh/site-functions/_keymgr %files utils %{_bindir}/kdig @@ -171,6 +175,7 @@ exit 0 %files devel %{_includedir}/dnssec %{_includedir}/libknot +%{_includedir}/zscanner %{_libdir}/libdnssec.so %{_libdir}/libknot.so %{_libdir}/libzscanner.so @@ -183,6 +188,32 @@ exit 0 %{_pkgdocdir}/html %changelog +* Thu Sep 03 2015 Jan Vcelak 2.0.1-1 +- new upstream release: + + fix: do not reload expired zones on 'knotc reload' and server startup + + fix: rare race-condition in event scheduling causing delayed event execution + + fix: skipping of non-authoritative nodes in NSEC proofs + + fix: TC flag setting in RRL slipped answers + + fix: disable domain name compression for root label + + fix: fix CNAME following when quering for NSEC RR type + + fix: fix refreshing of DNSSEC signatures for zone keys + + fix: fix binding an unavailable IPv6 address (IP_FREEBIND) + + fix: fix infinite loop in knotc zonestatus and memstats + + fix: fix memory leak in configuration on server shutdown + + fix: fix broken dnsproxy module + + fix: fix multi value parsing on big-endian + + fix: adapt to Nettle 3 API break causing base64 decoding failures on big-endian + + feature: add 'keymgr zone key ds' to show key's DS record + + feature: add 'keymgr tsig generate' to generate TSIG keys + + feature: add query module scoping to process either all queries or zone queries only + + feature: add support for file name globbing in config file includes + + feature: add 'request-edns-option' config option to add custom EDNS0 option into server initiated queries + + improvement: send minimal responses (remove NS from Authority section for NOERROR) + + improvement: update persistent timers only on shutdown for better performance + + improvement: allow change of RR TTL over DDNS + + improvement: documentation fixes, updates, and improvements in formatting + + improvement: install yparser and zscanner header files + * Mon Jul 20 2015 Jan Vcelak 2.0.0-1 - new upstream release: + feature: possibility to disable zone file synchronization diff --git a/sources b/sources index 9dafa47..8aeec5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d74b864640c32af3e125995a560fb38 knot-2.0.0.tar.xz +96c128b890767bdb2f61e6d47e6622e5 knot-2.0.1.tar.xz From 740a2c26015da5de2540b9af6a884326a7f6e1fd Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 25 Nov 2015 13:33:29 +0100 Subject: [PATCH 068/214] new upstream release (2.0.2) --- knot.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index 33bfe3a..6a30849 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.0.1 +Version: 2.0.2 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -188,6 +188,10 @@ exit 0 %{_pkgdocdir}/html %changelog +* Wed Nov 25 2015 Jan Vcelak 2.0.2-1 +- new upstream release: + + security fix: out-of-bound read in packet parser for malformed NAPTR record + * Thu Sep 03 2015 Jan Vcelak 2.0.1-1 - new upstream release: + fix: do not reload expired zones on 'knotc reload' and server startup diff --git a/sources b/sources index 8aeec5f..cf399bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96c128b890767bdb2f61e6d47e6622e5 knot-2.0.1.tar.xz +923837b1c58b7cfdd78785103696c322 knot-2.0.2.tar.xz From 890e0a47a347cb854e6f81911f0cafb42ed13c56 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Sun, 20 Dec 2015 12:34:00 +0100 Subject: [PATCH 069/214] new pre-release (2.1.0-rc1) --- knot.spec | 32 +++++++++++++++++++++++++------- sources | 2 +- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/knot.spec b/knot.spec index 6a30849..deaffc8 100644 --- a/knot.spec +++ b/knot.spec @@ -1,14 +1,16 @@ %global _hardened_build 1 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%global alphatag rc1 + Summary: High-performance authoritative DNS server Name: knot -Version: 2.0.2 -Release: 1%{?dist} +Version: 2.1.0 +Release: 0.1.%{alphatag}%{?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 +Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}-%{alphatag}.tar.xz Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles @@ -61,12 +63,10 @@ Provides: bundled(jquery) The package contains documentation for the Knot DNS server. %prep -%setup -q +%setup -q -n %{name}-%{version}-%{alphatag} # make sure embedded LMDB library is not used -for file in lmdb.h lmdb.c midl.h midl.c; do - rm -fv "src/libknot/internal/$file" -done +rm -vr src/contrib/lmdb %build # disable debug code (causes unused warnings) @@ -188,6 +188,24 @@ exit 0 %{_pkgdocdir}/html %changelog +* Sun Dec 20 2015 Jan Vcelak 2.1.0-0.1.rc1 +- new upstream pre-release: + + feature: Per-thread UDP socket binding using SO_REUSEPORT + + feature: Support for dynamic configuration database + + feature: DNSSEC, Support for cryptographic tokens via PKCS #11 interface + + feature: DNSSEC, Experimental support for online signing + + improvement: Support for zone file name patterns + + improvement: Configurable location of zone timer database + + improvement: Non-blocking network operations and better timeout handling + + improvement: Caching of Critical configuration values for better performance + + improvement: Logging of ACL failures + + improvement: RRL: Add rate-limit-slip zero support to drop all responses + + improvement: RRL: Document behavior for different rate-limit-slip options + + improvement: kdig: Warning instead of error on TSIG validation failure + + improvement: Cleanup of support libraries interfaces (libknot, libzscanner, libdnssec) + + fix: synth-record module: Fix application of default configuration options + + fix: TSIG: Allow compressed TSIG name when forwarding DDNS updates + * Wed Nov 25 2015 Jan Vcelak 2.0.2-1 - new upstream release: + security fix: out-of-bound read in packet parser for malformed NAPTR record diff --git a/sources b/sources index cf399bd..d87e529 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -923837b1c58b7cfdd78785103696c322 knot-2.0.2.tar.xz +3989fc32a186abf8aed5e0c3030aedc2 knot-2.1.0-rc1.tar.xz From a61fd345c7629a1bcd8ade5ecf1869eecd38c548 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 14 Jan 2016 12:56:49 +0100 Subject: [PATCH 070/214] changelog: dropping everything non-relevant for 2.0 --- knot.spec | 246 ------------------------------------------------------ 1 file changed, 246 deletions(-) diff --git a/knot.spec b/knot.spec index deaffc8..d1ee791 100644 --- a/knot.spec +++ b/knot.spec @@ -276,249 +276,3 @@ exit 0 - split package into subpackages - add documentation building - restart daemon on updated - -* Tue Jan 20 2015 Jan Vcelak 1.6.1-3 -- service file changes: - + remove dependency on network.target - + remove bounding capabilities (breaks reload) - -* Sat Dec 13 2014 Jan Vcelak 1.6.1-2 -- new upstream release: - + DNSSEC: support for Single-Type Signing Scheme - + fix: journal file growing over configured limit -- service file changes: - + run as 'knot' user and group - + set security bounding capabilities - + change Type to 'notify' - -* Thu Oct 30 2014 Jan Vcelak 1.6.0-2 -- default config: run server as unprivileged user -- service file: remove useless startup dependencies -- service file: add bounding capabilities - -* Thu Oct 23 2014 Jan Vcelak 1.6.0-1 -- new upstream release: - + support for persistent zone timers (expire, refresh, and flush) - + DNSSEC: RFC-compliant processing of letter case in RDATA domain names - + EDNS: return minimal response for queries with unsupported version - + EDNS: fix interpretation of Extended RCODE - + transfers: fix forced zone retransfer - + timers: properly expire zone when transfer is being refused by master - -* Mon Sep 15 2014 Jan Vcelak 1.5.3-1 -- new upstream release: - + fix crash on specific incoming IXFR message - + fix rare synchronization error during server reload - + fix crash in reverse record synthesis module on DNSSEC signed zones - + fix message ID and opcode for AXFR-style IXFR responses - + fix sending of large responses to remote control commands - -* Mon Sep 08 2014 Jan Vcelak 1.5.2-1 -- new upstream release: - + CVE-2014-0486: remote crash using crafted DNS message - + transfers: do not refuse AXFR answers to IXFR queries - + fix storing of hash character '#' in zone file - -* Tue Aug 19 2014 Jan Vcelak 1.5.1-1 -- new upstream release: - + logging: unified logging messages - + logging: support for systemd journal - + DDNS: processing updates in bulk - + DDNS: fix signing of responses with TSIG - + DDNS: fix prerequisites checking in apex node - + DNSSEC: fix domain names conversion to canonical format before signing - + DNSSEC: semantic checks for signing keys - + EDNS: fix inclusion of OPT record into some packets - + knsupdate: fix use of zone origin for deletions - -* Sun Aug 17 2014 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Jul 10 2014 Jan Vcelak 1.5.0-1 -- update to 1.5.0 - + reimplemented DDNS forwarding - + transfer sizes logged in bytes - + logging of outgoing/incoming NOTIFY messages - + zone flush planning after bootstrap - + DDNS signing changes freeing - + knotc key handling -- update to 1.5.0-rc2 - + edns-client-subnet support in kdig - + optional asynchronous startup (config 'asynchronous-start') - + preempt task queue for faster reload - + lazy zone file write after zone transfer (config 'zonefile-sync') - + close zone transfer after SERVFAIL response - + incremental to full zone transfer fallback, wrong log message - + zone events corner cases, reload replanning -- update to 1.5.0-rc1 - + Pluggable query processing modules - + Synthetic IPv4/IPv6 reverse/forward records (optional module) - + Dnstap support in both utilities & server (optional module) - + NOTIFY message support and new TSIG section in kdig - + Multi-master support - + Query processing and core functionality overhaul - + Performance and reduced memory footprint - + Faster zone events scheduling - + RFC compliant queries/responses in some corner cases - + Log messages - + New documentation (Sphinx) -- enabled dynamic linking -- removed info pages - -* Wed Jun 18 2014 Jan Vcelak 1.4.7-1 -- update to 1.4.7 - + Fixed DDNS corner cases - + Fixed zone EXPIRE timer - + Fixed semantic checks false positives - + Fixed sending malformed IXFR with automatic DNSSEC - + Fixed NAPTR record serialization - -* Thu May 22 2014 Jan Vcelak 1.4.6-2 -- update to 1.4.6 - + DNSSEC: fix possible signing loop when doing key rollover - + RRL: fixed sending of malformed UDP empty responses - -* Mon Apr 14 2014 Jan Vcelak 1.4.5-1 -- update to 1.4.5 - + fix weakness in TSIG digest checking - -* Thu Mar 27 2014 Jan Vcelak 1.4.4-1 -- update to 1.4.4 - + server is logging remote control commands - + 'knotc reload' doesn't refresh unchanged zones - + 'knotc -f refresh' forces zone retransfer - + missing notifications after DDNS/automatic resign - + zone is rebootstrapped if the zone file is unreadable - + progressive bootstrap retry backoff - + zone file parser allows asterisk as part of the label - + journal maximum entry size fixes - + sign DNSKEYs in non-apex nodes as regular RR sets - + various spelling and typo fixes - -* Tue Feb 18 2014 Jan Vcelak 1.4.3-1 -- update to 1.4.3 - + DNSSEC: fixes in authenticated denial proofs - + zone parser: case insensitive comparison of $ORIGIN - + journal: fix corruption if zone loading fails - + config: add support for includes of directories - -* Wed Feb 12 2014 Jan Vcelak 1.4.2-3 -- rebuild with new userspace-rcu - -* Mon Jan 27 2014 Jan Vcelak 1.4.2-2 -- enable IDN support in domain names - -* Mon Jan 27 2014 Jan Vcelak 1.4.2-1 -- update to 1.4.2 - -* Mon Jan 13 2014 Jan Vcelak 1.4.1-1 -- update to 1.4.1 - -* Mon Jan 06 2014 Jan Vcelak 1.4.0-1 -- update to 1.4.0 - -* Fri Dec 13 2013 Jan Vcelak 1.4.0-0.2.rc2 -- update to 1.4.0-rc2 - -* Tue Nov 26 2013 Jan Vcelak 1.4.0-0.1.rc1 -- update to 1.4.0-rc1 - -* Tue Oct 08 2013 Jan Vcelak 1.3.2-2 -- fix failing wire reading/writing tests on big endian (#1015976) - -* Tue Oct 01 2013 Jan Vcelak 1.3.2-1 -- update to 1.3.2 - + possibility to set max UDP payload in EDNS0 - + fixed bug limiting payload size in some TCP responses - + fixed closing of file descriptors for included files in config - -* Sun Sep 01 2013 Jan Vcelak 1.3.1-1 -- update to 1.3.1 - -* Mon Jul 29 2013 Jan Vcelak 1.3.0-0.4.rc5 -- update to 1.3.0-rc5 - -* Mon Jul 15 2013 Paul Wouters - 1.3.0-0.3.rc4 -- Added Alias=knotd.service alias to service file -- Added ExecStartPre=/usr/sbin/knotc checkconf to service file - -* Mon Jul 15 2013 Jan Vcelak 1.3.0-0.2.rc4 -- update to 1.3.0-rc4 - -* Wed Jul 03 2013 Jan Vcelak 1.3.0-0.1.rc3 -- update to 1.3.0-rc3 -- update configuration -- disable assertions in the code (define NDEBUG) -- enable unit tests as a part of RPM build process -- enable fast zone parser -- fix wrong dates in changelog - -* Fri Apr 05 2013 Paul Wouters - 1.2.0-1 -- Updated to 1.2.0-1 -- Enabled hardening/relro/pie protection - -* Thu Feb 14 2013 Fedora Release Engineering - 1.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Dec 20 2012 Paul Wouters - 1.1.3-2 -- Use new systemd macros - -* Thu Dec 20 2012 Paul Wouters - 1.1.3-1 -- Initial build for Fedora - -* Thu Nov 22 2012 Ondřej Surý - 1.1.2-1 -- Update to 1.1.2 - -* Wed Nov 7 2012 Stanislav Petr - 1.1.1-1 -- Fixed build problem -- Update to 1.1.1 -- Add man5 directory -- Add knot.info.gz to infodir - -* Mon Aug 27 2012 Stanislav Petr - 1.1.0-1 -- Update to 1.1.0-rc2 -- Fix default knot.conf -- Add build dependency to texinfo - -* Tue May 15 2012 Stanislav Petr - 1.0.6-2 -- Try to fix compilation problem on some systems - force add -lgcc_eh to gcc flags - -* Sun May 13 2012 Stanislav Petr - 1.0.6-1 -- Update to versio 1.0.6 -- Change attrs to 750 on /etc/knot - only for root (knot configuration can contain DNS keys for zone updates) -- Clean content in /etc/knot - -* Tue May 1 2012 Stanislav Petr - 1.0.5-1 -- Update to version 1.0.5 - -* Wed Apr 18 2012 Stanislav Petr - 1.0.3-1 -- Fixed knot directory ownership. -- Update to version 1.0.3 -- Merget changes from Paul Wouters -- Removed unnecessary commands pro %%post script -- Add knot user -- More configuration samples in /usr/share/doc/knot - -* Thu Mar 1 2012 Stanislav Petr - 1.0.0-4 -- Update to upstream version 1.0.0 -- Fix %%{_sharedstatedir} usage in .spec. -- Fix file and directories ownership -- Fix service upgrade in postun in rpm. -- Do not install unittests. - -* Wed Jan 25 2012 Stanislav Petr - 0.9.1-3 -- Update to upstream version 0.9.1 - -* Mon Dec 12 2011 Stanislav Petr - 0.8.1-3 -- Add docs (COPYING AUTHORS RELNOTES KNOWN_ISSUES) -- Update rpm building options. - Use %%{_sharedstatedir} instead of %%{_var}/lib, - dafault value for %%{buildroot} path -- Remove ldconfig from post and postun in rpm. -- Update licence to GPLv3+ - -* Wed Dec 07 2011 Stanislav Petr - 0.8.1-2 -- RPM build fix - -* Mon Dec 05 2011 Stanislav Petr - 0.8.1-1 -- Create From 11641d85914177788940ac762084ceb88c873105 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 14 Jan 2016 12:54:40 +0100 Subject: [PATCH 071/214] cleanup, user adding --- knot.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index d1ee791..ba69c9b 100644 --- a/knot.spec +++ b/knot.spec @@ -117,9 +117,7 @@ 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 exit 0 %post From 9d3c314d331fa006d8353417cad24d215b067dc3 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 14 Jan 2016 12:53:40 +0100 Subject: [PATCH 072/214] add KASP database initialization --- knot.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index ba69c9b..296a123 100644 --- a/knot.spec +++ b/knot.spec @@ -21,7 +21,7 @@ BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkg BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn) pkgconfig(libsystemd-daemon) pkgconfig(libsystemd-journal) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) BuildRequires: systemd -Requires(post): systemd +Requires(post): systemd %{_sbindir}/runuser Requires(preun): systemd Requires(postun): systemd @@ -122,6 +122,8 @@ exit 0 %post %systemd_post knot.service +# initialize/upgrade KASP database +%{_sbindir}/runuser -u knot -- %{_sbindir}/keymgr --dir %{_sharedstatedir}/%{name}/keys init %preun %systemd_preun knot.service From fdacee6e7d01e4c2da184dcb9b72bce65b310015 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 14 Jan 2016 12:57:20 +0100 Subject: [PATCH 073/214] new release (2.1.0) --- knot.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/knot.spec b/knot.spec index 296a123..f5da2df 100644 --- a/knot.spec +++ b/knot.spec @@ -1,16 +1,14 @@ %global _hardened_build 1 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -%global alphatag rc1 - Summary: High-performance authoritative DNS server Name: knot Version: 2.1.0 -Release: 0.1.%{alphatag}%{?dist} +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}-%{alphatag}.tar.xz +Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles @@ -63,7 +61,7 @@ Provides: bundled(jquery) The package contains documentation for the Knot DNS server. %prep -%setup -q -n %{name}-%{version}-%{alphatag} +%setup -q # make sure embedded LMDB library is not used rm -vr src/contrib/lmdb @@ -188,6 +186,12 @@ exit 0 %{_pkgdocdir}/html %changelog +* Thu Jan 14 2016 Jan Vcelak 2.1.0-1 +- new upstream release: + + improvement: Remove implementation limit for the number of network interfaces + + improvement: Remove possibly insecure server control over a network socket + + fix: Schedule zone bootstrap after slave zone fails to load from disk + * Sun Dec 20 2015 Jan Vcelak 2.1.0-0.1.rc1 - new upstream pre-release: + feature: Per-thread UDP socket binding using SO_REUSEPORT From c3ce6661c6a7c787e0cdf58514531800ce3e9407 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 14 Jan 2016 17:24:32 +0100 Subject: [PATCH 074/214] update sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index d87e529..01ef7a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3989fc32a186abf8aed5e0c3030aedc2 knot-2.1.0-rc1.tar.xz +e87d21fed5b30b83693cf36b0619ec6d knot-2.1.0.tar.xz From 29572bed889f1cdc208ed27b9a2c9975b055d1d2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 02:19:31 +0000 Subject: [PATCH 075/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index f5da2df..6d2f376 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -186,6 +186,9 @@ exit 0 %{_pkgdocdir}/html %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jan 14 2016 Jan Vcelak 2.1.0-1 - new upstream release: + improvement: Remove implementation limit for the number of network interfaces From 32aea1ee0df58e5fbc1472236b92aacb33fc1046 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Wed, 10 Feb 2016 20:36:55 +0100 Subject: [PATCH 076/214] new release (2.1.1) --- knot.spec | 13 +++++++++++-- sources | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 6d2f376..099c7bc 100644 --- a/knot.spec +++ b/knot.spec @@ -3,8 +3,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.1.0 -Release: 2%{?dist} +Version: 2.1.1 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -186,6 +186,15 @@ exit 0 %{_pkgdocdir}/html %changelog +* Wed Feb 10 2016 Jan Vcelak 2.1.1-1 +- new upstream release: + + fix: Allow import of duplicate private key into the KASP + + fix: Avoid duplicate NSEC for Wildcard No Data answer + + fix: Server crash when an incomming transfer is in progress and reload is issued + + fix: Socket polling when configured with many interfaces and threads + + improvement: Use correct source address for UDP messages recieved on ANY address + + improvement: Extend documentation of knotc commands + * Thu Feb 04 2016 Fedora Release Engineering - 2.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 01ef7a6..e2b9440 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e87d21fed5b30b83693cf36b0619ec6d knot-2.1.0.tar.xz +ee6a54ec8a7898579b768c66e2eaeb54 knot-2.1.1.tar.xz From 3bbb27f24d5286d34befbfdc274df43e7cae241b Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Tue, 26 Apr 2016 20:09:41 +0200 Subject: [PATCH 077/214] new release (2.2.0) --- .gitignore | 1 - knot.spec | 25 +++++++++++++++++++++++-- sources | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0fbcd24..fd86b97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/knot-*.tar.gz /knot-*.tar.xz diff --git a/knot.spec b/knot.spec index 099c7bc..d5fd620 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.1.1 +Version: 2.2.0 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -14,7 +14,7 @@ Source2: %{name}.conf Source3: %{name}.tmpfiles # Required dependencies -BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel +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-daemon) pkgconfig(libsystemd-journal) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) @@ -186,6 +186,27 @@ exit 0 %{_pkgdocdir}/html %changelog +* Tue Apr 26 2016 Jan Vcelak - 2.2.0-1 +- new upstream release: + + fix: Query/response message type setting in dnstap module + + fix: Remote address retrieval from dnstap capture in kdig + + fix: Global modules execution for queries hitting existing zones + + fix: Execution of semantic checks after an IXFR transfer + + fix: kdig failure when the first AXFR message contains just the SOA record + + fix: Exclude non-authoritative types from NSEC/NSEC3 bitmap at a delegation + + fix: Mark PKCS#11 generated keys as sensitive + + fix: Error when removing the only zone from the server + + fix: Don't abort knotc transaction when some check fails + + feature: URI and CAA resource record types support + + feature: RRL client address based white list + + feature: knotc interactive mode + + improvement: Consistent IXFR error messages + + improvement: Various fixes for better compatibility with PKCS#11 devices + + improvement: Various keymgr user interface improvements + + improvement: Better zone event scheduler performance with many zones + + improvement: New server control interface + + improvement: kdig uses local resolver if resolv.conf is empty + * Wed Feb 10 2016 Jan Vcelak 2.1.1-1 - new upstream release: + fix: Allow import of duplicate private key into the KASP diff --git a/sources b/sources index e2b9440..51cbd3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee6a54ec8a7898579b768c66e2eaeb54 knot-2.1.1.tar.xz +ac00a189038fd692c53b2e8c1837c5cb knot-2.2.0.tar.xz From a4a976e42c809bec41eebbc027b961efc57fb909 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Sun, 8 May 2016 13:41:54 +0200 Subject: [PATCH 078/214] fix server startup --- 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 d5fd620..022de57 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -186,6 +186,9 @@ exit 0 %{_pkgdocdir}/html %changelog +* Sun May 08 2016 Jan Vcelak - 2.2.0-2 +- fix: systemd service starting + * Tue Apr 26 2016 Jan Vcelak - 2.2.0-1 - new upstream release: + fix: Query/response message type setting in dnstap module From 65c2a717d1acac5a4a2f2d9539432eb6501c8e16 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Sun, 29 May 2016 16:19:12 +0200 Subject: [PATCH 079/214] fix configuration file --- knot.conf | 42 +++++++++++++++++------------------------- knot.spec | 5 ++++- 2 files changed, 21 insertions(+), 26 deletions(-) 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 022de57..ada80ba 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -186,6 +186,9 @@ exit 0 %{_pkgdocdir}/html %changelog +* Sun May 29 2016 Jan Vcelak - 2.2.0-3 +- update default configuration file + * Sun May 08 2016 Jan Vcelak - 2.2.0-2 - fix: systemd service starting From 79ae42d260669b590dcbc266a4b1ba6b62912dc4 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 30 May 2016 10:52:28 +0200 Subject: [PATCH 080/214] new release (2.2.1) --- knot.spec | 22 +++++++++++++++++++--- sources | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index ada80ba..583eb3f 100644 --- a/knot.spec +++ b/knot.spec @@ -3,8 +3,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.2.0 -Release: 3%{?dist} +Version: 2.2.1 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -16,7 +16,7 @@ Source3: %{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-daemon) pkgconfig(libsystemd-journal) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) +BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn) pkgconfig(libsystemd) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) BuildRequires: systemd Requires(post): systemd %{_sbindir}/runuser @@ -186,6 +186,22 @@ exit 0 %{_pkgdocdir}/html %changelog +* Mon May 30 2016 Jan Vcelak - 2.2.1-1 +- new upstream release: + + fix: Separate logging of server and zone events + + fix: Concurrent zone file flushing with many zones + + fix: Control timeout parsing in knotc + + fix: "Environment maxreaders limit reached" error in knotc + + fix: Don't apply journal changes on modified zone file + + fix: Enable multiple zone names completion in interactive knotc + + fix: Set the TC flag in a response if a glue doesn't fit the response + + fix: Disallow server reload when there is an active configuration transaction + + improvement: Distinguish unavailable zones from zones with zero serial in log messages + + improvement: Log warning and error messages to standard error output in all utilities + + improvement: Document tested PKCS #11 devices + + improvement: Extended Python configuration interface +- update requirements for Fedora 25 + * Sun May 29 2016 Jan Vcelak - 2.2.0-3 - update default configuration file diff --git a/sources b/sources index 51cbd3e..e731cc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac00a189038fd692c53b2e8c1837c5cb knot-2.2.0.tar.xz +d573ecadedf4f15ec1f02671443520cb knot-2.2.1.tar.xz From 508693268265f21ab13af5815afe6a34132895a1 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 24 Jun 2016 19:31:45 +0200 Subject: [PATCH 081/214] rebuild for updated userspace-rcu --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 583eb3f..3742a25 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -186,6 +186,9 @@ exit 0 %{_pkgdocdir}/html %changelog +* Fri Jun 24 2016 Jan Vcelak - 2.2.1-2 +- rebuild for updated userspace-rcu + * Mon May 30 2016 Jan Vcelak - 2.2.1-1 - new upstream release: + fix: Separate logging of server and zone events From 6efbf85917b1619d5f46dcba5bc240ac2c801afd Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Tue, 9 Aug 2016 19:44:18 +0200 Subject: [PATCH 082/214] new release (2.3.0) Resolves: #1353573 #1353574 --- knot.spec | 17 +++++++++++++++-- sources | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 3742a25..89c81d6 100644 --- a/knot.spec +++ b/knot.spec @@ -3,8 +3,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.2.1 -Release: 2%{?dist} +Version: 2.3.0 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -186,6 +186,19 @@ exit 0 %{_pkgdocdir}/html %changelog +* Tue Aug 09 2016 Jan Vcelak - 2.3.0-1 +- new upstream release: + + fix: No wildcard expansion below empty non-terminal for NSEC signed zone + + fix: Don't ignore non-existing records to be removed in IXFR + + fix: Fix kdig IXFR response processing if the transfer content is empty + + fix: Avoid multiple loads of the same PKCS #11 module + + improvement: Refactored semantic checks and better error messages + + improvement: Set TC flag in delegation only if mandatory glue doesn't fit the response + + improvement: Separate EDNS(0) payload size configuration for IPv4 and IPv6 + + feature: Zone size limit restriction for DDNS, AXFR, and IXFR (CVE-2016-6171) + + feature: DNS-over-TLS support in kdig (RFC 7858) + + feature: EDNS(0) padding and alignment support in kdig (RFC 7830) + * Fri Jun 24 2016 Jan Vcelak - 2.2.1-2 - rebuild for updated userspace-rcu diff --git a/sources b/sources index e731cc0..5bdd49a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d573ecadedf4f15ec1f02671443520cb knot-2.2.1.tar.xz +7ca754f972fb07faa4f30e50d8a4385b knot-2.3.0.tar.xz From 61186c4ac8c03d248a581a13f4697dd812f111f7 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Tue, 9 Aug 2016 21:57:45 +0200 Subject: [PATCH 083/214] package new utility --- knot.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/knot.spec b/knot.spec index 89c81d6..90bd4d4 100644 --- a/knot.spec +++ b/knot.spec @@ -146,7 +146,9 @@ exit 0 %{_sbindir}/keymgr %{_sbindir}/knotc %{_sbindir}/knotd +%{_sbindir}/kzonecheck %{_mandir}/man1/knot1to2.* +%{_mandir}/man1/kzonecheck.* %{_mandir}/man5/knot.conf.* %{_mandir}/man8/keymgr.* %{_mandir}/man8/knotc.* From 5a64f28e851d4bf48d3e35abe3591e3fe9a29929 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 11 Aug 2016 14:45:52 +0200 Subject: [PATCH 084/214] fix build on ppc64 and s390x (big endian) Resolves: #1365862 --- 0001-dns-cookies-endian.patch | 216 ++++++++++++++++++++++++++++++++++ knot.spec | 9 +- 2 files changed, 223 insertions(+), 2 deletions(-) create mode 100644 0001-dns-cookies-endian.patch diff --git a/0001-dns-cookies-endian.patch b/0001-dns-cookies-endian.patch new file mode 100644 index 0000000..60667ab --- /dev/null +++ b/0001-dns-cookies-endian.patch @@ -0,0 +1,216 @@ +From 84849be189c49ef9556bd84d5e5103317372e8a7 Mon Sep 17 00:00:00 2001 +From: Karel Slany +Date: Thu, 11 Aug 2016 11:39:39 +0200 +Subject: [PATCH] Added conversion to wire format when writing FNV64 hash values. + +Test on big-endian machines have been failing. +--- + src/libknot/cookies/alg-fnv64.c | 6 +++--- + tests/libknot/test_cookies-client.c | 20 ++++++++++---------- + tests/libknot/test_cookies-server.c | 20 ++++++++++---------- + 3 files changed, 23 insertions(+), 23 deletions(-) + +diff --git a/src/libknot/cookies/alg-fnv64.c b/src/libknot/cookies/alg-fnv64.c +index 9989a4f..5e263c1 100644 +--- a/src/libknot/cookies/alg-fnv64.c ++++ b/src/libknot/cookies/alg-fnv64.c +@@ -17,10 +17,10 @@ + #include + #include + #include +-#include + + #include "contrib/fnv/fnv.h" + #include "contrib/sockaddr.h" ++#include "contrib/wire.h" + #include "libknot/attribute.h" + #include "libknot/cookies/alg-fnv64.h" + #include "libknot/rrtype/opt-cookie.h" +@@ -80,7 +80,7 @@ static uint16_t cc_gen_fnv64(const struct knot_cc_input *input, + assert(KNOT_OPT_COOKIE_CLNT == sizeof(hash_val)); + + cc_len = sizeof(hash_val); +- memcpy(cc_out, &hash_val, cc_len); ++ wire_write_u64(cc_out, hash_val); + + return cc_len; + } +@@ -127,7 +127,7 @@ static uint16_t sc_gen_fnv64(const struct knot_sc_input *input, + assert(SRVR_FNV64_HASH_SIZE == sizeof(hash_val)); + + hash_len = sizeof(hash_val); +- memcpy(hash_out, &hash_val, hash_len); ++ wire_write_u64(hash_out, hash_val); + + return hash_len; + } +diff --git a/tests/libknot/test_cookies-client.c b/tests/libknot/test_cookies-client.c +index 44be903..712dbba 100644 +--- a/tests/libknot/test_cookies-client.c ++++ b/tests/libknot/test_cookies-client.c +@@ -110,7 +110,7 @@ int main(int argc, char *argv[]) + hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); + ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); + { +- uint8_t expected[] = { 0x74, 0x31, 0xf9, 0xa8, 0x03, 0xef, 0x15, 0xb1 }; ++ uint8_t expected[] = { 0xb1, 0x15, 0xef, 0x03, 0xa8, 0xf9, 0x31, 0x74 }; + ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); + } + +@@ -123,7 +123,7 @@ int main(int argc, char *argv[]) + hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); + ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); + { +- uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 }; ++ uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c }; + ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); + } + +@@ -136,7 +136,7 @@ int main(int argc, char *argv[]) + hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); + ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); + { +- uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 }; ++ uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c }; + ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); + } + +@@ -149,7 +149,7 @@ int main(int argc, char *argv[]) + hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); + ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); + { +- uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa }; ++ uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 }; + ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); + } + +@@ -162,7 +162,7 @@ int main(int argc, char *argv[]) + hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); + ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); + { +- uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa }; ++ uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 }; + ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); + } + +@@ -179,7 +179,7 @@ int main(int argc, char *argv[]) + } + + { +- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf }; ++ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 }; + ret = knot_cc_check(cookie, sizeof(cookie), NULL, &knot_cc_alg_fnv64); + ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no input"); + } +@@ -190,7 +190,7 @@ int main(int argc, char *argv[]) + cc_in.secret_data = secret; + cc_in.secret_len = sizeof(secret); + { +- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf }; ++ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 }; + ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, NULL); + ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no algorithm"); + } +@@ -201,7 +201,7 @@ int main(int argc, char *argv[]) + cc_in.secret_data = secret; + cc_in.secret_len = sizeof(secret); + { +- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf }; ++ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 }; + ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64); + ok(ret == KNOT_EOK, "cookies: FNV64 client good cookie check"); + } +@@ -212,7 +212,7 @@ int main(int argc, char *argv[]) + cc_in.secret_data = secret; + cc_in.secret_len = sizeof(secret); + { +- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf }; ++ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 }; + ret = knot_cc_check(cookie, sizeof(cookie) - 1, &cc_in, &knot_cc_alg_fnv64); + ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid length"); + } +@@ -223,7 +223,7 @@ int main(int argc, char *argv[]) + cc_in.secret_data = secret; + cc_in.secret_len = sizeof(secret); + { +- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xae }; ++ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x32 }; + ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64); + ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid cookie"); + } +diff --git a/tests/libknot/test_cookies-server.c b/tests/libknot/test_cookies-server.c +index 32001c1..66a54ba 100644 +--- a/tests/libknot/test_cookies-server.c ++++ b/tests/libknot/test_cookies-server.c +@@ -28,10 +28,10 @@ + #include "libknot/rrtype/opt-cookie.h" + + const char *cookie_opts[] = { +- "\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\xe0\xd9\x95\x4e\xbc\xc3\x99\x18", /* 8 octets long wrong server cookie. */ +- "\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\xe0\xd9\x95\x4e\xbc\xc3\x99\x19", /* 8 octets long OK server cookie. */ +- "\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\xc0\xbd\xdb\xec\x19\x78\x88\x38", /* 8B nonce 8B hash long wrong server cookie. */ +- "\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\xc0\xbd\xdb\xec\x19\x78\x88\x39" /* 8B nonce 8B hash long OK server cookie. */ ++ "\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x19\x99\xc3\xbc\x4e\x95\xd9\xdf", /* 8 octets long wrong server cookie. */ ++ "\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x19\x99\xc3\xbc\x4e\x95\xd9\xe0", /* 8 octets long OK server cookie. */ ++ "\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x39\x88\x78\x19\xec\xdb\xbd\xbf", /* 8B nonce 8B hash long wrong server cookie. */ ++ "\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x39\x88\x78\x19\xec\xdb\xbd\xc0"/* 8B nonce 8B hash long OK server cookie. */ + }; + + #define ROPT(i) ((const uint8_t *)cookie_opts[(i)]) +@@ -193,7 +193,7 @@ int main(int argc, char *argv[]) + hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); + ok(hash_len != 0, "cookies: FNV64 server cookie output"); + { +- uint8_t expected[] = { 0x75, 0x45, 0x7c, 0x9a, 0xe0, 0x13, 0xa8, 0xea }; ++ uint8_t expected[] = { 0xea, 0xa8, 0x13, 0xe0, 0x9a, 0x7c, 0x45, 0x75 }; + ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); + } + +@@ -210,7 +210,7 @@ int main(int argc, char *argv[]) + hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); + ok(hash_len != 0, "cookies: FNV64 server cookie output"); + { +- uint8_t expected[] = { 0xc0, 0xbd, 0xdb, 0xec, 0x19, 0x78, 0x88, 0x39 }; ++ uint8_t expected[] = { 0x39, 0x88, 0x78, 0x19, 0xec, 0xdb, 0xbd, 0xc0 }; + ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); + } + +@@ -227,7 +227,7 @@ int main(int argc, char *argv[]) + hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); + ok(hash_len != 0, "cookies: FNV64 server cookie output"); + { +- uint8_t expected[] = { 0xe0, 0xd9, 0x95, 0x4e, 0xbc, 0xc3, 0x99, 0x19 }; ++ uint8_t expected[] = { 0x19, 0x99, 0xc3, 0xbc, 0x4e, 0x95, 0xd9, 0xe0 }; + ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); + } + +@@ -244,7 +244,7 @@ int main(int argc, char *argv[]) + hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); + ok(hash_len != 0, "cookies: FNV64 server cookie output"); + { +- uint8_t expected[] = { 0x4d, 0xde, 0xfa, 0x22, 0xb9, 0x0a, 0xcc, 0xd8 }; ++ uint8_t expected[] = { 0xd8, 0xcc, 0x0a, 0xb9, 0x22, 0xfa, 0xde, 0x4d }; + ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); + } + +@@ -261,7 +261,7 @@ int main(int argc, char *argv[]) + hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); + ok(hash_len != 0, "cookies: FNV64 server cookie output"); + { +- uint8_t expected[] = { 0xa0, 0x35, 0xe3, 0xe0, 0x78, 0x7a, 0x91, 0xaf }; ++ uint8_t expected[] = { 0xaf, 0x91, 0x7a, 0x78, 0xe0, 0xe3, 0x35, 0xa0 }; + ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); + } + +@@ -278,7 +278,7 @@ int main(int argc, char *argv[]) + hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); + ok(hash_len != 0, "cookies: FNV64 server cookie output"); + { +- uint8_t expected[] = { 0x8e, 0xa3, 0xf8, 0x97, 0x84, 0x0a, 0x3d, 0x8b }; ++ uint8_t expected[] = { 0x8b, 0x3d, 0x0a, 0x84, 0x97, 0xf8, 0xa3, 0x8e }; + ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); + } + +-- +libgit2 0.24.0 + diff --git a/knot.spec b/knot.spec index 90bd4d4..f8661af 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -13,6 +13,8 @@ Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles +Patch1: 0001-dns-cookies-endian.patch + # Required dependencies BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel pkgconfig(libedit) # Optional dependencies @@ -61,7 +63,7 @@ Provides: bundled(jquery) The package contains documentation for the Knot DNS server. %prep -%setup -q +%autosetup -S git # make sure embedded LMDB library is not used rm -vr src/contrib/lmdb @@ -188,6 +190,9 @@ exit 0 %{_pkgdocdir}/html %changelog +* Thu Aug 11 2016 Jan Vcelak - 2.3.0-2 +- endian independent DNS cookies (fixes build on ppc64 and s390x) + * Tue Aug 09 2016 Jan Vcelak - 2.3.0-1 - new upstream release: + fix: No wildcard expansion below empty non-terminal for NSEC signed zone From 305a0b2a1d0f8e2fcedfc102fe566ceddadb490f Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 11 Aug 2016 14:55:52 +0200 Subject: [PATCH 085/214] %setup instead of %autosetup to avoid git depenency --- knot.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index f8661af..32a6dc8 100644 --- a/knot.spec +++ b/knot.spec @@ -63,7 +63,8 @@ Provides: bundled(jquery) The package contains documentation for the Knot DNS server. %prep -%autosetup -S git +%setup -q +%patch1 -p1 # make sure embedded LMDB library is not used rm -vr src/contrib/lmdb From 4dfe89727a9c73affb0ec85df2aa25cb4b8e8371 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 29 Aug 2016 12:04:39 +0200 Subject: [PATCH 086/214] fix post-installation scriptlet Resolves: #1370939 --- knot.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index 32a6dc8..5d34e55 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -124,7 +124,7 @@ exit 0 %post %systemd_post knot.service # initialize/upgrade KASP database -%{_sbindir}/runuser -u knot -- %{_sbindir}/keymgr --dir %{_sharedstatedir}/%{name}/keys init +%{_sbindir}/runuser -u knot -- %{_sbindir}/keymgr --dir %{_sharedstatedir}/%{name}/keys --legacy init %preun %systemd_preun knot.service @@ -191,6 +191,9 @@ exit 0 %{_pkgdocdir}/html %changelog +* Mon Aug 29 2016 Jan Vcelak - 2.3.0-3 +- fix post-installation scriptlet (RHBZ #1370939) + * Thu Aug 11 2016 Jan Vcelak - 2.3.0-2 - endian independent DNS cookies (fixes build on ppc64 and s390x) From e27a82dbeb9554686bc5098d15aeb226d9875fd7 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 17 Nov 2016 12:52:30 +0100 Subject: [PATCH 087/214] new upstream version --- 0001-dns-cookies-endian.patch | 216 ---------------------------------- knot.spec | 35 +++++- sources | 2 +- 3 files changed, 31 insertions(+), 222 deletions(-) delete mode 100644 0001-dns-cookies-endian.patch diff --git a/0001-dns-cookies-endian.patch b/0001-dns-cookies-endian.patch deleted file mode 100644 index 60667ab..0000000 --- a/0001-dns-cookies-endian.patch +++ /dev/null @@ -1,216 +0,0 @@ -From 84849be189c49ef9556bd84d5e5103317372e8a7 Mon Sep 17 00:00:00 2001 -From: Karel Slany -Date: Thu, 11 Aug 2016 11:39:39 +0200 -Subject: [PATCH] Added conversion to wire format when writing FNV64 hash values. - -Test on big-endian machines have been failing. ---- - src/libknot/cookies/alg-fnv64.c | 6 +++--- - tests/libknot/test_cookies-client.c | 20 ++++++++++---------- - tests/libknot/test_cookies-server.c | 20 ++++++++++---------- - 3 files changed, 23 insertions(+), 23 deletions(-) - -diff --git a/src/libknot/cookies/alg-fnv64.c b/src/libknot/cookies/alg-fnv64.c -index 9989a4f..5e263c1 100644 ---- a/src/libknot/cookies/alg-fnv64.c -+++ b/src/libknot/cookies/alg-fnv64.c -@@ -17,10 +17,10 @@ - #include - #include - #include --#include - - #include "contrib/fnv/fnv.h" - #include "contrib/sockaddr.h" -+#include "contrib/wire.h" - #include "libknot/attribute.h" - #include "libknot/cookies/alg-fnv64.h" - #include "libknot/rrtype/opt-cookie.h" -@@ -80,7 +80,7 @@ static uint16_t cc_gen_fnv64(const struct knot_cc_input *input, - assert(KNOT_OPT_COOKIE_CLNT == sizeof(hash_val)); - - cc_len = sizeof(hash_val); -- memcpy(cc_out, &hash_val, cc_len); -+ wire_write_u64(cc_out, hash_val); - - return cc_len; - } -@@ -127,7 +127,7 @@ static uint16_t sc_gen_fnv64(const struct knot_sc_input *input, - assert(SRVR_FNV64_HASH_SIZE == sizeof(hash_val)); - - hash_len = sizeof(hash_val); -- memcpy(hash_out, &hash_val, hash_len); -+ wire_write_u64(hash_out, hash_val); - - return hash_len; - } -diff --git a/tests/libknot/test_cookies-client.c b/tests/libknot/test_cookies-client.c -index 44be903..712dbba 100644 ---- a/tests/libknot/test_cookies-client.c -+++ b/tests/libknot/test_cookies-client.c -@@ -110,7 +110,7 @@ int main(int argc, char *argv[]) - hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); - ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); - { -- uint8_t expected[] = { 0x74, 0x31, 0xf9, 0xa8, 0x03, 0xef, 0x15, 0xb1 }; -+ uint8_t expected[] = { 0xb1, 0x15, 0xef, 0x03, 0xa8, 0xf9, 0x31, 0x74 }; - ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); - } - -@@ -123,7 +123,7 @@ int main(int argc, char *argv[]) - hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); - ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); - { -- uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 }; -+ uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c }; - ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); - } - -@@ -136,7 +136,7 @@ int main(int argc, char *argv[]) - hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); - ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); - { -- uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 }; -+ uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c }; - ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); - } - -@@ -149,7 +149,7 @@ int main(int argc, char *argv[]) - hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); - ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); - { -- uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa }; -+ uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 }; - ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); - } - -@@ -162,7 +162,7 @@ int main(int argc, char *argv[]) - hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); - ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); - { -- uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa }; -+ uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 }; - ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); - } - -@@ -179,7 +179,7 @@ int main(int argc, char *argv[]) - } - - { -- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf }; -+ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 }; - ret = knot_cc_check(cookie, sizeof(cookie), NULL, &knot_cc_alg_fnv64); - ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no input"); - } -@@ -190,7 +190,7 @@ int main(int argc, char *argv[]) - cc_in.secret_data = secret; - cc_in.secret_len = sizeof(secret); - { -- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf }; -+ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 }; - ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, NULL); - ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no algorithm"); - } -@@ -201,7 +201,7 @@ int main(int argc, char *argv[]) - cc_in.secret_data = secret; - cc_in.secret_len = sizeof(secret); - { -- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf }; -+ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 }; - ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64); - ok(ret == KNOT_EOK, "cookies: FNV64 client good cookie check"); - } -@@ -212,7 +212,7 @@ int main(int argc, char *argv[]) - cc_in.secret_data = secret; - cc_in.secret_len = sizeof(secret); - { -- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf }; -+ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 }; - ret = knot_cc_check(cookie, sizeof(cookie) - 1, &cc_in, &knot_cc_alg_fnv64); - ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid length"); - } -@@ -223,7 +223,7 @@ int main(int argc, char *argv[]) - cc_in.secret_data = secret; - cc_in.secret_len = sizeof(secret); - { -- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xae }; -+ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x32 }; - ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64); - ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid cookie"); - } -diff --git a/tests/libknot/test_cookies-server.c b/tests/libknot/test_cookies-server.c -index 32001c1..66a54ba 100644 ---- a/tests/libknot/test_cookies-server.c -+++ b/tests/libknot/test_cookies-server.c -@@ -28,10 +28,10 @@ - #include "libknot/rrtype/opt-cookie.h" - - const char *cookie_opts[] = { -- "\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\xe0\xd9\x95\x4e\xbc\xc3\x99\x18", /* 8 octets long wrong server cookie. */ -- "\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\xe0\xd9\x95\x4e\xbc\xc3\x99\x19", /* 8 octets long OK server cookie. */ -- "\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\xc0\xbd\xdb\xec\x19\x78\x88\x38", /* 8B nonce 8B hash long wrong server cookie. */ -- "\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\xc0\xbd\xdb\xec\x19\x78\x88\x39" /* 8B nonce 8B hash long OK server cookie. */ -+ "\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x19\x99\xc3\xbc\x4e\x95\xd9\xdf", /* 8 octets long wrong server cookie. */ -+ "\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x19\x99\xc3\xbc\x4e\x95\xd9\xe0", /* 8 octets long OK server cookie. */ -+ "\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x39\x88\x78\x19\xec\xdb\xbd\xbf", /* 8B nonce 8B hash long wrong server cookie. */ -+ "\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x39\x88\x78\x19\xec\xdb\xbd\xc0"/* 8B nonce 8B hash long OK server cookie. */ - }; - - #define ROPT(i) ((const uint8_t *)cookie_opts[(i)]) -@@ -193,7 +193,7 @@ int main(int argc, char *argv[]) - hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); - ok(hash_len != 0, "cookies: FNV64 server cookie output"); - { -- uint8_t expected[] = { 0x75, 0x45, 0x7c, 0x9a, 0xe0, 0x13, 0xa8, 0xea }; -+ uint8_t expected[] = { 0xea, 0xa8, 0x13, 0xe0, 0x9a, 0x7c, 0x45, 0x75 }; - ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); - } - -@@ -210,7 +210,7 @@ int main(int argc, char *argv[]) - hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); - ok(hash_len != 0, "cookies: FNV64 server cookie output"); - { -- uint8_t expected[] = { 0xc0, 0xbd, 0xdb, 0xec, 0x19, 0x78, 0x88, 0x39 }; -+ uint8_t expected[] = { 0x39, 0x88, 0x78, 0x19, 0xec, 0xdb, 0xbd, 0xc0 }; - ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); - } - -@@ -227,7 +227,7 @@ int main(int argc, char *argv[]) - hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); - ok(hash_len != 0, "cookies: FNV64 server cookie output"); - { -- uint8_t expected[] = { 0xe0, 0xd9, 0x95, 0x4e, 0xbc, 0xc3, 0x99, 0x19 }; -+ uint8_t expected[] = { 0x19, 0x99, 0xc3, 0xbc, 0x4e, 0x95, 0xd9, 0xe0 }; - ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); - } - -@@ -244,7 +244,7 @@ int main(int argc, char *argv[]) - hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); - ok(hash_len != 0, "cookies: FNV64 server cookie output"); - { -- uint8_t expected[] = { 0x4d, 0xde, 0xfa, 0x22, 0xb9, 0x0a, 0xcc, 0xd8 }; -+ uint8_t expected[] = { 0xd8, 0xcc, 0x0a, 0xb9, 0x22, 0xfa, 0xde, 0x4d }; - ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); - } - -@@ -261,7 +261,7 @@ int main(int argc, char *argv[]) - hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); - ok(hash_len != 0, "cookies: FNV64 server cookie output"); - { -- uint8_t expected[] = { 0xa0, 0x35, 0xe3, 0xe0, 0x78, 0x7a, 0x91, 0xaf }; -+ uint8_t expected[] = { 0xaf, 0x91, 0x7a, 0x78, 0xe0, 0xe3, 0x35, 0xa0 }; - ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); - } - -@@ -278,7 +278,7 @@ int main(int argc, char *argv[]) - hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); - ok(hash_len != 0, "cookies: FNV64 server cookie output"); - { -- uint8_t expected[] = { 0x8e, 0xa3, 0xf8, 0x97, 0x84, 0x0a, 0x3d, 0x8b }; -+ uint8_t expected[] = { 0x8b, 0x3d, 0x0a, 0x84, 0x97, 0xf8, 0xa3, 0x8e }; - ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); - } - --- -libgit2 0.24.0 - diff --git a/knot.spec b/knot.spec index 5d34e55..6ec29dc 100644 --- a/knot.spec +++ b/knot.spec @@ -3,8 +3,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.3.0 -Release: 3%{?dist} +Version: 2.3.2 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -13,8 +13,6 @@ Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles -Patch1: 0001-dns-cookies-endian.patch - # Required dependencies BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel pkgconfig(libedit) # Optional dependencies @@ -64,7 +62,6 @@ The package contains documentation for the Knot DNS server. %prep %setup -q -%patch1 -p1 # make sure embedded LMDB library is not used rm -vr src/contrib/lmdb @@ -191,6 +188,34 @@ exit 0 %{_pkgdocdir}/html %changelog +* Thu Nov 17 2016 Jan Vcelak - 2.3.2-1 +- new upstream release: + + fix: missing glue in some responses + + fix: knsupdate prompt printing on non-terminal + + fix: configuration policy item names in documentation + + fix: segfault on OS X Sierra + + fix: incorrect %s expansion for the root zone + + fix: refresh not existing slave zone after restart + + fix: immediate zone refresh upon restart if refresh already scheduled + + fix: early zone transfer after restart if transfer already scheduled + + fix: not ignoring empty non-terminal parents during delegation lookup + + fix: CD bit clearing in responses + + fix: compilation error on GNU/kFreeBSD + + fix: server crash after double zone-commit if journal error + + improvement: significant speed-up of conf-commit and conf-diff operations + + improvement: new EDNS Client Subnet API + + improvement: better semantic-checks error messages + + improvement: speed-up of knotc if control operation and known socket + + improvement: zone purge operation purges also zone timers + + feature: print TLS certificate hierarchy in kdig verbose mode + + feature: new +subnet alias for +client + + feature: new mod-whoami and mod-noudp modules + + feature: new zone-purge control command + + feature: new log-queries and log-responses options for mod-dnstap + + feature: simple modules don't require empty configuration section + + feature: new zone journal path configuration option + + feature: new timeout configuration option for module dnsproxy + * Mon Aug 29 2016 Jan Vcelak - 2.3.0-3 - fix post-installation scriptlet (RHBZ #1370939) diff --git a/sources b/sources index 5bdd49a..84371e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ca754f972fb07faa4f30e50d8a4385b knot-2.3.0.tar.xz +22f454e210f56230aef8c5e145e63990 knot-2.3.2.tar.xz From 40ddfef9853f6e20b07ba6d18fed8a3b3e046da8 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 17 Nov 2016 13:08:10 +0100 Subject: [PATCH 088/214] fix path for moved kzonecheck --- knot.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 6ec29dc..19278a6 100644 --- a/knot.spec +++ b/knot.spec @@ -143,10 +143,10 @@ exit 0 %{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf %{_libexecdir}/knot1to2 +%{_bindir}/kzonecheck %{_sbindir}/keymgr %{_sbindir}/knotc %{_sbindir}/knotd -%{_sbindir}/kzonecheck %{_mandir}/man1/knot1to2.* %{_mandir}/man1/kzonecheck.* %{_mandir}/man5/knot.conf.* From ebd4b0f9334179ef43904cf5b4ab21f2bd321dcd Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 17 Nov 2016 13:10:26 +0100 Subject: [PATCH 089/214] fix changelog e-mail --- knot.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 19278a6..8fa265f 100644 --- a/knot.spec +++ b/knot.spec @@ -188,7 +188,7 @@ exit 0 %{_pkgdocdir}/html %changelog -* Thu Nov 17 2016 Jan Vcelak - 2.3.2-1 +* Thu Nov 17 2016 Jan Vcelak - 2.3.2-1 - new upstream release: + fix: missing glue in some responses + fix: knsupdate prompt printing on non-terminal From 98f4bc1283b5552fe75f1854a6cc23143b350f82 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Fri, 9 Dec 2016 01:35:08 +0100 Subject: [PATCH 090/214] new upstream release (2.3.3) --- knot.spec | 14 +++++++++++++- sources | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index 8fa265f..1f44ec6 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.3.2 +Version: 2.3.3 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -143,11 +143,13 @@ exit 0 %{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf %{_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.* @@ -188,6 +190,16 @@ exit 0 %{_pkgdocdir}/html %changelog +* Fri Dec 09 2016 Jan Vcelak - 2.3.3-1 +- new upstream release: + + fix: double free when failed to apply zone journal + + fix: zone bootstrap retry interval not preserved upon zone reload + + fix: DNSSEC related records not flushed if not signed + + fix: false semantic checks warning about incorrect type in NSEC bitmap + + fix: memory leak in kzonecheck + + improvement: all zone names are fully-qualified in log + + features: new kjournalprint utility + * Thu Nov 17 2016 Jan Vcelak - 2.3.2-1 - new upstream release: + fix: missing glue in some responses diff --git a/sources b/sources index 84371e7..600192a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22f454e210f56230aef8c5e145e63990 knot-2.3.2.tar.xz +d8f6992c6ee073c5eaa1768b3aec1948 knot-2.3.3.tar.xz From 216a9708010613289a898b7d87003558f24da7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Tue, 24 Jan 2017 18:28:43 +0100 Subject: [PATCH 091/214] new upstream release (2.4.0) --- .gitignore | 1 + knot.spec | 27 ++++++++++++++++++++++++++- sources | 3 ++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fd86b97..e316ec0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /knot-*.tar.xz +/knot-2.4.0.tar.xz.asc diff --git a/knot.spec b/knot.spec index 1f44ec6..01ac992 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.3.3 +Version: 2.4.0 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -190,6 +190,31 @@ exit 0 %{_pkgdocdir}/html %changelog +* Tue Jan 24 2017 Petr Spacek - 2.4.0-1 +- new upstream release: + + fix: False positive semantic-check warning about invalid bitmap in NSEC + + fix: Unnecessary SOA queries upon notify with up to date serial + + fix: Timers for expired zones are reset on reload + + fix: Zone doesn't expire when the server is down + + fix: Failed to handle keys with duplicate keytags + + fix: Per zone module and global module insconsistency + + fix: Obsolete online signing module configuration + + fix: Malformed output from kjournalprint + + fix: Redundant SO_REUSEPORT activation on the TCP socket + + fix: Failed to use higher number of background workers + + improvement: Lower memory consumption with qp-trie + + improvement: Zone events and zone timers improvements + + improvement: Print all zone names in the FQDN format + + improvement: Simplified query module interface + + improvement: Shared TCP connection between SOA query and transfer + + improvement: Response Rate Limiting as a module with statistics support + + improvement: Key filters in keymgr + + features: New unified LMDB-based zone journal + + features: Server statistics support + + features: New statistics module for traffic measuring + + features: Automatic deletion of retired DNSSEC keys + + features: New control logging category + * Fri Dec 09 2016 Jan Vcelak - 2.3.3-1 - new upstream release: + fix: double free when failed to apply zone journal diff --git a/sources b/sources index 600192a..3a80b75 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -d8f6992c6ee073c5eaa1768b3aec1948 knot-2.3.3.tar.xz +SHA512 (knot-2.4.0.tar.xz) = 5c154104733b481ca2c4ffbac74fea2f4dac7beb35bb42364b9486d0e4d9c01ef46624fb16905ecca37d9a534b44bce7b8a7ed966b7baa7f4182e1dbf4dc7181 +SHA512 (knot-2.4.0.tar.xz.asc) = baa457ec4298514deafc8056cdfb1c13f849adc6f90e37616416ffef59053af636d5dcdf5260527490fe687baad8fd57aeb0b3be06f0b016fa234aae77385e83 From a485e3f8be9244e4bea042436684deb55f6c2fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Fri, 27 Jan 2017 19:28:16 +0100 Subject: [PATCH 092/214] add workarounds for 32-bit architectures (small address space) --- test_zone-update_10m.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 test_zone-update_10m.patch diff --git a/test_zone-update_10m.patch b/test_zone-update_10m.patch new file mode 100644 index 0000000..0b3e2c7 --- /dev/null +++ b/test_zone-update_10m.patch @@ -0,0 +1,25 @@ +commit 2eca65bb4e5cac557a48ee2f77cd6738d899865c +Author: Petr Špaček +Date: Thu Jan 26 22:05:36 2017 +0100 + + tests: adapt test_zone-update to work on 32 bit architectures + + The test might fail on 32 architectures with error message claiming + "not enough memory". This is probably caused by address space + fragmentation. + + To avoid this problem we are using pretty low values for database size + in the test (which contains little data anyway). + +diff --git a/tests/test_zone-update.c b/tests/test_zone-update.c +index 63b72c2..a50d64a 100644 +--- a/tests/test_zone-update.c ++++ b/tests/test_zone-update.c +@@ -293,6 +293,7 @@ int main(int argc, char *argv[]) + " - domain: test.\n" + "template:\n" + " - id: default\n" ++ " max-journal-db-size: 100M\n" + " storage: %s\n", + temp_dir); + From 414352318917ff622b7c75f3849b69d672629c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Fri, 27 Jan 2017 19:28:48 +0100 Subject: [PATCH 093/214] add workarounds for 32-bit architectures (small address space) --- knot.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 01ac992..1590d38 100644 --- a/knot.spec +++ b/knot.spec @@ -13,6 +13,9 @@ Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles +# tests: zone update test compatibility with 32-bit arches +Patch1: test_zone-update_10m.patch + # Required dependencies BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel pkgconfig(libedit) # Optional dependencies @@ -62,6 +65,7 @@ The package contains documentation for the Knot DNS server. %prep %setup -q +%patch1 -p1 # make sure embedded LMDB library is not used rm -vr src/contrib/lmdb @@ -69,7 +73,14 @@ 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 From 0df503baaf6c05a9b3d15f0f15286e1de5136ecd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 17:54:49 +0000 Subject: [PATCH 094/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 1590d38..460f233 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -201,6 +201,9 @@ exit 0 %{_pkgdocdir}/html %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jan 24 2017 Petr Spacek - 2.4.0-1 - new upstream release: + fix: False positive semantic-check warning about invalid bitmap in NSEC From 4249c9f66ece2262fd4c1c194c6358f7a8b5f624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Mon, 27 Feb 2017 16:11:04 +0100 Subject: [PATCH 095/214] new upstream release (2.4.1) --- .gitignore | 1 + knot.spec | 38 ++++++++++++++++++++++++++------------ sources | 4 ++-- test_zone-update_10m.patch | 25 ------------------------- 4 files changed, 29 insertions(+), 39 deletions(-) delete mode 100644 test_zone-update_10m.patch diff --git a/.gitignore b/.gitignore index e316ec0..9c1a046 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /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 460f233..a45458f 100644 --- a/knot.spec +++ b/knot.spec @@ -3,18 +3,16 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.4.0 -Release: 2%{?dist} +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 - -# tests: zone update test compatibility with 32-bit arches -Patch1: test_zone-update_10m.patch +Source1: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz.asc +Source2: %{name}.service +Source3: %{name}.conf +Source4: %{name}.tmpfiles # Required dependencies BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel pkgconfig(libedit) @@ -65,7 +63,6 @@ The package contains documentation for the Knot DNS server. %prep %setup -q -%patch1 -p1 # make sure embedded LMDB library is not used rm -vr src/contrib/lmdb @@ -99,11 +96,11 @@ install -p -m 0644 -D samples/keymgr-completion.zsh %{buildroot}%{_datadir}/zsh/ # 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 @@ -201,6 +198,23 @@ exit 0 %{_pkgdocdir}/html %changelog +* Mon Feb 27 2017 Petr Spacek - 2.4.1-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 diff --git a/sources b/sources index 3a80b75..ddefb3a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.4.0.tar.xz) = 5c154104733b481ca2c4ffbac74fea2f4dac7beb35bb42364b9486d0e4d9c01ef46624fb16905ecca37d9a534b44bce7b8a7ed966b7baa7f4182e1dbf4dc7181 -SHA512 (knot-2.4.0.tar.xz.asc) = baa457ec4298514deafc8056cdfb1c13f849adc6f90e37616416ffef59053af636d5dcdf5260527490fe687baad8fd57aeb0b3be06f0b016fa234aae77385e83 +SHA512 (knot-2.4.1.tar.xz.asc) = c2c7fede20592922c4ec79bfbc05f7662f0fd68420d8e085cf20112f99392fb358db5896c008fae73d15671815f028504ac5ac335ffdee99d2ff40f2d2f3904f +SHA512 (knot-2.4.1.tar.xz) = 2b3e6c1a187538b218e3e915aaa91bc38ad4cdecb0f03f31b29bfa83c620d117c169a580ddcc8a33e6422109b422c72f3cf79f2a8d1e10e613edfe4437b4b29c diff --git a/test_zone-update_10m.patch b/test_zone-update_10m.patch deleted file mode 100644 index 0b3e2c7..0000000 --- a/test_zone-update_10m.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 2eca65bb4e5cac557a48ee2f77cd6738d899865c -Author: Petr Špaček -Date: Thu Jan 26 22:05:36 2017 +0100 - - tests: adapt test_zone-update to work on 32 bit architectures - - The test might fail on 32 architectures with error message claiming - "not enough memory". This is probably caused by address space - fragmentation. - - To avoid this problem we are using pretty low values for database size - in the test (which contains little data anyway). - -diff --git a/tests/test_zone-update.c b/tests/test_zone-update.c -index 63b72c2..a50d64a 100644 ---- a/tests/test_zone-update.c -+++ b/tests/test_zone-update.c -@@ -293,6 +293,7 @@ int main(int argc, char *argv[]) - " - domain: test.\n" - "template:\n" - " - id: default\n" -+ " max-journal-db-size: 100M\n" - " storage: %s\n", - temp_dir); - From bf30e4218ce83939d8b365add016b4ba4dab6ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Mon, 27 Feb 2017 17:23:21 +0100 Subject: [PATCH 096/214] add support for EPEL builds --- knot.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/knot.spec b/knot.spec index a45458f..282c432 100644 --- a/knot.spec +++ b/knot.spec @@ -55,7 +55,11 @@ The package contains DNS client utilities shipped with the Knot DNS server. 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) %description doc From 0ff1a10ccb1fb1805dbe408fd45ad7777b01e30e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Mon, 10 Jul 2017 14:43:19 +0200 Subject: [PATCH 097/214] new upstream release (2.4.5) --- .gitignore | 1 + knot.spec | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++- sources | 4 ++-- 3 files changed, 71 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9c1a046..5f3441a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /knot-*.tar.xz /knot-2.4.0.tar.xz.asc /knot-2.4.1.tar.xz.asc +/knot-2.4.5.tar.xz.asc diff --git a/knot.spec b/knot.spec index 282c432..ff257f3 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.4.1 +Version: 2.4.5 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -202,6 +202,73 @@ exit 0 %{_pkgdocdir}/html %changelog +* Mon Jul 10 2017 Petr Spacek - 2.4.5-1 +New upstream release: 2.4.5 + +Knot DNS 2.4.5 (2017-06-23) +=========================== + +Security: +--------- + - Improper TSIG validity period check can allow TSIG forgery (Thanks to Synacktiv!) + +Bugfixes: +--------- + - Corner case journal fixes (huge changesets, OpenWRT operation) + +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 Feb 27 2017 Petr Spacek - 2.4.1-1 - new upstream release: + fix: Transfer of a huge rrset goes into an infinite loop diff --git a/sources b/sources index ddefb3a..356e7cd 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.4.5.tar.xz.asc) = 0ee880ca5397eeb839476cc708fdba98ee488d9933c127b6f993488dec4d085bbd4561d8acd2fa67f77214ceed13658ec21ee2b415dec2a0660409fa42fafe99 +SHA512 (knot-2.4.5.tar.xz) = db4919dbe2dc688f401e6611d784d47e1d40a0f8ec8c8cd6240d89ab9dd2ce7dd1976ac7cb24c712ed8aa074e0026ff0a10e9d6d5e685929d271ae554d9a1cff From 2e0a0e0bd49b1ca1965019dc194a6079e1442a82 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 17:54:01 +0000 Subject: [PATCH 098/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index ff257f3..279c06f 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.4.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -202,6 +202,9 @@ exit 0 %{_pkgdocdir}/html %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Jul 10 2017 Petr Spacek - 2.4.5-1 New upstream release: 2.4.5 From 962215f3dd895cb9c70a61b928c3c637d6e31cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Mon, 24 Jul 2017 16:09:41 +0200 Subject: [PATCH 099/214] 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. --- .gitignore | 4 +- knot.spec | 133 +++++++++++++++++++++++++++++++++++++++++++++++------ sources | 4 +- 3 files changed, 121 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 5f3441a..9ec35ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ /knot-*.tar.xz -/knot-2.4.0.tar.xz.asc -/knot-2.4.1.tar.xz.asc -/knot-2.4.5.tar.xz.asc +/knot-*.tar.xz.asc diff --git a/knot.spec b/knot.spec index ff257f3..13c564c 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.4.5 +Version: 2.5.3 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -17,9 +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(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 @@ -60,10 +63,11 @@ 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 @@ -81,7 +85,7 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused" %define configure_db_sizes --with-conf-mapsize=64 --with-timer-mapsize=16 %endif -%configure %{configure_db_sizes} +%configure %{configure_db_sizes} --disable-fastparser # FIXME make %{?_smp_mflags} make html @@ -94,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 @@ -132,8 +132,24 @@ exit 0 %post %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 + + # 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 @@ -154,21 +170,19 @@ exit 0 %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 @@ -188,11 +202,13 @@ exit 0 %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 @@ -202,6 +218,93 @@ exit 0 %{_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 + * Mon Jul 10 2017 Petr Spacek - 2.4.5-1 New upstream release: 2.4.5 diff --git a/sources b/sources index 356e7cd..36cf54c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.4.5.tar.xz.asc) = 0ee880ca5397eeb839476cc708fdba98ee488d9933c127b6f993488dec4d085bbd4561d8acd2fa67f77214ceed13658ec21ee2b415dec2a0660409fa42fafe99 -SHA512 (knot-2.4.5.tar.xz) = db4919dbe2dc688f401e6611d784d47e1d40a0f8ec8c8cd6240d89ab9dd2ce7dd1976ac7cb24c712ed8aa074e0026ff0a10e9d6d5e685929d271ae554d9a1cff +SHA512 (knot-2.5.3.tar.xz) = c93bfdd42c3f1e5b74de7a5bb46841bee75d5153b4c72eb876f11e193a290484620ea8f877bd039c40fc665a9d5d07905a712e8e085c3267da5db5208aa71f08 +SHA512 (knot-2.5.3.tar.xz.asc) = f9abdf02b1e0e8521b200266bfb82e6978599b5fcb374c210c847ad69b7ec4f9308b5a9e44c09eb4f6bc38ffcdbed25df9bc65ee772a2221f9da6e7ba883dd61 From c6e902f2be635ce33dd89fb97195062bd6d16b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Mon, 6 Nov 2017 15:37:52 +0100 Subject: [PATCH 100/214] new upstream release (2.6.1) --- knot.spec | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- sources | 4 +-- 2 files changed, 100 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 949afe9..770ee5f 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.5.3 +Version: 2.6.1 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -218,6 +218,103 @@ fi %{_pkgdocdir}/html %changelog +* Mon Nov 06 2017 Petr Špaček - 2.6.1-1 +- New upstream release 2.6.1 + +Knot DNS 2.6.1 (2017-11-02) +=========================== + +Features: +--------- + - NSEC3 Opt-Out support in the DNSSEC signing + - New CDS/CDNSKEY publish configuration option + +Improvements: +------------- + - Simplified DNSSEC log message with DNSKEY details + - +tls-hostname in kdig implies +tls-ca if neither +tls-ca nor +tls-pin is given + - New documentation sections for DNSSEC key rollovers and shared keys + - Keymgr no longer prints useless algorithm number for generated key + - Kdig prints unknown RCODE in a numeric format + - Better support for LLVM libFuzzer + +Bugfixes: +--------- + - Faulty DNAME semantic check if present in the zone apex and NSEC3 is used + - Immediate zone flush not scheduled during the zone load event + - Server crashes upon dynamic zone addition if a query module is loaded + - Kdig fails to connect over TLS due to SNI is set to server IP address + - Possible out-of-bounds memory access at the end of the input + - TCP Fast Open enabled by default in kdig breaks TLS connection + +Knot DNS 2.6.0 (2017-09-29) +=========================== + +Features: +--------- + - On-slave (inline) signing support + - Automatic DNSSEC key algorithm rollover + - Ed25519 algorithm support in DNSSEC (requires GnuTLS 3.6.0) + - New 'journal-content' and 'zonefile-load' configuration options + - keymgr tries to run as user/group set in the configuration + - Public-only DNSSEC key import into KASP DB via keymgr + - NSEC3 resalt and parent DS query events are persistent in timer DB + - New processing state for a response suppression within a query module + - Enabled server side TCP Fast Open if supported + - TCP Fast Open support in kdig + +Improvements: +------------- + - Better record owner compression if related to the previous rdata dname + - NSEC(3) chain is no longer recomputed whole on every update + - Remove inconsistent and unnecessary quoting in log files + - Avoiding of overlapping key rollovers at a time + - More DNSSSEC-related semantic checks + - Extended timestamp format in keymgr + +Bugfixes: +--------- + - Incorrect journal free space computation causing inefficient space handling + - Interface-automatic broken on Linux in the presence of asymmetric routing + +Knot DNS 2.5.5 (2017-09-29) +=========================== + +Improvements: +------------- + - Constant time memory comparison in the TSIG processing + - Proper use of the ctype functions + - Generated RRSIG records have inception time 90 minutes in the past + +Bugfixes: +--------- + - Incorrect online signature for NSEC in the case of a CNAME record + - Incorrect timestamps in dnstap records + - EDNS Subnet Client validation rejects valid payloads + - Module configuration semantic checks are not executed + - Kzonecheck segfaults with unusual inputs + +Knot DNS 2.5.4 (2017-08-31) +=========================== + +Improvements: +------------- + - New minimum and maximum refresh interval config options (Thanks to Manabu Sonoda) + - New warning when unforced flush with disabled zone file synchronization + - New 'dnskey' keymgr command + - Linking with libatomic on architectures that require it (Thanks to Pierre-Olivier Mercier) + - Removed 'OK' from listing keymgr command outputs + - Extended journal and keymgr documentation and logging + +Bugfixes: +--------- + - Incorrect handling of specific corner-cases with zone-in-journal + - The 'share' keymgr command doesn't work + - Server crashes if configured with query-size and reply-size statistics options + - Malformed big integer configuration values on some 32-bit platforms + - Keymgr uses local time when parsing date inputs + - Memory leak in kdig upon IXFR query + * 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. diff --git a/sources b/sources index 36cf54c..7f7eca0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.5.3.tar.xz) = c93bfdd42c3f1e5b74de7a5bb46841bee75d5153b4c72eb876f11e193a290484620ea8f877bd039c40fc665a9d5d07905a712e8e085c3267da5db5208aa71f08 -SHA512 (knot-2.5.3.tar.xz.asc) = f9abdf02b1e0e8521b200266bfb82e6978599b5fcb374c210c847ad69b7ec4f9308b5a9e44c09eb4f6bc38ffcdbed25df9bc65ee772a2221f9da6e7ba883dd61 +SHA512 (knot-2.6.1.tar.xz) = f4eaf311adcdfd13628c7174333bcc766b300be573f7df32eaaf162c5857e0ba35ce5a5e022f799c95618203abbe8db93e2364f172a87c4dd4eaf90b30ef8428 +SHA512 (knot-2.6.1.tar.xz.asc) = 84fbd79e42bd2779e3051604fb9a507d72ffd2dd9fad5db3b4b55ff9ff65e5e8232ffc68725d815cb46734da9bd1f059f3abf18e490999924f24d1a6d408b9a4 From 671f04d0a2d57b827d7355092a1f7634bd7c5185 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Mon, 22 Jan 2018 14:25:02 +0100 Subject: [PATCH 101/214] 2.6.4-1: new upstream release, pgp signature verification --- ...E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc | 51 +++++++++++++++ knot.spec | 63 ++++++++++++++++++- 2 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc diff --git a/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc b/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc new file mode 100644 index 0000000..7935cee --- /dev/null +++ b/gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc @@ -0,0 +1,51 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFljlBcBEACuCSBlN1vTS9eEDqowZcLAAF8NytcTlRjXTLWMQtjU+fXkz9Vz +10n9TIFj9Kcec0p0+8F+SowybecwhmYoUzhKI7S9M1ziUmaIhFs2KvZ1GzigE/W5 +L448P/7pugh875e1tIrkrbbcIp6+SxaLbgvXlFl630ILZl/gbYOa/Wk21sLu4RjQ +Y39oHb0WTiwPnKhdMdwlnxm6HeWkHzlvI9N8tlDc6oVnUfqVI8gUyExLnEYjDpZf +orTVgHRq6RNyfTRZkh8zRsXSTnJlk/bVEDW5i/VgIQugzkgpuTGWlCstryi/MRhe +NxU1YEUenT69okb96QStfr1J00n8L4VAs8V5IuFUcSc8UqSpB+LgERRTMRFo9IrE +XAW/gEKlEVR+501BvJ0/Qggxbgz4PEnKNaxXmAnykJzot2VDKTzrr26a9LnrT0GW +om9rg89Ih876PA53vUXBB+FWP9QOFDcOfz3nMjCrLbMzhTsAzrNFXxchzLq+66CL +qsQQytDVFpLI+X++sKRTOHkq6vV1bAPjlljrannLnn1y/DvkOOkiHOdYyjmR7Dfk +vxgcWh/3Gx4J9gipxZITOr7LamEYgHfElY/UWCtc1Vjt8Xvgt4dofDpvSwY9YzgR +WxJKC5ewYdqTCI+zxL1f0fjkeiRYNi959UMMjgdcY7Zpi8oPPQmlyBw15QARAQAB +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+7kCDQRZY5QX +ARAA6RnxYG82/X+A49srgHR9yIxlHqSq6IhNn+iJQ5lpVpfeBItOG4NDu4Aq5X41 +pAJ3NKxsCPV62gEald/C7gJrTI5rag/87GYFFo6QRrwGsWVGORGs9G1pBF7ZZwhP +JwD3MeagGZNfWZzRxXefL1P3mrpO3etSEEwENHtCqEMP6x/JHh3SKonKAlL4xfj3 +F54aKj4upIcjxGBAJH8u66bN1GmYjstBzzbD4TWNTwfKgp15XxjrTgbThFy7CBoO +gcaApiYTPE7D5nB1+AyhGjnO3ZlNgy1ZIHVDFk6HEakaqKM9QlkJnZsB2+cTqXlV +0etmFQsedCg2sUier0hhIrEOOtGQbY1P+0vv+VRoaNym3ritl+70RG8WgrHNLMRH +VGeLRq3gOFnt+d/3h7meAKbORW/ZY30UpwthtlZYgciFzoDJCW8Be1i1X4toiUaM +kFh79jd7YTvZ87+P4DllC9MNsoq5cY/bHBNZYtXf7y6XqVqYo2IbFUR3VXKtzSN5 +eYm5YpFPczzmg1bNgl3i6WBcOF4EPEJEVjZ+u1r59NvfVLQ8XVh/QmLoG7x8oFcv +hWctMy17Vdm4qZjpSA+B1sQocehdra+xT+PWV0kcrYpsqwkYeFRQnJGqIupWHnot +qGOBNAyQWIcjK6K5y0CeioJZpNN5Oe5XloMXsYmgXsR+gTUAEQEAAYkCJQQYAQoA +DwUCWWOUFwIbDAUJA8JnAAAKCRAQu3r2/rvWq+IQD/9ikZ5MtdDOVLtULPqXXeP3 +6Oss2Ie4/4IQ7xkUZZ/Ujig0x1rW+d21o92VryH1s4K+nyCIW31rbtexK/0a54/w +Zyyjbqfh6Tgo9n3f5bMV9qyubb49cfTSKfgzoOkG8Xdc/TIO1IjWHy1NBDl8GWKJ +0QPYz78SCCkEFiVCAFBjuIQsoPqDKcZTs7k661w0A75ken88JJLgUgffZJRQK0i1 +dCw8kS4c2pqm24Q6d0AF5EdqXn2IFH82p49Pp5bRMY3LnibRL3Sq0xvXs7i5vY+o +JLuPAdomiGbdEbxcLytqQ2KitVdrGvrnZJxPs16m0uuTeM06krorDlgGBXFp5+Z9 +JbQpViHkVpLo+vf/GuT9WOWWH8gG0r14ZLVQTvCGXiAR4Aju7W5jPMPmVDJ+wMrD +cLta1Jv0U0+AnVe67mRXb0n5E/7kVshB3rfGzunPSlqT5kEiOXq6fJWB2l0lzCv0 +WtNuINmU9U3ap1oZBGSYl83vyuRUIlx61/tlnJvwseBL1FmASXOgfedCsxjHIlgF +SUeScLxnOSyap/4ePqZ0C76Nkvzx43SfM1LJUeCHwon0o+LZv2GlBmlEp6PbekRQ +Tz1hewLBbfAeXZRnwxvmkRqTP4DJCIVu2AE47+rbqVEjJZuEO4ORlkKoBdLOV3HN +xWbfbG7+n/h2cnUw3pqbHw== +=4CxJ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/knot.spec b/knot.spec index 770ee5f..a72d279 100644 --- a/knot.spec +++ b/knot.spec @@ -3,7 +3,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.6.1 +Version: 2.6.4 Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons @@ -14,8 +14,14 @@ Source2: %{name}.service Source3: %{name}.conf Source4: %{name}.tmpfiles +# 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 +Source1000: gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc + # Required dependencies -BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.0 pkgconfig(nettle) pkgconfig(jansson) lmdb-devel pkgconfig(libedit) +BuildRequires: gnupg2 +BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.3 pkgconfig(nettle) lmdb-devel pkgconfig(libedit) # Optional dependencies BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn2) pkgconfig(libsystemd) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) BuildRequires: systemd @@ -70,6 +76,8 @@ The package contains documentation for the Knot DNS server. On-line version is available on https://www.knot-dns.cz/documentation/ %prep +gpg2 --import --import-options import-export,import-minimal %{SOURCE1000} > ./gpg-keyring.gpg +gpgv2 --keyring ./gpg-keyring.gpg %{SOURCE1} %{SOURCE0} %setup -q # make sure embedded LMDB library is not used @@ -218,6 +226,57 @@ fi %{_pkgdocdir}/html %changelog +* Mon Jan 22 2018 Tomas Krizek - 2.6.4-1 +- Added PGP signature verification +- New upstream release 2.6.4 + +Knot DNS 2.6.4 (2018-01-02) +=========================== + +Features: +--------- + - Module synthrecord allows multiple 'network' specification + - New CSK handling support in keymgr + +Improvements: +------------- + - Allowed configuration for infinite zsk lifetime + - Increased performance and security of the module synthrecord + - Signing changeset is stored into journal even if 'zonefile-load' is whole + +Bugfixes: +--------- + - Unintentional zone re-sign during reload if empty NSEC3 salt + - Inconsistent zone names in journald structured logs + - Malformed outgoing transfer for big zone with TSIG + - Some minor DNSSEC-related issues + +Knot DNS 2.6.3 (2017-11-24) +=========================== + +Bugfixes: +--------- + - Wrong detection of signing scheme rollover + +Knot DNS 2.6.2 (2017-11-23) +=========================== + +Features: +--------- + - CSK algorithm rollover and (KSK, ZSK) <-> CSK rollover support + +Improvements: +------------- + - Allowed explicit configuration for infinite ksk lifetime + - Proper error messages instead of unclear error codes in server log + - Better support for old compilers + +Bugfixes: +--------- + - Unexpected reply for DS query with an owner below a delegation point + - Old dependencies in the pkg-config file + + * Mon Nov 06 2017 Petr Špaček - 2.6.1-1 - New upstream release 2.6.1 From 6156f9370ae5848550bb74526e5d116413c81d6a Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Mon, 22 Jan 2018 15:50:13 +0100 Subject: [PATCH 102/214] add integration test --- knot.spec | 2 ++ tests/README.md | 22 ++++++++++++++++++++++ tests/test_basic_zone.yml | 33 +++++++++++++++++++++++++++++++++ tests/tests.yml | 25 +++++++++++++++++++++++++ 4 files changed, 82 insertions(+) create mode 100644 tests/README.md create mode 100644 tests/test_basic_zone.yml create mode 100644 tests/tests.yml diff --git a/knot.spec b/knot.spec index a72d279..157e6ec 100644 --- a/knot.spec +++ b/knot.spec @@ -228,6 +228,8 @@ fi %changelog * Mon Jan 22 2018 Tomas Krizek - 2.6.4-1 - Added PGP signature verification +- Added integration test + - New upstream release 2.6.4 Knot DNS 2.6.4 (2018-01-02) diff --git a/tests/README.md b/tests/README.md new file mode 100644 index 0000000..c52e8a5 --- /dev/null +++ b/tests/README.md @@ -0,0 +1,22 @@ +Package tests +============= + +These tests implement the standard test interface in Fedora CI. +See https://fedoraproject.org/wiki/CI/Tests for details. + +Manual execution +---------------- + +Run the following command on your machine. Please note, it will make +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/test_basic_zone.yml b/tests/test_basic_zone.yml new file mode 100644 index 0000000..0f75c94 --- /dev/null +++ b/tests/test_basic_zone.yml @@ -0,0 +1,33 @@ +--- +- 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 new file mode 100644 index 0000000..b86e45f --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,25 @@ +--- +- hosts: localhost + remote_user: root + pre_tasks: + - package: # Install additional dependecies + name: bind-utils + state: latest + roles: + - role: standard-test-rpm + 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 From 5ed4a8bcc28889dddf282de0e1ab06dd0d4b8af9 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Mon, 22 Jan 2018 16:37:14 +0100 Subject: [PATCH 103/214] add new sources --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7f7eca0..9ab8c80 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.6.1.tar.xz) = f4eaf311adcdfd13628c7174333bcc766b300be573f7df32eaaf162c5857e0ba35ce5a5e022f799c95618203abbe8db93e2364f172a87c4dd4eaf90b30ef8428 -SHA512 (knot-2.6.1.tar.xz.asc) = 84fbd79e42bd2779e3051604fb9a507d72ffd2dd9fad5db3b4b55ff9ff65e5e8232ffc68725d815cb46734da9bd1f059f3abf18e490999924f24d1a6d408b9a4 +SHA512 (knot-2.6.4.tar.xz) = 7242ef76bd3a379f574ca9af8fec96b0419c2209b6d8114c3b8e675cb5459ec70dab928a5a9ba9850fe1d7201729c9ff7e4c8800674e840e1cf04544c32a6f78 +SHA512 (knot-2.6.4.tar.xz.asc) = a10c502658e5fd431405222a57d91d4a0cabd307b543ebafe024dd52e5dcea3543e99f128bdd0fcb7bfdb484af75c8bf6e7f1fe14378402cf9f9c35ffa21bd88 From 08f8992e68658599bf10722d7cff281bd0affa11 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Mon, 22 Jan 2018 17:19:47 +0100 Subject: [PATCH 104/214] make gpg signature verification EPEL7 compatible --- knot.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index 157e6ec..c5f2bea 100644 --- a/knot.spec +++ b/knot.spec @@ -76,8 +76,11 @@ The package contains documentation for the Knot DNS server. On-line version is available on https://www.knot-dns.cz/documentation/ %prep -gpg2 --import --import-options import-export,import-minimal %{SOURCE1000} > ./gpg-keyring.gpg -gpgv2 --keyring ./gpg-keyring.gpg %{SOURCE1} %{SOURCE0} +export GNUPGHOME=./gpg-keyring +mkdir ${GNUPGHOME} +gpg2 --import %{SOURCE1000} +gpg2 --verify %{SOURCE1} %{SOURCE0} + %setup -q # make sure embedded LMDB library is not used From 1da6dbb71ebb5471a11e943a1e3fd93aa4d6caaf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 20:20:33 +0000 Subject: [PATCH 105/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index c5f2bea..45819b4 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.6.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -229,6 +229,9 @@ fi %{_pkgdocdir}/html %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.6.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Jan 22 2018 Tomas Krizek - 2.6.4-1 - Added PGP signature verification - Added integration test From 8cd2a9acda89719a96b1fe3999f800853bf8e414 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:04:54 +0100 Subject: [PATCH 106/214] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- knot.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 45819b4..0decd41 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.6.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -229,6 +229,9 @@ fi %{_pkgdocdir}/html %changelog +* Fri Feb 09 2018 Igor Gnatenko - 2.6.4-3 +- Escape macros in %%changelog + * Wed Feb 07 2018 Fedora Release Engineering - 2.6.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -600,7 +603,7 @@ Bugfixes: + fix: knsupdate prompt printing on non-terminal + fix: configuration policy item names in documentation + fix: segfault on OS X Sierra - + fix: incorrect %s expansion for the root zone + + fix: incorrect %%s expansion for the root zone + fix: refresh not existing slave zone after restart + fix: immediate zone refresh upon restart if refresh already scheduled + fix: early zone transfer after restart if transfer already scheduled @@ -772,7 +775,7 @@ Bugfixes: + feature: kdig, add generic dump style option (+generic) + feature: try all master servers on failure in multi-master environment + feature: improved remotes and ACLs (multiple addresses, multiple keys) - + feature: basic support for zone file patterns (%s to substitute zone name) + + feature: basic support for zone file patterns (%%s to substitute zone name) + improvement: do not write class for SOA record (unified with other RR types) + improvement: do not write master server address into the zone file + documentation: manual pages also in HTML and PDF format From 5408c3455fa9a19eb050b7dd00d7919346197802 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Mon, 12 Feb 2018 16:33:26 +0100 Subject: [PATCH 107/214] 2.6.5-1: new upstream release --- knot.spec | 31 +++++++++++++++++++++++++++++-- sources | 4 ++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 0decd41..6dc99ec 100644 --- a/knot.spec +++ b/knot.spec @@ -3,8 +3,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 2.6.4 -Release: 3%{?dist} +Version: 2.6.5 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -229,6 +229,33 @@ fi %{_pkgdocdir}/html %changelog +* Mon Feb 12 2018 Tomas Krizek - 2.6.5-1 +- New upstream release 2.6.5 + +Knot DNS 2.6.5 (2018-02-12) +=========================== + +Features: +--------- + - New 'zone-notify' command in knotc + - Kdig uses '@server' as a hostname for TLS authenticaion if '+tls-ca' is set + +Improvements: +------------- + - Better heap memory trimming for zone operations + - Added proper polling for TLS operations in kdig + - Configuration export uses stdout as a default output + - Simplified detection of atomic operations + - Added '--disable-modules' configure option + - Small documentation updates + +Bugfixes: +--------- + - Zone retransfer doesn't work well if more masters configured + - Kdig can leak or double free memory in corner cases + - Inconsistent error outputs from dynamic configuration operations + - Failed to generate documentation on OpenBSD + * Fri Feb 09 2018 Igor Gnatenko - 2.6.4-3 - Escape macros in %%changelog diff --git a/sources b/sources index 9ab8c80..62f67f4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.6.4.tar.xz) = 7242ef76bd3a379f574ca9af8fec96b0419c2209b6d8114c3b8e675cb5459ec70dab928a5a9ba9850fe1d7201729c9ff7e4c8800674e840e1cf04544c32a6f78 -SHA512 (knot-2.6.4.tar.xz.asc) = a10c502658e5fd431405222a57d91d4a0cabd307b543ebafe024dd52e5dcea3543e99f128bdd0fcb7bfdb484af75c8bf6e7f1fe14378402cf9f9c35ffa21bd88 +SHA512 (knot-2.6.5.tar.xz) = ed0d1d30e6d8d802e669aac12c4fd0cec8e315eb0e2c05b722f49ada434c82b8caebf12568881e5fbba2f61a5027c44fbde42b543c9086ff2e9614caf42a6d12 +SHA512 (knot-2.6.5.tar.xz.asc) = dd256abbbe4613e2ddf48a47e8f41b9eefab6d895a4a31e5c77b7ee4e4c6a5aa69da7d895794cc96f65e03aca3e4a96b3510dcc210507b7a8be7b6a98184d255 From 82bb3f880a62f77d63cac1ec09d76354cd1902d0 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Mon, 26 Mar 2018 22:07:21 +0200 Subject: [PATCH 108/214] Update Python 2 dependency declarations to new packaging standards --- knot.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 6dc99ec..df23894 100644 --- a/knot.spec +++ b/knot.spec @@ -4,7 +4,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 2.6.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -26,9 +26,9 @@ BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.3 pkgconfig(nettle) lmd BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn2) pkgconfig(libsystemd) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) BuildRequires: systemd -Requires: python-lmdb +Requires: python2-lmdb -Requires(post): python-lmdb +Requires(post): python2-lmdb Requires(post): systemd %{_sbindir}/runuser Requires(preun): systemd Requires(postun): systemd @@ -229,6 +229,10 @@ fi %{_pkgdocdir}/html %changelog +* Mon Mar 26 2018 Iryna Shcherbina - 2.6.5-2 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Mon Feb 12 2018 Tomas Krizek - 2.6.5-1 - New upstream release 2.6.5 From 4b8a4e0694691b68e050d934e2d154b27cd54af4 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 11 Apr 2018 10:10:17 +0200 Subject: [PATCH 109/214] 2.6.6-1: new upstream release --- knot.spec | 49 +++++++++++++++++++++++++++++++++++++++++-------- sources | 4 ++-- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/knot.spec b/knot.spec index df23894..0733223 100644 --- a/knot.spec +++ b/knot.spec @@ -1,26 +1,32 @@ %global _hardened_build 1 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%define GPG_CHECK 1 +%define VERSION 2.6.6 + Summary: High-performance authoritative DNS server Name: knot -Version: 2.6.5 -Release: 2%{?dist} +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 -Source1: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz.asc + 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 # 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 -Source1000: gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc +# Don't forget to update %%prep section when adding/removing keys +Source100: gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc +BuildRequires: gnupg2 +%endif # Required dependencies -BuildRequires: gnupg2 BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.3 pkgconfig(nettle) lmdb-devel pkgconfig(libedit) # Optional dependencies BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn2) pkgconfig(libsystemd) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) @@ -76,11 +82,12 @@ 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} export GNUPGHOME=./gpg-keyring mkdir ${GNUPGHOME} -gpg2 --import %{SOURCE1000} +gpg2 --import %{SOURCE100} gpg2 --verify %{SOURCE1} %{SOURCE0} - +%endif %setup -q # make sure embedded LMDB library is not used @@ -229,6 +236,32 @@ fi %{_pkgdocdir}/html %changelog +* Wed Apr 11 2018 Tomas Krizek - 2.6.6-1 +Knot DNS 2.6.6 (2018-04-11) +=========================== + +Features: +--------- + - New EDNS option counters in the statistics module + - New '+orphan' filter for the 'zone-purge' operation + +Improvements: +------------- + - Reduced memory consuption of disabled statistics metrics + - Some spelling fixes (Thanks to Daniel Kahn Gillmor) + - Server no longer fails to start if MODULE_DIR doesn't exist + - Configuration include doesn't fail if empty wildcard match + - Added a configuration check for a problematical option combination + +Bugfixes: +--------- + - NSEC3 chain not re-created when SOA minimum TTL changed + - Failed to start server if no template is configured + - Possibly incorrect SOA serial upon changed zone reload with DNSSEC signing + - Inaccurate outgoing zone transfer size in the log message + - Invalid dname compression if empty question section + - Missing EDNS in EMALF responses + * Mon Mar 26 2018 Iryna Shcherbina - 2.6.5-2 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) diff --git a/sources b/sources index 62f67f4..dcb9369 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.6.5.tar.xz) = ed0d1d30e6d8d802e669aac12c4fd0cec8e315eb0e2c05b722f49ada434c82b8caebf12568881e5fbba2f61a5027c44fbde42b543c9086ff2e9614caf42a6d12 -SHA512 (knot-2.6.5.tar.xz.asc) = dd256abbbe4613e2ddf48a47e8f41b9eefab6d895a4a31e5c77b7ee4e4c6a5aa69da7d895794cc96f65e03aca3e4a96b3510dcc210507b7a8be7b6a98184d255 +SHA512 (knot-2.6.6.tar.xz) = bd7a36decc74041f12971045cd69b8cc9e7ecce68f8d2b4cddc9b5f23ee96e8ed290d98fe9e6c441d6727ad4395bea615cbd9ec19cc641abce19ef8da6371972 +SHA512 (knot-2.6.6.tar.xz.asc) = 04478ae491bd87b4267ec47ff544a7984f39b2646b177990f87750d0f39b887662a68fefce56a3af62d40b89fa67de62339de532eb879e78a6459361a2576f31 From 1b1e7349f58bd2778c476b7ed08c4517c299ad0d Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Thu, 17 May 2018 13:06:22 +0200 Subject: [PATCH 110/214] 2.6.7-1: new upstream release --- knot.spec | 22 +++++++++++++++++++++- sources | 4 ++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 0733223..8983775 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.6 +%define VERSION 2.6.7 Summary: High-performance authoritative DNS server Name: knot @@ -236,6 +236,26 @@ fi %{_pkgdocdir}/html %changelog +* Thu May 17 2018 Tomas Krizek - 2.6.7-1 +Knot DNS 2.6.7 (2018-05-17) +=========================== + +Features: +--------- + - Added 'dateserial' (YYYYMMDDnn) serial policy configuration (Thanks to Wolfgang Jung) + +Improvements: +------------- + - Trailing data indication from the packet parser (libknot) + - Better configuration check for a problematical option combination + +Bugfixes: +--------- + - Incomplete configuration option item name check + - Possible buffer overflow in 'knot_dname_to_str' (libknot) + - Module dnsproxy doesn't preserve letter case of QNAME + - Module dnsproxy duplicates OPT and TSIG in the non-fallback mode + * Wed Apr 11 2018 Tomas Krizek - 2.6.6-1 Knot DNS 2.6.6 (2018-04-11) =========================== diff --git a/sources b/sources index dcb9369..450a7a6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.6.6.tar.xz) = bd7a36decc74041f12971045cd69b8cc9e7ecce68f8d2b4cddc9b5f23ee96e8ed290d98fe9e6c441d6727ad4395bea615cbd9ec19cc641abce19ef8da6371972 -SHA512 (knot-2.6.6.tar.xz.asc) = 04478ae491bd87b4267ec47ff544a7984f39b2646b177990f87750d0f39b887662a68fefce56a3af62d40b89fa67de62339de532eb879e78a6459361a2576f31 +SHA512 (knot-2.6.7.tar.xz) = 021810b396e9aaca140c6df858c8dcb9a4be6ac8d64a413195b88d8073d39e1de0604058343bff7534d39f32de27b0e0bc2271a0e545bb9f809adfe1bfaec9a9 +SHA512 (knot-2.6.7.tar.xz.asc) = 8bf35d54f99728ab78c5f912b65a392cb573d4bbd78b5eb0b3d6c1c2215cdbd00a92c6270590d796cc96a844878feb14cb6046f4a5f8a723683737a8913a83eb From 2823d44dee4d70999f4e171bfae3d49736896cd2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:47 +0200 Subject: [PATCH 111/214] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- knot.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/knot.spec b/knot.spec index 8983775..c00e730 100644 --- a/knot.spec +++ b/knot.spec @@ -23,6 +23,7 @@ Source1: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz.asc # 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: gcc BuildRequires: gnupg2 %endif From b1c8e29cf5e183beb6edbc2839610043a81e910d Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 11 Jul 2018 13:02:23 +0200 Subject: [PATCH 112/214] move gcc dependency to correct place --- knot.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index c00e730..2620cdb 100644 --- a/knot.spec +++ b/knot.spec @@ -23,11 +23,11 @@ Source1: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz.asc # 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: gcc BuildRequires: gnupg2 %endif # Required dependencies +BuildRequires: gcc BuildRequires: pkgconfig(liburcu) pkgconfig(gnutls) >= 3.3 pkgconfig(nettle) lmdb-devel pkgconfig(libedit) # Optional dependencies BuildRequires: pkgconfig(libcap-ng) pkgconfig(libidn2) pkgconfig(libsystemd) pkgconfig(libfstrm) pkgconfig(libprotobuf-c) From 2c41e147626f55ca3b4b24786798f3262768a32f Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 11 Jul 2018 13:09:50 +0200 Subject: [PATCH 113/214] 2.6.8-1: new upstream release --- knot.spec | 24 +++++++++++++++++++++++- sources | 4 ++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 2620cdb..d9492d8 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.7 +%define VERSION 2.6.8 Summary: High-performance authoritative DNS server Name: knot @@ -237,6 +237,28 @@ fi %{_pkgdocdir}/html %changelog +* Wed Jul 11 2018 Tomas Krizek - 2.6.8-1 +Knot DNS 2.6.8 (2018-07-10) +=========================== + +Features: +--------- + - New 'import-pkcs11' command in keymgr + +Improvements: +------------- + - Unixtime serial policy mimics Bind – increment if lower #593 + +Bugfixes: +--------- + - Creeping memory consuption upon server reload #584 + - Kdig incorrectly detects QNAME if 'notify' is a prefix + - Server crashes when zone sign fails #587 + - CSK->KZSK rollover retires CSK early #588 + - Server crashes when zone expires during outgoing multi-message transfer + - Kjournalprint doesn't convert zone name argument to lower-case + - Cannot switch to a previously used ksk-shared dnssec policy #589 + * Thu May 17 2018 Tomas Krizek - 2.6.7-1 Knot DNS 2.6.7 (2018-05-17) =========================== diff --git a/sources b/sources index 450a7a6..88b26f8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.6.7.tar.xz) = 021810b396e9aaca140c6df858c8dcb9a4be6ac8d64a413195b88d8073d39e1de0604058343bff7534d39f32de27b0e0bc2271a0e545bb9f809adfe1bfaec9a9 -SHA512 (knot-2.6.7.tar.xz.asc) = 8bf35d54f99728ab78c5f912b65a392cb573d4bbd78b5eb0b3d6c1c2215cdbd00a92c6270590d796cc96a844878feb14cb6046f4a5f8a723683737a8913a83eb +SHA512 (knot-2.6.8.tar.xz) = 3300985bd4fbf88b58fbb5ba06bdd3dcbe7a50885baa89f9db47811c071a93994a2b17a0dbd27d185feade056ed5d65eef712eedb26de5a4101da363a7c24967 +SHA512 (knot-2.6.8.tar.xz.asc) = 70761db0b2b01a98d18acba4bb4ea4e5f4b49452631194a3dd0e26de272e317b1107382e24c15b2773f849b97a15ae72c55aacf524f643abf144c127127b62fe From 1c62e7bedd3b74450a38eb9e30c7c156f9421b4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 07:19:31 +0000 Subject: [PATCH 114/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index d9492d8..c3872d7 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz @@ -237,6 +237,9 @@ fi %{_pkgdocdir}/html %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.6.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jul 11 2018 Tomas Krizek - 2.6.8-1 Knot DNS 2.6.8 (2018-07-10) =========================== From 6216b6570ba42c5478dcfaf18f827dec527f834c Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 15 Aug 2018 12:40:02 +0200 Subject: [PATCH 115/214] 2.7.1-1: new upstream release --- knot.spec | 269 +++++++++++++++++++++++++++++++++++------------------- sources | 4 +- 2 files changed, 177 insertions(+), 96 deletions(-) diff --git a/knot.spec b/knot.spec index c3872d7..839bffe 100644 --- a/knot.spec +++ b/knot.spec @@ -1,82 +1,98 @@ %global _hardened_build 1 -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.6.8 +%define VERSION 2.7.1 +%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 +Group: System Environment/Daemons +URL: http://www.knot-dns.cz +Source0: http://public.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: 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) 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. @@ -91,9 +107,6 @@ 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" @@ -101,10 +114,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 +134,89 @@ 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 %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 -%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 +229,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 +254,70 @@ fi %{_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 88b26f8..d5ae23c 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.7.1.tar.xz) = 547a146abb882885ff2ba0fe070a03b29138400dad78119e9c550019369a01902bc1c8f0fd12ca19367e716e506e680acc27f4d7801a30fbdec3f4cf6f4105e7 +SHA512 (knot-2.7.1.tar.xz.asc) = 86b9c34be9fd24a153a3261551167273974b9bed06cc8e28b1ce0af02f905dc1b904a4ecc71f0f17475cd76f60ebdf8d288b4a27e5ad808bf13f39f32491e8e6 From 241e73e564db143fb0b08a2bf472062724d4d722 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 29 Aug 2018 15:12:28 +0200 Subject: [PATCH 116/214] 2.7.2-1: new upstream release --- knot.conf | 23 ----------------------- knot.service | 15 --------------- knot.spec | 20 +++++++++++++++++++- knot.tmpfiles | 2 -- sources | 4 ++-- 5 files changed, 21 insertions(+), 43 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.spec b/knot.spec index 839bffe..aa57f5c 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.7.1 +%define VERSION 2.7.2 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server @@ -254,6 +254,24 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Wed Aug 29 2018 Tomas Krizek - 2.7.2-1 +Knot DNS 2.7.2 (2018-08-29) +=========================== + +Improvements: +------------- + - Keymgr list command displays also key size + - Kjournalprint displays total occupied size in the debug mode + - Server doesn't stop if failed to load a shared module from the module directory + - Libraries libcap-ng, pthread, and dl are linked selectively if needed + +Bugfixes: +--------- + - Sometimes incorrect result from dnssec_nsec_bitmap_contains (libdnssec) + - Server can crash when loading zone file difference and zone-in-journal is set + - Incorrect treatment of specific queries in the module RRL + - Failed to link module Cookies as a shared library + * Wed Aug 15 2018 Tomas Krizek - 2.7.1-1 Knot DNS 2.7.1 (2018-08-14) =========================== 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 - diff --git a/sources b/sources index d5ae23c..6cd3117 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.7.2.tar.xz) = e09f8a38e975ff4f90db59db9ae8a6baaca9b0cbc9c2ecd37225febfe718b7c2038ae45481ed830dc66f2b70d8312266e2dc7cb54a0aa0fdc02c87ca42bac96d +SHA512 (knot-2.7.2.tar.xz.asc) = 9219d7fbcc7420a729d1a43de2e53722e15944b61824d76f07cbaafcad1488bb00ffcfbc704f848ca6c9065dba9cff4167cd41f168cfd413d371f312c78b5961 From 4ebdb38189ffb83cd576615cb2c18c5ff3f059ab Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Fri, 12 Oct 2018 13:16:20 +0200 Subject: [PATCH 117/214] 2.7.3-1: new upstream release --- knot.spec | 33 +++++++++++++++++++++++++++++---- sources | 4 ++-- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/knot.spec b/knot.spec index aa57f5c..af95300 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.7.2 +%define VERSION 2.7.3 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server @@ -11,11 +11,11 @@ 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 +URL: https://www.knot-dns.cz +Source0: https://public.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://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 @@ -254,6 +254,31 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Fri Oct 12 2018 Tomas Krizek - 2.7.3-1 +Knot DNS 2.7.3 (2018-10-11) +=========================== + +Features: +--------- + - New queryacl module for query access control + - Configurable answer rrset rotation #612 + - Configurable NSEC bitmap in online signing + +Improvements: +------------- + - Better error logging for KASP DB operations #601 + - Some documentation improvements + +Bugfixes: +--------- + - Keymgr "list" output doesn't show key size for ECDSA algorithms #602 + - Failed to link statically with embedded LMDB + - Configuration commit causes zone reload for all zones + - The statistics module overlooks TSIG record in a request + - Improper processing of an AXFR-style-IXFR response consisting of one-record messages + - Race condition in online signing during key rollover #600 + - Server can crash if geoip module is enabled in the geo mode + * Wed Aug 29 2018 Tomas Krizek - 2.7.2-1 Knot DNS 2.7.2 (2018-08-29) =========================== diff --git a/sources b/sources index 6cd3117..435d0df 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.7.2.tar.xz) = e09f8a38e975ff4f90db59db9ae8a6baaca9b0cbc9c2ecd37225febfe718b7c2038ae45481ed830dc66f2b70d8312266e2dc7cb54a0aa0fdc02c87ca42bac96d -SHA512 (knot-2.7.2.tar.xz.asc) = 9219d7fbcc7420a729d1a43de2e53722e15944b61824d76f07cbaafcad1488bb00ffcfbc704f848ca6c9065dba9cff4167cd41f168cfd413d371f312c78b5961 +SHA512 (knot-2.7.3.tar.xz) = ba735eb06d99f8cb41619f44413f6450178ab249ef9ff282bae36e8e965cb421f082852bbf0ae5814e3e3148f27431fc1f2b4ed30e21bfd0cbea1be189bdadfd +SHA512 (knot-2.7.3.tar.xz.asc) = 4b1c6909f2ea914a560baafebb37d66242d66a3d47de00a1dc3e76066afe5527f31cf0e885f749386eb98553ee9aaeaaf9e811ea11898459981ba7496faede4d From 89d11859c4d397d020fc8728b51dda6ee6cce11b Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 13 Nov 2018 12:37:32 +0100 Subject: [PATCH 118/214] 2.7.4-1: new upstream release --- knot.spec | 28 +++++++++++++++++++++++++++- sources | 4 ++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index af95300..dd606c6 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.7.3 +%define VERSION 2.7.4 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server @@ -254,6 +254,32 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Tue Nov 13 2018 Tomas Krizek - 2.7.4-1 +Knot DNS 2.7.4 (2018-11-13) +=========================== + +Features: +--------- + - Added SNI configuration for TLS in kdig (Thanks to Alexander Schultz) + +Improvements: +------------- + - Added warning log when DNSSEC events not successfully scheduled + - New semantic check on timer values in keymgr + - DS query no longer asks other addresses if got a negative answer + - Reintroduced 'rollover' configuration option for CDS/CDNSKEY publication + - Extended logging for zone loading + - Various documentation improvements + +Bugfixes: +--------- + - Failed to import module configuration #613 + - Improper Cflags value in libknot.pc if built with embedded LMDB #615 + - IXFR doesn't fall back to AXFR if malformed reply + - DNSSEC events not correctly scheduled for empty zone updates + - During algorithm rollover old keys get removed before DS TTL expires #617 + - Maximum zone's RRSIG TTL not considered during algorithm rollover #620 + * Fri Oct 12 2018 Tomas Krizek - 2.7.3-1 Knot DNS 2.7.3 (2018-10-11) =========================== diff --git a/sources b/sources index 435d0df..87ae77d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.7.3.tar.xz) = ba735eb06d99f8cb41619f44413f6450178ab249ef9ff282bae36e8e965cb421f082852bbf0ae5814e3e3148f27431fc1f2b4ed30e21bfd0cbea1be189bdadfd -SHA512 (knot-2.7.3.tar.xz.asc) = 4b1c6909f2ea914a560baafebb37d66242d66a3d47de00a1dc3e76066afe5527f31cf0e885f749386eb98553ee9aaeaaf9e811ea11898459981ba7496faede4d +SHA512 (knot-2.7.4.tar.xz) = e5f60a23817503468b18eaea517c5936945b901f568c56cb1ca67a208cc6206ff103e9ca03f1bf05018d13a688f54580ae816a5d70510f28a98ae31116a3f674 +SHA512 (knot-2.7.4.tar.xz.asc) = 16cd46916d5fbcef28f0f89ad2914edf7d968880002dceb5b83eceb7f7fba2d42b4fde0c5282b04ac68ab069c7537e384a311242018860e36a8f7c4168ff806b From 5d3ab414963b1c836e93beba92c66f63eb0b8742 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Mon, 7 Jan 2019 16:35:44 +0100 Subject: [PATCH 119/214] 2.7.5-1: new upstream release --- knot.spec | 37 +++++++++++++++++++++++++++++++++---- sources | 4 ++-- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/knot.spec b/knot.spec index dd606c6..7c4fb24 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.7.4 +%define VERSION 2.7.5 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server @@ -10,12 +10,11 @@ Name: knot Version: %{VERSION} Release: 1%{?dist} License: GPLv3 -Group: System Environment/Daemons URL: https://www.knot-dns.cz -Source0: https://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz +Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz %if 0%{GPG_CHECK} -Source1: https://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 @@ -254,6 +253,36 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Mon Jan 07 2019 Tomas Krizek - 2.7.5-1 +Knot DNS 2.7.5 (2019-01-07) +=========================== + +Features: +--------- + - Keymgr supports NSEC3 salt handling + +Improvements: +------------- + - Zone history in journal is dropped apon AXFR-like zone update + - Libdnssec is no longer linked against libm #628 + - Libdnssec is explicitly linked against libpthread if PKCS #11 enabled #629 + - Better support for libknot packaging in Python + - Manually generated KSK is 'ready' by default + - Kdig supports '+timeout' as an alias for '+time' + - Kdig supports '+nocomments' option + - Kdig no longer prints empty lines between retries + - Kdig returns failure if operations not successfully resolved #632 + - Fixed repeating of the 'KSK submission, waiting for confirmation' log + - Various improvements in documentation, Dockerfile, and tests + +Bugfixes: +--------- + - Knotc fails to unset huge configuration section + - Kjournalprint sometimes fails to display zone journal content + - Improper timing of ZSK removal during ZSK rollover + - Missing UTC time zone indication in the 'iso' keymgr list output + - A race condition in the online signing module + * Tue Nov 13 2018 Tomas Krizek - 2.7.4-1 Knot DNS 2.7.4 (2018-11-13) =========================== diff --git a/sources b/sources index 87ae77d..1d19a72 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.7.4.tar.xz) = e5f60a23817503468b18eaea517c5936945b901f568c56cb1ca67a208cc6206ff103e9ca03f1bf05018d13a688f54580ae816a5d70510f28a98ae31116a3f674 -SHA512 (knot-2.7.4.tar.xz.asc) = 16cd46916d5fbcef28f0f89ad2914edf7d968880002dceb5b83eceb7f7fba2d42b4fde0c5282b04ac68ab069c7537e384a311242018860e36a8f7c4168ff806b +SHA512 (knot-2.7.5.tar.xz) = 661dbf59cf87105221421b110bfd17ac40fed4ace1a330322dfd618a203385da5f4c20dda65479059218291e4e12daf935138567527fe3bc799f042ff2522c1b +SHA512 (knot-2.7.5.tar.xz.asc) = 856cf119a9296c8175dff2e5a50acb710f3e0d9d3831d82bd7e3a9bd0e0438bd733708afc15f5dc65fe491674d5ce47504d75048503f4a295cf4baa07a61f003 From 51b0fa28744a32c9e0065a8ee57d03130ffdf32e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:39:27 +0100 Subject: [PATCH 120/214] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- knot.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 7c4fb24..1c3c2dc 100644 --- a/knot.spec +++ b/knot.spec @@ -190,9 +190,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %systemd_postun_with_restart knot.service %endif -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files %license COPYING From 87ccb3c7eedb84b41d2b13fc70b3e78f5300799b Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 23 Jan 2019 13:45:41 +0100 Subject: [PATCH 121/214] 2.7.6-1: new upstream release --- knot.spec | 32 ++++++++++++++++++++++++++++---- sources | 4 ++-- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/knot.spec b/knot.spec index 1c3c2dc..dfbf55e 100644 --- a/knot.spec +++ b/knot.spec @@ -2,13 +2,13 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.7.5 +%define VERSION 2.7.6 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server Name: knot -Version: %{VERSION} -Release: 1%{?dist} +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 @@ -190,7 +190,12 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %systemd_postun_with_restart knot.service %endif -%ldconfig_scriptlets libs +%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 @@ -251,6 +256,25 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Wed Jan 23 2019 Tomas Krizek - 2.7.6-1 +Knot DNS 2.7.6 (2019-01-23) +=========================== + +Improvements: +------------- + - Zone status also shows when the zone load is scheduled + - Server workers status also shows background workers utilization + - Default control timeout for knotc was increased to 10 seconds + - Pkg-config files contain auxiliary variable with library filename + +Bugfixes: +--------- + - Configuration commit or server reload can drop some pending zone events + - Nonempty zone journal is created even though it's disabled #635 + - Zone is completely re-signed during empty dynamic update processing + - Server can crash when storing a big zone difference to the journal + - Failed to link on FreeBSD 12 with Clang + * Mon Jan 07 2019 Tomas Krizek - 2.7.5-1 Knot DNS 2.7.5 (2019-01-07) =========================== diff --git a/sources b/sources index 1d19a72..5b54fcf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.7.5.tar.xz) = 661dbf59cf87105221421b110bfd17ac40fed4ace1a330322dfd618a203385da5f4c20dda65479059218291e4e12daf935138567527fe3bc799f042ff2522c1b -SHA512 (knot-2.7.5.tar.xz.asc) = 856cf119a9296c8175dff2e5a50acb710f3e0d9d3831d82bd7e3a9bd0e0438bd733708afc15f5dc65fe491674d5ce47504d75048503f4a295cf4baa07a61f003 +SHA512 (knot-2.7.6.tar.xz) = 6b6a727d57337da01e2d44abec7fde4504d112604769b118fe6254b0317f149ed4e9fab321a04517eccedb08e409818d1817fc1136c27d1fd351538e6816022a +SHA512 (knot-2.7.6.tar.xz.asc) = ee3401466ea2d59c508b568fbcc68f72ba559e0680e79245248e97e038e2724379f83513149af81a8ba3155ca2f77dd2cf049f402e5d5dfa55fd2dfc72da1056 From 14bba60009f8035e71ca62d872da743079884cb7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 05:54:13 +0000 Subject: [PATCH 122/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index dfbf55e..f0ba271 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: GPLv3 URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz @@ -256,6 +256,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.7.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Jan 23 2019 Tomas Krizek - 2.7.6-1 Knot DNS 2.7.6 (2019-01-23) =========================== From ae5a70fcd620c339dffab9fc3a7f396a03c4fa25 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Thu, 28 Feb 2019 15:16:56 +0100 Subject: [PATCH 123/214] 2.7.6-3: disable unccessary failing test Fixes BZ#1675235 --- ..._net-disable-udp-send-on-unconnected.patch | 27 +++++++++++++++++++ knot.spec | 10 ++++++- 2 files changed, 36 insertions(+), 1 deletion(-) 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 f0ba271..4203579 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz @@ -22,6 +22,9 @@ 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) @@ -105,6 +108,7 @@ gpg2 --import %{SOURCE100} gpg2 --verify %{SOURCE1} %{SOURCE0} %endif %setup -q +%patch1 -p1 %build # disable debug code (causes unused warnings) @@ -256,6 +260,10 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Thu Feb 28 2019 Tomas Krizek - 2.7.6-3 +- Added 01-test_net-disable-udp-send-on-unconnected.patch to disable + unnecessary failing test. Fixes BZ#1675235 + * Fri Feb 01 2019 Fedora Release Engineering - 2.7.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From e1861312c10c0a5de1b9c7630e230693a27b2084 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 29 May 2019 16:50:13 +0200 Subject: [PATCH 124/214] new upstream release 2.8.1 Resolves BZ#1700251 --- knot.spec | 8 ++++++-- sources | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 4203579..fab43fd 100644 --- a/knot.spec +++ b/knot.spec @@ -2,13 +2,13 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.7.6 +%define VERSION 2.8.1 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv3 URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz @@ -260,6 +260,10 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Wed May 29 2019 Tomas Krizek - 2.8.1-1 +- New upstream release 2.8.1 +- Resolves BZ#1700251 + * Thu Feb 28 2019 Tomas Krizek - 2.7.6-3 - Added 01-test_net-disable-udp-send-on-unconnected.patch to disable unnecessary failing test. Fixes BZ#1675235 diff --git a/sources b/sources index 5b54fcf..12c7f1b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.7.6.tar.xz) = 6b6a727d57337da01e2d44abec7fde4504d112604769b118fe6254b0317f149ed4e9fab321a04517eccedb08e409818d1817fc1136c27d1fd351538e6816022a -SHA512 (knot-2.7.6.tar.xz.asc) = ee3401466ea2d59c508b568fbcc68f72ba559e0680e79245248e97e038e2724379f83513149af81a8ba3155ca2f77dd2cf049f402e5d5dfa55fd2dfc72da1056 +SHA512 (knot-2.8.1.tar.xz) = b1f97171efae85b5d6f845e57d933170e8f81b30e8b5a1a6157bb0f6bf5e1e545e7b3d2d51eedf0061166e9842ab01eb6c5e84b1ef9e98e20eda9a806e3e5d4b +SHA512 (knot-2.8.1.tar.xz.asc) = a8a33a1430a7252ac2a12ff22f8a4b3d64a3238f84597daf93d9dc275d42e2ae858a6f08319f29b8351feef2aa89629612fc05dfd16b018854d95a09b3935b88 From 6a5c050e9e0093627d82557bbb9ca1cb674660bd Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 26 Jun 2019 10:43:44 +0200 Subject: [PATCH 125/214] new upstream release 2.8.2 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index fab43fd..316a15a 100644 --- a/knot.spec +++ b/knot.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 2.8.1 +%define VERSION 2.8.2 %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 Jun 26 2019 Tomas Krizek - 2.8.2-1 +- New upstream release 2.8.2 + * Wed May 29 2019 Tomas Krizek - 2.8.1-1 - New upstream release 2.8.1 - Resolves BZ#1700251 diff --git a/sources b/sources index 12c7f1b..6e0075c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-2.8.1.tar.xz) = b1f97171efae85b5d6f845e57d933170e8f81b30e8b5a1a6157bb0f6bf5e1e545e7b3d2d51eedf0061166e9842ab01eb6c5e84b1ef9e98e20eda9a806e3e5d4b -SHA512 (knot-2.8.1.tar.xz.asc) = a8a33a1430a7252ac2a12ff22f8a4b3d64a3238f84597daf93d9dc275d42e2ae858a6f08319f29b8351feef2aa89629612fc05dfd16b018854d95a09b3935b88 +SHA512 (knot-2.8.2.tar.xz) = d7a045cc7b1a1f43b9536283d4202d7f8f36ac2160e0b985b40f318cc0041f3c3e977ff2db6f518dd37ea62d93d0d3f617bca1ac0dff81185bf5dcb9c1eac97b +SHA512 (knot-2.8.2.tar.xz.asc) = 6e0f6683ff5525184f1c69b430d0b3f2c8dc1a5df89ca7c5f4e3015e17d95015c08d5c7be89c85ebf91e6ad20c02c30332fc38437c3824c9c4854f5627d7a908 From 770016912acbb595acd5040c9cf675bc253ea48c Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 16 Jul 2019 15:00:29 +0200 Subject: [PATCH 126/214] new upstream release 2.8.3 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 316a15a..f00d7da 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 +* Tue Jul 16 2019 Tomas Krizek - 2.8.3-1 +- New upstream release 2.8.3 + * Wed Jun 26 2019 Tomas Krizek - 2.8.2-1 - New upstream release 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 13cc527fb917a06b174d0a5d446925c07c67b6b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 11:58:56 +0000 Subject: [PATCH 127/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index f00d7da..23361cb 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: GPLv3 URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz @@ -260,6 +260,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jul 16 2019 Tomas Krizek - 2.8.3-1 - New upstream release 2.8.3 From 8be9013bf4a38d2d29ba405b5eb2420a6b04307c Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 24 Sep 2019 12:55:49 +0200 Subject: [PATCH 128/214] 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 23361cb..1febed1 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 + * Thu Jul 25 2019 Fedora Release Engineering - 2.8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild 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 5e8d6168a9132850e45760e99a9f8403a649cc2a Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 12 Nov 2019 10:39:38 +0100 Subject: [PATCH 129/214] 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 @@ om9rg89Ih876PA53vUXBB+FWP9QOFDcOfz3nMjCrLbMzhTsAzrNFXxchzLq+66CL qsQQytDVFpLI+X++sKRTOHkq6vV1bAPjlljrannLnn1y/DvkOOkiHOdYyjmR7Dfk vxgcWh/3Gx4J9gipxZITOr7LamEYgHfElY/UWCtc1Vjt8Xvgt4dofDpvSwY9YzgR WxJKC5ewYdqTCI+zxL1f0fjkeiRYNi959UMMjgdcY7Zpi8oPPQmlyBw15QARAQAB -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+7kCDQRZY5QX -ARAA6RnxYG82/X+A49srgHR9yIxlHqSq6IhNn+iJQ5lpVpfeBItOG4NDu4Aq5X41 -pAJ3NKxsCPV62gEald/C7gJrTI5rag/87GYFFo6QRrwGsWVGORGs9G1pBF7ZZwhP -JwD3MeagGZNfWZzRxXefL1P3mrpO3etSEEwENHtCqEMP6x/JHh3SKonKAlL4xfj3 -F54aKj4upIcjxGBAJH8u66bN1GmYjstBzzbD4TWNTwfKgp15XxjrTgbThFy7CBoO -gcaApiYTPE7D5nB1+AyhGjnO3ZlNgy1ZIHVDFk6HEakaqKM9QlkJnZsB2+cTqXlV -0etmFQsedCg2sUier0hhIrEOOtGQbY1P+0vv+VRoaNym3ritl+70RG8WgrHNLMRH -VGeLRq3gOFnt+d/3h7meAKbORW/ZY30UpwthtlZYgciFzoDJCW8Be1i1X4toiUaM -kFh79jd7YTvZ87+P4DllC9MNsoq5cY/bHBNZYtXf7y6XqVqYo2IbFUR3VXKtzSN5 -eYm5YpFPczzmg1bNgl3i6WBcOF4EPEJEVjZ+u1r59NvfVLQ8XVh/QmLoG7x8oFcv -hWctMy17Vdm4qZjpSA+B1sQocehdra+xT+PWV0kcrYpsqwkYeFRQnJGqIupWHnot -qGOBNAyQWIcjK6K5y0CeioJZpNN5Oe5XloMXsYmgXsR+gTUAEQEAAYkCJQQYAQoA -DwUCWWOUFwIbDAUJA8JnAAAKCRAQu3r2/rvWq+IQD/9ikZ5MtdDOVLtULPqXXeP3 -6Oss2Ie4/4IQ7xkUZZ/Ujig0x1rW+d21o92VryH1s4K+nyCIW31rbtexK/0a54/w -Zyyjbqfh6Tgo9n3f5bMV9qyubb49cfTSKfgzoOkG8Xdc/TIO1IjWHy1NBDl8GWKJ -0QPYz78SCCkEFiVCAFBjuIQsoPqDKcZTs7k661w0A75ken88JJLgUgffZJRQK0i1 -dCw8kS4c2pqm24Q6d0AF5EdqXn2IFH82p49Pp5bRMY3LnibRL3Sq0xvXs7i5vY+o -JLuPAdomiGbdEbxcLytqQ2KitVdrGvrnZJxPs16m0uuTeM06krorDlgGBXFp5+Z9 -JbQpViHkVpLo+vf/GuT9WOWWH8gG0r14ZLVQTvCGXiAR4Aju7W5jPMPmVDJ+wMrD -cLta1Jv0U0+AnVe67mRXb0n5E/7kVshB3rfGzunPSlqT5kEiOXq6fJWB2l0lzCv0 -WtNuINmU9U3ap1oZBGSYl83vyuRUIlx61/tlnJvwseBL1FmASXOgfedCsxjHIlgF -SUeScLxnOSyap/4ePqZ0C76Nkvzx43SfM1LJUeCHwon0o+LZv2GlBmlEp6PbekRQ -Tz1hewLBbfAeXZRnwxvmkRqTP4DJCIVu2AE47+rbqVEjJZuEO4ORlkKoBdLOV3HN -xWbfbG7+n/h2cnUw3pqbHw== -=4CxJ +tCZEYW5pZWwgU2Fsem1hbiA8ZGFuaWVsLnNhbHptYW5AbmljLmN6PokCVAQTAQoA +PgIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBHQvpOlYKbbF6sa4VxC7evb+ +u9arBQJcZrrTBQkGxY28AAoJEBC7evb+u9arU78QAJOVSul2YTXediwcY1YtpAli +KtHcjOS5PzaezB4c+E89xw6x/XO76KLI6+7GFrcGallPPCHXQfseQh5FmlZ2VMMT +5+f/eTY/s9kwhexAarW8AE8GeKZ/ejt6AqCokjbD/75Sfkx+F6/1Vg20kOoma8Uy +QyIozmUOue0z0VYR3uHJw6BIncGtkuxt5IHzXw5AsAtdNqneuRg5Ibx1gmJqW/Xa +M3cPo2WwF5Arh6JjGZTkUaiBcc4miUS08nqT6hvmxFY9X9KvWMl/NeMiom09HcV+ +JJnrjf1hoW4uy4DxEo6Mt34iZddsjCw3x1Qmgs70BonKpBjCY6fE6KU66c6ykOdt +vx0QrqUnODoHOEyN54TREw+PZDftkfgchwg1nN1SQeWvQ9JGRNKOuQhEGrRq1Wxa +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 -----END PGP PUBLIC KEY BLOCK----- diff --git a/knot.spec b/knot.spec index 1febed1..688e458 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 8445752fec73add09549ab6cd25f672c2dc18b83 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 12 Nov 2019 12:02:10 +0100 Subject: [PATCH 130/214] new upstream release 2.9.1-1 --- 01-test_net-disable-udp-send-on-unconnected.patch | 6 +++--- knot.spec | 15 ++++++++++----- sources | 4 ++-- 3 files changed, 15 insertions(+), 10 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 688e458..6276314 100644 --- a/knot.spec +++ b/knot.spec @@ -2,13 +2,13 @@ %{!?_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 Name: knot Version: %{VERSION} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv3 URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz @@ -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 6b318bb5585b33037d6cd4c5d2409c1d5dd219ba Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Fri, 13 Dec 2019 10:22:20 +0100 Subject: [PATCH 131/214] 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 6276314..fea849c 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 351316b8ee3c80ebc160a7d4c0096b4c492abd5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 07:43:02 +0000 Subject: [PATCH 132/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index fea849c..bb83e02 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: GPLv3 URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz @@ -261,6 +261,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Dec 13 2019 Tomas Krizek - 2.9.2-1 - new upstream release 2.9.2 From 41c915ca741389104ba7fc5127ac0d1b88ff13a3 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 3 Mar 2020 13:05:03 +0100 Subject: [PATCH 133/214] 2.9.3-1: new upstream release --- knot.spec | 17 +++++++++++++---- sources | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/knot.spec b/knot.spec index bb83e02..07e272b 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: 2%{?dist} -License: GPLv3 +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 @@ -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 + * Wed Jan 29 2020 Fedora Release Engineering - 2.9.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild 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 1d6d80228a28edcec1d91b53136499cd2d7a2c22 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 5 May 2020 10:21:06 +0200 Subject: [PATCH 134/214] 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 07e272b..07653d6 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 948f67beac1484e542f387e428c264f4b5214cc8 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Mon, 25 May 2020 10:58:01 +0200 Subject: [PATCH 135/214] 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 07653d6..163d880 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 e64f78ee4a85f8e0c51bcd8d004d2a85d8db4b58 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sun, 21 Jun 2020 18:53:01 +0200 Subject: [PATCH 136/214] Rebuilt for protobuf 3.12 --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 163d880..67e74ca 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 @@ -267,6 +267,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Sun Jun 14 2020 Adrian Reber - 2.9.5-2 +- Rebuilt for protobuf 3.12 + * Mon May 25 2020 Tomas Krizek - 2.9.5-1 - new upstream release 2.9.5 From fe5f24c167b134335bd24dd85f16e7fb9192639f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 03:33:56 +0000 Subject: [PATCH 137/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 67e74ca..4a6f062 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -Release: 2%{?dist} +Release: 3%{?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 @@ -267,6 +267,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_pkgdocdir}/html %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.9.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 14 2020 Adrian Reber - 2.9.5-2 - Rebuilt for protobuf 3.12 From 07b52db0e29af8076c2464a2e1ab009ba999317f 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 138/214] 2.9.6-1: new upstream release Changelog: - Update to 2.9.6 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 4a6f062..d383c00 100644 --- a/knot.spec +++ b/knot.spec @@ -2,13 +2,13 @@ %{!?_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 Name: knot Version: %{VERSION} -Release: 3%{?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 @@ -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 + * Tue Jul 28 2020 Fedora Release Engineering - 2.9.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild 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 ba4dfabd8fc5e771e939fbc40909b6fe6ab6b767 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 139/214] knot-3.0.0-1: new major upstream release Changelog: - New major upstream release 3.0.0 - Sync packaging from upstream --- knot.spec | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index d383c00..1339843 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 From 4c31ed0792a32a15ea88d11ffd419ddff75ef0bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 10 Sep 2020 15:37:32 +0000 Subject: [PATCH 140/214] knot-3.0.0-1: update sources --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 fdd70bcd23029ae08982ba6a1bb02487c7228542 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 24 Sep 2020 08:59:31 +0200 Subject: [PATCH 141/214] Rebuilt for protobuf 3.13 --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 1339843..8f76bf4 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 +* Thu Sep 24 2020 Adrian Reber - 3.0.0-2 +- Rebuilt for protobuf 3.13 + * Thu Sep 10 2020 Jakub Ružička 3.0.0-1 - New major upstream release 3.0.0 - Sync packaging from upstream From 10b74c474a35687cd5d418facd0750bd90137f5c 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 142/214] 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 dd08587d22a83391b5f4ac16954417329766aa18 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 143/214] 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 8f76bf4..c98bb9a 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 + * Thu Sep 24 2020 Adrian Reber - 3.0.0-2 - Rebuilt for protobuf 3.13 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 2d84f223834ba4e1d4697bd5fa24e9621a7ec6f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 29 Oct 2020 11:55:48 +0000 Subject: [PATCH 144/214] knot-3.0.1-2: respect GnuTLS insecure algorithms Changelog: - Respect GnuTLS insecure algorithms --- ...c-respect-GnuTLS-insecure-algorithms.patch | 127 ++++++++++++++++++ knot.spec | 7 +- 2 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 02-libdnssec-respect-GnuTLS-insecure-algorithms.patch diff --git a/02-libdnssec-respect-GnuTLS-insecure-algorithms.patch b/02-libdnssec-respect-GnuTLS-insecure-algorithms.patch new file mode 100644 index 0000000..2f8af15 --- /dev/null +++ b/02-libdnssec-respect-GnuTLS-insecure-algorithms.patch @@ -0,0 +1,127 @@ +From 1cd35b0cad2007307867fcd90d7c546fc439e5ff Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= +Date: Thu, 29 Oct 2020 08:23:00 +0100 +Subject: [PATCH] libdnssec: respect GnuTLS insecure algorithms + +--- + src/libdnssec/key.h | 6 +++++- + src/libdnssec/key/algorithm.c | 6 ------ + src/libdnssec/key/ds.c | 17 +++++++++++++++-- + src/libdnssec/sign/sign.c | 16 +++++++++++----- + 4 files changed, 31 insertions(+), 14 deletions(-) + +diff --git a/src/libdnssec/key.h b/src/libdnssec/key.h +index ac84f8190..0023e8dde 100644 +--- a/src/libdnssec/key.h ++++ b/src/libdnssec/key.h +@@ -68,6 +68,10 @@ typedef struct dnssec_key dnssec_key_t; + * Check whether a DNSKEY algorithm is supported. + * + * @note: less secure algorithms may go unsupported on purpose. ++ * - if IETF RFCs deprecate algorithm even for validation (see RFC 8624) ++ * - if (local) GnuTLS policy considers an algorithm insecure ++ * ++ * Perhaps confusing: it's implemented in ./sign/sign.c and not ./key/ + */ + bool dnssec_algorithm_key_support(dnssec_key_algorithm_t algo); + +@@ -269,7 +273,7 @@ typedef enum dnssec_key_digest { + /*! + * Check whether a DS algorithm is supported. + * +- * @note: less secure algorithms may go unsupported on purpose. ++ * @note: see note at dnssec_algorithm_key_support(). + */ + bool dnssec_algorithm_digest_support(dnssec_key_digest_t algo); + +diff --git a/src/libdnssec/key/algorithm.c b/src/libdnssec/key/algorithm.c +index 83cbe94b9..97800c8a4 100644 +--- a/src/libdnssec/key/algorithm.c ++++ b/src/libdnssec/key/algorithm.c +@@ -109,12 +109,6 @@ gnutls_pk_algorithm_t algorithm_to_gnutls(dnssec_key_algorithm_t dnssec) + + /* -- public API ----------------------------------------------------------- */ + +-_public_ +-bool dnssec_algorithm_key_support(dnssec_key_algorithm_t algo) +-{ +- return algorithm_to_gnutls(algo) != GNUTLS_PK_UNKNOWN; +-} +- + _public_ + bool dnssec_algorithm_reproducible(dnssec_key_algorithm_t algo, bool explicit) + { +diff --git a/src/libdnssec/key/ds.c b/src/libdnssec/key/ds.c +index 36fcdbd98..64389148e 100644 +--- a/src/libdnssec/key/ds.c ++++ b/src/libdnssec/key/ds.c +@@ -40,9 +40,22 @@ static gnutls_digest_algorithm_t lookup_algorithm(dnssec_key_digest_t algorithm) + } + + _public_ +-bool dnssec_algorithm_digest_support(dnssec_key_digest_t algo) ++bool dnssec_algorithm_digest_support(dnssec_key_digest_t algorithm) + { +- return lookup_algorithm(algo) != GNUTLS_DIG_UNKNOWN; ++ /* GnuTLS docs: ++ * > It is not possible to query for insecure hash algorithms directly ++ * > (only indirectly through the signature API). ++ * So let's query combining the hash with RSA. ++ */ ++ gnutls_sign_algorithm_t rsa; ++ switch (algorithm) { ++ case DNSSEC_KEY_DIGEST_SHA1: rsa = GNUTLS_SIGN_RSA_SHA1; break; ++ case DNSSEC_KEY_DIGEST_SHA256: rsa = GNUTLS_SIGN_RSA_SHA256; break; ++ case DNSSEC_KEY_DIGEST_SHA384: rsa = GNUTLS_SIGN_RSA_SHA384; break; ++ default: ++ return false; ++ }; ++ return gnutls_sign_is_secure(rsa); + } + + static void wire_write_digest(wire_ctx_t *wire, +diff --git a/src/libdnssec/sign/sign.c b/src/libdnssec/sign/sign.c +index 3f9557aaf..1a7e8292e 100644 +--- a/src/libdnssec/sign/sign.c ++++ b/src/libdnssec/sign/sign.c +@@ -230,11 +230,9 @@ static gnutls_digest_algorithm_t get_digest_algorithm(const dnssec_key_t *key) + } + #endif + +-static gnutls_sign_algorithm_t get_sign_algorithm(const dnssec_key_t *key) ++static gnutls_sign_algorithm_t algo_dnssec2gnutls(dnssec_key_algorithm_t algorithm) + { +- uint8_t algorithm = dnssec_key_get_algorithm(key); +- +- switch ((dnssec_key_algorithm_t)algorithm) { ++ switch (algorithm) { + case DNSSEC_KEY_ALGORITHM_RSA_SHA1: + case DNSSEC_KEY_ALGORITHM_RSA_SHA1_NSEC3: + return GNUTLS_SIGN_RSA_SHA1; +@@ -261,6 +259,13 @@ static gnutls_sign_algorithm_t get_sign_algorithm(const dnssec_key_t *key) + + /* -- public API ---------------------------------------------------------- */ + ++_public_ ++bool dnssec_algorithm_key_support(dnssec_key_algorithm_t algo) ++{ ++ gnutls_sign_algorithm_t a = algo_dnssec2gnutls(algo); ++ return a != GNUTLS_SIGN_UNKNOWN && gnutls_sign_is_secure(a); ++} ++ + _public_ + int dnssec_sign_new(dnssec_sign_ctx_t **ctx_ptr, const dnssec_key_t *key) + { +@@ -278,7 +283,8 @@ int dnssec_sign_new(dnssec_sign_ctx_t **ctx_ptr, const dnssec_key_t *key) + return DNSSEC_INVALID_KEY_ALGORITHM; + } + +- ctx->sign_algorithm = get_sign_algorithm(key); ++ const uint8_t algo_raw = dnssec_key_get_algorithm(key); ++ ctx->sign_algorithm = algo_dnssec2gnutls((dnssec_key_algorithm_t)algo_raw); + int result = dnssec_sign_init(ctx); + if (result != DNSSEC_EOK) { + free(ctx); +-- +2.28.0 + diff --git a/knot.spec b/knot.spec index c98bb9a..3788e0e 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz @@ -24,6 +24,7 @@ BuildRequires: gnupg2 # Test fails on F30+ aarch/s390x for unknown reason, but it is not neccassary for Knot DNS Patch1: 01-test_net-disable-udp-send-on-unconnected.patch +Patch2: 02-libdnssec-respect-GnuTLS-insecure-algorithms.patch # Required dependencies BuildRequires: gcc @@ -117,6 +118,7 @@ gpg2 --verify %{SOURCE1} %{SOURCE0} %endif %setup -q %patch1 -p1 +%patch2 -p1 %build # disable debug code (causes unused warnings) @@ -281,6 +283,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Oct 29 2020 Jakub Ružička - 3.0.1-2 +- Respect GnuTLS insecure algorithms + * Mon Oct 12 2020 Jakub Ružička - 3.0.1-1 - Update to 3.0.1 - Sync packaging from upstream From 145359c0fdae15637cb301f7cbb2801f713e9a44 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 145/214] knot-3.0.2-1: new upstream release Changelog: - Update to 3.0.2 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 3788e0e..d60d623 100644 --- a/knot.spec +++ b/knot.spec @@ -2,13 +2,13 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 3.0.1 +%define VERSION 3.0.2 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -Release: 2%{?dist} +Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz @@ -283,6 +283,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Wed Nov 11 2020 Jakub Ružička - 3.0.2-1 +- Update to 3.0.2 + * Thu Oct 29 2020 Jakub Ružička - 3.0.1-2 - Respect GnuTLS insecure algorithms diff --git a/sources b/sources index 5441177..286230f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.1.tar.xz) = e220d1db7d01c4899d687b0c1eaf792a48ef3a2d356265fd89addfc89c23f41462967fc974b96d22714e0c812c70f83f919bc2b91803776025e0b907e0cd914d -SHA512 (knot-3.0.1.tar.xz.asc) = 179681474d08b136cab0d46c58f5980dc9a5bbf5424a235447c05da2cbbf9e0a6c578de70de3419279dd79c9f18f6f04f137d60ac6e614c6daa445a2df7426e0 +SHA512 (knot-3.0.2.tar.xz) = 677de7a80688d4820d56c020af1bb1da97546f44a616e2d72d7e0301fca4a7ab682994cf66e8c37403e65ddb45ea3e0eb37b3304739c1239364115588c589699 +SHA512 (knot-3.0.2.tar.xz.asc) = 056afa176067d05917928d8b11bad40499d51ea8699dbc6bebf5c638e8fc9990582338e6745ed178c0685cfb97a19aa0a844e28a2b13c89f9195702d1b816a49 From 936ea8d574f5e7aa9c8c25d92ff55d7720c747c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 11 Nov 2020 15:20:54 +0000 Subject: [PATCH 146/214] knot-3.0.2-2 Changelog: - Remove patch included in upstream release --- ...c-respect-GnuTLS-insecure-algorithms.patch | 127 ------------------ knot.spec | 7 +- 2 files changed, 4 insertions(+), 130 deletions(-) delete mode 100644 02-libdnssec-respect-GnuTLS-insecure-algorithms.patch diff --git a/02-libdnssec-respect-GnuTLS-insecure-algorithms.patch b/02-libdnssec-respect-GnuTLS-insecure-algorithms.patch deleted file mode 100644 index 2f8af15..0000000 --- a/02-libdnssec-respect-GnuTLS-insecure-algorithms.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 1cd35b0cad2007307867fcd90d7c546fc439e5ff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= -Date: Thu, 29 Oct 2020 08:23:00 +0100 -Subject: [PATCH] libdnssec: respect GnuTLS insecure algorithms - ---- - src/libdnssec/key.h | 6 +++++- - src/libdnssec/key/algorithm.c | 6 ------ - src/libdnssec/key/ds.c | 17 +++++++++++++++-- - src/libdnssec/sign/sign.c | 16 +++++++++++----- - 4 files changed, 31 insertions(+), 14 deletions(-) - -diff --git a/src/libdnssec/key.h b/src/libdnssec/key.h -index ac84f8190..0023e8dde 100644 ---- a/src/libdnssec/key.h -+++ b/src/libdnssec/key.h -@@ -68,6 +68,10 @@ typedef struct dnssec_key dnssec_key_t; - * Check whether a DNSKEY algorithm is supported. - * - * @note: less secure algorithms may go unsupported on purpose. -+ * - if IETF RFCs deprecate algorithm even for validation (see RFC 8624) -+ * - if (local) GnuTLS policy considers an algorithm insecure -+ * -+ * Perhaps confusing: it's implemented in ./sign/sign.c and not ./key/ - */ - bool dnssec_algorithm_key_support(dnssec_key_algorithm_t algo); - -@@ -269,7 +273,7 @@ typedef enum dnssec_key_digest { - /*! - * Check whether a DS algorithm is supported. - * -- * @note: less secure algorithms may go unsupported on purpose. -+ * @note: see note at dnssec_algorithm_key_support(). - */ - bool dnssec_algorithm_digest_support(dnssec_key_digest_t algo); - -diff --git a/src/libdnssec/key/algorithm.c b/src/libdnssec/key/algorithm.c -index 83cbe94b9..97800c8a4 100644 ---- a/src/libdnssec/key/algorithm.c -+++ b/src/libdnssec/key/algorithm.c -@@ -109,12 +109,6 @@ gnutls_pk_algorithm_t algorithm_to_gnutls(dnssec_key_algorithm_t dnssec) - - /* -- public API ----------------------------------------------------------- */ - --_public_ --bool dnssec_algorithm_key_support(dnssec_key_algorithm_t algo) --{ -- return algorithm_to_gnutls(algo) != GNUTLS_PK_UNKNOWN; --} -- - _public_ - bool dnssec_algorithm_reproducible(dnssec_key_algorithm_t algo, bool explicit) - { -diff --git a/src/libdnssec/key/ds.c b/src/libdnssec/key/ds.c -index 36fcdbd98..64389148e 100644 ---- a/src/libdnssec/key/ds.c -+++ b/src/libdnssec/key/ds.c -@@ -40,9 +40,22 @@ static gnutls_digest_algorithm_t lookup_algorithm(dnssec_key_digest_t algorithm) - } - - _public_ --bool dnssec_algorithm_digest_support(dnssec_key_digest_t algo) -+bool dnssec_algorithm_digest_support(dnssec_key_digest_t algorithm) - { -- return lookup_algorithm(algo) != GNUTLS_DIG_UNKNOWN; -+ /* GnuTLS docs: -+ * > It is not possible to query for insecure hash algorithms directly -+ * > (only indirectly through the signature API). -+ * So let's query combining the hash with RSA. -+ */ -+ gnutls_sign_algorithm_t rsa; -+ switch (algorithm) { -+ case DNSSEC_KEY_DIGEST_SHA1: rsa = GNUTLS_SIGN_RSA_SHA1; break; -+ case DNSSEC_KEY_DIGEST_SHA256: rsa = GNUTLS_SIGN_RSA_SHA256; break; -+ case DNSSEC_KEY_DIGEST_SHA384: rsa = GNUTLS_SIGN_RSA_SHA384; break; -+ default: -+ return false; -+ }; -+ return gnutls_sign_is_secure(rsa); - } - - static void wire_write_digest(wire_ctx_t *wire, -diff --git a/src/libdnssec/sign/sign.c b/src/libdnssec/sign/sign.c -index 3f9557aaf..1a7e8292e 100644 ---- a/src/libdnssec/sign/sign.c -+++ b/src/libdnssec/sign/sign.c -@@ -230,11 +230,9 @@ static gnutls_digest_algorithm_t get_digest_algorithm(const dnssec_key_t *key) - } - #endif - --static gnutls_sign_algorithm_t get_sign_algorithm(const dnssec_key_t *key) -+static gnutls_sign_algorithm_t algo_dnssec2gnutls(dnssec_key_algorithm_t algorithm) - { -- uint8_t algorithm = dnssec_key_get_algorithm(key); -- -- switch ((dnssec_key_algorithm_t)algorithm) { -+ switch (algorithm) { - case DNSSEC_KEY_ALGORITHM_RSA_SHA1: - case DNSSEC_KEY_ALGORITHM_RSA_SHA1_NSEC3: - return GNUTLS_SIGN_RSA_SHA1; -@@ -261,6 +259,13 @@ static gnutls_sign_algorithm_t get_sign_algorithm(const dnssec_key_t *key) - - /* -- public API ---------------------------------------------------------- */ - -+_public_ -+bool dnssec_algorithm_key_support(dnssec_key_algorithm_t algo) -+{ -+ gnutls_sign_algorithm_t a = algo_dnssec2gnutls(algo); -+ return a != GNUTLS_SIGN_UNKNOWN && gnutls_sign_is_secure(a); -+} -+ - _public_ - int dnssec_sign_new(dnssec_sign_ctx_t **ctx_ptr, const dnssec_key_t *key) - { -@@ -278,7 +283,8 @@ int dnssec_sign_new(dnssec_sign_ctx_t **ctx_ptr, const dnssec_key_t *key) - return DNSSEC_INVALID_KEY_ALGORITHM; - } - -- ctx->sign_algorithm = get_sign_algorithm(key); -+ const uint8_t algo_raw = dnssec_key_get_algorithm(key); -+ ctx->sign_algorithm = algo_dnssec2gnutls((dnssec_key_algorithm_t)algo_raw); - int result = dnssec_sign_init(ctx); - if (result != DNSSEC_EOK) { - free(ctx); --- -2.28.0 - diff --git a/knot.spec b/knot.spec index d60d623..ac3d59a 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz @@ -24,7 +24,6 @@ BuildRequires: gnupg2 # Test fails on F30+ aarch/s390x for unknown reason, but it is not neccassary for Knot DNS Patch1: 01-test_net-disable-udp-send-on-unconnected.patch -Patch2: 02-libdnssec-respect-GnuTLS-insecure-algorithms.patch # Required dependencies BuildRequires: gcc @@ -118,7 +117,6 @@ gpg2 --verify %{SOURCE1} %{SOURCE0} %endif %setup -q %patch1 -p1 -%patch2 -p1 %build # disable debug code (causes unused warnings) @@ -283,6 +281,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Wed Nov 11 2020 Jakub Ružička - 3.0.2-2 +- Remove patch included in upstream release + * Wed Nov 11 2020 Jakub Ružička - 3.0.2-1 - Update to 3.0.2 From fd14c786d317acd0720db37cd363d5605b4fe217 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 147/214] knot-3.0.3-1 Changelog: - Update to 3.0.3 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index ac3d59a..4f2f71e 100644 --- a/knot.spec +++ b/knot.spec @@ -2,13 +2,13 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 -%define VERSION 3.0.2 +%define VERSION 3.0.3 %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -Release: 2%{?dist} +Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.xz @@ -281,6 +281,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Dec 17 2020 Jakub Ružička - 3.0.3-1 +- Update to 3.0.3 + * Wed Nov 11 2020 Jakub Ružička - 3.0.2-2 - Remove patch included in upstream release diff --git a/sources b/sources index 286230f..f30e35d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.2.tar.xz) = 677de7a80688d4820d56c020af1bb1da97546f44a616e2d72d7e0301fca4a7ab682994cf66e8c37403e65ddb45ea3e0eb37b3304739c1239364115588c589699 -SHA512 (knot-3.0.2.tar.xz.asc) = 056afa176067d05917928d8b11bad40499d51ea8699dbc6bebf5c638e8fc9990582338e6745ed178c0685cfb97a19aa0a844e28a2b13c89f9195702d1b816a49 +SHA512 (knot-3.0.3.tar.xz) = 4a4de22f8324d8459a7012faa49fb1503ad3b2f23af434a82381a73bf3f43a66f096bba7b0dfc8a61f416d9e02ce97c449ed1590a8a899279ac793798423c339 +SHA512 (knot-3.0.3.tar.xz.asc) = 4fccc5e97241556a36fc58d08dbe96666485f66e45bfb4ef59097a413f3409231f974a17c0c2f68207d8360c58e75769b08fac24d95d75d1f6da47c1974ea2ea From 2b28a103bcaf6b245ddc2f4c583794623bd18a29 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 22:34:36 +0000 Subject: [PATCH 148/214] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- knot.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/knot.spec b/knot.spec index 4f2f71e..675f8f1 100644 --- a/knot.spec +++ b/knot.spec @@ -26,6 +26,7 @@ BuildRequires: gnupg2 Patch1: 01-test_net-disable-udp-send-on-unconnected.patch # Required dependencies +BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig(liburcu) BuildRequires: pkgconfig(gnutls) >= 3.3 From 83124a8512365e03c0b469fd772d419d5e509577 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 14 Jan 2021 08:45:50 +0100 Subject: [PATCH 149/214] Rebuilt for protobuf 3.14 --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 675f8f1..2dbd7c3 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 @@ -282,6 +282,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Jan 14 08:45:48 CET 2021 Adrian Reber - 3.0.3-2 +- Rebuilt for protobuf 3.14 + * Thu Dec 17 2020 Jakub Ružička - 3.0.3-1 - Update to 3.0.3 From 5b8fe55789cd57db4c76c81f125d02ca8e6f3a36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 16:00:42 +0000 Subject: [PATCH 150/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 2dbd7c3..bfb20cd 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: %{VERSION} -Release: 2%{?dist} +Release: 3%{?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 @@ -282,6 +282,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Jan 14 08:45:48 CET 2021 Adrian Reber - 3.0.3-2 - Rebuilt for protobuf 3.14 From 0e975f2df9dfc7772b190f8f195139071f0cb445 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 151/214] 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 | 46 ++++++++++++++++++++++++++++++++++++++-------- sources | 4 ++-- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/knot.spec b/knot.spec index bfb20cd..a5c20c2 100644 --- a/knot.spec +++ b/knot.spec @@ -2,13 +2,13 @@ %{!?_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} -Release: 3%{?dist} +Version: 3.0.4 +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 @@ -34,20 +34,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 @@ -99,6 +101,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 @@ -134,12 +150,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 @@ -256,6 +274,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 @@ -282,6 +306,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 + * Tue Jan 26 2021 Fedora Release Engineering - 3.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild 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 20531bf49389933e117cbbd9e10f07083a2ce6cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:35 +0100 Subject: [PATCH 152/214] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- knot.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index a5c20c2..21d5072 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.0.4 -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 @@ -306,6 +306,10 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.0.4-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Mon Feb 01 2021 Jakub Ružička - 3.0.4-1 - Update to 3.0.4 - Move dnstap module to subpackage From dfb711f3b9fd877b60671f608be298e71a4ec31f 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 153/214] knot-3.0.5-1 Changelog: - Update to 3.0.5 - Properly escape BASE_VERSION macro - Include module dirs in main package --- knot.spec | 13 ++++++++++--- sources | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/knot.spec b/knot.spec index 21d5072..c12dc6f 100644 --- a/knot.spec +++ b/knot.spec @@ -2,13 +2,13 @@ %{!?_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 -Release: 2%{?dist} +Version: 3.0.5 +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 @@ -238,6 +238,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %attr(770,root,knot) %dir %{_sysconfdir}/knot %config(noreplace) %attr(640,root,knot) %{_sysconfdir}/knot/knot.conf %attr(770,root,knot) %dir %{_sharedstatedir}/knot +%dir %{_libdir}/knot +%dir %{_libdir}/knot/modules-* %{_unitdir}/knot.service %{_tmpfilesdir}/knot.conf %{_bindir}/kzonecheck @@ -306,6 +308,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Tue Mar 30 2021 Jakub Ružička 3.0.5-1 +- Update to 3.0.5 +- Properly escape BASE_VERSION macro +- Include module dirs in main package + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.0.4-2 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. 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 e391b72f8bdcb5f75485605ebc62b0b47685c6da 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 154/214] 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 c12dc6f..4182c46 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.0.5 +Version: 3.0.6 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -308,6 +308,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Fri May 14 2021 Jakub Ružička - 3.0.6-1 +- Update to 3.0.6 + * Tue Mar 30 2021 Jakub Ružička 3.0.5-1 - Update to 3.0.5 - Properly escape BASE_VERSION macro diff --git a/sources b/sources index 056213e..d327402 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.5.tar.xz) = b4875b3a5bef0c597d89ded3c1c87ab65952057e02f4ee79088e08fe62ee542ff737b544995bf8f2cc4dfaeac1fac230213a8492040ed80992bab8c7e8f8c786 -SHA512 (knot-3.0.5.tar.xz.asc) = 3b6e8260dc26703a4601a342c10c5147e2de95297f87124747e4bf95ce0831c46a87eac910e4e09ddd5dfbe6ea9a899cedd9ccde6edd26fd96e1dfa7dc2e1b1b +SHA512 (knot-3.0.6.tar.xz) = f1bfb0bc3a4cf622a68562409e71c8b84ee628a5452b48e172148bcac9cd0827b60a0c060075b80a086ca65da958d2d63e33ef7e373ab300b50089d06af3e5d0 +SHA512 (knot-3.0.6.tar.xz.asc) = 7e62201dca5bfd5cf24a32850eee974a3d9690dc1265d267b5fe29f1bcb318efa4e96390b07deeac71e0c2aeac69e0df33efb888540613718fae97afed2723ba From 4797c4649d64d04a5fc57f7cd082e03a5fd85624 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 155/214] 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 4182c46..3a52ed8 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.0.6 +Version: 3.0.7 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -308,6 +308,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Jun 17 2021 Jakub Ružička - 3.0.7-1 +- Update to 3.0.7 + * Fri May 14 2021 Jakub Ružička - 3.0.6-1 - Update to 3.0.6 diff --git a/sources b/sources index d327402..b68b512 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.6.tar.xz) = f1bfb0bc3a4cf622a68562409e71c8b84ee628a5452b48e172148bcac9cd0827b60a0c060075b80a086ca65da958d2d63e33ef7e373ab300b50089d06af3e5d0 -SHA512 (knot-3.0.6.tar.xz.asc) = 7e62201dca5bfd5cf24a32850eee974a3d9690dc1265d267b5fe29f1bcb318efa4e96390b07deeac71e0c2aeac69e0df33efb888540613718fae97afed2723ba +SHA512 (knot-3.0.7.tar.xz) = 89e17cd2bc5a07b05ccd11cfd58481078eff4076a537d1623ed575c1ab87eac87ce949c12dc35eb15dc7e4358a405c19a6660b4da9abc230077a251792f196bd +SHA512 (knot-3.0.7.tar.xz.asc) = 369aba7e666e5d04e755b3692ae43a50dabef2b9cba721cd5fb0feab13cde666f788b394c568e4500caa7512c03759101d99b0e3299f9b4ff176ad3e89dc9338 From 0ffed24e6a10d9a7a6da3cb72e23b6ec540eb361 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 156/214] 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 3a52ed8..207ab62 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.0.7 +Version: 3.0.8 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -191,7 +191,7 @@ install -d -m 0770 -D %{buildroot}%{_sharedstatedir}/knot find %{buildroot} -type f -name "*.la" -delete -print %check -make check +V=1 make check %pre getent group knot >/dev/null || groupadd -r knot @@ -308,6 +308,10 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Fri Jul 16 2021 Jakub Ružička - 3.0.8-1 +- Update to 3.0.8 +- Print failed tests during check + * Thu Jun 17 2021 Jakub Ružička - 3.0.7-1 - Update to 3.0.7 diff --git a/sources b/sources index b68b512..69848cd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.0.7.tar.xz) = 89e17cd2bc5a07b05ccd11cfd58481078eff4076a537d1623ed575c1ab87eac87ce949c12dc35eb15dc7e4358a405c19a6660b4da9abc230077a251792f196bd -SHA512 (knot-3.0.7.tar.xz.asc) = 369aba7e666e5d04e755b3692ae43a50dabef2b9cba721cd5fb0feab13cde666f788b394c568e4500caa7512c03759101d99b0e3299f9b4ff176ad3e89dc9338 +SHA512 (knot-3.0.8.tar.xz) = 0ed55681210211427b54634428c07ac313a6fbc20492ab127f171a26e48a06e22d8360391a8f80247206c339ce76c32f0a82d6db2ec5dfb43cbfa8f455a4ee60 +SHA512 (knot-3.0.8.tar.xz.asc) = 397348d1c4ea19a14d021374b347db9682267edd607d7d506ebc9dc8d3d814b95417edcb68ca55dcd59977e18dd53447fa549df01245e2bbeadf594509996efa From 35867a2b2973e7637f824b9fbd96786cbb442ca0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 10:16:28 +0000 Subject: [PATCH 157/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 207ab62..74521c6 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.0.8 -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 @@ -308,6 +308,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 3.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jul 16 2021 Jakub Ružička - 3.0.8-1 - Update to 3.0.8 - Print failed tests during check From 1d7d2875cda6e06fceab3f320b177ecf42299ce5 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 158/214] 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 | 29 ++++++++++++++++++++++++----- sources | 4 ++-- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/knot.spec b/knot.spec index 74521c6..435b47f 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.0.8 -Release: 2%{?dist} +Version: 3.1.0 +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 @@ -26,6 +26,9 @@ BuildRequires: gnupg2 Patch1: 01-test_net-disable-udp-send-on-unconnected.patch # Required dependencies +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig(liburcu) @@ -35,6 +38,7 @@ BuildRequires: pkgconfig(libedit) # Optional dependencies BuildRequires: pkgconfig(libcap-ng) BuildRequires: pkgconfig(libidn2) +BuildRequires: pkgconfig(libmnl) BuildRequires: pkgconfig(libnghttp2) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd) @@ -59,12 +63,22 @@ BuildRequires: lmdb-devel BuildRequires: python3-sphinx BuildRequires: pkgconfig(lmdb) %endif + +%ifarch aarch64 %{arm} +# disable XDP on ARM until issues are resolved +%define configure_xdp --enable-xdp=no +%else +%if 0%{?fedora} >= 31 +# XDP is auto-enabled when libbpf is present +%define use_xdp 1 +BuildRequires: pkgconfig(libbpf) >= 0.0.6 +%endif %if 0%{?rhel} >= 8 || 0%{?suse_version} +# enable XDP on EL using embedded libbpf +%define use_xdp 1 %define configure_xdp --enable-xdp=yes BuildRequires: pkgconfig(libelf) %endif -%if 0%{?fedora} >= 31 -BuildRequires: pkgconfig(libbpf) >= 0.0.6 %endif Requires(post): systemd %{_sbindir}/runuser @@ -267,7 +281,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %{_bindir}/khost %{_bindir}/knsec3hash %{_bindir}/knsupdate -%if 0%{?rhel} >= 8 || 0%{?suse_version} || 0%{?fedora} >= 31 +%if 0%{?use_xdp} %{_sbindir}/kxdpgun %{_mandir}/man8/kxdpgun.* %endif @@ -308,6 +322,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Mon Aug 02 2021 Jakub Ružička - 3.1.0-1 +- Update to 3.1.0 +- Add missing BuildRequires including new libmnl for kxdpgun +- Temporarily disable XDP on ARM until issues are resolved + * Thu Jul 22 2021 Fedora Release Engineering - 3.0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild 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 fc53c045dfe2682073d40ce5f9236e1d17a5ad24 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 159/214] 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 435b47f..7934b3e 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 e878508e288fbe2f0d6fcd57500011bfbcbe8414 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 160/214] 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 7934b3e..e2407ce 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 0a3c2778b28cc77481b7acc864f81c95dba51949 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 161/214] knot-3.1.2-1 Changelog: - Update to 3.1.2 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index e2407ce..4a51027 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.1 +Version: 3.1.2 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -320,6 +320,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Sep 09 2021 Jakub Ružička - 3.1.2-1 +- Update to 3.1.2 + * Tue Aug 10 2021 Jakub Ružička - 3.1.1-1 - Update to 3.1.1 - Enable XDP on ARM and improve XDP config macros diff --git a/sources b/sources index 41537cb..2e078c8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.1.tar.xz) = 44c2973025e752f73ebd6bc78dad5c48c1c1432b62ec3b6d75b5876af4dd21aeed94f78523ef85cd6a986ff27789143a0a67450819c0b75ffa627d06b98e1b0b -SHA512 (knot-3.1.1.tar.xz.asc) = 161a689f751ace7214416241b4e6ce6ee01d50b099c950b792b7fc42d7c726174b9bf686dc45316c63887b15dba91a57bc7e961dd84b728b38046bc9f5f260d2 +SHA512 (knot-3.1.2.tar.xz) = e72f249f6291980cc69f90dca54cd8ba3ffbc617a1e69e441a48bdcbf46afb9fc202bbb1f88a93887fd264ddb59ad42ff6765c9bd0c1fa4789f035a902a3907a +SHA512 (knot-3.1.2.tar.xz.asc) = 3dc0c5e2d8d508ff7e63489b9d944cedbf9d3008fb6764192fdd07a0d7717bd1aeac9496e6401ae7604e94499c968e1e0900639cd82fe1457354c374619e5f99 From ab953300dbee72e7d0293b2f972f76e249f1624f 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 162/214] knot-3.1.3-1 Changelog: - Update to 3.1.3 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 4a51027..9e01cdf 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.2 +Version: 3.1.3 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -320,6 +320,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Tue Oct 19 2021 Jakub Ružička - 3.1.3-1 +- Update to 3.1.3 + * Thu Sep 09 2021 Jakub Ružička - 3.1.2-1 - Update to 3.1.2 diff --git a/sources b/sources index 2e078c8..6be7ae5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.2.tar.xz) = e72f249f6291980cc69f90dca54cd8ba3ffbc617a1e69e441a48bdcbf46afb9fc202bbb1f88a93887fd264ddb59ad42ff6765c9bd0c1fa4789f035a902a3907a -SHA512 (knot-3.1.2.tar.xz.asc) = 3dc0c5e2d8d508ff7e63489b9d944cedbf9d3008fb6764192fdd07a0d7717bd1aeac9496e6401ae7604e94499c968e1e0900639cd82fe1457354c374619e5f99 +SHA512 (knot-3.1.3.tar.xz) = 537013e914c3f00615a384c92da06c40bb33871e7dbd28e987280d62d91df42026774cfe0596ac72a218dafa650d8d600b1d831dd0a5c28a9fd796c5cd799838 +SHA512 (knot-3.1.3.tar.xz.asc) = 870a98ae3b18c1ec9ef32ae85dd1d78fd6f021074ef772d093538ceb8107754be466fa1d93b3819f933af46aa663d530ee77e77156065582b9c78d7168076fa3 From e0d26b29679f30c2a1982d4dfb630022276882ec Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 26 Oct 2021 08:44:22 +0200 Subject: [PATCH 163/214] Rebuilt for protobuf 3.18.1 --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 9e01cdf..4d89b22 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.1.3 -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 @@ -320,6 +320,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Tue Oct 26 2021 Adrian Reber - 3.1.3-2 +- Rebuilt for protobuf 3.18.1 + * Tue Oct 19 2021 Jakub Ružička - 3.1.3-1 - Update to 3.1.3 From 122a1b21fdf87697d15b53bfa5ceb2680bc9a321 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 164/214] knot-3.1.4-1 Changelog: - Update to 3.1.4 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 4d89b22..8b2fa4c 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.3 -Release: 2%{?dist} +Version: 3.1.4 +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 @@ -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 26 2021 Adrian Reber - 3.1.3-2 - Rebuilt for protobuf 3.18.1 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 c2e3dd7c481623483fbb8a33278f8bc1a8e23362 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sat, 6 Nov 2021 18:41:40 +0100 Subject: [PATCH 165/214] Rebuilt for protobuf 3.19.0 --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 8b2fa4c..483649a 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.1.4 -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 @@ -320,6 +320,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Sat Nov 06 2021 Adrian Reber - 3.1.4-2 +- Rebuilt for protobuf 3.19.0 + * Thu Nov 04 2021 Jakub Ružička - 3.1.4-1 - Update to 3.1.4 From 9e0ee5e6d6b8c8617e62979eaad67e3731882553 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 166/214] knot-3.1.5-1 Changelog: - Update to 3.1.5 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 483649a..aa97356 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.4 -Release: 2%{?dist} +Version: 3.1.5 +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 @@ -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 + * Sat Nov 06 2021 Adrian Reber - 3.1.4-2 - Rebuilt for protobuf 3.19.0 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 617553e5c7beae504b83a354209d0c2aa93413d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 15:02:34 +0000 Subject: [PATCH 167/214] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index aa97356..f9da8bc 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.1.5 -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 @@ -320,6 +320,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 3.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jan 05 2022 Jakub Ružička 3.1.5-1 - Update to 3.1.5 From bbc2183701d07aede9e7cbaede157885c6f432f7 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 168/214] knot-3.1.6-1 Changelog: - Update to 3.1.6 - Add dbus config - Use _sharedstatedir for home --- knot.spec | 19 +++++++++++++++---- sources | 4 ++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/knot.spec b/knot.spec index f9da8bc..92da19f 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.5 -Release: 2%{?dist} +Version: 3.1.6 +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 @@ -184,9 +184,12 @@ cp -av doc/_build/html %{buildroot}%{_pkgdocdir} [ -r %{buildroot}%{_pkgdocdir}/html/index.html ] || exit 1 rm -f %{buildroot}%{_pkgdocdir}/html/.buildinfo -# install configuration file +# install daemon and dbus configuration files rm %{buildroot}%{_sysconfdir}/%{name}/* install -p -m 0644 -D %{repodir}/samples/%{name}.sample.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf +%if 0%{?fedora} || 0%{?rhel} > 7 +install -p -m 0644 -D %{repodir}/distro/common/cz.nic.knotd.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/cz.nic.knotd.conf +%endif # install systemd files install -p -m 0644 -D %{repodir}/distro/common/%{name}.service %{buildroot}%{_unitdir}/%{name}.service @@ -208,7 +211,7 @@ V=1 make check %pre getent group knot >/dev/null || groupadd -r knot getent passwd knot >/dev/null || \ - useradd -r -g knot -d %{_sysconfdir}/knot -s /sbin/nologin \ + useradd -r -g knot -d %{_sharedstatedir}/knot -s /sbin/nologin \ -c "Knot DNS server" knot %if 0%{?suse_version} %service_add_pre knot.service @@ -249,6 +252,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %exclude %{_pkgdocdir}/html %attr(770,root,knot) %dir %{_sysconfdir}/knot %config(noreplace) %attr(640,root,knot) %{_sysconfdir}/knot/knot.conf +%if 0%{?fedora} || 0%{?rhel} > 7 +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/cz.nic.knotd.conf +%endif %attr(770,root,knot) %dir %{_sharedstatedir}/knot %dir %{_libdir}/knot %dir %{_libdir}/knot/modules-* @@ -320,6 +326,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Feb 10 2022 Jakub Ružička - 3.1.6-1 +- Update to 3.1.6 +- Add dbus config +- Use _sharedstatedir for home + * Thu Jan 20 2022 Fedora Release Engineering - 3.1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild 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 be01bbef6a9bc450d4457e1cbb4b0066ef4ccb86 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 169/214] 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 92da19f..7afc0a8 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.6 +Version: 3.1.7 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -326,6 +326,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Wed Mar 30 2022 Jakub Ružička - 3.1.7-1 +- Update to 3.1.7 + * Thu Feb 10 2022 Jakub Ružička - 3.1.6-1 - Update to 3.1.6 - Add dbus config diff --git a/sources b/sources index e706203..93247ea 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.1.6.tar.xz) = daffb3658ecce1ac206a18c623329af62b03035e621c9b297cc68d521d07f61e2d55ae2afa46340b9a0671dc4147490eeb7cb4ee50fc3b91bfa4cf97f6b3e249 -SHA512 (knot-3.1.6.tar.xz.asc) = 5de99084ef64a0451d0fe40d8944479ebd3bc51c1f5519b40af86301e3dca036624f368b3982a289fae50ff07f293473218eb497be8ed07e3bac5050d1e2565d +SHA512 (knot-3.1.7.tar.xz) = 4b6982e8b44addbc77f42d0a1c435dd257cc8a8f112677c371d16063ee8e769b646a6425d54ef338cd21555f276d8d6f4faad2da2f24bf92437ce4af9ff1fb44 +SHA512 (knot-3.1.7.tar.xz.asc) = 41c597228e1f6fb57aeba22d4665c0e39fda7ce60d14c3b8bc4f3ab61ffc0e5cef395527d981c9342ceba8fd5e80d57b4962318e9f2b9aed2000e9ab5dd03ac9 From 16c38465b52357130ad0035fd75d9923935c6a6d 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 170/214] 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 7afc0a8..5a5cd8a 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 15d4874bf9ba5d211b39887557cca49715d2ad13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 16:29:34 +0000 Subject: [PATCH 171/214] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 5a5cd8a..64459ac 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.1.8 -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 @@ -326,6 +326,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 3.1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Apr 28 2022 Jakub Ružička - 3.1.8-1 - Update to 3.1.8 From 51b9a96e1cb357b05cedf0a6dfb47c9366973760 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 172/214] Release 3.2.0-1 --- ...sts-xdp-tcp-fix-under-32bit-platform.patch | 67 +++++++++++++++++++ 03-revert-distro-harden-systemd-service.patch | 31 +++++++++ knot.spec | 55 ++++++++++----- sources | 4 +- 4 files changed, 138 insertions(+), 19 deletions(-) create mode 100644 02-tests-xdp-tcp-fix-under-32bit-platform.patch create mode 100644 03-revert-distro-harden-systemd-service.patch diff --git a/02-tests-xdp-tcp-fix-under-32bit-platform.patch b/02-tests-xdp-tcp-fix-under-32bit-platform.patch new file mode 100644 index 0000000..06e45e5 --- /dev/null +++ b/02-tests-xdp-tcp-fix-under-32bit-platform.patch @@ -0,0 +1,67 @@ +From 2fc4c0fcc1b0f75413ceeb580472ad05ffffe3b6 Mon Sep 17 00:00:00 2001 +From: Libor Peltan +Date: Mon, 22 Aug 2022 15:07:50 +0200 +Subject: [PATCH] tests/xdp-tcp: fix under 32bit platform + +--- + tests/libknot/test_xdp_tcp.c | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/tests/libknot/test_xdp_tcp.c b/tests/libknot/test_xdp_tcp.c +index fb044aca4..64e3bdc95 100644 +--- a/tests/libknot/test_xdp_tcp.c ++++ b/tests/libknot/test_xdp_tcp.c +@@ -23,6 +23,8 @@ + #include "libknot/xdp/tcp_iobuf.c" + #include "libknot/xdp/bpf-user.h" + ++#define INFTY INT32_MAX ++ + knot_tcp_table_t *test_table = NULL; + knot_tcp_table_t *test_syn_table = NULL; + #define TEST_TABLE_SIZE 100 +@@ -148,7 +150,7 @@ static int mock_send2(_unused_ knot_xdp_socket_t *sock, const knot_xdp_msg_t msg + + static void clean_table(void) + { +- (void)tcp_cleanup(test_table, 0, UINT32_MAX); ++ (void)tcp_cleanup(test_table, 0, INFTY); + } + + static void clean_sent(void) +@@ -421,8 +423,8 @@ void test_many(void) + clean_sent(); + + knot_sweep_stats_t stats = { 0 }; +- ret = knot_tcp_sweep(test_table, timeout_time, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, +- UINT32_MAX, rls, CONNS, &stats); ++ ret = knot_tcp_sweep(test_table, timeout_time, INFTY, INFTY, INFTY, INFTY, ++ INFTY, rls, CONNS, &stats); + is_int(KNOT_EOK, ret, "many/timeout1: OK"); + is_int(CONNS - 1, stats.counters[KNOT_SWEEP_CTR_TIMEOUT], "many/timeout1: close count"); + is_int(0, stats.counters[KNOT_SWEEP_CTR_LIMIT_CONN], "may/timeout1: reset count"); +@@ -431,8 +433,8 @@ void test_many(void) + check_sent(0, 0, 0, CONNS - 1); + + knot_sweep_stats_reset(&stats); +- ret = knot_tcp_sweep(test_table, UINT32_MAX, timeout_time, UINT32_MAX, UINT32_MAX, UINT32_MAX, +- UINT32_MAX, rls, CONNS, &stats); ++ ret = knot_tcp_sweep(test_table, INFTY, timeout_time, INFTY, INFTY, INFTY, ++ INFTY, rls, CONNS, &stats); + is_int(KNOT_EOK, ret, "many/timeout2: OK"); + is_int(0, stats.counters[KNOT_SWEEP_CTR_TIMEOUT], "many/timeout2: close count"); + is_int(CONNS - 1, stats.counters[KNOT_SWEEP_CTR_LIMIT_CONN], "may/timeout2: reset count"); +@@ -502,8 +504,8 @@ void test_ibufs_size(void) + + // now free some + knot_sweep_stats_t stats = { 0 }; +- ret = knot_tcp_sweep(test_table, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, +- test_table->inbufs_total - 8, UINT32_MAX, rls, ++ ret = knot_tcp_sweep(test_table, INFTY, INFTY, INFTY, INFTY, ++ test_table->inbufs_total - 8, INFTY, rls, + CONNS, &stats); + is_int(KNOT_EOK, ret, "inbufs: timeout OK"); + ret = knot_tcp_send(test_sock, rls, CONNS, CONNS); +-- +2.37.1 + diff --git a/03-revert-distro-harden-systemd-service.patch b/03-revert-distro-harden-systemd-service.patch new file mode 100644 index 0000000..c4f5ce3 --- /dev/null +++ b/03-revert-distro-harden-systemd-service.patch @@ -0,0 +1,31 @@ +From 76b2e79356052753e0d5dc2c8daca2049b221e55 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= +Date: Wed, 24 Aug 2022 13:08:03 +0200 +Subject: [PATCH] Revert "distro: harden systemd service" + +This reverts commit e152a4c21e0f34bece12eb68af61e54ab2f30d8d. +--- + distro/common/knot.service | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/distro/common/knot.service b/distro/common/knot.service +index 39017de1e..a87292943 100644 +--- a/distro/common/knot.service ++++ b/distro/common/knot.service +@@ -21,13 +21,5 @@ Environment="KNOT_ZONE_LOAD_TIMEOUT_SEC=180" + # Maximum size (MiB) of a configuration database + Environment="KNOT_CONF_MAX_SIZE=512" + +-# Expected systemd >= v239 +-TemporaryFileSystem=/run:ro /var:ro +-BindPaths=/run/systemd +-RuntimeDirectory=knot +-StateDirectory=knot +-LogsDirectory=knot +-NoNewPrivileges=yes +- + [Install] + WantedBy=multi-user.target +-- +2.37.1 + diff --git a/knot.spec b/knot.spec index 64459ac..ce3094b 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.1.8 -Release: 2%{?dist} +Version: 3.2.0 +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,6 +24,10 @@ BuildRequires: gnupg2 # Test fails on F30+ aarch/s390x for unknown reason, but it is not neccassary for Knot DNS Patch1: 01-test_net-disable-udp-send-on-unconnected.patch +# Fix tests on 32bit platforms (merged upstream, drop on next release) +Patch2: 02-tests-xdp-tcp-fix-under-32bit-platform.patch +# Revert hardening of service file (problematic) +Patch3: 03-revert-distro-harden-systemd-service.patch # Required dependencies BuildRequires: autoconf @@ -65,18 +69,18 @@ BuildRequires: pkgconfig(lmdb) %endif %if 0%{?centos} == 7 || 0%{?rhel} == 7 -# disable XDP on old EL %define configure_xdp --enable-xdp=no %else %define use_xdp 1 -%if 0%{?rhel} >= 8 || 0%{?suse_version} -# enable XDP on recent EL using embedded libbpf +%if 0%{?rhel} == 8 || 0%{?suse_version} +# Use the embedded libbpf %define use_xdp 1 -%define configure_xdp --enable-xdp=yes +%define configure_xdp --enable-xdp=yes --enable-quic=yes BuildRequires: pkgconfig(libelf) %else # XDP is auto-enabled when libbpf is present -BuildRequires: pkgconfig(libbpf) >= 0.0.6 +%define configure_xdp --enable-quic=yes +BuildRequires: pkgconfig(libbpf) >= 0.0.6 %endif %endif @@ -110,10 +114,19 @@ included in knot-libs package. %package utils Summary: DNS client utilities shipped with the Knot DNS server Requires: %{name}-libs%{?_isa} = %{version}-%{release} +# Debian package compat +Provides: %{name}-dnsutils = %{version}-%{release} %description utils The package contains DNS client utilities shipped with the Knot DNS server. +%package dnssecutils +Summary: DNSSEC tools shipped with the Knot DNS server +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description dnssecutils +The package contains DNSSEC tools shipped with the Knot DNS server. + %package module-dnstap Summary: dnstap module for Knot DNS Requires: %{name} = %{version}-%{release} @@ -131,7 +144,7 @@ The package contains geoip Knot DNS module for geography-based responses. %package doc Summary: Documentation for the Knot DNS server BuildArch: noarch -Provides: bundled(jquery) = 3.1.0 +Provides: bundled(jquery) %description doc The package contains documentation for the Knot DNS server. @@ -193,7 +206,6 @@ install -p -m 0644 -D %{repodir}/distro/common/cz.nic.knotd.conf %{buildroot}%{_ # install systemd files install -p -m 0644 -D %{repodir}/distro/common/%{name}.service %{buildroot}%{_unitdir}/%{name}.service -install -p -m 0644 -D %{repodir}/distro/common/%{name}.tmpfiles %{buildroot}%{_tmpfilesdir}/%{name}.conf %if 0%{?suse_version} ln -s service %{buildroot}/%{_sbindir}/rcknot %endif @@ -218,7 +230,6 @@ getent passwd knot >/dev/null || \ %endif %post -systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %if 0%{?suse_version} %service_add_post knot.service %else @@ -259,9 +270,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %dir %{_libdir}/knot %dir %{_libdir}/knot/modules-* %{_unitdir}/knot.service -%{_tmpfilesdir}/knot.conf -%{_bindir}/kzonecheck -%{_bindir}/kzonesign %{_sbindir}/kcatalogprint %{_sbindir}/kjournalprint %{_sbindir}/keymgr @@ -270,8 +278,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %if 0%{?suse_version} %{_sbindir}/rcknot %endif -%{_mandir}/man1/kzonecheck.* -%{_mandir}/man1/kzonesign.* %{_mandir}/man5/knot.conf.* %{_mandir}/man8/kcatalogprint.* %{_mandir}/man8/kjournalprint.* @@ -283,7 +289,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %files utils %{_bindir}/kdig %{_bindir}/khost -%{_bindir}/knsec3hash %{_bindir}/knsupdate %if 0%{?use_xdp} %{_sbindir}/kxdpgun @@ -291,9 +296,16 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %endif %{_mandir}/man1/kdig.* %{_mandir}/man1/khost.* -%{_mandir}/man1/knsec3hash.* %{_mandir}/man1/knsupdate.* +%files dnssecutils +%{_bindir}/knsec3hash +%{_bindir}/kzonecheck +%{_bindir}/kzonesign +%{_mandir}/man1/knsec3hash.* +%{_mandir}/man1/kzonecheck.* +%{_mandir}/man1/kzonesign.* + %files module-dnstap %{_libdir}/knot/modules-*/dnstap.so @@ -326,6 +338,15 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Mon Aug 22 2022 Jakub Ružička - 3.2.0-1 +- Update to 3.2.0 +- Patch: fix tests on 32-bit platforms +- Patch: revert problematic hardening of service file +- Enable QUIC +- New knot-dnssecutils subpackage +- Debian compat (knot-utils vs knot-dnsutils) +- Remove bundled(jquery) version as it differes between distros + * Thu Jul 21 2022 Fedora Release Engineering - 3.1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild 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 2810363627d8c708780e7108231a3fc2517dbfe8 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 173/214] Release 3.2.1-1 --- ...sts-xdp-tcp-fix-under-32bit-platform.patch | 67 ------------------- 03-revert-distro-harden-systemd-service.patch | 31 --------- knot.spec | 16 ++--- sources | 4 +- 4 files changed, 10 insertions(+), 108 deletions(-) delete mode 100644 02-tests-xdp-tcp-fix-under-32bit-platform.patch delete mode 100644 03-revert-distro-harden-systemd-service.patch diff --git a/02-tests-xdp-tcp-fix-under-32bit-platform.patch b/02-tests-xdp-tcp-fix-under-32bit-platform.patch deleted file mode 100644 index 06e45e5..0000000 --- a/02-tests-xdp-tcp-fix-under-32bit-platform.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 2fc4c0fcc1b0f75413ceeb580472ad05ffffe3b6 Mon Sep 17 00:00:00 2001 -From: Libor Peltan -Date: Mon, 22 Aug 2022 15:07:50 +0200 -Subject: [PATCH] tests/xdp-tcp: fix under 32bit platform - ---- - tests/libknot/test_xdp_tcp.c | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/tests/libknot/test_xdp_tcp.c b/tests/libknot/test_xdp_tcp.c -index fb044aca4..64e3bdc95 100644 ---- a/tests/libknot/test_xdp_tcp.c -+++ b/tests/libknot/test_xdp_tcp.c -@@ -23,6 +23,8 @@ - #include "libknot/xdp/tcp_iobuf.c" - #include "libknot/xdp/bpf-user.h" - -+#define INFTY INT32_MAX -+ - knot_tcp_table_t *test_table = NULL; - knot_tcp_table_t *test_syn_table = NULL; - #define TEST_TABLE_SIZE 100 -@@ -148,7 +150,7 @@ static int mock_send2(_unused_ knot_xdp_socket_t *sock, const knot_xdp_msg_t msg - - static void clean_table(void) - { -- (void)tcp_cleanup(test_table, 0, UINT32_MAX); -+ (void)tcp_cleanup(test_table, 0, INFTY); - } - - static void clean_sent(void) -@@ -421,8 +423,8 @@ void test_many(void) - clean_sent(); - - knot_sweep_stats_t stats = { 0 }; -- ret = knot_tcp_sweep(test_table, timeout_time, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, -- UINT32_MAX, rls, CONNS, &stats); -+ ret = knot_tcp_sweep(test_table, timeout_time, INFTY, INFTY, INFTY, INFTY, -+ INFTY, rls, CONNS, &stats); - is_int(KNOT_EOK, ret, "many/timeout1: OK"); - is_int(CONNS - 1, stats.counters[KNOT_SWEEP_CTR_TIMEOUT], "many/timeout1: close count"); - is_int(0, stats.counters[KNOT_SWEEP_CTR_LIMIT_CONN], "may/timeout1: reset count"); -@@ -431,8 +433,8 @@ void test_many(void) - check_sent(0, 0, 0, CONNS - 1); - - knot_sweep_stats_reset(&stats); -- ret = knot_tcp_sweep(test_table, UINT32_MAX, timeout_time, UINT32_MAX, UINT32_MAX, UINT32_MAX, -- UINT32_MAX, rls, CONNS, &stats); -+ ret = knot_tcp_sweep(test_table, INFTY, timeout_time, INFTY, INFTY, INFTY, -+ INFTY, rls, CONNS, &stats); - is_int(KNOT_EOK, ret, "many/timeout2: OK"); - is_int(0, stats.counters[KNOT_SWEEP_CTR_TIMEOUT], "many/timeout2: close count"); - is_int(CONNS - 1, stats.counters[KNOT_SWEEP_CTR_LIMIT_CONN], "may/timeout2: reset count"); -@@ -502,8 +504,8 @@ void test_ibufs_size(void) - - // now free some - knot_sweep_stats_t stats = { 0 }; -- ret = knot_tcp_sweep(test_table, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, -- test_table->inbufs_total - 8, UINT32_MAX, rls, -+ ret = knot_tcp_sweep(test_table, INFTY, INFTY, INFTY, INFTY, -+ test_table->inbufs_total - 8, INFTY, rls, - CONNS, &stats); - is_int(KNOT_EOK, ret, "inbufs: timeout OK"); - ret = knot_tcp_send(test_sock, rls, CONNS, CONNS); --- -2.37.1 - diff --git a/03-revert-distro-harden-systemd-service.patch b/03-revert-distro-harden-systemd-service.patch deleted file mode 100644 index c4f5ce3..0000000 --- a/03-revert-distro-harden-systemd-service.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 76b2e79356052753e0d5dc2c8daca2049b221e55 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= -Date: Wed, 24 Aug 2022 13:08:03 +0200 -Subject: [PATCH] Revert "distro: harden systemd service" - -This reverts commit e152a4c21e0f34bece12eb68af61e54ab2f30d8d. ---- - distro/common/knot.service | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/distro/common/knot.service b/distro/common/knot.service -index 39017de1e..a87292943 100644 ---- a/distro/common/knot.service -+++ b/distro/common/knot.service -@@ -21,13 +21,5 @@ Environment="KNOT_ZONE_LOAD_TIMEOUT_SEC=180" - # Maximum size (MiB) of a configuration database - Environment="KNOT_CONF_MAX_SIZE=512" - --# Expected systemd >= v239 --TemporaryFileSystem=/run:ro /var:ro --BindPaths=/run/systemd --RuntimeDirectory=knot --StateDirectory=knot --LogsDirectory=knot --NoNewPrivileges=yes -- - [Install] - WantedBy=multi-user.target --- -2.37.1 - diff --git a/knot.spec b/knot.spec index ce3094b..5747798 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.0 +Version: 3.2.1 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -24,10 +24,6 @@ BuildRequires: gnupg2 # Test fails on F30+ aarch/s390x for unknown reason, but it is not neccassary for Knot DNS Patch1: 01-test_net-disable-udp-send-on-unconnected.patch -# Fix tests on 32bit platforms (merged upstream, drop on next release) -Patch2: 02-tests-xdp-tcp-fix-under-32bit-platform.patch -# Revert hardening of service file (problematic) -Patch3: 03-revert-distro-harden-systemd-service.patch # Required dependencies BuildRequires: autoconf @@ -88,9 +84,6 @@ Requires(post): systemd %{_sbindir}/runuser Requires(preun): systemd Requires(postun): systemd -# Knot DNS 2.7+ isn't compatible with earlier knot-resolver -Conflicts: knot-resolver < 3.0.0 - Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description @@ -98,6 +91,8 @@ Knot DNS is a high-performance authoritative DNS server implementation. %package libs Summary: Libraries used by the Knot DNS server and client applications +# Knot DNS 3.2+ isn't compatible with earlier knot-resolver +Conflicts: knot-resolver < 5.5.2 %description libs The package contains shared libraries used by the Knot DNS server and @@ -338,6 +333,11 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Fri Sep 09 2022 Jakub Ružička - 3.2.1-1 +- Update to 3.2.1 +- Remove patches included upstream +- Update Conflicts and move to knot-libs + * Mon Aug 22 2022 Jakub Ružička - 3.2.0-1 - Update to 3.2.0 - Patch: fix tests on 32-bit platforms diff --git a/sources b/sources index d33dd09..6466b75 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.0.tar.xz) = e007d633f1debb559d47a7646b055dc970502be11a1849063da3e3d28355f77e6cba41e34f06726bc5945e4e2ba3ecb84a4b39813a8079514d3bf584d7d565a2 -SHA512 (knot-3.2.0.tar.xz.asc) = 47546df3933d66229bdc4b059664cbc4cda3f988ac3d8b2b8d0d8edeb2d0b60eb7a2bbd00019092d872eb56ac8d25f7227c526ae90035814be31fff755255681 +SHA512 (knot-3.2.1.tar.xz) = 2f12750dc0db06fd915c1b322626780c1d66e10c0b8170dea57559e514f66ee105ed8dbbc0a5f8084fcf772e82c242a8b09ae449631960abf4d60af4a13a1ea0 +SHA512 (knot-3.2.1.tar.xz.asc) = 029a43329388db4f1ff66b1e6b887a6a69e728ee15671a2a57e2fc2ed324af10451afe9a01d4b85a87f8aae4bd5569a4875ea90c6150ff23c1bb2944599f972a From 1c209927f19cf6f1cf31d31fe8535d66b9ebc2ae 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 174/214] 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 5747798..105c5ff 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.1 +Version: 3.2.2 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -333,6 +333,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Tue Nov 01 2022 Jakub Ružička - 3.2.2-1 +- Update to 3.2.2 + * Fri Sep 09 2022 Jakub Ružička - 3.2.1-1 - Update to 3.2.1 - Remove patches included upstream diff --git a/sources b/sources index 6466b75..1f81a20 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.2.1.tar.xz) = 2f12750dc0db06fd915c1b322626780c1d66e10c0b8170dea57559e514f66ee105ed8dbbc0a5f8084fcf772e82c242a8b09ae449631960abf4d60af4a13a1ea0 -SHA512 (knot-3.2.1.tar.xz.asc) = 029a43329388db4f1ff66b1e6b887a6a69e728ee15671a2a57e2fc2ed324af10451afe9a01d4b85a87f8aae4bd5569a4875ea90c6150ff23c1bb2944599f972a +SHA512 (knot-3.2.2.tar.xz) = 29fadb96c1ea525c6183f9e7552f4ad370579b67d74aec1910a92d561cc2c5656fd7876015f29161d279a07c23643f6584308bf9fa0e74d351b17af54e5e9a7f +SHA512 (knot-3.2.2.tar.xz.asc) = 78289cffd9eca23539210ca9dc9b3a67d0cce6a86de1dc185b3f58aa10030fc73401bb50b4a0b9cc2c9122db69c461880c0c9166b85dadb15a117dbbd338ab75 From ffc3405998c1e22fced5f3acabe4c6444ba435f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Fri, 4 Nov 2022 13:33:07 +0100 Subject: [PATCH 175/214] Release 3.2.2-2 --- knot.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 105c5ff..027814e 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.2.2 -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 @@ -77,6 +77,9 @@ BuildRequires: pkgconfig(libelf) # XDP is auto-enabled when libbpf is present %define configure_xdp --enable-quic=yes BuildRequires: pkgconfig(libbpf) >= 0.0.6 +%if 0%{?fedora} >= 36 +BuildRequires: pkgconfig(libxdp) +%endif %endif %endif @@ -333,6 +336,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Fri Nov 04 2022 Jakub Ružička - 3.2.2-2 +- New BuildRequires: libxdp (needed for libbpf >= 1.0) + * Tue Nov 01 2022 Jakub Ružička - 3.2.2-1 - Update to 3.2.2 From 0f4cb8a10af5a90b20957540be602d9a037e2c46 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 176/214] Release 3.2.3-1 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 027814e..b9abc97 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.2 -Release: 2%{?dist} +Version: 3.2.3 +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 @@ -336,6 +336,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Mon Nov 21 2022 Jakub Ružička - 3.2.3-1 +- Update to 3.2.3 + * Fri Nov 04 2022 Jakub Ružička - 3.2.2-2 - New BuildRequires: libxdp (needed for libbpf >= 1.0) 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 22e44f1851ec45b13d243347cd4d02663cfcf82b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 28 Nov 2022 22:25:29 +0000 Subject: [PATCH 177/214] Rebuilt for libbpf 1.0 transition --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index b9abc97..41a8540 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.2.3 -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 @@ -336,6 +336,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Mon Nov 28 2022 Jakub Ružička - 3.2.3-2 +- Rebuilt for libbpf 1.0 transition + * Mon Nov 21 2022 Jakub Ružička - 3.2.3-1 - Update to 3.2.3 From d5eb75216cadf8f90fc2612fd3955df72998e1fa 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 178/214] Release 3.2.4-1 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 41a8540..da16163 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.3 -Release: 2%{?dist} +Version: 3.2.4 +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 @@ -336,6 +336,9 @@ getent passwd knot >/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 28 2022 Jakub Ružička - 3.2.3-2 - Rebuilt for libbpf 1.0 transition 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 5342475850020328b499596a0ee2a788c2aedb0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 15:00:33 +0000 Subject: [PATCH 179/214] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index da16163..37c4da5 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.2.4 -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 @@ -336,6 +336,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 3.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Dec 12 2022 Jakub Ružička - 3.2.4-1 - Update to 3.2.4 From ebadb0cd478c6aa13de1132be704863fab12e6c0 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 180/214] Release 3.2.5-1 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 37c4da5..0485bcc 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.4 -Release: 2%{?dist} +Version: 3.2.5 +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 @@ -336,6 +336,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Feb 02 2023 Jakub Ružička - 3.2.5-1 +- Update to 3.2.5 + * Thu Jan 19 2023 Fedora Release Engineering - 3.2.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild 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 e87a1b23b53f6ce7ba5083a8f06401efb8462700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 6 Apr 2023 16:39:50 +0200 Subject: [PATCH 181/214] Release 3.2.6-1 --- knot.spec | 49 ++++++++++++++++++++----------------------------- sources | 4 ++-- 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/knot.spec b/knot.spec index 0485bcc..e6b3773 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 @@ -47,6 +47,8 @@ BuildRequires: pkgconfig(libfstrm) BuildRequires: pkgconfig(libprotobuf-c) # geoip dependencies BuildRequires: pkgconfig(libmaxminddb) +# XDP dependencies +BuildRequires: pkgconfig(libbpf) # Distro-dependent dependencies %if 0%{?suse_version} @@ -54,33 +56,20 @@ BuildRequires: python3-Sphinx BuildRequires: lmdb-devel BuildRequires: protobuf-c Requires(pre): pwdutils -%endif -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: python-sphinx -BuildRequires: lmdb-devel -%endif -%if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: python3-sphinx -BuildRequires: pkgconfig(lmdb) -%endif - -%if 0%{?centos} == 7 || 0%{?rhel} == 7 -%define configure_xdp --enable-xdp=no -%else -%define use_xdp 1 -%if 0%{?rhel} == 8 || 0%{?suse_version} -# Use the embedded libbpf -%define use_xdp 1 -%define configure_xdp --enable-xdp=yes --enable-quic=yes -BuildRequires: pkgconfig(libelf) -%else -# XDP is auto-enabled when libbpf is present -%define configure_xdp --enable-quic=yes -BuildRequires: pkgconfig(libbpf) >= 0.0.6 -%if 0%{?fedora} >= 36 +%if 0%{?sle_version} != 150400 BuildRequires: pkgconfig(libxdp) %endif %endif +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: python3-sphinx +BuildRequires: pkgconfig(lmdb) +%if 0%{?fedora} +BuildRequires: pkgconfig(libxdp) +%endif +%endif + +%if 0%{?rhel} >= 9 || 0%{?suse_version} || 0%{?fedora} +%define configure_quic --enable-quic=yes %endif Requires(post): systemd %{_sbindir}/runuser @@ -176,7 +165,7 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused" --with-moduledir=%{_libdir}/knot/modules-%{BASE_VERSION} \ --with-storage=/var/lib/knot \ %{?configure_db_sizes} \ - %{?configure_xdp} \ + %{?configure_quic} \ --disable-static \ --enable-dnstap=yes \ --with-module-dnstap=shared \ @@ -259,7 +248,7 @@ getent passwd knot >/dev/null || \ %license COPYING %doc %{_pkgdocdir} %exclude %{_pkgdocdir}/html -%attr(770,root,knot) %dir %{_sysconfdir}/knot +%attr(750,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 @@ -288,10 +277,8 @@ getent passwd knot >/dev/null || \ %{_bindir}/kdig %{_bindir}/khost %{_bindir}/knsupdate -%if 0%{?use_xdp} %{_sbindir}/kxdpgun %{_mandir}/man8/kxdpgun.* -%endif %{_mandir}/man1/kdig.* %{_mandir}/man1/khost.* %{_mandir}/man1/knsupdate.* @@ -336,6 +323,10 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Apr 06 2023 Jakub Ružička - 3.2.6-1 +- Update to 3.2.6 +- Sync upstream packaging improvements + * 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 fbdc7bb308604a81fe9c61a61e81d1688672a880 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 182/214] 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 dbe8134e547f45d8d06955579bf7503646b179a4 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 12 May 2023 11:24:05 -0700 Subject: [PATCH 183/214] Add BR on libxdp on RHEL >= 9 to use with libbpf-1.x Signed-off-by: Michel Alexandre Salim --- knot.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/knot.spec b/knot.spec index e6b3773..bc22381 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.2.6 -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 @@ -63,7 +63,7 @@ BuildRequires: pkgconfig(libxdp) %if 0%{?fedora} || 0%{?rhel} BuildRequires: python3-sphinx BuildRequires: pkgconfig(lmdb) -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 9 BuildRequires: pkgconfig(libxdp) %endif %endif @@ -323,6 +323,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Fri May 12 2023 Michel Alexandre Salim - 3.2.6-2 +- Add BR on libxdp on RHEL >= 9 to use with libbpf-1.x + * Thu Apr 06 2023 Jakub Ružička - 3.2.6-1 - Update to 3.2.6 - Sync upstream packaging improvements From 8ea3b7cd99a74d1f2700fa47f22a3f72bbf39cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 6 Jun 2023 13:31:36 +0200 Subject: [PATCH 184/214] Release 3.2.7-1 --- ..._net-disable-udp-send-on-unconnected.patch | 26 ------------------- knot.spec | 18 +++++++------ sources | 4 +-- 3 files changed, 12 insertions(+), 36 deletions(-) delete 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 deleted file mode 100644 index f2b5b11..0000000 --- a/01-test_net-disable-udp-send-on-unconnected.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 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); - 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); -- is_int(buffer_len, r, "UDP, send on defined address"); -- - close(sock); - - // TCP diff --git a/knot.spec b/knot.spec index bc22381..05df469 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.6 -Release: 2%{?dist} +Version: 3.2.7 +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 @@ -22,9 +22,6 @@ 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: autoconf BuildRequires: automake @@ -32,7 +29,7 @@ BuildRequires: libtool BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig(liburcu) -BuildRequires: pkgconfig(gnutls) >= 3.3 +BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(libedit) # Optional dependencies @@ -188,7 +185,7 @@ rm -f %{buildroot}%{_pkgdocdir}/html/.buildinfo 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 +install -p -m 0644 -D %{repodir}/distro/common/cz.nic.knotd.conf %{buildroot}%{_datadir}/dbus-1/system.d/cz.nic.knotd.conf %endif # install systemd files @@ -251,7 +248,7 @@ getent passwd knot >/dev/null || \ %attr(750,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 +%config(noreplace) %attr(644,root,root) %{_datadir}/dbus-1/system.d/cz.nic.knotd.conf %endif %attr(770,root,knot) %dir %{_sharedstatedir}/knot %dir %{_libdir}/knot @@ -323,6 +320,11 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Tue Jun 06 2023 Jakub Ružička - 3.2.7-1 +- Update to 3.2.7 +- Remove unneeded tests patch +- Use _datadir for config + * Fri May 12 2023 Michel Alexandre Salim - 3.2.6-2 - Add BR on libxdp on RHEL >= 9 to use with libbpf-1.x 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 408cf4e78f44fe10246b0e52684be7faed625913 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 185/214] 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 05df469..1b184f1 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 @@ -320,6 +320,9 @@ getent passwd knot >/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 - Remove unneeded tests patch 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 45f01e80d0b81d785a91c0bfff611c7e860cc1f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 09:25:17 +0000 Subject: [PATCH 186/214] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 1b184f1..9944024 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.2.8 -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 @@ -320,6 +320,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 3.2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jun 26 2023 Jakub Ružička - 3.2.8-1 - Update to 3.2.8 From d00ce92d5c8b65ad1640338149d64dd67bc3165f 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 187/214] Release 3.2.9-1 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 9944024..b84077e 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.2.8 -Release: 2%{?dist} +Version: 3.2.9 +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 @@ -320,6 +320,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Jul 27 2023 Jakub Ružička - 3.2.9-1 +- Update to 3.2.9 + * Thu Jul 20 2023 Fedora Release Engineering - 3.2.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild 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 7d87ec6eb5f6fab0c96d4ed6b23a71ee4f067113 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 188/214] 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 b84077e..aa13c12 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 @@ -320,6 +320,9 @@ getent passwd knot >/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 bfd23ff3573cb53d988ea890082cb5663f43c9fe 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 189/214] 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 aa13c12..84f77f2 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 @@ -80,8 +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 +# 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 @@ -320,6 +320,9 @@ getent passwd knot >/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 268a49299ee5c6f14746aae642052abed360a170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Sat, 21 Oct 2023 01:29:58 +0200 Subject: [PATCH 190/214] Release 3.3.2-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 84f77f2..e7c054b 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.3.2 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -320,6 +320,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Fri Oct 20 2023 Jakub Ružička - 3.3.2-1 +- Update to 3.3.2 + * Tue Sep 12 2023 Jakub Ružička - 3.3.1-1 - Update to 3.3.1 diff --git a/sources b/sources index f59e717..2ecb7fe 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.3.2.tar.xz) = c19a11db43b208a6aabfd96e0c31856affdcef1b599425343663fd6e00bacc964f197de7e5d732d7180219ba57b6e426afd2b762c7528cb50755f81429aaac1a +SHA512 (knot-3.3.2.tar.xz.asc) = ed0b744169c8f127cced5ace70e0d252993d73f17e34a956ada9cae37b468fdaaf9e8f294a39d3427ca89c2c1fb25ecfc9b32c76fb0c10bebe9fe59809b6d47f From 8b65df188761d15e4ea79ba1285a894295c1327c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 13 Dec 2023 16:55:20 +0100 Subject: [PATCH 191/214] Release 3.3.3-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index e7c054b..d7fe7b3 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.3.2 +Version: 3.3.3 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -320,6 +320,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Wed Dec 13 2023 Jakub Ružička - 3.3.3-1 +- Update to 3.3.3 + * Fri Oct 20 2023 Jakub Ružička - 3.3.2-1 - Update to 3.3.2 diff --git a/sources b/sources index 2ecb7fe..a8fd537 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.3.2.tar.xz) = c19a11db43b208a6aabfd96e0c31856affdcef1b599425343663fd6e00bacc964f197de7e5d732d7180219ba57b6e426afd2b762c7528cb50755f81429aaac1a -SHA512 (knot-3.3.2.tar.xz.asc) = ed0b744169c8f127cced5ace70e0d252993d73f17e34a956ada9cae37b468fdaaf9e8f294a39d3427ca89c2c1fb25ecfc9b32c76fb0c10bebe9fe59809b6d47f +SHA512 (knot-3.3.3.tar.xz) = f911c6d735dc3f2dec9920263bcb9e5ce13d8bfbd97ebc66d8388088e9bf5059fa5976b58996b8a5688c186320b97a1707375fadfdd63ebc5f976d92733d78b9 +SHA512 (knot-3.3.3.tar.xz.asc) = 540f45205e2d067ecb1e8d5d9e985e27f074ac72f001a1c240388757ffe419e03ea80d9efff6857206702a8cc96ac106f12bd78b21d20ba02a3fdf9ffb176c0c From 2f4bd0e3934c908652e0f77c25b6c88b60e16deb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 01:11:24 +0000 Subject: [PATCH 192/214] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index d7fe7b3..360242f 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.3.3 -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 @@ -320,6 +320,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 3.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Dec 13 2023 Jakub Ružička - 3.3.3-1 - Update to 3.3.3 From 7d567e615b724ffd28b7e6078e977f770e993499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 24 Jan 2024 14:18:06 +0100 Subject: [PATCH 193/214] Release 3.3.4-1 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 360242f..af2ee3a 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.3.3 -Release: 2%{?dist} +Version: 3.3.4 +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 @@ -320,6 +320,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Wed Jan 24 2024 Jakub Ružička - 3.3.4-1 +- Update to 3.3.4 + * Sun Jan 21 2024 Fedora Release Engineering - 3.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index a8fd537..d89e72c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.3.3.tar.xz) = f911c6d735dc3f2dec9920263bcb9e5ce13d8bfbd97ebc66d8388088e9bf5059fa5976b58996b8a5688c186320b97a1707375fadfdd63ebc5f976d92733d78b9 -SHA512 (knot-3.3.3.tar.xz.asc) = 540f45205e2d067ecb1e8d5d9e985e27f074ac72f001a1c240388757ffe419e03ea80d9efff6857206702a8cc96ac106f12bd78b21d20ba02a3fdf9ffb176c0c +SHA512 (knot-3.3.4.tar.xz) = bc881a2dd1bd0f4ed7eaaa81640842b4f6bebe958c8b4de9a3ceeff5d399df765f83d81468fd5cd9d9c3b090d3a31d2bbff2e715033fc4b9284a2cbd260e79e5 +SHA512 (knot-3.3.4.tar.xz.asc) = 8d6365c8332dc62028b59d50318cfe888b9bff73e78569591c4b0eb9f152d41237e4d50ce1c4ba4bce63e04fc0bf4ad9b2c9dc083a9c5b0e05b99c0ee0cc0a2c From 75d5fcc8bf89e7a9d220596d449e2239b940a9ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 7 Mar 2024 17:06:16 +0100 Subject: [PATCH 194/214] Release 3.3.5-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index af2ee3a..f4587e4 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.3.4 +Version: 3.3.5 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -320,6 +320,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Mar 07 2024 Jakub Ružička - 3.3.5-1 +- Update to 3.3.5 + * Wed Jan 24 2024 Jakub Ružička - 3.3.4-1 - Update to 3.3.4 diff --git a/sources b/sources index d89e72c..5917d76 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.3.4.tar.xz) = bc881a2dd1bd0f4ed7eaaa81640842b4f6bebe958c8b4de9a3ceeff5d399df765f83d81468fd5cd9d9c3b090d3a31d2bbff2e715033fc4b9284a2cbd260e79e5 -SHA512 (knot-3.3.4.tar.xz.asc) = 8d6365c8332dc62028b59d50318cfe888b9bff73e78569591c4b0eb9f152d41237e4d50ce1c4ba4bce63e04fc0bf4ad9b2c9dc083a9c5b0e05b99c0ee0cc0a2c +SHA512 (knot-3.3.5.tar.xz) = f0e22514aba4bdf01d3e21f1e8a61852a0cabcd12bfa0d955c36bb127bb57448f38f8bdb45fe40fdd0d15abe8a707288c1dbbe96ef14d8918c4ddc5f3edf97ea +SHA512 (knot-3.3.5.tar.xz.asc) = 59a51035d8f0f113a345da767e4477dbaba323097d22327e98b8c50e328bbcf03a8dc3c577b0e1169cce71bf6b688adbaa29bde42ec93bf18d2389b71ec14575 From 0c873d2b5d5e13918a9e70716a6f83d14a53e1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 13 Jun 2024 22:15:33 +0200 Subject: [PATCH 195/214] Release 3.3.6-1 --- knot.spec | 9 ++++++++- sources | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index f4587e4..8d994c0 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.3.5 +Version: 3.3.6 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -75,6 +75,10 @@ Requires(postun): systemd Requires: %{name}-libs%{?_isa} = %{version}-%{release} +%if 0%{?suse_version} +Provides: group(knot) +%endif + %description Knot DNS is a high-performance authoritative DNS server implementation. @@ -320,6 +324,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Jun 13 2024 Jakub Ružička - 3.3.6-1 +- Update to 3.3.6 + * Thu Mar 07 2024 Jakub Ružička - 3.3.5-1 - Update to 3.3.5 diff --git a/sources b/sources index 5917d76..ad6b22e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.3.5.tar.xz) = f0e22514aba4bdf01d3e21f1e8a61852a0cabcd12bfa0d955c36bb127bb57448f38f8bdb45fe40fdd0d15abe8a707288c1dbbe96ef14d8918c4ddc5f3edf97ea -SHA512 (knot-3.3.5.tar.xz.asc) = 59a51035d8f0f113a345da767e4477dbaba323097d22327e98b8c50e328bbcf03a8dc3c577b0e1169cce71bf6b688adbaa29bde42ec93bf18d2389b71ec14575 +SHA512 (knot-3.3.6.tar.xz) = c3ca2ca2af2e13bcd1eb37ed1d6f730dc90413afbb4cbd3355c9b307c27d7f3d5fc3d5bcfaa1deb5cdd95a92afa9f24543e363534e05055e8642abf5b67d08a4 +SHA512 (knot-3.3.6.tar.xz.asc) = 557157fc86b49bfa46b1a70f849f05bcebb0e7dc1a273ff44fc6ec68f5eee2318ff0f51c517b55d3a9aafa8c9c98082651e85898a8e918fc20e44a17ef0d48d7 From b123566bebbdd27db15b7b15229fa5a60d9ab3c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 25 Jun 2024 17:55:52 +0200 Subject: [PATCH 196/214] Release 3.3.7-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 8d994c0..c61521d 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.3.6 +Version: 3.3.7 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -324,6 +324,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Tue Jun 25 2024 Jakub Ružička - 3.3.7-1 +- Update to 3.3.7 + * Thu Jun 13 2024 Jakub Ružička - 3.3.6-1 - Update to 3.3.6 diff --git a/sources b/sources index ad6b22e..b9951ec 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.3.6.tar.xz) = c3ca2ca2af2e13bcd1eb37ed1d6f730dc90413afbb4cbd3355c9b307c27d7f3d5fc3d5bcfaa1deb5cdd95a92afa9f24543e363534e05055e8642abf5b67d08a4 -SHA512 (knot-3.3.6.tar.xz.asc) = 557157fc86b49bfa46b1a70f849f05bcebb0e7dc1a273ff44fc6ec68f5eee2318ff0f51c517b55d3a9aafa8c9c98082651e85898a8e918fc20e44a17ef0d48d7 +SHA512 (knot-3.3.7.tar.xz) = f4e3088f4c647c0b146a20d89d792d6d7b75622d42e8466acabda7ee7db2414c52160a9bbdf5c12091d28150704d63f8cc32b9a59d0ccdfee8f94a2c09b5a019 +SHA512 (knot-3.3.7.tar.xz.asc) = e279bff513fb8032aba68147cef4df1f432d275794dffcfc1a12d7ce510994d3772067e22c06b34576df0d44bdd56affceda590dd1dce81fae648cb11bccf9a3 From a9e74b73bbff36afdb0abe13a5927679ab416c22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 12:31:29 +0000 Subject: [PATCH 197/214] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index c61521d..7338976 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.3.7 -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 @@ -324,6 +324,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 3.3.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jun 25 2024 Jakub Ružička - 3.3.7-1 - Update to 3.3.7 From 2a8b2da1f12cda9a90fba0e81074fcad3fa0cca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 22 Jul 2024 15:41:40 +0200 Subject: [PATCH 198/214] Release 3.3.8-1 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 7338976..36d90fc 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.3.7 -Release: 2%{?dist} +Version: 3.3.8 +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 @@ -324,6 +324,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Mon Jul 22 2024 Jakub Ružička - 3.3.8-1 +- Update to 3.3.8 + * Thu Jul 18 2024 Fedora Release Engineering - 3.3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index b9951ec..d278dca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.3.7.tar.xz) = f4e3088f4c647c0b146a20d89d792d6d7b75622d42e8466acabda7ee7db2414c52160a9bbdf5c12091d28150704d63f8cc32b9a59d0ccdfee8f94a2c09b5a019 -SHA512 (knot-3.3.7.tar.xz.asc) = e279bff513fb8032aba68147cef4df1f432d275794dffcfc1a12d7ce510994d3772067e22c06b34576df0d44bdd56affceda590dd1dce81fae648cb11bccf9a3 +SHA512 (knot-3.3.8.tar.xz) = 4cb7ae728e722902a6808e48747621eceb0a92a7a0afc1a12ecfecca5b1ece5e4a367a98fa6ec68b008697002b881effd314bb4333f225d50f3891d8184f5630 +SHA512 (knot-3.3.8.tar.xz.asc) = 7e00e17bf148a8f4671ba34bb542d9a568d24b0ac7655d3afe9ce40d4e1979e65570ee967f1372b47b9446aa2d175f6b80335794ff4d28c4af62a701d4eaa69b From e032f5a7bb1f2c5c314830d05d0be68f35bb4c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Mon, 26 Aug 2024 13:12:43 +0200 Subject: [PATCH 199/214] Release 3.3.9-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 36d90fc..cb1bfe1 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.3.8 +Version: 3.3.9 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -324,6 +324,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Mon Aug 26 2024 Jakub Ružička - 3.3.9-1 +- Update to 3.3.9 + * Mon Jul 22 2024 Jakub Ružička - 3.3.8-1 - Update to 3.3.8 diff --git a/sources b/sources index d278dca..c9097fc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.3.8.tar.xz) = 4cb7ae728e722902a6808e48747621eceb0a92a7a0afc1a12ecfecca5b1ece5e4a367a98fa6ec68b008697002b881effd314bb4333f225d50f3891d8184f5630 -SHA512 (knot-3.3.8.tar.xz.asc) = 7e00e17bf148a8f4671ba34bb542d9a568d24b0ac7655d3afe9ce40d4e1979e65570ee967f1372b47b9446aa2d175f6b80335794ff4d28c4af62a701d4eaa69b +SHA512 (knot-3.3.9.tar.xz) = fccc817c6e486e1f84d09c4793072ebf60c829ffdbd64f823b1a494c2103176026e341f7fe6fab5e7c622af44c53dad2dffad1a4f9c8e5e26308254ffb3609fc +SHA512 (knot-3.3.9.tar.xz.asc) = d9f444bf70268dff7afa41278fd6f79478c3406d7be1523fe6ba0edf10fba6030f126b9bf7606858e3403c3353faf84a393e16935431fdd54e29ad40992288a4 From 5d161e7b839db4195bdb85ddb92077f6ed75c13c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 4 Sep 2024 14:08:34 +0200 Subject: [PATCH 200/214] Release 3.4.2-1 --- knot.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/knot.spec b/knot.spec index cb1bfe1..1a677b1 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.3.9 +Version: 3.4.2 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.3+ isn't compatible with earlier knot-resolver -Conflicts: knot-resolver < 5.7.0 +# Knot DNS 3.4+ isn't compatible with earlier knot-resolver +Conflicts: knot-resolver < 5.7.4-2 %description libs The package contains shared libraries used by the Knot DNS server and @@ -324,6 +324,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Mon Nov 25 2024 Jakub Ružička - 3.4.2-1 +- Update to 3.4.2 + * Mon Aug 26 2024 Jakub Ružička - 3.3.9-1 - Update to 3.3.9 diff --git a/sources b/sources index c9097fc..a28b210 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.3.9.tar.xz) = fccc817c6e486e1f84d09c4793072ebf60c829ffdbd64f823b1a494c2103176026e341f7fe6fab5e7c622af44c53dad2dffad1a4f9c8e5e26308254ffb3609fc -SHA512 (knot-3.3.9.tar.xz.asc) = d9f444bf70268dff7afa41278fd6f79478c3406d7be1523fe6ba0edf10fba6030f126b9bf7606858e3403c3353faf84a393e16935431fdd54e29ad40992288a4 +SHA512 (knot-3.4.2.tar.xz) = d5353fdd51224e20a8009aea7df6fe7503a726756c82041b770d8e90cae00b38ede7ecb2f31178ccb9f472a98b86f90208d4627fa4aaaf3c0383272b451e3015 +SHA512 (knot-3.4.2.tar.xz.asc) = a3aed9eadcd27c0a1bcf271eee095516db13d0cf265761f9aa9e0d658b96a2c776522d3af556469c9ef3e4698127e41472241c7a72a8b148b4e7f6216c39dde1 From dd8ae2dfdcbd4554caad0d9a0d3fc04280929b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 10 Dec 2024 15:06:13 +0100 Subject: [PATCH 201/214] Release 3.4.3-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 1a677b1..a007fea 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.4.2 +Version: 3.4.3 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -324,6 +324,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Tue Dec 10 2024 Jakub Ružička - 3.4.3-1 +- Update to 3.4.3 + * Mon Nov 25 2024 Jakub Ružička - 3.4.2-1 - Update to 3.4.2 diff --git a/sources b/sources index a28b210..8943dbb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.4.2.tar.xz) = d5353fdd51224e20a8009aea7df6fe7503a726756c82041b770d8e90cae00b38ede7ecb2f31178ccb9f472a98b86f90208d4627fa4aaaf3c0383272b451e3015 -SHA512 (knot-3.4.2.tar.xz.asc) = a3aed9eadcd27c0a1bcf271eee095516db13d0cf265761f9aa9e0d658b96a2c776522d3af556469c9ef3e4698127e41472241c7a72a8b148b4e7f6216c39dde1 +SHA512 (knot-3.4.3.tar.xz) = c05a214a9e5564d09257aff44c0f42e9d084d47536197c95dff7aa125a8b53ed99e26c90affaa6833779778cd8d37af9cc473f108ab6acf7230c476b5858c03f +SHA512 (knot-3.4.3.tar.xz.asc) = ee8618401628a2979475fb9cf6c408d454841d5aa35fd801fdb5c24f48efc000d39160b995490341de4c0db5942deedab8991436304a9d4900560274ea526b48 From bfa25fcbdf5706b5aa84e9015e2da3c11fd6d217 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 09:38:33 +0000 Subject: [PATCH 202/214] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index a007fea..667ffb7 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.4.3 -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 @@ -324,6 +324,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 3.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Dec 10 2024 Jakub Ružička - 3.4.3-1 - Update to 3.4.3 From c7a05c603f436bf1466977962e92320b0ff41c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 23 Jan 2025 12:33:32 +0100 Subject: [PATCH 203/214] Release 3.4.4-1 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 667ffb7..2b60057 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.4.3 -Release: 2%{?dist} +Version: 3.4.4 +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 @@ -324,6 +324,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Jan 23 2025 Jakub Ružička - 3.4.4-1 +- Update to 3.4.4 + * Fri Jan 17 2025 Fedora Release Engineering - 3.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 8943dbb..ebdd2bb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.4.3.tar.xz) = c05a214a9e5564d09257aff44c0f42e9d084d47536197c95dff7aa125a8b53ed99e26c90affaa6833779778cd8d37af9cc473f108ab6acf7230c476b5858c03f -SHA512 (knot-3.4.3.tar.xz.asc) = ee8618401628a2979475fb9cf6c408d454841d5aa35fd801fdb5c24f48efc000d39160b995490341de4c0db5942deedab8991436304a9d4900560274ea526b48 +SHA512 (knot-3.4.4.tar.xz) = bf8e80d430336934083c1f7c304306de78b254fba5d3b9dd8b44065a0f1527cd78b74d498d994822ed2d364b66091ad967d3cd991bde380fbba67ea34a1ee33f +SHA512 (knot-3.4.4.tar.xz.asc) = ee66d1b1304cd4630ce002e849f02a5f722ba1506c8d32b48bd7f80659227de774a1d4331b02187b0d5c8bb5a13a06cf5c9ca6688ee3662694b866856a5a6a09 From d143e24bd6f703619a02f525e3592f0298e26df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 23 Jan 2025 19:41:30 +0100 Subject: [PATCH 204/214] Add sysusers.d config file to allow rpm to create users/groups automatically --- knot.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/knot.spec b/knot.spec index 2b60057..75ed60f 100644 --- a/knot.spec +++ b/knot.spec @@ -8,7 +8,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.4.4 -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 @@ -148,6 +148,11 @@ gpg2 --verify %{SOURCE1} %{SOURCE0} %endif %autosetup -p1 +# Create a sysusers.d config file +cat >knot.sysusers.conf </dev/null || groupadd -r knot -getent passwd knot >/dev/null || \ - useradd -r -g knot -d %{_sharedstatedir}/knot -s /sbin/nologin \ - -c "Knot DNS server" knot %if 0%{?suse_version} %service_add_pre knot.service %endif @@ -273,6 +276,7 @@ getent passwd knot >/dev/null || \ %{_mandir}/man8/knotc.* %{_mandir}/man8/knotd.* %ghost %attr(770,root,knot) %dir %{_rundir}/knot +%{_sysusersdir}/knot.conf %files utils %{_bindir}/kdig @@ -324,6 +328,9 @@ getent passwd knot >/dev/null || \ %doc %{_pkgdocdir}/html %changelog +* Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek - 3.4.4-2 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Thu Jan 23 2025 Jakub Ružička - 3.4.4-1 - Update to 3.4.4 From c4c752235536431e273ed20795656e2d2b26c377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 19 Mar 2025 15:57:06 +0100 Subject: [PATCH 205/214] Release 3.4.5-1 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index 75ed60f..5dc40bc 100644 --- a/knot.spec +++ b/knot.spec @@ -7,8 +7,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.4.4 -Release: 2%{?dist} +Version: 3.4.5 +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 @@ -328,6 +328,9 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog +* Wed Mar 19 2025 Jakub Ružička - 3.4.5-1 +- Update to 3.4.5 + * Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek - 3.4.4-2 - Add sysusers.d config file to allow rpm to create users/groups automatically diff --git a/sources b/sources index ebdd2bb..b9c4389 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.4.4.tar.xz) = bf8e80d430336934083c1f7c304306de78b254fba5d3b9dd8b44065a0f1527cd78b74d498d994822ed2d364b66091ad967d3cd991bde380fbba67ea34a1ee33f -SHA512 (knot-3.4.4.tar.xz.asc) = ee66d1b1304cd4630ce002e849f02a5f722ba1506c8d32b48bd7f80659227de774a1d4331b02187b0d5c8bb5a13a06cf5c9ca6688ee3662694b866856a5a6a09 +SHA512 (knot-3.4.5.tar.xz) = 62e7023fa2a9b2323104816dbc2adeec513b70c1891f5f87ab4e951d0db18717f1089bab8b5d2ada008fcf2efd9f0547881084a2e6121891e15cbe9992528c9e +SHA512 (knot-3.4.5.tar.xz.asc) = 50b5c798dac5b7370508c9cc7571e2b3bda0f38a3b521b92710f779adb33a370d313a7ee41a6daffabdba5cf28e50c2a7ac463318b017a3eea826a011951cac9 From 14ad9e8872017ede2038a249174789a478b30e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 10 Apr 2025 14:56:53 +0200 Subject: [PATCH 206/214] Release 3.4.6-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 5dc40bc..767c5c4 100644 --- a/knot.spec +++ b/knot.spec @@ -7,7 +7,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.4.5 +Version: 3.4.6 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -328,6 +328,9 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog +* Thu Apr 10 2025 Jakub Ružička - 3.4.6-1 +- Update to 3.4.6 + * Wed Mar 19 2025 Jakub Ružička - 3.4.5-1 - Update to 3.4.5 diff --git a/sources b/sources index b9c4389..86febab 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.4.5.tar.xz) = 62e7023fa2a9b2323104816dbc2adeec513b70c1891f5f87ab4e951d0db18717f1089bab8b5d2ada008fcf2efd9f0547881084a2e6121891e15cbe9992528c9e -SHA512 (knot-3.4.5.tar.xz.asc) = 50b5c798dac5b7370508c9cc7571e2b3bda0f38a3b521b92710f779adb33a370d313a7ee41a6daffabdba5cf28e50c2a7ac463318b017a3eea826a011951cac9 +SHA512 (knot-3.4.6.tar.xz) = 30e6a843c5b4b89fd51f062f138e031a96cbaf86db5a559ab10dc98d3705086bd987bf99deb5f2c077f7201af8f05311ab8b579bfafa7d285ca4c3e78de8c096 +SHA512 (knot-3.4.6.tar.xz.asc) = 400512cfddadd93e4b536d2421126ee5fce19fa03e0ad6cee2407b1f67e242b9d65ac4ea3f527c17a7100cb63b583cf8a4ca617f6fe119cd4f15a001a0c80abf From da48f736c7765558cf31e43f30a6ccc7bf994b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 4 Jun 2025 12:17:47 +0200 Subject: [PATCH 207/214] Release 3.4.7-1 --- knot.spec | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- sources | 4 +-- 2 files changed, 86 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 767c5c4..2aedafe 100644 --- a/knot.spec +++ b/knot.spec @@ -2,12 +2,19 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %define GPG_CHECK 1 +%if 0%{?fedora} >= 40 || 0%{?rhel} >= 9 +# use modern %pyproject_* macros on distros which support them +%define PYPROJECT 1 +%else +# use older %py3_* macros on older/other distros +%define PYPROJECT 0 +%endif %define BASE_VERSION %(echo "%{version}" | sed 's/^\\([^.]\\+\\.[^.]\\+\\).*/\\1/') %define repodir %{_builddir}/%{name}-%{version} Summary: High-performance authoritative DNS server Name: knot -Version: 3.4.6 +Version: 3.4.7 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -39,6 +46,9 @@ BuildRequires: pkgconfig(libmnl) BuildRequires: pkgconfig(libnghttp2) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd) +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: softhsm +%endif # dnstap dependencies BuildRequires: pkgconfig(libfstrm) BuildRequires: pkgconfig(libprotobuf-c) @@ -46,6 +56,15 @@ BuildRequires: pkgconfig(libprotobuf-c) BuildRequires: pkgconfig(libmaxminddb) # XDP dependencies BuildRequires: pkgconfig(libbpf) +# Python modules (python3-libknot, knot-exporter) dependencies +BuildRequires: python3-devel +%if 0%{?PYPROJECT} +BuildRequires: pyproject-rpm-macros +BuildRequires: python3-pip +BuildRequires: python3-hatchling +%else +BuildRequires: python3-setuptools +%endif # Distro-dependent dependencies %if 0%{?suse_version} @@ -129,6 +148,23 @@ Requires: %{name} = %{version}-%{release} %description module-geoip The package contains geoip Knot DNS module for geography-based responses. +%package exporter +Summary: Prometheus exporter for Knot DNS +BuildArch: noarch +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description exporter +The package provides Python Prometheus exporter for Knot DNS. + +%package -n python3-libknot +Summary: Python bindings for libknot +BuildArch: noarch +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python3-libknot} + +%description -n python3-libknot +The package provides Python bindings for the libknot shared library. + %package doc Summary: Documentation for the Knot DNS server BuildArch: noarch @@ -179,9 +215,43 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused" make %{?_smp_mflags} make html +# build python3-libknot +pushd python/libknot +%if %{PYPROJECT} +%pyproject_wheel +%else +%py3_build +%endif +popd +# build knot-exporter +pushd python/knot_exporter +%if %{PYPROJECT} +%pyproject_wheel +%else +%py3_build +%endif +popd + %install make install DESTDIR=%{buildroot} +# install python3-libknot +pushd python/libknot +%if %{PYPROJECT} +%pyproject_install +%else +%py3_install +%endif +popd +# install knot-exporter +pushd python/knot_exporter +%if %{PYPROJECT} +%pyproject_install +%else +%py3_install +%endif +popd + # install documentation install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples install -p -m 0644 -t %{buildroot}%{_pkgdocdir}/samples samples/*.zone* @@ -302,6 +372,15 @@ V=1 make check %files module-geoip %{_libdir}/knot/modules-*/geoip.so +%files exporter +%{_bindir}/knot-exporter +%{python3_sitelib}/knot_exporter +%{python3_sitelib}/knot_exporter-*-info + +%files -n python3-libknot +%{python3_sitelib}/libknot +%{python3_sitelib}/libknot-*-info + %files libs %license COPYING %doc NEWS @@ -328,6 +407,10 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog +* Wed Jun 04 2025 Jakub Ružička - 3.4.7-1 +- Update to 3.4.7 +- Add new knot-exporter and python3-libknot packages + * Thu Apr 10 2025 Jakub Ružička - 3.4.6-1 - Update to 3.4.6 diff --git a/sources b/sources index 86febab..c5dab5b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.4.6.tar.xz) = 30e6a843c5b4b89fd51f062f138e031a96cbaf86db5a559ab10dc98d3705086bd987bf99deb5f2c077f7201af8f05311ab8b579bfafa7d285ca4c3e78de8c096 -SHA512 (knot-3.4.6.tar.xz.asc) = 400512cfddadd93e4b536d2421126ee5fce19fa03e0ad6cee2407b1f67e242b9d65ac4ea3f527c17a7100cb63b583cf8a4ca617f6fe119cd4f15a001a0c80abf +SHA512 (knot-3.4.7.tar.xz) = edc0ac8f6bcb9a2bb0221fbc438f8b0b048bd592bea0a486f2cd8bedfd52509e3692a2e29daa39fdd4c11f7d1d83aa0b0d7394b94c8e15d570535cdc2b3a2e13 +SHA512 (knot-3.4.7.tar.xz.asc) = 56f15712467b06440daf5ab8e69d69671345959a0c91d799b2c43e6eb7f14f5be543abd11ff0d99edb45bb4b397fc0ee9f02282669832778cf6e4b2d56fe550a From 4beee8e3ef5ccec0d87363d2055888eec44f86e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 12 Jun 2025 15:27:38 +0200 Subject: [PATCH 208/214] Remove %{_isa} from new noarch packages Requires --- knot.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 2aedafe..a33e6a0 100644 --- a/knot.spec +++ b/knot.spec @@ -151,7 +151,7 @@ The package contains geoip Knot DNS module for geography-based responses. %package exporter Summary: Prometheus exporter for Knot DNS BuildArch: noarch -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description exporter The package provides Python Prometheus exporter for Knot DNS. @@ -159,7 +159,7 @@ The package provides Python Prometheus exporter for Knot DNS. %package -n python3-libknot Summary: Python bindings for libknot BuildArch: noarch -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %{?python_provide:%python_provide python3-libknot} %description -n python3-libknot @@ -407,7 +407,7 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog -* Wed Jun 04 2025 Jakub Ružička - 3.4.7-1 +* Thu Jun 12 2025 Jakub Ružička - 3.4.7-1 - Update to 3.4.7 - Add new knot-exporter and python3-libknot packages From 6c5a438f27182ff83996ce3de6beddc9e6bc5579 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:52:17 +0000 Subject: [PATCH 209/214] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index a33e6a0..c42fd88 100644 --- a/knot.spec +++ b/knot.spec @@ -15,7 +15,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.4.7 -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 @@ -407,6 +407,9 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 3.4.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jun 12 2025 Jakub Ružička - 3.4.7-1 - Update to 3.4.7 - Add new knot-exporter and python3-libknot packages From dd527b7f5e5e7841907fe308a3ce9aa6f52c12c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Wed, 30 Jul 2025 18:51:10 +0200 Subject: [PATCH 210/214] Release 3.4.8-1 --- knot.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/knot.spec b/knot.spec index c42fd88..f3111d9 100644 --- a/knot.spec +++ b/knot.spec @@ -14,8 +14,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.4.7 -Release: 2%{?dist} +Version: 3.4.8 +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 @@ -407,6 +407,9 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog +* Wed Jul 30 2025 Jakub Ružička - 3.4.8-1 +- Update to 3.4.8 + * Thu Jul 24 2025 Fedora Release Engineering - 3.4.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index c5dab5b..2b9d53a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.4.7.tar.xz) = edc0ac8f6bcb9a2bb0221fbc438f8b0b048bd592bea0a486f2cd8bedfd52509e3692a2e29daa39fdd4c11f7d1d83aa0b0d7394b94c8e15d570535cdc2b3a2e13 -SHA512 (knot-3.4.7.tar.xz.asc) = 56f15712467b06440daf5ab8e69d69671345959a0c91d799b2c43e6eb7f14f5be543abd11ff0d99edb45bb4b397fc0ee9f02282669832778cf6e4b2d56fe550a +SHA512 (knot-3.4.8.tar.xz) = 62fb62e07c751bbc63759c0c74e3967b6a245bb0c76770e109b2c1bacf1580be98315ce3ecac8adfbdd37beab7b300a06078c44e57a1189def9efbc48b8d2c3e +SHA512 (knot-3.4.8.tar.xz.asc) = 55900f6cd9963299066597da6eab2be61a9a8fb7acd562b24a6883466e132372b99fc9e9643aef39566d2eff5fec27850fed0d8b97ca8ea417626ef5c90481e1 From 5f2a9a0ff65a6f2c3f7ac531c2f23711899717b2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:54:15 +0200 Subject: [PATCH 211/214] Rebuilt for Python 3.14.0rc2 bytecode --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index f3111d9..96b1692 100644 --- a/knot.spec +++ b/knot.spec @@ -15,7 +15,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.4.8 -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 @@ -407,6 +407,9 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog +* Fri Aug 15 2025 Python Maint - 3.4.8-2 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 30 2025 Jakub Ružička - 3.4.8-1 - Update to 3.4.8 From ddd930d7524ff6ba95206cb0b44228408fac84b3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:24:39 +0200 Subject: [PATCH 212/214] Rebuilt for Python 3.14.0rc3 bytecode --- knot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/knot.spec b/knot.spec index 96b1692..5ec2d74 100644 --- a/knot.spec +++ b/knot.spec @@ -15,7 +15,7 @@ Summary: High-performance authoritative DNS server Name: knot Version: 3.4.8 -Release: 2%{?dist} +Release: 3%{?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 @@ -407,6 +407,9 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog +* Fri Sep 19 2025 Python Maint - 3.4.8-3 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 3.4.8-2 - Rebuilt for Python 3.14.0rc2 bytecode From 52aa1c6b27ca981abe9960c0a4161be7204be75e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 16 Oct 2025 18:23:12 +0200 Subject: [PATCH 213/214] Release 3.5.1-1 --- knot.spec | 41 +++++++++++++++++++++++++++++++++++------ sources | 4 ++-- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/knot.spec b/knot.spec index 5ec2d74..322d68d 100644 --- a/knot.spec +++ b/knot.spec @@ -14,8 +14,8 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.4.8 -Release: 3%{?dist} +Version: 3.5.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 @@ -46,6 +46,7 @@ BuildRequires: pkgconfig(libmnl) BuildRequires: pkgconfig(libnghttp2) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(hiredis) %if 0%{?fedora} || 0%{?rhel} BuildRequires: softhsm %endif @@ -94,6 +95,8 @@ Requires(postun): systemd Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Recommends: %{name}-keymgr + %if 0%{?suse_version} Provides: group(knot) %endif @@ -103,8 +106,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.4+ isn't compatible with earlier knot-resolver -Conflicts: knot-resolver < 5.7.4-2 +# Knot DNS 3.5+ isn't compatible with earlier knot-resolver +Conflicts: knot-resolver < 5.7.6-3 %description libs The package contains shared libraries used by the Knot DNS server and @@ -134,6 +137,13 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description dnssecutils The package contains DNSSEC tools shipped with the Knot DNS server. +%package keymgr +Summary: Knot DNS key management utility +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description keymgr +The package contains keymgr program for Knot DNS key management. + %package module-dnstap Summary: dnstap module for Knot DNS Requires: %{name} = %{version}-%{release} @@ -165,6 +175,13 @@ Requires: %{name}-libs = %{version}-%{release} %description -n python3-libknot The package provides Python bindings for the libknot shared library. +%package -n valkey-module-knot +Summary: Valkey module for Knot DNS. +Requires: %{name}-libs = %{version}-%{release} + +%description -n valkey-module-knot +The package provides Valkey module for Knot DNS. + %package doc Summary: Documentation for the Knot DNS server BuildArch: noarch @@ -205,9 +222,11 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused" --libexecdir=/usr/lib/knot \ --with-rundir=/run/knot \ --with-moduledir=%{_libdir}/knot/modules-%{BASE_VERSION} \ + --with-redisdir=%{_libdir}/valkey/modules \ --with-storage=/var/lib/knot \ %{?configure_db_sizes} \ %{?configure_quic} \ + --enable-redis=auto \ --disable-static \ --enable-dnstap=yes \ --with-module-dnstap=shared \ @@ -333,7 +352,6 @@ V=1 make check %{_unitdir}/knot.service %{_sbindir}/kcatalogprint %{_sbindir}/kjournalprint -%{_sbindir}/keymgr %{_sbindir}/knotc %{_sbindir}/knotd %if 0%{?suse_version} @@ -342,7 +360,6 @@ V=1 make check %{_mandir}/man5/knot.conf.* %{_mandir}/man8/kcatalogprint.* %{_mandir}/man8/kjournalprint.* -%{_mandir}/man8/keymgr.* %{_mandir}/man8/knotc.* %{_mandir}/man8/knotd.* %ghost %attr(770,root,knot) %dir %{_rundir}/knot @@ -366,6 +383,10 @@ V=1 make check %{_mandir}/man1/kzonecheck.* %{_mandir}/man1/kzonesign.* +%files keymgr +%{_sbindir}/keymgr +%{_mandir}/man8/keymgr.* + %files module-dnstap %{_libdir}/knot/modules-*/dnstap.so @@ -381,6 +402,9 @@ V=1 make check %{python3_sitelib}/libknot %{python3_sitelib}/libknot-*-info +%files -n valkey-module-knot +%attr(0755, root, root) %{_libdir}/valkey/modules/knot.so + %files libs %license COPYING %doc NEWS @@ -407,6 +431,11 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog +* Thu Oct 16 2025 Jakub Ružička - 3.5.1-1 +- Update to 3.5.1 +- Add new valkey-module-knot package +- Split keymgr into knot-keymgr package + * Fri Sep 19 2025 Python Maint - 3.4.8-3 - Rebuilt for Python 3.14.0rc3 bytecode diff --git a/sources b/sources index 2b9d53a..5f51682 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.4.8.tar.xz) = 62fb62e07c751bbc63759c0c74e3967b6a245bb0c76770e109b2c1bacf1580be98315ce3ecac8adfbdd37beab7b300a06078c44e57a1189def9efbc48b8d2c3e -SHA512 (knot-3.4.8.tar.xz.asc) = 55900f6cd9963299066597da6eab2be61a9a8fb7acd562b24a6883466e132372b99fc9e9643aef39566d2eff5fec27850fed0d8b97ca8ea417626ef5c90481e1 +SHA512 (knot-3.5.1.tar.xz) = f4f42425fe20a0632489a6de642993515a7914b0392553dc8842e3ec2a4ab0c515dd3e11799c90a7f36e79d83fa92998aa6f03a5c6c527d1520c2cb6388fc9ba +SHA512 (knot-3.5.1.tar.xz.asc) = 740528e26e999bf4c12cc2995838f8d1bf0aaac68d3bc823f45090ed5f498bb3cb294b4c07fa0056dd8b7033a7502f800cbdf608276fbf40c79d566035aca8d3 From e93f63e14a45244eb059f8e7091c74994bfeae86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Fri, 19 Dec 2025 15:09:23 +0100 Subject: [PATCH 214/214] Release 3.5.2-1 --- knot.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/knot.spec b/knot.spec index 322d68d..4b79d07 100644 --- a/knot.spec +++ b/knot.spec @@ -14,7 +14,7 @@ Summary: High-performance authoritative DNS server Name: knot -Version: 3.5.1 +Version: 3.5.2 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -431,6 +431,9 @@ V=1 make check %doc %{_pkgdocdir}/html %changelog +* Fri Dec 19 2025 Jakub Ružička - 3.5.2-1 +- Update to 3.5.2 + * Thu Oct 16 2025 Jakub Ružička - 3.5.1-1 - Update to 3.5.1 - Add new valkey-module-knot package diff --git a/sources b/sources index 5f51682..b941cb1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (knot-3.5.1.tar.xz) = f4f42425fe20a0632489a6de642993515a7914b0392553dc8842e3ec2a4ab0c515dd3e11799c90a7f36e79d83fa92998aa6f03a5c6c527d1520c2cb6388fc9ba -SHA512 (knot-3.5.1.tar.xz.asc) = 740528e26e999bf4c12cc2995838f8d1bf0aaac68d3bc823f45090ed5f498bb3cb294b4c07fa0056dd8b7033a7502f800cbdf608276fbf40c79d566035aca8d3 +SHA512 (knot-3.5.2.tar.xz) = 4dd8e42088f792459859da807427024ded926c2a8fb5b9fd4596b631a184269e3d84f0cd4be9192f2546977c598c418f8d44cabccbc393f9f7cf2f0dd5adc595 +SHA512 (knot-3.5.2.tar.xz.asc) = 5f6ee7fedc0d5b904572d2f6d47858065cdc4efa7217b4e9dcbb38ae63a1533646ba2b042bb0c1fe533a3caf6ba41c81010616393d2a0adcea77712608931b38