From f449f278dd3c70e479a035f50a9bb817a9b433ba Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 17:24:08 +0200 Subject: Adding upstream version 3.2.6. Signed-off-by: Daniel Baumann --- distro/pkg/arch/PKGBUILD | 66 ++++ distro/pkg/arch/knot.sysusers | 1 + distro/pkg/arch/knot.tmpfiles.arch | 2 + distro/pkg/deb/changelog | 6 + distro/pkg/deb/clean | 2 + distro/pkg/deb/compat | 1 + distro/pkg/deb/control | 267 +++++++++++++++++ distro/pkg/deb/copyright | 208 +++++++++++++ distro/pkg/deb/cz.nic.knotd.conf | 9 + distro/pkg/deb/docs | 1 + distro/pkg/deb/knot-dnssecutils.install | 3 + distro/pkg/deb/knot-dnssecutils.manpages | 3 + distro/pkg/deb/knot-dnsutils.install | 3 + distro/pkg/deb/knot-dnsutils.manpages | 3 + distro/pkg/deb/knot-doc.install | 1 + distro/pkg/deb/knot-doc.links | 5 + distro/pkg/deb/knot-host.install | 1 + distro/pkg/deb/knot-host.manpages | 1 + distro/pkg/deb/knot-module-dnstap.install | 1 + distro/pkg/deb/knot-module-geoip.install | 1 + distro/pkg/deb/knot.dirs | 1 + distro/pkg/deb/knot.init | 149 +++++++++ distro/pkg/deb/knot.install | 8 + distro/pkg/deb/knot.manpages | 6 + distro/pkg/deb/knot.postinst | 16 + distro/pkg/deb/knot.postrm | 21 ++ distro/pkg/deb/knot.service | 30 ++ distro/pkg/deb/libdnssec9.install | 1 + distro/pkg/deb/libdnssec9.symbols | 96 ++++++ distro/pkg/deb/libknot-dev.install | 3 + distro/pkg/deb/libknot13.install | 1 + distro/pkg/deb/libknot13.symbols | 265 ++++++++++++++++ distro/pkg/deb/libzscanner4.install | 1 + distro/pkg/deb/libzscanner4.symbols | 12 + distro/pkg/deb/not-installed | 1 + distro/pkg/deb/prepare-environment | 38 +++ distro/pkg/deb/rules | 101 +++++++ distro/pkg/deb/source/format | 1 + distro/pkg/deb/tests/authoritative-server | 150 ++++++++++ distro/pkg/deb/tests/control | 13 + distro/pkg/deb/tests/kdig | 14 + distro/pkg/deb/ufw/knot | 4 + distro/pkg/deb/watch | 4 + .../pkg/el-7/01-disable-unconnected-net-test.patch | 26 ++ distro/pkg/el-7/02-revert-AC_PROG_CC.patch | 18 ++ distro/pkg/el-7/knot.service | 25 ++ distro/pkg/el-7/knot.spec | 333 +++++++++++++++++++++ distro/pkg/el-7/knot.tmpfiles | 3 + distro/pkg/nix/default.nix | 69 +++++ distro/pkg/nix/dont-create-run-time-dirs.patch | 32 ++ distro/pkg/nix/runtime-deps.patch | 14 + distro/pkg/nix/top-level.nix | 8 + ...-test_net-disable-udp-send-on-unconnected.patch | 26 ++ distro/pkg/rpm/knot.spec | 328 ++++++++++++++++++++ 54 files changed, 2403 insertions(+) create mode 100644 distro/pkg/arch/PKGBUILD create mode 100644 distro/pkg/arch/knot.sysusers create mode 100644 distro/pkg/arch/knot.tmpfiles.arch create mode 100644 distro/pkg/deb/changelog create mode 100644 distro/pkg/deb/clean create mode 100644 distro/pkg/deb/compat create mode 100644 distro/pkg/deb/control create mode 100644 distro/pkg/deb/copyright create mode 100644 distro/pkg/deb/cz.nic.knotd.conf create mode 100644 distro/pkg/deb/docs create mode 100644 distro/pkg/deb/knot-dnssecutils.install create mode 100644 distro/pkg/deb/knot-dnssecutils.manpages create mode 100644 distro/pkg/deb/knot-dnsutils.install create mode 100644 distro/pkg/deb/knot-dnsutils.manpages create mode 100644 distro/pkg/deb/knot-doc.install create mode 100644 distro/pkg/deb/knot-doc.links create mode 100644 distro/pkg/deb/knot-host.install create mode 100644 distro/pkg/deb/knot-host.manpages create mode 100644 distro/pkg/deb/knot-module-dnstap.install create mode 100644 distro/pkg/deb/knot-module-geoip.install create mode 100644 distro/pkg/deb/knot.dirs create mode 100644 distro/pkg/deb/knot.init create mode 100644 distro/pkg/deb/knot.install create mode 100644 distro/pkg/deb/knot.manpages create mode 100644 distro/pkg/deb/knot.postinst create mode 100644 distro/pkg/deb/knot.postrm create mode 100644 distro/pkg/deb/knot.service create mode 100644 distro/pkg/deb/libdnssec9.install create mode 100644 distro/pkg/deb/libdnssec9.symbols create mode 100644 distro/pkg/deb/libknot-dev.install create mode 100644 distro/pkg/deb/libknot13.install create mode 100644 distro/pkg/deb/libknot13.symbols create mode 100644 distro/pkg/deb/libzscanner4.install create mode 100644 distro/pkg/deb/libzscanner4.symbols create mode 100644 distro/pkg/deb/not-installed create mode 100755 distro/pkg/deb/prepare-environment create mode 100755 distro/pkg/deb/rules create mode 100644 distro/pkg/deb/source/format create mode 100755 distro/pkg/deb/tests/authoritative-server create mode 100644 distro/pkg/deb/tests/control create mode 100755 distro/pkg/deb/tests/kdig create mode 100644 distro/pkg/deb/ufw/knot create mode 100644 distro/pkg/deb/watch create mode 100644 distro/pkg/el-7/01-disable-unconnected-net-test.patch create mode 100644 distro/pkg/el-7/02-revert-AC_PROG_CC.patch create mode 100644 distro/pkg/el-7/knot.service create mode 100644 distro/pkg/el-7/knot.spec create mode 100644 distro/pkg/el-7/knot.tmpfiles create mode 100644 distro/pkg/nix/default.nix create mode 100644 distro/pkg/nix/dont-create-run-time-dirs.patch create mode 100644 distro/pkg/nix/runtime-deps.patch create mode 100644 distro/pkg/nix/top-level.nix create mode 100644 distro/pkg/rpm/01-test_net-disable-udp-send-on-unconnected.patch create mode 100644 distro/pkg/rpm/knot.spec (limited to 'distro/pkg') diff --git a/distro/pkg/arch/PKGBUILD b/distro/pkg/arch/PKGBUILD new file mode 100644 index 0000000..16f1259 --- /dev/null +++ b/distro/pkg/arch/PKGBUILD @@ -0,0 +1,66 @@ +# Maintainer: Tomas Krizek +# Maintainer: Bruno Pagani +# Contributor: Ondřej Surý +# Contributor: Julian Brost +# Contributor: Oleander Reis +# Contributor: Otto Sabart + +pkgname=knot +pkgver={{ version }} +pkgrel=1 +pkgdesc="High-performance authoritative-only DNS server" +arch=('x86_64') +url="https://www.knot-dns.cz/" +license=('GPL3') +depends=('fstrm' + 'gnutls' + 'libcap-ng' + 'libedit' + 'libidn2' + 'libmaxminddb' + 'liburcu' + 'lmdb' + 'protobuf-c' + 'systemd') +backup=('etc/knot/knot.conf') +source=("${pkgname}-${pkgver}.tar.xz") +sha256sums=('SKIP') +validpgpkeys=('742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB') # Daniel Salzman + +build() { + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --localstatedir=/var/lib \ + --libexecdir=/usr/lib/knot \ + --with-rundir=/run/knot \ + --with-storage=/var/lib/knot \ + --enable-recvmmsg \ + --enable-dnstap \ + --enable-systemd \ + --enable-reuseport \ + --disable-silent-rules \ + --disable-static + + make +} + +check() { + cd ${pkgname}-${pkgver} + make check +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install + + rm "${pkgdir}"/etc/knot/example.com.zone + mv "${pkgdir}"/etc/knot/{knot.sample.conf,knot.conf} + + install -Dm644 distro/common/${pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/ + install -Dm644 distro/pkg/arch/${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf +} diff --git a/distro/pkg/arch/knot.sysusers b/distro/pkg/arch/knot.sysusers new file mode 100644 index 0000000..735db76 --- /dev/null +++ b/distro/pkg/arch/knot.sysusers @@ -0,0 +1 @@ +u knot - "Knot DNS Daemon User" diff --git a/distro/pkg/arch/knot.tmpfiles.arch b/distro/pkg/arch/knot.tmpfiles.arch new file mode 100644 index 0000000..b20df6a --- /dev/null +++ b/distro/pkg/arch/knot.tmpfiles.arch @@ -0,0 +1,2 @@ +d /run/knot 0755 knot knot - - +d /var/lib/knot 0700 knot knot - - diff --git a/distro/pkg/deb/changelog b/distro/pkg/deb/changelog new file mode 100644 index 0000000..123f92b --- /dev/null +++ b/distro/pkg/deb/changelog @@ -0,0 +1,6 @@ +knot ({{ version }}-cznic.{{ release }}) unstable; urgency=medium + + * upstream package + * see https://www.knot-dns.cz + + -- Knot DNS {{ now }} diff --git a/distro/pkg/deb/clean b/distro/pkg/deb/clean new file mode 100644 index 0000000..b2a9f3f --- /dev/null +++ b/distro/pkg/deb/clean @@ -0,0 +1,2 @@ +doc/modules +.pybuild/ diff --git a/distro/pkg/deb/compat b/distro/pkg/deb/compat new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/distro/pkg/deb/compat @@ -0,0 +1 @@ +11 diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control new file mode 100644 index 0000000..9cc4f54 --- /dev/null +++ b/distro/pkg/deb/control @@ -0,0 +1,267 @@ +Source: knot +Section: net +Priority: optional +Maintainer: Knot DNS +Uploaders: + Jakub Ružička , + Daniel Salzman , +Build-Depends-Indep: + python3-setuptools, + python3-sphinx, +Build-Depends: + autoconf, + automake, + debhelper (>= 11), + dh-python, + libcap-ng-dev, + libedit-dev, + libelf-dev, + libfstrm-dev, + libgnutls28-dev, + libidn2-dev, + liblmdb-dev, + libmaxminddb-dev, + libmnl-dev, + libnghttp2-dev, + libprotobuf-c-dev, + libsofthsm2 , + libsystemd-dev [linux-any] | libsystemd-daemon-dev [linux-any], + libsystemd-dev [linux-any] | libsystemd-journal-dev [linux-any], + libtool, + liburcu-dev, + pkg-config, + protobuf-c-compiler, + python3-all, +Standards-Version: 4.5.0 +Homepage: https://www.knot-dns.cz/ +Vcs-Browser: https://gitlab.nic.cz/knot/knot-dns +Vcs-Git: https://gitlab.nic.cz/knot/knot-dns.git +Rules-Requires-Root: no + +Package: knot +Architecture: any +Depends: + adduser, + libdnssec9 (= ${binary:Version}), + libknot13 (= ${binary:Version}), + libzscanner4 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Pre-Depends: + ${misc:Pre-Depends}, +Suggests: + systemd, +Description: Authoritative domain name server + Knot DNS is a fast, authoritative only, high performance, feature + full and open source name server. + . + Knot DNS is developed by CZ.NIC Labs, the R&D department of .CZ + registry and hence is well suited to run anything from the root + zone, the top-level domain, to many smaller standard domain names. + +Package: libknot13 +Architecture: any +Depends: + ${misc:Depends}, + ${shlibs:Depends}, +Section: libs +Description: DNS shared library from Knot DNS + Knot DNS is a fast, authoritative only, high performance, feature + full and open source name server. + . + Knot DNS is developed by CZ.NIC Labs, the R&D department of .CZ + registry and hence is well suited to run anything from the root + zone, the top-level domain, to many smaller standard domain names. + . + This package provides a DNS shared library used by Knot DNS and + Knot Resolver. + +Package: libzscanner4 +Architecture: any +Depends: + ${misc:Depends}, + ${shlibs:Depends}, +Section: libs +Description: DNS zone-parsing shared library from Knot DNS + Knot DNS is a fast, authoritative only, high performance, feature + full and open source name server. + . + Knot DNS is developed by CZ.NIC Labs, the R&D department of .CZ + registry and hence is well suited to run anything from the root + zone, the top-level domain, to many smaller standard domain names. + . + This package provides a fast zone parser shared library used by Knot + DNS and Knot Resolver. + +Package: libdnssec9 +Architecture: any +Depends: + ${misc:Depends}, + ${shlibs:Depends}, +Section: libs +Description: DNSSEC shared library from Knot DNS + Knot DNS is a fast, authoritative only, high performance, feature + full and open source name server. + . + Knot DNS is developed by CZ.NIC Labs, the R&D department of .CZ + registry and hence is well suited to run anything from the root + zone, the top-level domain, to many smaller standard domain names. + . + This package provides common DNSSEC shared library used by Knot DNS + and Knot Resolver. + +Package: libknot-dev +Architecture: any +Depends: + libdnssec9 (= ${binary:Version}), + libgnutls28-dev, + libknot13 (= ${binary:Version}), + libzscanner4 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Section: libdevel +Description: Knot DNS shared library development files + Knot DNS is a fast, authoritative only, high performance, feature + full and open source name server. + . + Knot DNS is developed by CZ.NIC Labs, the R&D department of .CZ + registry and hence is well suited to run anything from the root + zone, the top-level domain, to many smaller standard domain names. + . + This package provides development files for shared libraries from Knot DNS. + +Package: knot-dnsutils +Architecture: any +Depends: + libdnssec9 (= ${binary:Version}), + libknot13 (= ${binary:Version}), + libzscanner4 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: DNS clients provided with Knot DNS (kdig, knsupdate) + Knot DNS is a fast, authoritative only, high performance, feature + full and open source name server. + . + Knot DNS is developed by CZ.NIC Labs, the R&D department of .CZ + registry and hence is well suited to run anything from the root + zone, the top-level domain, to many smaller standard domain names. + . + This package delivers various DNS client programs from Knot DNS. + . + - kdig - query a DNS server in various ways + - knsupdate - perform dynamic updates (See RFC2136) + - kxdpgun - send a DNS query stream over UDP to a DNS server + . + Those clients were designed to be almost 1:1 compatible with BIND dnsutils, + but they provide some enhancements, which are documented. + . + WARNING: knslookup is not provided as it is considered obsolete. + +Package: knot-dnssecutils +Architecture: any +Depends: + libdnssec9 (= ${binary:Version}), + libknot13 (= ${binary:Version}), + libzscanner4 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: DNSSEC tools provided with Knot DNS + Knot DNS is a fast, authoritative only, high performance, feature + full and open source name server. + . + Knot DNS is developed by CZ.NIC Labs, the R&D department of .CZ + registry and hence is well suited to run anything from the root + zone, the top-level domain, to many smaller standard domain names. + . + This package delivers various DNSSEC tools from Knot DNS. + . + - kzonecheck + - kzonesign + - knsec3hash + +Package: knot-host +Architecture: any +Depends: + libdnssec9 (= ${binary:Version}), + libknot13 (= ${binary:Version}), + libzscanner4 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: Version of 'host' bundled with Knot DNS + Knot DNS is a fast, authoritative only, high performance, feature + full and open source name server. + . + Knot DNS is developed by CZ.NIC Labs, the R&D department of .CZ + registry and hence is well suited to run anything from the root + zone, the top-level domain, to many smaller standard domain names. + . + This package provides the 'host' program from Knot DNS. This program is + designed to be almost 1:1 compatible with BIND 9.x 'host' program. + +Package: knot-module-dnstap +Architecture: any +Depends: + knot (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: dnstap module for Knot DNS + Knot DNS is a fast, authoritative only, high performance, feature + full and open source name server. + . + Knot DNS is developed by CZ.NIC Labs, the R&D department of .CZ + registry and hence is well suited to run anything from the root + zone, the top-level domain, to many smaller standard domain names. + . + This package contains dnstap module for logging DNS traffic. + +Package: knot-module-geoip +Architecture: any +Depends: + knot (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: geoip module for Knot DNS + Knot DNS is a fast, authoritative only, high performance, feature + full and open source name server. + . + Knot DNS is developed by CZ.NIC Labs, the R&D department of .CZ + registry and hence is well suited to run anything from the root + zone, the top-level domain, to many smaller standard domain names. + . + This package contains geoip module for geography-based responses. + +Package: knot-doc +Architecture: all +Multi-Arch: foreign +Depends: + libjs-jquery, + libjs-sphinxdoc, + libjs-underscore, + ${misc:Depends}, +Section: doc +Description: Documentation for Knot DNS + Knot DNS is a fast, authoritative only, high performance, feature + full and open source name server. + . + Knot DNS is developed by CZ.NIC Labs, the R&D department of .CZ + registry and hence is well suited to run anything from the root + zone, the top-level domain, to many smaller standard domain names. + . + This package provides various documents that are useful for + maintaining a working Knot DNS installation. + +Package: python3-libknot +Architecture: all +Depends: + ${misc:Depends}, + ${python3:Depends}, +Section: python +Description: Python bindings for libknot + Knot DNS is a fast, authoritative only, high performance, feature + full and open source name server. + . + Knot DNS is developed by CZ.NIC Labs, the R&D department of .CZ + registry and hence is well suited to run anything from the root + zone, the top-level domain, to many smaller standard domain names. + . + This package provides Python bindings for the libknot shared library. diff --git a/distro/pkg/deb/copyright b/distro/pkg/deb/copyright new file mode 100644 index 0000000..3565d25 --- /dev/null +++ b/distro/pkg/deb/copyright @@ -0,0 +1,208 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Knot DNS +Upstream-Contact: knot-dns@labs.nic.cz +Source: https://secure.nic.cz/files/knot-dns/ + +Files: * +Copyright: 2011-2023 CZ.NIC, z.s.p.o. +License: GPL-3+ + +Files: m4/* +Copyright: 2011-2022 CZ.NIC, z.s.p.o. + 1996-2001, 2003-2015 Free Software Foundation, Inc. +License: GPL-3+ + +Files: install-sh +Copyright: 1994 X Consortium +License: MIT + +Files: debian/* distro/pkg/deb/* +Copyright: 2011-2023 CZ.NIC, z.s.p.o. + 2011 Ondřej Surý +License: GPL-3+ + +Files: tests/tap/* +Copyright: 2000-2001, 2004, 2006-2012 Russ Allbery + 2006, 2007, 2008, 2013 The Board of Trustees of the Leland Stanford Junior University +License: MIT + +Files: tests/tap/files.* +Copyright: 2011-2019 CZ.NIC, z.s.p.o. +License: GPL-3+ + +Files: src/contrib/dnstap/* +Copyright: 2014, Farsight Security, Inc. + 2011-2022 CZ.NIC, z.s.p.o. +License: GPL-3+ + +Files: src/contrib/libbpf/* +Copyright: 2013-2015 Alexei Starovoitov + 2015 Wang Nan + 2015 Huawei Inc. + 2017 Nicira, Inc. + 2019 Isovalent, Inc. + 2019 Netronome Systems, Inc. + 2003-2013 Thomas Graf + 2018-2019 Intel Corporation. + 2018-2019 Facebook +License: LGPL-2.1 + +Files: src/contrib/libngtcp2/* +Copyright: 2016-2023 ngtcp2 contributors + 2012-2017 nghttp2 contributors +License: MIT + +Files: src/contrib/musl/* +Copyright: 2005-2020 Rich Felker, et al. +License: MIT + +Files: src/contrib/openbsd/siphash.* +Copyright: 2013 Andre Oppermann +License: BSD-3-Clause + +Files: src/contrib/openbsd/strl* +Copyright: 1998 Todd C. Miller +License: 0BSD + +Files: src/contrib/proxyv2/* +Copyright: 2022 CZ.NIC, z.s.p.o. + 2021 Fastly, Inc. +License: GPL-3+ + +Files: src/contrib/qp-trie/* +Copyright: 2011-2019 CZ.NIC, z.s.p.o. + 2018 Tony Finch +License: GPL-3+ + +Files: src/contrib/ucw/* +Copyright: 2011-2022 CZ.NIC, z.s.p.o. + 1997-2017 Martin Mares + 2007 Pavel Charvat + 2012 Ondrej Filip +License: LGPL-2.0 + +Files: src/contrib/ucw/heap.h +Copyright: 2011-2022 CZ.NIC, z.s.p.o. +License: GPL-3+ + +Files: src/contrib/url-parser/* +Copyright: 2020 Igor Sysoev + 2020 Nginx, Inc. + 2020 Joyent, Inc. +License: MIT + +Files: src/contrib/vpool/* +Copyright: 2006, 2008 Alexey Vatchenko +License: 0BSD + +Files: tests-fuzz/main.c +Copyright: 2011-2019 CZ.NIC, z.s.p.o. + 2017 Tim Ruehsen +License: MIT + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the full text of the GNU General Public License + version 3 can be found in the file `/usr/share/common-licenses/GPL-3'. + +License: LGPL-2.0 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. + +License: LGPL-2.1 + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public License + along with this program; If not, see . + . + On Debian systems, the complete text of the GNU Lesser General Public + License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. + +License: 0BSD + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +License: BSD-3-Clause + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + OF THE POSSIBILITY OF SUCH DAMAGE. + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. diff --git a/distro/pkg/deb/cz.nic.knotd.conf b/distro/pkg/deb/cz.nic.knotd.conf new file mode 100644 index 0000000..50af87a --- /dev/null +++ b/distro/pkg/deb/cz.nic.knotd.conf @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/distro/pkg/deb/docs b/distro/pkg/deb/docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/distro/pkg/deb/docs @@ -0,0 +1 @@ +README.md diff --git a/distro/pkg/deb/knot-dnssecutils.install b/distro/pkg/deb/knot-dnssecutils.install new file mode 100644 index 0000000..20009e8 --- /dev/null +++ b/distro/pkg/deb/knot-dnssecutils.install @@ -0,0 +1,3 @@ +usr/bin/knsec3hash +usr/bin/kzonecheck +usr/bin/kzonesign diff --git a/distro/pkg/deb/knot-dnssecutils.manpages b/distro/pkg/deb/knot-dnssecutils.manpages new file mode 100644 index 0000000..913c4cb --- /dev/null +++ b/distro/pkg/deb/knot-dnssecutils.manpages @@ -0,0 +1,3 @@ +usr/share/man/man1/knsec3hash.1 +usr/share/man/man1/kzonecheck.1 +usr/share/man/man1/kzonesign.1 diff --git a/distro/pkg/deb/knot-dnsutils.install b/distro/pkg/deb/knot-dnsutils.install new file mode 100644 index 0000000..e2f2a8a --- /dev/null +++ b/distro/pkg/deb/knot-dnsutils.install @@ -0,0 +1,3 @@ +usr/bin/kdig +usr/bin/knsupdate +usr/sbin/kxdpgun diff --git a/distro/pkg/deb/knot-dnsutils.manpages b/distro/pkg/deb/knot-dnsutils.manpages new file mode 100644 index 0000000..67254d9 --- /dev/null +++ b/distro/pkg/deb/knot-dnsutils.manpages @@ -0,0 +1,3 @@ +usr/share/man/man1/kdig.1 +usr/share/man/man1/knsupdate.1 +usr/share/man/man8/kxdpgun.8 diff --git a/distro/pkg/deb/knot-doc.install b/distro/pkg/deb/knot-doc.install new file mode 100644 index 0000000..c2a345d --- /dev/null +++ b/distro/pkg/deb/knot-doc.install @@ -0,0 +1 @@ +usr/share/doc/knot/* /usr/share/doc/knot-doc/ diff --git a/distro/pkg/deb/knot-doc.links b/distro/pkg/deb/knot-doc.links new file mode 100644 index 0000000..1376b3a --- /dev/null +++ b/distro/pkg/deb/knot-doc.links @@ -0,0 +1,5 @@ +usr/share/javascript/jquery/jquery.min.js usr/share/doc/knot-doc/_static/jquery.js +usr/share/javascript/sphinxdoc/1.0/doctools.js usr/share/doc/knot-doc/_static/doctools.js +usr/share/javascript/sphinxdoc/1.0/language_data.js usr/share/doc/knot-doc/_static/language_data.js +usr/share/javascript/sphinxdoc/1.0/searchtools.js usr/share/doc/knot-doc/_static/searchtools.js +usr/share/javascript/underscore/underscore.min.js usr/share/doc/knot-doc/_static/underscore.js diff --git a/distro/pkg/deb/knot-host.install b/distro/pkg/deb/knot-host.install new file mode 100644 index 0000000..51bacf0 --- /dev/null +++ b/distro/pkg/deb/knot-host.install @@ -0,0 +1 @@ +usr/bin/khost diff --git a/distro/pkg/deb/knot-host.manpages b/distro/pkg/deb/knot-host.manpages new file mode 100644 index 0000000..4891e2c --- /dev/null +++ b/distro/pkg/deb/knot-host.manpages @@ -0,0 +1 @@ +usr/share/man/man1/khost.1 diff --git a/distro/pkg/deb/knot-module-dnstap.install b/distro/pkg/deb/knot-module-dnstap.install new file mode 100644 index 0000000..983455e --- /dev/null +++ b/distro/pkg/deb/knot-module-dnstap.install @@ -0,0 +1 @@ +usr/lib/*/knot/modules-*/dnstap.so diff --git a/distro/pkg/deb/knot-module-geoip.install b/distro/pkg/deb/knot-module-geoip.install new file mode 100644 index 0000000..16d87c3 --- /dev/null +++ b/distro/pkg/deb/knot-module-geoip.install @@ -0,0 +1 @@ +usr/lib/*/knot/modules-*/geoip.so diff --git a/distro/pkg/deb/knot.dirs b/distro/pkg/deb/knot.dirs new file mode 100644 index 0000000..6e937aa --- /dev/null +++ b/distro/pkg/deb/knot.dirs @@ -0,0 +1 @@ +var/lib/knot diff --git a/distro/pkg/deb/knot.init b/distro/pkg/deb/knot.init new file mode 100644 index 0000000..3f8fcae --- /dev/null +++ b/distro/pkg/deb/knot.init @@ -0,0 +1,149 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: knot +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: authoritative domain name server +# Description: Knot DNS is a authoritative-only domain name server +### END INIT INFO + +# Author: Ondřej Surý + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Knot DNS server" # Introduce a short description here +NAME=knotd # Introduce the short server's name here +DAEMON=/usr/sbin/$NAME # Introduce the server's location here +PIDFILE=/run/knot/knot.pid +SCRIPTNAME=/etc/init.d/knot +KNOTC=/usr/sbin/knotc +RUNDIR=/run/knot + +# Exit if the package is not installed +[ -x $DAEMON ] || exit 0 + +KNOTD_ARGS="" + +# Read configuration variable file if it is present +[ -r /etc/default/knot ] && . /etc/default/knot + +DAEMON_ARGS="-d $KNOTD_ARGS" + +# Define LSB log_* functions. +# Depend on sysvinit-utils (>= 2.96) to ensure that this file is present. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + + $KNOTC status >/dev/null 2>/dev/null \ + && return 1 + + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + + $KNOTC status >/dev/null 2>/dev/null \ + || return 1 + + $KNOTC stop >/dev/null + RETVAL="$?" + [ $? = 1 ] && return 2 + + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return 0 +} + +do_reload() { + $KNOTC reload >/dev/null + return $? +} + +do_mkrundir() { + mkdir -p $RUNDIR + chmod 0755 $RUNDIR + chown knot:knot $RUNDIR +} + +case "$1" in + start) + do_mkrundir + log_daemon_msg "Starting $DESC " "$NAME" + do_start + case "$?" in + 0|1) log_end_msg 0 ;; + 2) log_end_msg 1 ;; + esac + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) log_end_msg 0 ;; + 2) log_end_msg 1 ;; + esac + ;; + status) + STATUS=$($KNOTC status 2>&1 >/dev/null) + RETVAL=$? + if [ $RETVAL = 0 ]; then + log_success_msg "$NAME is running" + else + log_failure_msg "$NAME is not running ($STATUS)" + fi + exit $RETVAL + ;; + reload|force-reload) + log_daemon_msg "Reloading $DESC" "$NAME" + do_reload + log_end_msg $? + ;; + restart) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|status|restart|reload|force-reload}" >&2 + exit 3 + ;; +esac + +: diff --git a/distro/pkg/deb/knot.install b/distro/pkg/deb/knot.install new file mode 100644 index 0000000..94c3999 --- /dev/null +++ b/distro/pkg/deb/knot.install @@ -0,0 +1,8 @@ +debian/cz.nic.knotd.conf etc/dbus-1/system.d/ +debian/ufw/knot etc/ufw/applications.d/ +etc/knot/knot.conf +usr/sbin/kcatalogprint +usr/sbin/keymgr +usr/sbin/kjournalprint +usr/sbin/knotc +usr/sbin/knotd diff --git a/distro/pkg/deb/knot.manpages b/distro/pkg/deb/knot.manpages new file mode 100644 index 0000000..5d23e9f --- /dev/null +++ b/distro/pkg/deb/knot.manpages @@ -0,0 +1,6 @@ +usr/share/man/man5/knot.conf.5 +usr/share/man/man8/kcatalogprint.8 +usr/share/man/man8/keymgr.8 +usr/share/man/man8/kjournalprint.8 +usr/share/man/man8/knotc.8 +usr/share/man/man8/knotd.8 diff --git a/distro/pkg/deb/knot.postinst b/distro/pkg/deb/knot.postinst new file mode 100644 index 0000000..da747c8 --- /dev/null +++ b/distro/pkg/deb/knot.postinst @@ -0,0 +1,16 @@ +#!/bin/sh +set -e + +if [ "$1" = "configure" ]; then + if ! getent passwd knot > /dev/null; then + adduser --quiet --system --group --no-create-home --home /var/lib/knot knot + fi + + dpkg-statoverride --list /var/lib/knot >/dev/null 2>&1 || dpkg-statoverride --update --add root knot 0770 /var/lib/knot + dpkg-statoverride --list /etc/knot/knot.conf >/dev/null 2>&1 || dpkg-statoverride --update --add root knot 0640 /etc/knot/knot.conf + dpkg-statoverride --list /etc/knot >/dev/null 2>&1 || dpkg-statoverride --update --add root knot 0750 /etc/knot +fi + +#DEBHELPER# + +exit 0 diff --git a/distro/pkg/deb/knot.postrm b/distro/pkg/deb/knot.postrm new file mode 100644 index 0000000..14b3d69 --- /dev/null +++ b/distro/pkg/deb/knot.postrm @@ -0,0 +1,21 @@ +#!/bin/sh +set -e + +if test "$1" = "purge"; then + state_dir=/var/lib/knot + for db_name in "catalog" "confdb" "journal" "keys" "timers"; do + rm -rf $state_dir/$db_name >/dev/null 2>&1 || true + done + rmdir $state_dir >/dev/null 2>&1 || true + [ -e $state_dir/* ] && echo "Notice: there are still data in ${state_dir}, please check." + + dpkg-statoverride --remove /var/lib/knot >/dev/null 2>&1 || true + dpkg-statoverride --remove /etc/knot/knot.conf >/dev/null 2>&1 || true + dpkg-statoverride --remove /etc/knot >/dev/null 2>&1 || true + + deluser --quiet knot >/dev/null 2>&1 || true +fi + +#DEBHELPER# + +exit 0 diff --git a/distro/pkg/deb/knot.service b/distro/pkg/deb/knot.service new file mode 100644 index 0000000..e6c13ed --- /dev/null +++ b/distro/pkg/deb/knot.service @@ -0,0 +1,30 @@ +[Unit] +Description=Knot DNS server +Wants=network-online.target +After=network-online.target +Documentation=man:knotd(8) man:knot.conf(5) man:knotc(8) + +[Service] +Type=notify +User=knot +Group=knot +CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_SETPCAP +AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_SETPCAP +ExecStartPre=/usr/sbin/knotc conf-check +ExecStart=/usr/sbin/knotd -m "$KNOT_CONF_MAX_SIZE" +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort +LimitNOFILE=1048576 +TimeoutStopSec=300 +# Extend the systemd startup timeout by this value (seconds) for each zone +Environment="KNOT_ZONE_LOAD_TIMEOUT_SEC=180" +# Maximum size (MiB) of a configuration database +Environment="KNOT_CONF_MAX_SIZE=512" + +# Expected systemd >= v239 +RuntimeDirectory=knot +StateDirectory=knot +NoNewPrivileges=yes + +[Install] +WantedBy=multi-user.target diff --git a/distro/pkg/deb/libdnssec9.install b/distro/pkg/deb/libdnssec9.install new file mode 100644 index 0000000..17a9fe6 --- /dev/null +++ b/distro/pkg/deb/libdnssec9.install @@ -0,0 +1 @@ +usr/lib/*/libdnssec.so.* diff --git a/distro/pkg/deb/libdnssec9.symbols b/distro/pkg/deb/libdnssec9.symbols new file mode 100644 index 0000000..c3ab2ed --- /dev/null +++ b/distro/pkg/deb/libdnssec9.symbols @@ -0,0 +1,96 @@ +libdnssec.so.9 libdnssec9 #MINVER# +* Build-Depends-Package: libknot-dev + dnssec_algorithm_digest_support@Base 3.2.0 + dnssec_algorithm_key_size_check@Base 3.2.0 + dnssec_algorithm_key_size_default@Base 3.2.0 + dnssec_algorithm_key_size_range@Base 3.2.0 + dnssec_algorithm_key_support@Base 3.2.0 + dnssec_algorithm_reproducible@Base 3.2.0 + dnssec_binary_alloc@Base 3.2.0 + dnssec_binary_cmp@Base 3.2.0 + dnssec_binary_dup@Base 3.2.0 + dnssec_binary_free@Base 3.2.0 + dnssec_binary_from_base64@Base 3.2.0 + dnssec_binary_resize@Base 3.2.0 + dnssec_binary_to_base64@Base 3.2.0 + dnssec_crypto_cleanup@Base 3.2.0 + dnssec_crypto_init@Base 3.2.0 + dnssec_crypto_reinit@Base 3.2.0 + dnssec_digest@Base 3.2.0 + dnssec_digest_finish@Base 3.2.0 + dnssec_digest_init@Base 3.2.0 + dnssec_key_can_sign@Base 3.2.0 + dnssec_key_can_verify@Base 3.2.0 + dnssec_key_clear@Base 3.2.0 + dnssec_key_create_ds@Base 3.2.0 + dnssec_key_dup@Base 3.2.0 + dnssec_key_free@Base 3.2.0 + dnssec_key_get_algorithm@Base 3.2.0 + dnssec_key_get_dname@Base 3.2.0 + dnssec_key_get_flags@Base 3.2.0 + dnssec_key_get_keyid@Base 3.2.0 + dnssec_key_get_keytag@Base 3.2.0 + dnssec_key_get_protocol@Base 3.2.0 + dnssec_key_get_pubkey@Base 3.2.0 + dnssec_key_get_rdata@Base 3.2.0 + dnssec_key_get_size@Base 3.2.0 + dnssec_key_load_pkcs8@Base 3.2.0 + dnssec_key_new@Base 3.2.0 + dnssec_key_set_algorithm@Base 3.2.0 + dnssec_key_set_dname@Base 3.2.0 + dnssec_key_set_flags@Base 3.2.0 + dnssec_key_set_protocol@Base 3.2.0 + dnssec_key_set_pubkey@Base 3.2.0 + dnssec_key_set_rdata@Base 3.2.0 + dnssec_keyid_copy@Base 3.2.0 + dnssec_keyid_equal@Base 3.2.0 + dnssec_keyid_is_valid@Base 3.2.0 + dnssec_keyid_normalize@Base 3.2.0 + dnssec_keystore_close@Base 3.2.0 + dnssec_keystore_deinit@Base 3.2.0 + dnssec_keystore_generate@Base 3.2.0 + dnssec_keystore_get_private@Base 3.2.0 + dnssec_keystore_import@Base 3.2.0 + dnssec_keystore_init@Base 3.2.0 + dnssec_keystore_init_pkcs11@Base 3.2.0 + dnssec_keystore_init_pkcs8@Base 3.2.0 + dnssec_keystore_open@Base 3.2.0 + dnssec_keystore_remove@Base 3.2.0 + dnssec_keystore_set_private@Base 3.2.0 + dnssec_keytag@Base 3.2.0 + dnssec_nsec3_hash@Base 3.2.0 + dnssec_nsec3_hash_length@Base 3.2.0 + dnssec_nsec3_params_free@Base 3.2.0 + dnssec_nsec3_params_from_rdata@Base 3.2.0 + dnssec_nsec3_params_match@Base 3.2.0 + dnssec_nsec_bitmap_add@Base 3.2.0 + dnssec_nsec_bitmap_clear@Base 3.2.0 + dnssec_nsec_bitmap_contains@Base 3.2.0 + dnssec_nsec_bitmap_free@Base 3.2.0 + dnssec_nsec_bitmap_new@Base 3.2.0 + dnssec_nsec_bitmap_size@Base 3.2.0 + dnssec_nsec_bitmap_write@Base 3.2.0 + dnssec_pem_from_privkey@Base 3.2.0 + dnssec_pem_from_x509@Base 3.2.0 + dnssec_pem_to_privkey@Base 3.2.0 + dnssec_pem_to_x509@Base 3.2.0 + dnssec_random_binary@Base 3.2.0 + dnssec_random_buffer@Base 3.2.0 + dnssec_sign_add@Base 3.2.0 + dnssec_sign_free@Base 3.2.0 + dnssec_sign_init@Base 3.2.0 + dnssec_sign_new@Base 3.2.0 + dnssec_sign_verify@Base 3.2.0 + dnssec_sign_write@Base 3.2.0 + dnssec_strerror@Base 3.2.0 + dnssec_tsig_add@Base 3.2.0 + dnssec_tsig_algorithm_from_dname@Base 3.2.0 + dnssec_tsig_algorithm_from_name@Base 3.2.0 + dnssec_tsig_algorithm_size@Base 3.2.0 + dnssec_tsig_algorithm_to_dname@Base 3.2.0 + dnssec_tsig_algorithm_to_name@Base 3.2.0 + dnssec_tsig_free@Base 3.2.0 + dnssec_tsig_new@Base 3.2.0 + dnssec_tsig_optimal_key_size@Base 3.2.0 + dnssec_tsig_size@Base 3.2.0 + dnssec_tsig_write@Base 3.2.0 diff --git a/distro/pkg/deb/libknot-dev.install b/distro/pkg/deb/libknot-dev.install new file mode 100644 index 0000000..cb60d88 --- /dev/null +++ b/distro/pkg/deb/libknot-dev.install @@ -0,0 +1,3 @@ +usr/include/ +usr/lib/*/*.so +usr/lib/*/pkgconfig/* diff --git a/distro/pkg/deb/libknot13.install b/distro/pkg/deb/libknot13.install new file mode 100644 index 0000000..f9b9f93 --- /dev/null +++ b/distro/pkg/deb/libknot13.install @@ -0,0 +1 @@ +usr/lib/*/libknot.so.* diff --git a/distro/pkg/deb/libknot13.symbols b/distro/pkg/deb/libknot13.symbols new file mode 100644 index 0000000..d4b2b45 --- /dev/null +++ b/distro/pkg/deb/libknot13.symbols @@ -0,0 +1,265 @@ +libknot.so.13 libknot13 #MINVER# +* Build-Depends-Package: libknot-dev + KNOT_DB_LMDB_DUPSORT@Base 3.2.0 + KNOT_DB_LMDB_INTEGERKEY@Base 3.2.0 + KNOT_DB_LMDB_MAPASYNC@Base 3.2.0 + KNOT_DB_LMDB_NOSYNC@Base 3.2.0 + KNOT_DB_LMDB_NOTLS@Base 3.2.0 + KNOT_DB_LMDB_RDONLY@Base 3.2.0 + KNOT_DB_LMDB_WRITEMAP@Base 3.2.0 + KNOT_DUMP_STYLE_DEFAULT@Base 3.2.0 + knot_ctl_accept@Base 3.2.0 + knot_ctl_alloc@Base 3.2.0 + knot_ctl_bind@Base 3.2.0 + knot_ctl_close@Base 3.2.0 + knot_ctl_connect@Base 3.2.0 + knot_ctl_free@Base 3.2.0 + knot_ctl_receive@Base 3.2.0 + knot_ctl_send@Base 3.2.0 + knot_ctl_set_timeout@Base 3.2.0 + knot_ctl_unbind@Base 3.2.0 + knot_db_lmdb_api@Base 3.2.0 + knot_db_lmdb_del_exact@Base 3.2.0 + knot_db_lmdb_get_mapsize@Base 3.2.0 + knot_db_lmdb_get_path@Base 3.2.0 + knot_db_lmdb_get_usage@Base 3.2.0 + knot_db_lmdb_iter_del@Base 3.2.0 + knot_db_lmdb_txn_begin@Base 3.2.0 + knot_db_trie_api@Base 3.2.0 + knot_dname_cmp@Base 3.2.0 + knot_dname_copy@Base 3.2.0 + knot_dname_copy_lower@Base 3.2.0 + knot_dname_free@Base 3.2.0 + knot_dname_from_str@Base 3.2.0 + knot_dname_in_bailiwick@Base 3.2.0 + knot_dname_is_case_equal@Base 3.2.0 + knot_dname_is_equal@Base 3.2.0 + knot_dname_labels@Base 3.2.0 + knot_dname_lf@Base 3.2.0 + knot_dname_matched_labels@Base 3.2.0 + knot_dname_prefixlen@Base 3.2.0 + knot_dname_realsize@Base 3.2.0 + knot_dname_replace_suffix@Base 3.2.0 + knot_dname_size@Base 3.2.0 + knot_dname_store@Base 3.2.0 + knot_dname_to_lower@Base 3.2.0 + knot_dname_to_str@Base 3.2.0 + knot_dname_to_wire@Base 3.2.0 + knot_dname_unpack@Base 3.2.0 + knot_dname_wire_check@Base 3.2.0 + knot_dnssec_alg_names@Base 3.2.0 + knot_edns_add_option@Base 3.2.0 + knot_edns_alignment_size@Base 3.2.0 + knot_edns_chain_parse@Base 3.2.0 + knot_edns_chain_size@Base 3.2.0 + knot_edns_chain_write@Base 3.2.0 + knot_edns_client_subnet_get_addr@Base 3.2.0 + knot_edns_client_subnet_parse@Base 3.2.0 + knot_edns_client_subnet_set_addr@Base 3.2.0 + knot_edns_client_subnet_size@Base 3.2.0 + knot_edns_client_subnet_write@Base 3.2.0 + knot_edns_cookie_client_check@Base 3.2.0 + knot_edns_cookie_client_generate@Base 3.2.0 + knot_edns_cookie_parse@Base 3.2.0 + knot_edns_cookie_server_check@Base 3.2.0 + knot_edns_cookie_server_generate@Base 3.2.0 + knot_edns_cookie_size@Base 3.2.0 + knot_edns_cookie_write@Base 3.2.0 + knot_edns_ede_names@Base 3.2.0 + knot_edns_get_ext_rcode@Base 3.2.0 + knot_edns_get_option@Base 3.2.0 + knot_edns_get_options@Base 3.2.0 + knot_edns_get_version@Base 3.2.0 + knot_edns_init@Base 3.2.0 + knot_edns_keepalive_parse@Base 3.2.0 + knot_edns_keepalive_size@Base 3.2.0 + knot_edns_keepalive_write@Base 3.2.0 + knot_edns_reserve_option@Base 3.2.0 + knot_edns_set_ext_rcode@Base 3.2.0 + knot_edns_set_version@Base 3.2.0 + knot_error_from_libdnssec@Base 3.2.0 + knot_eth_mtu@Base 3.2.0 + knot_eth_name_from_addr@Base 3.2.0 + knot_eth_queues@Base 3.2.0 + knot_eth_rss@Base 3.2.0 + knot_eth_vlans@Base 3.2.2 + knot_eth_xdp_mode@Base 3.2.0 + knot_get_obsolete_rdata_descriptor@Base 3.2.0 + knot_get_rdata_descriptor@Base 3.2.0 + knot_naptr_header_size@Base 3.2.0 + knot_opcode_names@Base 3.2.0 + knot_opt_code_to_string@Base 3.2.0 + knot_pkt_begin@Base 3.2.0 + knot_pkt_clear@Base 3.2.0 + knot_pkt_copy@Base 3.2.0 + knot_pkt_ext_rcode@Base 3.2.0 + knot_pkt_ext_rcode_name@Base 3.2.0 + knot_pkt_free@Base 3.2.0 + knot_pkt_init_response@Base 3.2.0 + knot_pkt_new@Base 3.2.0 + knot_pkt_parse@Base 3.2.0 + knot_pkt_parse_question@Base 3.2.0 + knot_pkt_put_question@Base 3.2.0 + knot_pkt_put_rotate@Base 3.2.0 + knot_pkt_reclaim@Base 3.2.0 + knot_pkt_reserve@Base 3.2.0 + knot_probe_alloc@Base 3.2.0 + knot_probe_consume@Base 3.2.0 + knot_probe_data_set@Base 3.2.0 + knot_probe_fd@Base 3.2.0 + knot_probe_free@Base 3.2.0 + knot_probe_produce@Base 3.2.0 + knot_probe_set_consumer@Base 3.2.0 + knot_probe_set_producer@Base 3.2.0 + knot_probe_tcp_rtt@Base 3.2.0 + knot_rcode_names@Base 3.2.0 + knot_rdataset_add@Base 3.2.0 + knot_rdataset_at@Base 3.2.0 + knot_rdataset_clear@Base 3.2.0 + knot_rdataset_copy@Base 3.2.0 + knot_rdataset_eq@Base 3.2.0 + knot_rdataset_intersect@Base 3.2.0 + knot_rdataset_intersect2@Base 3.2.0 + knot_rdataset_member@Base 3.2.0 + knot_rdataset_merge@Base 3.2.0 + knot_rdataset_subset@Base 3.2.0 + knot_rdataset_subtract@Base 3.2.0 + knot_rrclass_from_string@Base 3.2.0 + knot_rrclass_to_string@Base 3.2.0 + knot_rrset_add_rdata@Base 3.2.0 + knot_rrset_clear@Base 3.2.0 + knot_rrset_copy@Base 3.2.0 + knot_rrset_equal@Base 3.2.0 + knot_rrset_free@Base 3.2.0 + knot_rrset_is_nsec3rel@Base 3.2.0 + knot_rrset_new@Base 3.2.0 + knot_rrset_rr_from_wire@Base 3.2.0 + knot_rrset_rr_to_canonical@Base 3.2.0 + knot_rrset_size@Base 3.2.0 + knot_rrset_to_wire_extra@Base 3.2.0 + knot_rrset_txt_dump@Base 3.2.0 + knot_rrset_txt_dump_data@Base 3.2.0 + knot_rrset_txt_dump_header@Base 3.2.0 + knot_rrtype_additional_needed@Base 3.2.0 + knot_rrtype_from_string@Base 3.2.0 + knot_rrtype_is_dnssec@Base 3.2.0 + knot_rrtype_is_metatype@Base 3.2.0 + knot_rrtype_should_be_lowercased@Base 3.2.0 + knot_rrtype_to_string@Base 3.2.0 + knot_strerror@Base 3.2.0 + knot_svcb_param_names@Base 3.2.0 + knot_tcp_cleanup@Base 3.2.0 + knot_tcp_inbuf_update@Base 3.2.0 + knot_tcp_outbufs_ack@Base 3.2.0 + knot_tcp_outbufs_add@Base 3.2.0 + knot_tcp_outbufs_can_send@Base 3.2.0 + knot_tcp_outbufs_usage@Base 3.2.0 + knot_tcp_recv@Base 3.2.0 + knot_tcp_reply_data@Base 3.2.0 + knot_tcp_send@Base 3.2.0 + knot_tcp_sweep@Base 3.2.0 + knot_tcp_table_free@Base 3.2.0 + knot_tcp_table_new@Base 3.2.0 + knot_tsig_add@Base 3.2.0 + knot_tsig_append@Base 3.2.0 + knot_tsig_client_check@Base 3.2.0 + knot_tsig_client_check_next@Base 3.2.0 + knot_tsig_create_rdata@Base 3.2.0 + knot_tsig_key_copy@Base 3.2.0 + knot_tsig_key_deinit@Base 3.2.0 + knot_tsig_key_init@Base 3.2.0 + knot_tsig_key_init_file@Base 3.2.0 + knot_tsig_key_init_str@Base 3.2.0 + knot_tsig_rcode_names@Base 3.2.0 + knot_tsig_rdata_alg@Base 3.2.0 + knot_tsig_rdata_alg_name@Base 3.2.0 + knot_tsig_rdata_error@Base 3.2.0 + knot_tsig_rdata_fudge@Base 3.2.0 + knot_tsig_rdata_is_ok@Base 3.2.0 + knot_tsig_rdata_mac@Base 3.2.0 + knot_tsig_rdata_mac_length@Base 3.2.0 + knot_tsig_rdata_orig_id@Base 3.2.0 + knot_tsig_rdata_other_data@Base 3.2.0 + knot_tsig_rdata_other_data_length@Base 3.2.0 + knot_tsig_rdata_set_fudge@Base 3.2.0 + knot_tsig_rdata_set_mac@Base 3.2.0 + knot_tsig_rdata_set_orig_id@Base 3.2.0 + knot_tsig_rdata_set_other_data@Base 3.2.0 + knot_tsig_rdata_set_time_signed@Base 3.2.0 + knot_tsig_rdata_time_signed@Base 3.2.0 + knot_tsig_rdata_tsig_timers_length@Base 3.2.0 + knot_tsig_rdata_tsig_variables_length@Base 3.2.0 + knot_tsig_server_check@Base 3.2.0 + knot_tsig_sign@Base 3.2.0 + knot_tsig_sign_next@Base 3.2.0 + knot_tsig_wire_maxsize@Base 3.2.0 + knot_tsig_wire_size@Base 3.2.0 + knot_xdp_deinit@Base 3.2.0 + knot_xdp_info@Base 3.2.0 + knot_xdp_init@Base 3.2.0 + knot_xdp_recv@Base 3.2.0 + knot_xdp_recv_finish@Base 3.2.0 + knot_xdp_reply_alloc@Base 3.2.0 + knot_xdp_send@Base 3.2.0 + knot_xdp_send_alloc@Base 3.2.0 + knot_xdp_send_finish@Base 3.2.0 + knot_xdp_send_free@Base 3.2.0 + knot_xdp_send_prepare@Base 3.2.0 + knot_xdp_socket_fd@Base 3.2.0 + knot_xquic_cleanup@Base 3.2.1 + knot_xquic_client@Base 3.2.0 + knot_xquic_conn_get_stream@Base 3.2.0 + knot_xquic_conn_rtt@Base 3.2.0 + knot_xquic_free_creds@Base 3.2.0 + knot_xquic_handle@Base 3.2.0 + knot_xquic_init_creds@Base 3.2.0 + knot_xquic_send@Base 3.2.0 + knot_xquic_session_load@Base 3.2.0 + knot_xquic_session_save@Base 3.2.0 + knot_xquic_stream_add_data@Base 3.2.0 + knot_xquic_stream_get_process@Base 3.2.0 + knot_xquic_table_free@Base 3.2.0 + knot_xquic_table_new@Base 3.2.0 + knot_xquic_table_rem@Base 3.2.0 + knot_xquic_table_sweep@Base 3.2.0 + yp_addr@Base 3.2.0 + yp_addr_noport@Base 3.2.0 + yp_addr_noport_to_bin@Base 3.2.0 + yp_addr_noport_to_txt@Base 3.2.0 + yp_addr_range_to_bin@Base 3.2.0 + yp_addr_range_to_txt@Base 3.2.0 + yp_addr_to_bin@Base 3.2.0 + yp_addr_to_txt@Base 3.2.0 + yp_base64_to_bin@Base 3.2.0 + yp_base64_to_txt@Base 3.2.0 + yp_bool_to_bin@Base 3.2.0 + yp_bool_to_txt@Base 3.2.0 + yp_deinit@Base 3.2.0 + yp_dname_to_bin@Base 3.2.0 + yp_dname_to_txt@Base 3.2.0 + yp_format_id@Base 3.2.0 + yp_format_key0@Base 3.2.0 + yp_format_key1@Base 3.2.0 + yp_hex_to_bin@Base 3.2.0 + yp_hex_to_txt@Base 3.2.0 + yp_init@Base 3.2.0 + yp_int_to_bin@Base 3.2.0 + yp_int_to_txt@Base 3.2.0 + yp_item_to_bin@Base 3.2.0 + yp_item_to_txt@Base 3.2.0 + yp_option_to_bin@Base 3.2.0 + yp_option_to_txt@Base 3.2.0 + yp_parse@Base 3.2.0 + yp_schema_check_deinit@Base 3.2.0 + yp_schema_check_init@Base 3.2.0 + yp_schema_check_parser@Base 3.2.0 + yp_schema_check_str@Base 3.2.0 + yp_schema_copy@Base 3.2.0 + yp_schema_find@Base 3.2.0 + yp_schema_free@Base 3.2.0 + yp_schema_merge@Base 3.2.0 + yp_schema_purge_dynamic@Base 3.2.0 + yp_set_input_file@Base 3.2.0 + yp_set_input_string@Base 3.2.0 + yp_str_to_bin@Base 3.2.0 + yp_str_to_txt@Base 3.2.0 diff --git a/distro/pkg/deb/libzscanner4.install b/distro/pkg/deb/libzscanner4.install new file mode 100644 index 0000000..a8dc226 --- /dev/null +++ b/distro/pkg/deb/libzscanner4.install @@ -0,0 +1 @@ +usr/lib/*/libzscanner.so.* diff --git a/distro/pkg/deb/libzscanner4.symbols b/distro/pkg/deb/libzscanner4.symbols new file mode 100644 index 0000000..99ac3b7 --- /dev/null +++ b/distro/pkg/deb/libzscanner4.symbols @@ -0,0 +1,12 @@ +libzscanner.so.4 libzscanner4 #MINVER# +* Build-Depends-Package: libknot-dev + zs_deinit@Base 3.1.0 + zs_errorname@Base 3.1.0 + zs_init@Base 3.1.0 + zs_parse_all@Base 3.1.0 + zs_parse_record@Base 3.1.0 + zs_set_input_file@Base 3.1.0 + zs_set_input_string@Base 3.1.0 + zs_set_processing@Base 3.1.0 + zs_set_processing_comment@Base 3.1.0 + zs_strerror@Base 3.1.0 diff --git a/distro/pkg/deb/not-installed b/distro/pkg/deb/not-installed new file mode 100644 index 0000000..c928be1 --- /dev/null +++ b/distro/pkg/deb/not-installed @@ -0,0 +1 @@ +etc/knot/example.com.zone diff --git a/distro/pkg/deb/prepare-environment b/distro/pkg/deb/prepare-environment new file mode 100755 index 0000000..7176f5e --- /dev/null +++ b/distro/pkg/deb/prepare-environment @@ -0,0 +1,38 @@ +#!/bin/sh + +set -eu + +CONFFILE=${1:-/etc/knot/knot.conf} + +if [ ! -r $CONFFILE ]; then + echo "$CONFFILE doesn't exist or has wrong permissions." + exit 1; +fi + +KNOT_RUNDIR=$(sed -ne "s/#.*$//;s/.*rundir: \"*\([^\";]*\\).*/\\1/p;" $CONFFILE) +[ -z "$KNOT_RUNDIR" ] && KNOT_RUNDIR=/run/knot + +mkdir --parents "$KNOT_RUNDIR"; + +KNOT_USER=$(sed -ne "s/#.*$//;s/.*user:[ \"]*\\([^\\:\"]*\\)[ \"]*/\\1/p;" $CONFFILE) + +if [ -n "$KNOT_USER" ]; then + if ! getent passwd $KNOT_USER >/dev/null; then + echo "Configured user '$KNOT_USER' doesn't exist." + exit 1 + fi + + KNOT_GROUP=$(sed -ne "s/#.*$//;s/.*user:[ \"]*[^\\:\"]*\\:\\([^\"]*\\)[ \"]*/\\1/p;" $CONFFILE) + if [ -z "$KNOT_GROUP" ]; then + KNOT_GROUP=$(getent group $(getent passwd "$KNOT_USER" | cut -f 4 -d :) | cut -f 1 -d :) + fi + + if ! getent group $KNOT_GROUP >/dev/null; then + echo "Configured group '$KNOT_GROUP' doesn't exist." + exit 1 + fi + chown --silent "$KNOT_USER:$KNOT_GROUP" "$KNOT_RUNDIR" + chmod 775 "$KNOT_RUNDIR" +fi + +: diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules new file mode 100755 index 0000000..bfa0bba --- /dev/null +++ b/distro/pkg/deb/rules @@ -0,0 +1,101 @@ +#!/usr/bin/make -f + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_CFLAGS_MAINT_APPEND = -Wall -DNDEBUG +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + +export DPKG_GENSYMBOLS_CHECK_LEVEL := 4 +export KNOT_SOFTHSM2_DSO = /usr/lib/softhsm/libsofthsm2.so + +include /usr/share/dpkg/default.mk + +ifeq (maint,$(filter $(DEB_BUILD_OPTIONS),maint)) + FASTPARSER := --disable-fastparser +else + FASTPARSER := --enable-fastparser +endif + +ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),hurd-i386)) + RECVMMSG:=--enable-recvmmsg=no +else + RECVMMSG:=--enable-recvmmsg=yes +endif + +ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),amd64 i386)) + RUN_TEST := +else + RUN_TEST := -timeout --kill-after=5s 5m +endif + +LIBKNOT_SYMBOLS := $(wildcard $(CURDIR)/debian/libknot*.symbols) + +# MAJOR.MINOR version part +BASE_VERSION := $(shell echo $(DEB_VERSION) | sed 's/^\([^.]\+\.[^.]\+\).*/\1/') + +PYBUILD = pybuild --dir python --dest-dir debian/python3-libknot + +%: + dh $@ \ + --exclude=.la --exclude=example.com.zone \ + --with python3 + +override_dh_auto_configure: + dh_auto_configure -- \ + --sysconfdir=/etc \ + --localstatedir=/var/lib \ + --libexecdir=/usr/lib/knot \ + --with-rundir=/run/knot \ + --with-moduledir=/usr/lib/$(DEB_HOST_MULTIARCH)/knot/modules-$(BASE_VERSION) \ + --with-storage=/var/lib/knot \ + --enable-systemd=auto \ + --enable-dnstap \ + --with-module-dnstap=shared \ + --with-module-geoip=shared \ + $(RECVMMSG) \ + $(FASTPARSER) \ + --disable-silent-rules \ + --enable-xdp=yes \ + --enable-quic=yes \ + --disable-static + +override_dh_auto_configure-indep: + $(PYBUILD) --configure + +override_dh_auto_build-indep: + dh_auto_build -- html + $(PYBUILD) --build + +override_dh_auto_install-arch: + dh_auto_install -- install + # rename knot.sample.conf to knot.conf + mv $(CURDIR)/debian/tmp/etc/knot/knot.sample.conf $(CURDIR)/debian/tmp/etc/knot/knot.conf + # Some workarounds where XDP is unavailable + @if [ -f "$(CURDIR)/debian/tmp/usr/sbin/kxdpgun" ]; then \ + echo "XDP enabled"; \ + if grep -E -q "DoQ support: +no" "$(CURDIR)/debian/tmp/usr/sbin/knotd"; then \ + echo "Stripping the QUIC symbols"; \ + sed -i '/knot_xquic_/d' $(LIBKNOT_SYMBOLS); \ + fi \ + else \ + echo "XDP disabled"; \ + touch $(CURDIR)/debian/tmp/usr/share/man/man8/kxdpgun.8; \ + printf '#!/bin/sh\n\necho "kxdpgun not available"\n' > $(CURDIR)/debian/tmp/usr/sbin/kxdpgun; \ + fi + +override_dh_auto_install-indep: + dh_auto_install -- install-html + # rename knot.sample.conf to knot.conf + mv $(CURDIR)/debian/tmp/etc/knot/knot.sample.conf $(CURDIR)/debian/tmp/etc/knot/knot.conf + $(PYBUILD) --install + +override_dh_auto_test-indep: +override_dh_auto_test-arch: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + $(RUN_TEST) dh_auto_test +endif + +override_dh_missing: + dh_missing --fail-missing + +override_dh_installchangelogs: + dh_installchangelogs NEWS diff --git a/distro/pkg/deb/source/format b/distro/pkg/deb/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/distro/pkg/deb/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/distro/pkg/deb/tests/authoritative-server b/distro/pkg/deb/tests/authoritative-server new file mode 100755 index 0000000..028dfbf --- /dev/null +++ b/distro/pkg/deb/tests/authoritative-server @@ -0,0 +1,150 @@ +#!/bin/bash + +# Author: Daniel Kahn Gillmor +# 2018-11-02 +# License: GPLv3+ + +# error on exit +set -e +# for handling jobspecs: +set -m + +if [ -z "$AUTOPKGTEST_ARTIFACTS" ]; then + d="$(mktemp -d)" + remove="$d" +else + d="$AUTOPKGTEST_ARTIFACTS" +fi +ip="${TESTIP:-127.$(( $RANDOM % 256 )).$(( $RANDOM % 256 )).$(( $RANDOM % 256 ))}" +port="${PORT:-8123}" +knotc="${KNOTC:-/usr/sbin/knotc}" +knotd="${KNOTD:-/usr/sbin/knotd}" +keymgr="${KEYMGR:-/usr/sbin/keymgr}" +kdig="${KDIG:-$(command -v kdig)}" +kzonecheck="${KZONECHECK:-$(command -v kzonecheck)}" +test_address="${TEST_ADDRESS:-192.0.2.199}" + +declare -a knot_conf="--config=$d/knot.conf" +declare -a knot_args=("$knot_conf" --verbose) + +printf "%s + %s roundtrip tests\n------------\n workdir: %s\n IP addr: %s\n knot args: %s\n" "$knotd" "$kdig" "$d" "$ip" "${knot_args[*]}" + +section() { + printf "\n%s\n" "$1" + sed 's/./-/g' <<<"$1" +} + +cleanup () { + section "cleaning up" + find "$d" -ls + "${knotc}" "${knot_args[@]}" stop + wait %1 + tail -n +1 -v "$d"/*.err + if [ "$remove" ]; then + printf "\ncleaning up working directory %s\n" "$remove" + rm -rf "$remove" + fi +} +trap cleanup EXIT + +section "set up config file and zonefile" + +user=$(id -nu) +group=$(id -ng) +cat > "$d/knot.conf" < "$d/example.net.zone" < "$d/knotd.err" & + +# FIXME: this is an annoying poll -- would be better if we could be +# alerted when the daemon is done setting up the socket, but i don't +# want to "--daemonize" if i can avoid it because i want the shell to +# remain in direct supervision of all its processes +tried=0 +while [ $tried -lt 10 ] ; do + if "${knotc}" "${knot_args[@]}" status 2>&1; then + break; + fi + sleep 0.5 + tried=$(( $tried + 1 )) +done +if [ $tried -ge 10 ]; then + printf "failed to use %s\n" "${knotc}" >&2 + exit 1 +fi + +section "querying knot" +"${kdig}" -p "${port}" @"${ip}" -t A test.example.net test2.example.net +answer="$("${kdig}" +short -p "${port}" @"${ip}" -t A test.example.net)" +if ! [ "$answer" = "$test_address" ]; then + printf "test.example.net mismatch!\nexpected: %s\n got: %s\n" "$test_address" "$answer" >&2 + exit 1 +fi +answer2="$("${kdig}" +short -p "${port}" @"${ip}" -t A test2.example.net)" +if ! [ "$answer2" = "" ]; then + printf "test2.example.net gave unexpected answer!\n got: %s\n" "$answer2" >&2 + exit 1 +fi + +section "modifying zone" +printf "test2 1D IN A $test_address\n" >>"$d/example.net.zone" +sed -i 's/^@ 1D IN SOA.*/@ 1D IN SOA a.ns hostmaster 2018110100 3h 15m 1w 1d/' "$d/example.net.zone" +"${knotc}" "${knot_args[@]}" reload +sleep 1 + +section "querying again" +"${kdig}" -p "${port}" @"${ip}" -t A test.example.net test2.example.net +answer="$("${kdig}" +short -p "${port}" @"${ip}" -t A test.example.net)" +if ! [ "$answer" = "$test_address" ]; then + printf "test.example.net mismatch!\nexpected: %s\n got: %s\n" "$test_address" "$answer" >&2 + exit 1 +fi +answer2="$("${kdig}" +short -p "${port}" @"${ip}" -t A test2.example.net)" +if ! [ "$answer2" = "$test_address" ]; then + printf "test2.example.net mismatch!\nexpected: %s\n got: %s\n" "$test_address" "$answer2" >&2 + exit 1 +fi + +section "querying DNSSEC" +"${kdig}" -p "${port}" @"${ip}" -t DNSKEY example.net. +dnssec +if ! "${kdig}" -p "${port}" @"${ip}" -t DNSKEY example.net. +dnssec 2>&1 | grep -q "RRSIG[[:space:]]*DNSKEY"; then + printf "DNSSEC query not successful" >&2 + exit 1 +fi + +section "listing keys with keymgr" +"${keymgr}" "$knot_conf" -e example.net. list +if ! "${keymgr}" "$knot_conf" -e example.net. list 2>&1 | grep -q "ksk=yes"; then + printf "keymgr did not list KSK as expected" >&2 + exit 1 +fi diff --git a/distro/pkg/deb/tests/control b/distro/pkg/deb/tests/control new file mode 100644 index 0000000..e8b3dcb --- /dev/null +++ b/distro/pkg/deb/tests/control @@ -0,0 +1,13 @@ +Tests: kdig +Restrictions: skippable +Depends: + ca-certificates, + iputils-ping, + knot-dnsutils, + +Tests: authoritative-server +Depends: + findutils, + knot, + knot-dnsutils, + knot-dnssecutils, diff --git a/distro/pkg/deb/tests/kdig b/distro/pkg/deb/tests/kdig new file mode 100755 index 0000000..f1dbe5a --- /dev/null +++ b/distro/pkg/deb/tests/kdig @@ -0,0 +1,14 @@ +#!/bin/bash + +set -e + +# Skip the test if no internet access +ping -c1 1.1.1.1 2>&1 || exit 77 + +expected=198.41.0.4 +answer=$(kdig +short +tls-ca @1.1.1.1 -q a.root-servers.net. -t A 2>&1 || true) + +if [ "$answer" != "$expected" ]; then + printf "expected: %s\ngot: %s\n" "$expected" "$answer" >&2 + kdig -d +tls-ca @1.1.1.1 -q a.root-servers.net. -t A +fi diff --git a/distro/pkg/deb/ufw/knot b/distro/pkg/deb/ufw/knot new file mode 100644 index 0000000..ee36916 --- /dev/null +++ b/distro/pkg/deb/ufw/knot @@ -0,0 +1,4 @@ +[Knot] +title=Internet Domain Name Server +description=The Knot DNS implements an Internet domain name server. +ports=53 diff --git a/distro/pkg/deb/watch b/distro/pkg/deb/watch new file mode 100644 index 0000000..7cf9ea1 --- /dev/null +++ b/distro/pkg/deb/watch @@ -0,0 +1,4 @@ +version=4 +opts=uversionmangle=s/-((alpha|beta|rc)\d*)$/~$1/,pgpsigurlmangle=s/$/.asc/,dversionmangle=s/\+hotfix// \ +https://secure.nic.cz/files/knot-dns/ \ +(?:|.*/)knot(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) diff --git a/distro/pkg/el-7/01-disable-unconnected-net-test.patch b/distro/pkg/el-7/01-disable-unconnected-net-test.patch new file mode 100644 index 0000000..f2b5b11 --- /dev/null +++ b/distro/pkg/el-7/01-disable-unconnected-net-test.patch @@ -0,0 +1,26 @@ +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/distro/pkg/el-7/02-revert-AC_PROG_CC.patch b/distro/pkg/el-7/02-revert-AC_PROG_CC.patch new file mode 100644 index 0000000..fb49c00 --- /dev/null +++ b/distro/pkg/el-7/02-revert-AC_PROG_CC.patch @@ -0,0 +1,18 @@ +From: Daniel Salzman +Date: Sun, 20 Feb 2022 20:38:35 +0100 +Subject: [PATCH] Revert "configure: upgrade from AC_PROG_CC_C99 to AC_PROG_CC" + +diff --git a/configure.ac b/configure.ac +index 6506197ed..c7df7f815 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,7 +38,8 @@ release_date=$($SED -n 's/^Knot DNS .* (\(.*\))/\1/p;q;' ${srcdir}/NEWS) + AC_SUBST([RELEASE_DATE], $release_date) + + # Set compiler compatibility flags +-AC_PROG_CC ++AC_PROG_CC_C99 # AC_PROG_CC not supported by CentOS 7 ++AM_PROG_CC_C_O # Needed by CentOS 7 + AC_PROG_CPP_WERROR + + # Set default CFLAGS diff --git a/distro/pkg/el-7/knot.service b/distro/pkg/el-7/knot.service new file mode 100644 index 0000000..a872929 --- /dev/null +++ b/distro/pkg/el-7/knot.service @@ -0,0 +1,25 @@ +[Unit] +Description=Knot DNS server +Wants=network-online.target +After=network-online.target +Documentation=man:knotd(8) man:knot.conf(5) man:knotc(8) + +[Service] +Type=notify +User=knot +Group=knot +CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_SETPCAP +AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_SETPCAP +ExecStartPre=/usr/sbin/knotc conf-check +ExecStart=/usr/sbin/knotd -m "$KNOT_CONF_MAX_SIZE" +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort +LimitNOFILE=1048576 +TimeoutStopSec=300 +# Extend the systemd startup timeout by this value (seconds) for each zone +Environment="KNOT_ZONE_LOAD_TIMEOUT_SEC=180" +# Maximum size (MiB) of a configuration database +Environment="KNOT_CONF_MAX_SIZE=512" + +[Install] +WantedBy=multi-user.target diff --git a/distro/pkg/el-7/knot.spec b/distro/pkg/el-7/knot.spec new file mode 100644 index 0000000..b3953e2 --- /dev/null +++ b/distro/pkg/el-7/knot.spec @@ -0,0 +1,333 @@ +%global _hardened_build 1 +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} + +%define GPG_CHECK 0 +%define BASE_VERSION %(echo "%{version}" | sed 's/^\\([^.]\\+\\.[^.]\\+\\).*/\\1/') +%define repodir %{_builddir}/%{name}-%{version} + +Summary: High-performance authoritative DNS server +Name: knot +Version: {{ version }} +Release: cznic.{{ release }}%{?dist} +License: GPL-3.0-or-later +URL: https://www.knot-dns.cz +Source0: %{name}-%{version}.tar.xz + +%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 +# Don't forget to update %%prep section when adding/removing keys +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-disable-unconnected-net-test.patch +Patch2: 02-revert-AC_PROG_CC.patch + +# Required dependencies +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: devtoolset-11-make +BuildRequires: devtoolset-11-gcc +BuildRequires: pkgconfig(liburcu) +BuildRequires: pkgconfig(gnutls) >= 3.3 +BuildRequires: pkgconfig(libedit) + +# Optional dependencies +BuildRequires: pkgconfig(libcap-ng) +BuildRequires: pkgconfig(libidn2) +BuildRequires: pkgconfig(libmnl) +BuildRequires: pkgconfig(libnghttp2) +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 +%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 + +# disable XDP on old EL +%define configure_xdp --enable-xdp=no + +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 +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} +# 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} + +%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 +Provides: bundled(jquery) + +%description doc +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 +[ -d ${GNUPGHOME} ] && rm -r ${GNUPGHOME} +mkdir --mode=700 ${GNUPGHOME} +gpg2 --import %{SOURCE100} +gpg2 --verify %{SOURCE1} %{SOURCE0} +%endif +%autosetup -p1 + +%build +# disable debug code (causes unused warnings) +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 +%endif + +autoreconf -if + +export CC="/opt/rh/devtoolset-11/root/usr/bin/gcc" +%configure \ + --sysconfdir=/etc \ + --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=shared \ + --with-module-geoip=shared +make %{?_smp_mflags} +make html + +%install +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.md %{buildroot}%{_pkgdocdir} +cp -av doc/_build/html %{buildroot}%{_pkgdocdir} +[ -r %{buildroot}%{_pkgdocdir}/html/index.html ] || exit 1 +rm -f %{buildroot}%{_pkgdocdir}/html/.buildinfo + +# 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/pkg/el-7/%{name}.service %{buildroot}%{_unitdir}/%{name}.service +install -p -m 0644 -D %{repodir}/distro/pkg/el-7/%{name}.tmpfiles %{buildroot}%{_tmpfilesdir}/%{name}.conf +%if 0%{?suse_version} +ln -s service %{buildroot}/%{_sbindir}/rcknot +%endif + +# create storage dir +install -d %{buildroot}%{_sharedstatedir} +install -d -m 0770 -D %{buildroot}%{_sharedstatedir}/knot + +# remove libarchive files +find %{buildroot} -type f -name "*.la" -delete -print + +%check +V=1 make check + +%pre +getent group knot >/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 + +%post +systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || : +%if 0%{?suse_version} +%service_add_post knot.service +%else +%systemd_post knot.service +%endif + +%preun +%if 0%{?suse_version} +%service_del_preun knot.service +%else +%systemd_preun knot.service +%endif + +%postun +%if 0%{?suse_version} +%service_del_postun knot.service +%else +%systemd_postun_with_restart knot.service +%endif + +%if 0%{?fedora} || 0%{?rhel} > 7 +# https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets +%else +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig +%endif + +%files +%license COPYING +%doc %{_pkgdocdir} +%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 +%{_sbindir}/kcatalogprint +%{_sbindir}/kjournalprint +%{_sbindir}/keymgr +%{_sbindir}/knotc +%{_sbindir}/knotd +%if 0%{?suse_version} +%{_sbindir}/rcknot +%endif +%{_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 + +%files utils +%{_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.* + +%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 + +%files module-geoip +%{_libdir}/knot/modules-*/geoip.so + +%files libs +%license COPYING +%doc NEWS +%doc README.md +%{_libdir}/libdnssec.so.* +%{_libdir}/libknot.so.* +%{_libdir}/libzscanner.so.* + +%files devel +%{_includedir}/libdnssec +%{_includedir}/knot +%{_includedir}/libknot +%{_includedir}/libzscanner +%{_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 + +%files doc +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/html + +%changelog +* {{ now }} Jakub Ružička - {{ version }}-{{ release }} +- upstream package +- see https://www.knot-dns.cz diff --git a/distro/pkg/el-7/knot.tmpfiles b/distro/pkg/el-7/knot.tmpfiles new file mode 100644 index 0000000..edec729 --- /dev/null +++ b/distro/pkg/el-7/knot.tmpfiles @@ -0,0 +1,3 @@ +# tmpfiles.d(5) runtime directory for knot +#Type Path Mode UID GID Age Argument + d /run/knot 0755 knot knot - - diff --git a/distro/pkg/nix/default.nix b/distro/pkg/nix/default.nix new file mode 100644 index 0000000..35cc3e4 --- /dev/null +++ b/distro/pkg/nix/default.nix @@ -0,0 +1,69 @@ +{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring +, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl +, autoreconfHook, nixosTests, knot-resolver +}: + +stdenv.mkDerivation rec { + pname = "knot-dns"; + version = "{{ version }}"; + + src = fetchurl { + url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; + sha256 = "{{ src_hash }}"; + }; + + outputs = [ "bin" "out" "dev" ]; + + configureFlags = [ + "--with-configdir=/etc/knot" + "--with-rundir=/run/knot" + "--with-storage=/var/lib/knot" + ]; + + patches = [ + # Don't try to create directories like /var/lib/knot at build time. + # They are later created from NixOS itself. + ./dont-create-run-time-dirs.patch + ./runtime-deps.patch + ]; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ + gnutls liburcu libidn2 libunistring + nettle libedit + libiconv lmdb libintl + nghttp2 # DoH support in kdig + libmaxminddb # optional for geoip module (it's tiny) + # without sphinx &al. for developer documentation + # TODO: add dnstap support? + ] ++ lib.optionals stdenv.isLinux [ + libcap_ng systemd + libbpf libmnl # XDP support (it's Linux kernel API) + ] ++ lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls + + enableParallelBuilding = true; + + CFLAGS = [ "-O2" "-DNDEBUG" ]; + + doCheck = true; + checkFlags = "V=1"; # verbose output in case some test fails + doInstallCheck = true; + + postInstall = '' + rm -r "$out"/lib/*.la + ''; + + passthru.tests = { + inherit knot-resolver; + } // lib.optionalAttrs stdenv.isLinux { + inherit (nixosTests) knot; + }; + + meta = with lib; { + description = "Authoritative-only DNS server from .cz domain registry"; + homepage = "https://knot-dns.cz"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ maintainers.vcunat ]; + }; +} diff --git a/distro/pkg/nix/dont-create-run-time-dirs.patch b/distro/pkg/nix/dont-create-run-time-dirs.patch new file mode 100644 index 0000000..9fe165e --- /dev/null +++ b/distro/pkg/nix/dont-create-run-time-dirs.patch @@ -0,0 +1,32 @@ +diff --git a/samples/Makefile.am b/samples/Makefile.am +index c253c91..107401d 100644 +--- a/samples/Makefile.am ++++ b/samples/Makefile.am +@@ -19,11 +19,6 @@ EXTRA_DIST = knot.sample.conf.in example.com.zone + + if HAVE_DAEMON + +-install-data-local: knot.sample.conf +- if [ \! -f $(DESTDIR)/$(config_dir)/knot.sample.conf ]; then \ +- $(INSTALL) -d $(DESTDIR)/$(config_dir); \ +- $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(config_dir); \ +- fi + uninstall-local: + -rm -rf $(DESTDIR)/$(config_dir)/knot.sample.conf \ + $(DESTDIR)/$(config_dir)/example.com.zone +diff --git a/src/utils/Makefile.inc b/src/utils/Makefile.inc +index e6765d9..d859d23 100644 +--- a/src/utils/Makefile.inc ++++ b/src/utils/Makefile.inc +@@ -79,11 +79,6 @@ endif HAVE_DNSTAP + endif HAVE_UTILS + + if HAVE_DAEMON +-# Create storage and run-time directories +-install-data-hook: +- $(INSTALL) -d $(DESTDIR)/@config_dir@ +- $(INSTALL) -d $(DESTDIR)/@run_dir@ +- $(INSTALL) -d $(DESTDIR)/@storage_dir@ + + sbin_PROGRAMS = knotc knotd + diff --git a/distro/pkg/nix/runtime-deps.patch b/distro/pkg/nix/runtime-deps.patch new file mode 100644 index 0000000..19fc9cd --- /dev/null +++ b/distro/pkg/nix/runtime-deps.patch @@ -0,0 +1,14 @@ +Remove unnecessary runtime dependencies. + +`knotc status configure` shows summary from the configure script, +but that contains also references like include paths. +Filter these at least in a crude way (whole lines). +--- a/configure.ac ++++ b/configure.ac +@@ -766,5 +766,5 @@ result_msg_base=" Knot DNS $VERSION + +-result_msg_esc=$(echo -n "$result_msg_base" | sed '$!s/$/\\n/' | tr -d '\n') ++result_msg_esc=$(echo -n "$result_msg_base" | grep -Fv "$NIX_STORE" | sed '$!s/$/\\n/' | tr -d '\n') + + AC_DEFINE_UNQUOTED([CONFIGURE_SUMMARY],["$result_msg_esc"],[Configure summary]) + diff --git a/distro/pkg/nix/top-level.nix b/distro/pkg/nix/top-level.nix new file mode 100644 index 0000000..303923c --- /dev/null +++ b/distro/pkg/nix/top-level.nix @@ -0,0 +1,8 @@ + +with import {}; + +(callPackage ./. { +}).overrideAttrs (attrs: { + src = ./knot-{{ version }}.tar.xz; +}) + diff --git a/distro/pkg/rpm/01-test_net-disable-udp-send-on-unconnected.patch b/distro/pkg/rpm/01-test_net-disable-udp-send-on-unconnected.patch new file mode 100644 index 0000000..f2b5b11 --- /dev/null +++ b/distro/pkg/rpm/01-test_net-disable-udp-send-on-unconnected.patch @@ -0,0 +1,26 @@ +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/distro/pkg/rpm/knot.spec b/distro/pkg/rpm/knot.spec new file mode 100644 index 0000000..c245945 --- /dev/null +++ b/distro/pkg/rpm/knot.spec @@ -0,0 +1,328 @@ +%global _hardened_build 1 +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} + +%define GPG_CHECK 0 +%define BASE_VERSION %(echo "%{version}" | sed 's/^\\([^.]\\+\\.[^.]\\+\\).*/\\1/') +%define repodir %{_builddir}/%{name}-%{version} + +Summary: High-performance authoritative DNS server +Name: knot +Version: {{ version }} +Release: cznic.{{ release }}%{?dist} +License: GPL-3.0-or-later +URL: https://www.knot-dns.cz +Source0: %{name}-%{version}.tar.xz + +%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 +# Don't forget to update %%prep section when adding/removing keys +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 +BuildRequires: libtool +BuildRequires: make +BuildRequires: gcc +BuildRequires: pkgconfig(liburcu) +BuildRequires: pkgconfig(gnutls) >= 3.3 +BuildRequires: pkgconfig(libedit) + +# Optional dependencies +BuildRequires: pkgconfig(libcap-ng) +BuildRequires: pkgconfig(libidn2) +BuildRequires: pkgconfig(libmnl) +BuildRequires: pkgconfig(libnghttp2) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(systemd) +# dnstap dependencies +BuildRequires: pkgconfig(libfstrm) +BuildRequires: pkgconfig(libprotobuf-c) +# geoip dependencies +BuildRequires: pkgconfig(libmaxminddb) +# XDP dependencies +BuildRequires: pkgconfig(libbpf) + +# Distro-dependent dependencies +%if 0%{?suse_version} +BuildRequires: python3-Sphinx +BuildRequires: lmdb-devel +BuildRequires: protobuf-c +Requires(pre): pwdutils +%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 +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 +# 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 +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} +# 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} + +%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 +Provides: bundled(jquery) + +%description doc +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 +[ -d ${GNUPGHOME} ] && rm -r ${GNUPGHOME} +mkdir --mode=700 ${GNUPGHOME} +gpg2 --import %{SOURCE100} +gpg2 --verify %{SOURCE1} %{SOURCE0} +%endif +%autosetup -p1 + +%build +# disable debug code (causes unused warnings) +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 +%endif + +%configure \ + --sysconfdir=/etc \ + --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_quic} \ + --disable-static \ + --enable-dnstap=yes \ + --with-module-dnstap=shared \ + --with-module-geoip=shared +make %{?_smp_mflags} +make html + +%install +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.md %{buildroot}%{_pkgdocdir} +cp -av doc/_build/html %{buildroot}%{_pkgdocdir} +[ -r %{buildroot}%{_pkgdocdir}/html/index.html ] || exit 1 +rm -f %{buildroot}%{_pkgdocdir}/html/.buildinfo + +# 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 +%if 0%{?suse_version} +ln -s service %{buildroot}/%{_sbindir}/rcknot +%endif + +# create storage dir +install -d %{buildroot}%{_sharedstatedir} +install -d -m 0770 -D %{buildroot}%{_sharedstatedir}/knot + +# remove libarchive files +find %{buildroot} -type f -name "*.la" -delete -print + +%check +V=1 make check + +%pre +getent group knot >/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 + +%post +%if 0%{?suse_version} +%service_add_post knot.service +%else +%systemd_post knot.service +%endif + +%preun +%if 0%{?suse_version} +%service_del_preun knot.service +%else +%systemd_preun knot.service +%endif + +%postun +%if 0%{?suse_version} +%service_del_postun knot.service +%else +%systemd_postun_with_restart knot.service +%endif + +%if 0%{?fedora} || 0%{?rhel} > 7 +# https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets +%else +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig +%endif + +%files +%license COPYING +%doc %{_pkgdocdir} +%exclude %{_pkgdocdir}/html +%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 +%endif +%attr(770,root,knot) %dir %{_sharedstatedir}/knot +%dir %{_libdir}/knot +%dir %{_libdir}/knot/modules-* +%{_unitdir}/knot.service +%{_sbindir}/kcatalogprint +%{_sbindir}/kjournalprint +%{_sbindir}/keymgr +%{_sbindir}/knotc +%{_sbindir}/knotd +%if 0%{?suse_version} +%{_sbindir}/rcknot +%endif +%{_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 + +%files utils +%{_bindir}/kdig +%{_bindir}/khost +%{_bindir}/knsupdate +%{_sbindir}/kxdpgun +%{_mandir}/man8/kxdpgun.* +%{_mandir}/man1/kdig.* +%{_mandir}/man1/khost.* +%{_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 + +%files module-geoip +%{_libdir}/knot/modules-*/geoip.so + +%files libs +%license COPYING +%doc NEWS +%doc README.md +%{_libdir}/libdnssec.so.* +%{_libdir}/libknot.so.* +%{_libdir}/libzscanner.so.* + +%files devel +%{_includedir}/libdnssec +%{_includedir}/knot +%{_includedir}/libknot +%{_includedir}/libzscanner +%{_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 + +%files doc +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/html + +%changelog +* {{ now }} Knot DNS - {{ version }}-{{ release }} +- upstream package +- see https://www.knot-dns.cz -- cgit v1.2.3