.gitignore

@@ -81,6 +81,9 @@ src/libknot/libknot.h
 # Generated tarballs
 /knot-*.tar.xz
 
+# Packaging output
+/pkg
+
 # Code coverage
 *.gcda
 *.gcno

.gitlab-ci.yml

@@ -128,8 +128,9 @@ docker:knot-dns:fedora:
 .pkg_symbols: &pkg_symbols
   stage: test
   script:
-    - ln -s distro/deb debian
-    - sed -i "s/__VERSION__/99/g" distro/deb/changelog
+    - ln -s distro/pkg/deb debian
+    - sed -i "s/{{ version }}/99/g" distro/pkg/deb/changelog
+    - sed -i "s/{{ release }}/1/g" distro/pkg/deb/changelog
     - dpkg-gensymbols -c4 -esrc/.libs/$LIB_NAME.so.$LIB_ABI -P. -p$LIB_NAME$LIB_ABI
   allow_failure: true
   except:

Knot.files

@@ -118,6 +118,8 @@ src/knot/common/process.c
 src/knot/common/process.h
 src/knot/common/stats.c
 src/knot/common/stats.h
+src/knot/common/systemd.c
+src/knot/common/systemd.h
 src/knot/conf/base.c
 src/knot/conf/base.h
 src/knot/conf/conf.c
@@ -211,6 +213,7 @@ src/knot/modules/noudp/noudp.c
 src/knot/modules/onlinesign/nsec_next.c
 src/knot/modules/onlinesign/nsec_next.h
 src/knot/modules/onlinesign/onlinesign.c
+src/knot/modules/probe/probe.c
 src/knot/modules/queryacl/queryacl.c
 src/knot/modules/rrl/functions.c
 src/knot/modules/rrl/functions.h
@@ -278,6 +281,8 @@ src/knot/zone/backup.c
 src/knot/zone/backup.h
 src/knot/zone/contents.c
 src/knot/zone/contents.h
+src/knot/zone/digest.c
+src/knot/zone/digest.h
 src/knot/zone/measure.c
 src/knot/zone/measure.h
 src/knot/zone/node.c
@@ -308,6 +313,8 @@ src/libdnssec/binary.c
 src/libdnssec/binary.h
 src/libdnssec/crypto.c
 src/libdnssec/crypto.h
+src/libdnssec/digest.c
+src/libdnssec/digest.h
 src/libdnssec/dnssec.h
 src/libdnssec/error.c
 src/libdnssec/error.h
@@ -387,6 +394,10 @@ src/libknot/packet/pkt.h
 src/libknot/packet/rrset-wire.c
 src/libknot/packet/rrset-wire.h
 src/libknot/packet/wire.h
+src/libknot/probe/data.c
+src/libknot/probe/data.h
+src/libknot/probe/probe.c
+src/libknot/probe/probe.h
 src/libknot/rdata.h
 src/libknot/rdataset.c
 src/libknot/rdataset.h
@@ -408,6 +419,7 @@ src/libknot/rrtype/rrsig.h
 src/libknot/rrtype/soa.h
 src/libknot/rrtype/tsig.c
 src/libknot/rrtype/tsig.h
+src/libknot/rrtype/zonemd.h
 src/libknot/tsig-op.c
 src/libknot/tsig-op.h
 src/libknot/tsig.c
@@ -529,6 +541,7 @@ tests/contrib/test_qp-cow.c
 tests/contrib/test_qp-trie.c
 tests/contrib/test_siphash.c
 tests/contrib/test_sockaddr.c
+tests/contrib/test_spinlock.c
 tests/contrib/test_string.c
 tests/contrib/test_strtonum.c
 tests/contrib/test_time.c
@@ -540,6 +553,7 @@ tests/knot/test_conf.h
 tests/knot/test_conf_tools.c
 tests/knot/test_confdb.c
 tests/knot/test_confio.c
+tests/knot/test_digest.c
 tests/knot/test_dthreads.c
 tests/knot/test_fdset.c
 tests/knot/test_journal.c
@@ -586,6 +600,7 @@ tests/libknot/test_edns_ecs.c
 tests/libknot/test_endian.c
 tests/libknot/test_lookup.c
 tests/libknot/test_pkt.c
+tests/libknot/test_probe.c
 tests/libknot/test_rdata.c
 tests/libknot/test_rdataset.c
 tests/libknot/test_rrset-wire.c

Knot.includes

@@ -6,3 +6,6 @@ src/libzscanner
 tests
 tests-fuzz
 tests-fuzz/knotd_wrap
+src/knot/zone
+src/libknot/rrtype
+tests/knot

configure.ac

@@ -199,21 +199,20 @@ AC_ARG_ENABLE([xdp],
    [], [enable_xdp=auto])
 
 AS_CASE([$enable_xdp],
-   [auto],[PKG_CHECK_MODULES([libbpf],[libbpf >= 0.0.6],[enable_xdp=yes],[enable_xdp=no])],
-   [yes],[PKG_CHECK_MODULES([libelf],[libelf],[
-     AC_CHECK_FUNC([reallocarray],[
-       enable_xdp=embedded
-       embedded_libbpf_CFLAGS="-I\$(top_srcdir)/src/contrib/libbpf/include -I\$(top_srcdir)/src/contrib/libbpf/include/uapi"
-       embedded_libbpf_LIBS=$libelf_LIBS
-       libbpf_CFLAGS="-I\$(top_srcdir)/src/contrib/libbpf -I\$(top_srcdir)/src/contrib/libbpf/include/uapi"
-     ],[
-       enable_xdp=no
-       AC_MSG_WARN([reallocarray not available])
-     ])
-   ],[AC_MSG_ERROR([libelf is required])])],
-   [no],[],
-   [*],[AC_MSG_ERROR([Invalid value of --enable-xdp.]
- )])
+   [auto], [PKG_CHECK_MODULES([libbpf], [libbpf >= 0.0.6], [enable_xdp=yes], [enable_xdp=no])],
+   [yes], [PKG_CHECK_MODULES([libbpf], [libbpf >= 0.0.6], [enable_xdp=yes],
+             [PKG_CHECK_MODULES([libelf], [libelf],
+                [AC_CHECK_FUNC([reallocarray],
+                   [enable_xdp=embedded
+                    embedded_libbpf_CFLAGS="-I\$(top_srcdir)/src/contrib/libbpf/include -I\$(top_srcdir)/src/contrib/libbpf/include/uapi"
+                    embedded_libbpf_LIBS=$libelf_LIBS
+                    libbpf_CFLAGS="-I\$(top_srcdir)/src/contrib/libbpf -I\$(top_srcdir)/src/contrib/libbpf/include/uapi"],
+                   [enable_xdp=no
+                    AC_MSG_WARN([reallocarray not available])])],
+                [AC_MSG_ERROR([libelf is required])])])],
+   [no], [],
+   [*], [AC_MSG_ERROR([Invalid value of --enable-xdp.])]
+)
 AM_CONDITIONAL([EMBEDDED_LIBBPF], [test "$enable_xdp" = "embedded"])
 AM_CONDITIONAL([ENABLE_XDP], [test "$enable_xdp" != "no"])
 AC_SUBST([embedded_libbpf_CFLAGS])
@@ -393,6 +392,7 @@ KNOT_MODULE([dnstap],      "no")
 KNOT_MODULE([geoip],       "yes")
 KNOT_MODULE([noudp],       "yes")
 KNOT_MODULE([onlinesign],  "yes", "non-shareable")
+KNOT_MODULE([probe],       "yes")
 KNOT_MODULE([queryacl],    "yes")
 KNOT_MODULE([rrl],         "yes")
 KNOT_MODULE([stats],       "yes")

distro/Makefile.am

 EXTRA_DIST =	\
-	arch	\
 	common	\
-	deb	\
-	rpm	\
+	pkg	\
 	tests

distro/common/knot.service

@@ -12,9 +12,11 @@ CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_SETPCAP
 AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_SETPCAP
 ExecStartPre=/usr/sbin/knotc conf-check
 ExecStart=/usr/sbin/knotd
-ExecReload=/usr/sbin/knotc reload
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 LimitNOFILE=1048576
+TimeoutStopSec=300
+Environment="ZONE_LOAD_TIMEOUT_SEC=180"
 
 [Install]
 WantedBy=multi-user.target

distro/config/apkg.toml

+[project]
+name = "knot-dns"
+# needed for make-archive
+make_archive_script = "scripts/make-dev-archive.sh"
+
+[upstream]
+# needed for get-archive
+archive_url = "https://secure.nic.cz/files/knot-dns/knot-{{ version }}.tar.xz"
+signature_url = "https://secure.nic.cz/files/knot-dns/knot-{{ version }}.tar.xz.asc"
+
+[apkg]
+compat = 1

distro/deb/knot.service

-../common/knot.service
\ No newline at end of file

distro/deb/knot.tmpfile

-../common/knot.tmpfiles
\ No newline at end of file

distro/arch/PKGBUILD → distro/pkg/arch/PKGBUILD

@@ -6,7 +6,7 @@
 # Contributor: Otto Sabart <seberm[at]gmail[dot]com>
 
 pkgname=knot
-pkgver=__VERSION__
+pkgver={{ version }}
 pkgrel=1
 pkgdesc="High-performance authoritative-only DNS server"
 arch=('x86_64')
@@ -23,7 +23,7 @@ depends=('fstrm'
          'protobuf-c'
          'systemd')
 backup=('etc/knot/knot.conf')
-source=("${pkgname}_${pkgver}.orig.tar.xz")
+source=("${pkgname}-${pkgver}.tar.xz")
 sha256sums=('SKIP')
 validpgpkeys=('742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB') # Daniel Salzman <daniel.salzman@nic.cz>
 
@@ -65,6 +65,6 @@ package() {
     mv "${pkgdir}"/etc/knot/{knot.sample.conf,knot.conf}
 
     install -Dm644 distro/common/${pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
-    install -Dm644 distro/arch/${pkgname}.tmpfiles.arch "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
-    install -Dm644 distro/arch/${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
+    install -Dm644 distro/pkg/arch/${pkgname}.tmpfiles.arch "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
+    install -Dm644 distro/pkg/arch/${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
 }

distro/deb/changelog → distro/pkg/deb/changelog

-knot (__VERSION__-cznic.1) unstable; urgency=medium
+knot ({{ version }}-cznic.{{ release }}) unstable; urgency=medium
 
   * move changelog to OBS
   * see NEWS or https://knot-dns.cz

distro/deb/control → distro/pkg/deb/control

@@ -9,6 +9,8 @@ Build-Depends-Indep:
  python3-setuptools,
  python3-sphinx,
 Build-Depends:
+ autoconf,
+ automake,
  debhelper (>= 9),
  dh-python,
  libcap-ng-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
@@ -25,6 +27,7 @@ Build-Depends:
  libsofthsm2 <!nocheck>,
  libsystemd-dev [linux-any] | libsystemd-daemon-dev [linux-any],
  libsystemd-dev [linux-any] | libsystemd-journal-dev [linux-any],
+ libtool,
  liburcu-dev (>= 0.4),
  pkg-config,
  protobuf-c-compiler,