diff --git a/knot.spec b/knot.spec index e2407ce..d61fa22 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.2.2 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.knot-dns.cz @@ -65,18 +65,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 @@ -84,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 @@ -94,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 @@ -110,10 +109,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 +139,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. @@ -184,13 +192,15 @@ 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 -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 @@ -208,14 +218,13 @@ 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 %endif %post -systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %if 0%{?suse_version} %service_add_post knot.service %else @@ -249,13 +258,13 @@ 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-* %{_unitdir}/knot.service -%{_tmpfilesdir}/knot.conf -%{_bindir}/kzonecheck -%{_bindir}/kzonesign %{_sbindir}/kcatalogprint %{_sbindir}/kjournalprint %{_sbindir}/keymgr @@ -264,8 +273,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.* @@ -277,7 +284,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 @@ -285,9 +291,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 @@ -320,6 +333,46 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : %doc %{_pkgdocdir}/html %changelog +* Tue Nov 01 2022 Jakub Ružička - 3.2.2-1 +- Update to 3.2.2 + +* Fri Sep 09 2022 Jakub Ružička - 3.2.1-1 +- Update to 3.2.1 +- Remove patches included upstream +- 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 +- 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 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 + +* Thu Feb 10 2022 Jakub Ružička - 3.1.6-1 +- Update to 3.1.6 +- Add dbus config +- Use _sharedstatedir for home + +* Wed Jan 05 2022 Jakub Ružička - 3.1.5-1 +- Update to 3.1.5 + +* Thu Nov 04 2021 Jakub Ružička - 3.1.4-1 +- Update to 3.1.4 + +* Tue Oct 19 2021 Jakub Ružička - 3.1.3-1 +- Update to 3.1.3 + +* 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..1f81a20 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.2.2.tar.xz) = 29fadb96c1ea525c6183f9e7552f4ad370579b67d74aec1910a92d561cc2c5656fd7876015f29161d279a07c23643f6584308bf9fa0e74d351b17af54e5e9a7f +SHA512 (knot-3.2.2.tar.xz.asc) = 78289cffd9eca23539210ca9dc9b3a67d0cce6a86de1dc185b3f58aa10030fc73401bb50b4a0b9cc2c9122db69c461880c0c9166b85dadb15a117dbbd338ab75