Merging debian version 3.4.0-3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 48 insertions, 49 deletions

diff --git a/debian/changelog b/debian/changelog
index b8f8359..65a74e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+knot (3.4.0-3) unstable; urgency=medium
+
+  [ Daniel Salzman ]
+  * Fix maint mode (disabled fast parser)
+  * Enable extra modules and features only for well supported architectures
+  * Tiny rules cleanup
+  * Remove timeout for tests on well supported architectures
+  * Remove ufw configuration
+  * Add missing dependency for test libdnssec/test_keystore_pkcs11
+
+  [ Jakub Ružička ]
+  * Remove unwanted /usr/sbin/knot-exporter dir (Closes: #1081191)
+
+ -- Jakub Ružička <jru@debian.org>  Mon, 09 Sep 2024 10:49:08 +0200
+
 knot (3.4.0-2~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 96d6c8e..04160ef 100644
--- a/debian/control
+++ b/debian/control
@@ -17,31 +17,31 @@ Build-Depends:
  debhelper-compat (= 13),
  dh-python,
  dpkg-dev (>= 1.22.5),
- libbpf-dev [!hurd-amd64 !hurd-i386 !alpha !arc !hppa !ia64 !loong64 !m68k !powerpc !sh4 !sparc64 !x32],
+ libbpf-dev [amd64 arm64 armhf i386 mips64el ppc64el riscv64 s390x ppc64],
  libcap-ng-dev [!hurd-amd64 !hurd-i386],
  libedit-dev,
- libfstrm-dev [!hurd-amd64 !hurd-i386],
+ libfstrm-dev [amd64 arm64 armhf i386 mips64el ppc64el riscv64 s390x ppc64],
  libgnutls28-dev,
  libidn2-dev,
  liblmdb-dev,
- libmaxminddb-dev [!hurd-amd64 !hurd-i386],
- libmnl-dev [!hurd-amd64 !hurd-i386 !alpha !arc !hppa !ia64 !loong64 !m68k !powerpc !sh4 !sparc64 !x32],
+ libmaxminddb-dev [amd64 arm64 armhf i386 mips64el ppc64el riscv64 s390x ppc64],
+ libmnl-dev [amd64 arm64 armhf i386 mips64el ppc64el riscv64 s390x ppc64],
  libnghttp2-dev,
- libngtcp2-crypto-gnutls-dev [!hurd-amd64 !hurd-i386 !alpha !arc !hppa !ia64 !loong64 !m68k !powerpc !sh4 !sparc64 !x32],
- libngtcp2-dev [!hurd-amd64 !hurd-i386 !alpha !arc !hppa !ia64 !loong64 !m68k !powerpc !sh4 !sparc64 !x32],
- libprotobuf-c-dev,
- libsofthsm2 <!nocheck>,
+ libngtcp2-crypto-gnutls-dev [amd64 arm64 armhf i386 mips64el ppc64el riscv64 s390x ppc64],
+ libngtcp2-dev [amd64 arm64 armhf i386 mips64el ppc64el riscv64 s390x ppc64],
+ libprotobuf-c-dev [amd64 arm64 armhf i386 mips64el ppc64el riscv64 s390x ppc64],
  libsystemd-dev [linux-any] | libsystemd-daemon-dev [linux-any],
  libsystemd-dev [linux-any] | libsystemd-journal-dev [linux-any],
  libtool,
  liburcu-dev,
- libxdp-dev [!hurd-amd64 !hurd-i386 !alpha !arc !hppa !ia64 !loong64 !m68k !powerpc !sh4 !sparc64 !x32],
+ libxdp-dev [amd64 arm64 armhf i386 mips64el ppc64el riscv64 s390x ppc64],
  pkgconf,
- protobuf-c-compiler,
+ protobuf-c-compiler [amd64 arm64 armhf i386 mips64el ppc64el riscv64 s390x ppc64],
  python3-all,
  python3-setuptools,
  python3-sphinx,
  python3-sphinx-panels,
+ softhsm2 <!nocheck>,
 Standards-Version: 4.7.0
 Homepage: https://www.knot-dns.cz/
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/knot
@@ -226,7 +226,7 @@ Description: Version of 'host' bundled with Knot DNS
  compatible with BIND 9.x 'host' program.
 
 Package: knot-module-dnstap
-Architecture: any
+Architecture: amd64 arm64 armhf i386 mips64el ppc64el riscv64 s390x ppc64
 Depends:
  knot (= ${binary:Version}),
  ${misc:Depends},
@@ -242,7 +242,7 @@ Description: dnstap module for Knot DNS
  This package contains dnstap module for logging DNS traffic.
 
 Package: knot-module-geoip
-Architecture: any
+Architecture: amd64 arm64 armhf i386 mips64el ppc64el riscv64 s390x ppc64
 Depends:
  knot (= ${binary:Version}),
  ${misc:Depends},
diff --git a/debian/knot-exporter.install b/debian/knot-exporter.install
index 4c2d5ed..9b2bf4f 100644
--- a/debian/knot-exporter.install
+++ b/debian/knot-exporter.install
@@ -1,3 +1,3 @@
 usr/lib/python3*/dist-packages/knot_exporter-*.egg-info
 usr/lib/python3*/dist-packages/knot_exporter/*.py
-usr/bin/knot-exporter /usr/sbin/knot-exporter
+usr/bin/knot-exporter /usr/sbin/
diff --git a/debian/knot.install b/debian/knot.install
index 5c716fc..a31224f 100644
--- a/debian/knot.install
+++ b/debian/knot.install
@@ -1,5 +1,4 @@
 debian/cz.nic.knotd.conf usr/share/dbus-1/system.d/
-debian/ufw/knot etc/ufw/applications.d/
 etc/knot/knot.conf
 usr/sbin/kcatalogprint
 usr/sbin/keymgr
diff --git a/debian/libknot15.symbols.arc b/debian/libknot15.symbols.armel
index b4a28cc..b4a28cc 120000
--- a/debian/libknot15.symbols.arc
+++ b/debian/libknot15.symbols.armel
diff --git a/debian/libknot15.symbols.ia64 b/debian/libknot15.symbols.ia64
deleted file mode 120000
index b4a28cc..0000000
--- a/debian/libknot15.symbols.ia64
+++ /dev/null
@@ -1 +0,0 @@
-libknot15.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 5bf8ad7..4bc13c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,42 +1,37 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_CFLAGS_MAINT_APPEND  = -Wall -DNDEBUG
+export DEB_CFLAGS_MAINT_APPEND = -Wall -DNDEBUG
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL := 4
 export KNOT_SOFTHSM2_DSO = /usr/lib/softhsm/libsofthsm2.so
 export KNOT_VERSION_FORMAT = release
-
-ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),armel))
-  export DEB_LDFLAGS_MAINT_APPEND += -latomic
-endif
+export KNOT_FULL_ARCHS = amd64 arm64 armhf i386 mips64el ppc64el riscv64 s390x ppc64
 
 include /usr/share/dpkg/default.mk
 
-ifeq (maint,$(filter $(DEB_BUILD_OPTIONS),maint))
-  FASTPARSER := --disable-fastparser
-else
+# Enable extra modules and features only for well supported architectures
+ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(KNOT_FULL_ARCHS)))
   FASTPARSER := --enable-fastparser
-endif
-
-ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),amd64 i386))
-  RUN_TEST :=
+  RECVMMSG   := --enable-recvmmsg=yes
+  QUIC       := --enable-quic=auto
+  RRL        := --with-module-rrl=yes
+  GEOIP      := --with-module-geoip=shared
+  DNSTAP     := --enable-dnstap --with-module-dnstap=shared
+  RUN_TEST   :=
 else
-  RUN_TEST := -timeout --kill-after=5s 5m
-endif
-
-ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),hurd-amd64 hurd-i386 sh4))
   FASTPARSER := --disable-fastparser
   RECVMMSG   := --enable-recvmmsg=no
+  QUIC       := --enable-quic=no
   RRL        := --with-module-rrl=no
   GEOIP      := --with-modle-geoip=no
   DNSTAP     := --disable-dnstap --with-module-dnstap=no
-else
-  FASTPARSER := --enable-fastparser
-  RECVMMSG   := --enable-recvmmsg=yes
-  RRL        := --with-module-rrl=yes
-  GEOIP      := --with-module-geoip=shared
-  DNSTAP     := --enable-dnstap --with-module-dnstap=shared
+  RUN_TEST   := -timeout --kill-after=5s 5m
+endif
+
+# Disable fastparser if requested
+ifeq (maint,$(filter $(DEB_BUILD_OPTIONS),maint))
+  FASTPARSER := --disable-fastparser
 endif
 
 # MAJOR.MINOR version part
@@ -46,18 +41,13 @@ BASE_VERSION := $(shell echo $(DEB_VERSION) | sed 's/^\([^.]\+\.[^.]\+\).*/\1/')
 # invocation due to bug in dh-python's plugin_pyproject.py wheel unpack
 export PYBUILD_SYSTEM = distutils
 
-
 %:
 	dh $@ \
 	 --exclude=.la --exclude=example.com.zone \
 	 --with python3
 
 override_dh_auto_configure:
-	echo confirming architecture...
-	echo 'arch:' $(DEB_HOST_ARCH)
-	echo 'filtered arch:' $(filter $(DEB_HOST_ARCH),mips powerpc riscv64)
-	echo 'DEB_LDFLAGS_MAINT_APPEND:' $(DEB_LDFLAGS_MAINT_APPEND)
-	echo done
+	@echo 'architecture:' $(DEB_HOST_ARCH)
 	dh_auto_configure -- \
 	  --sysconfdir=/etc \
 	  --localstatedir=/var/lib \
@@ -66,13 +56,13 @@ override_dh_auto_configure:
 	  --with-moduledir=/usr/lib/$(DEB_HOST_MULTIARCH)/knot/modules-$(BASE_VERSION) \
 	  --with-storage=/var/lib/knot \
 	  --enable-systemd=auto \
+	  --disable-silent-rules \
 	  $(RRL) \
 	  $(GEOIP) \
 	  $(DNSTAP) \
 	  $(RECVMMSG) \
 	  $(FASTPARSER) \
-	  --disable-silent-rules \
-	  --enable-quic
+	  $(QUIC)
 
 override_dh_auto_configure-indep:
 	pybuild --dir python/libknot --configure
diff --git a/debian/ufw/knot b/debian/ufw/knot
deleted file mode 100644
index ee36916..0000000
--- a/debian/ufw/knot
+++ /dev/null
@@ -1,4 +0,0 @@
-[Knot]
-title=Internet Domain Name Server
-description=The Knot DNS implements an Internet domain name server.
-ports=53