dnsdist: Move files (test)

.github/actions/spell-check/expect.txt

@@ -388,6 +388,7 @@ Ekkelenkamp
 elgoog
 endbr
 Enden
+enp
 ent
 envoutput
 epel
@@ -449,6 +450,7 @@ gaba
 gacogne
 gatech
 Gavarret
+Gbps
 gdpr
 Geijn
 genindex
@@ -477,6 +479,7 @@ gettime
 gettsigkey
 Geuze
 GFm
+Ghz
 Gibheer
 Gieben
 Gillstrom
@@ -648,6 +651,7 @@ ktls
 KTNAME
 Kuehrer
 kvs
+kxdpgun
 Ladot
 Lafon
 Lakkas
@@ -701,6 +705,7 @@ libsodium
 libsofthsm
 libsystemd
 libtdsodbc
+libxdp
 libyaml
 libzmq
 lightningstream
@@ -861,6 +866,7 @@ NETWORKMASK
 Neue
 Neuf
 newcontent
+nftables
 nic
 Nilsen
 nimber
@@ -1183,6 +1189,7 @@ Schueler
 schwer
 scopebits
 scopemask
+sdfn
 sdfoijdfio
 sdig
 secpoll
@@ -1409,6 +1416,7 @@ Ueber
 Ueli
 UIDs
 Uisms
+UMEM
 unauth
 unbreak
 unescaping
@@ -1513,6 +1521,8 @@ Xiang
 xorbooter
 xpf
 XRecord
+xsk
+xskmap
 XXXXXX
 yahttp
 yamlconversion

.github/workflows/codeql-analysis.yml

@@ -147,7 +147,7 @@ jobs:
     - name: Install dependencies for dnsdist
       if: matrix.product == 'dnsdist'
       run: |
-        inv install-dnsdist-build-deps
+        inv install-dnsdist-build-deps --skipXDP
     - name: Autoreconf dnsdist
       if: matrix.product == 'dnsdist'
       working-directory: ./pdns/dnsdistdist/

.github/workflows/misc-dailies.yml

@@ -81,7 +81,7 @@ jobs:
           submodules: recursive
       - run: build-scripts/gh-actions-setup-inv-no-dist-upgrade
       - run: inv install-clang
-      - run: inv install-dnsdist-build-deps
+      - run: inv install-dnsdist-build-deps --skipXDP
       - run: inv install-coverity-tools dnsdist
       - run: inv coverity-clang-configure
       - run: inv ci-autoconf

.not-formatted

@@ -36,31 +36,6 @@
 ./pdns/dnscrypt.cc
 ./pdns/dnscrypt.hh
 ./pdns/dnsdemog.cc
-./pdns/dnsdist-cache.cc
-./pdns/dnsdist-cache.hh
-./pdns/dnsdist-console.cc
-./pdns/dnsdist-console.hh
-./pdns/dnsdist-dynbpf.cc
-./pdns/dnsdist-dynbpf.hh
-./pdns/dnsdist-ecs.cc
-./pdns/dnsdist-ecs.hh
-./pdns/dnsdist-lbpolicies.hh
-./pdns/dnsdist-lua-bindings-dnsquestion.cc
-./pdns/dnsdist-lua-bindings.cc
-./pdns/dnsdist-lua-inspection.cc
-./pdns/dnsdist-lua-rules.cc
-./pdns/dnsdist-lua-vars.cc
-./pdns/dnsdist-lua.hh
-./pdns/dnsdist-rings.cc
-./pdns/dnsdist-rings.hh
-./pdns/dnsdist-snmp.cc
-./pdns/dnsdist-snmp.hh
-./pdns/dnsdist-tcp.cc
-./pdns/dnsdist-web.cc
-./pdns/dnsdist-xpf.cc
-./pdns/dnsdist-xpf.hh
-./pdns/dnsdist.cc
-./pdns/dnsdist.hh
 ./pdns/dnsdistdist/connection-management.hh
 ./pdns/dnsdistdist/dnsdist-backend.cc
 ./pdns/dnsdistdist/dnsdist-kvs.cc
@@ -232,8 +207,6 @@
 ./pdns/test-common.hh
 ./pdns/test-distributor_hh.cc
 ./pdns/test-dnscrypt_cc.cc
-./pdns/test-dnsdist_cc.cc
-./pdns/test-dnsdistpacketcache_cc.cc
 ./pdns/test-dnsname_cc.cc
 ./pdns/test-dnsparser_cc.cc
 ./pdns/test-dnsparser_hh.cc

Dockerfile-dnsdist

@@ -1,5 +1,5 @@
 # our chosen base image
-FROM debian:11-slim AS builder
+FROM debian:12-slim AS builder
 
 ENV NO_LUA_JIT="s390x arm64"
 
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y  --no-instal
 COPY builder-support /source/builder-support
 
 # TODO: control file is not in tarballs at all right now
-RUN mk-build-deps -i -t 'apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends' /source/builder-support/debian/dnsdist/debian-buster/control && \
+RUN mk-build-deps -i -t 'apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends' /source/builder-support/debian/dnsdist/debian-bookworm/control && \
     apt-get clean
 
 COPY pdns /source/pdns
@@ -84,7 +84,7 @@ RUN cd /tmp && mkdir /build/tmp/ && mkdir debian && \
 
 # Runtime
 
-FROM debian:11-slim
+FROM debian:12-slim
 
 # Reusable layer for base update - Should be cached from builder
 RUN apt-get update && apt-get -y dist-upgrade && apt-get clean

builder-support/debian/dnsdist/debian-bookworm/compat

@@ -0,0 +1 @@
+10

builder-support/debian/dnsdist/debian-bookworm/control

@@ -0,0 +1,39 @@
+Source: dnsdist
+Section: net
+Priority: optional
+Maintainer: PowerDNS.COM BV <[email protected]>
+Uploaders: PowerDNS.COM BV <[email protected]>
+Build-Depends: debhelper (>= 10),
+               libboost-all-dev,
+               libbpf-dev [linux-any],
+               libcap-dev,
+               libcdb-dev,
+               libedit-dev,
+               libfstrm-dev,
+               libgnutls28-dev,
+               liblmdb-dev,
+               libluajit-5.1-dev [!arm64 !s390x],
+               liblua5.3-dev [arm64 s390x],
+               libnghttp2-dev,
+               libre2-dev,
+               libsnmp-dev,
+               libsodium-dev,
+               libssl-dev,
+               libsystemd-dev [linux-any],
+               libwslay-dev,
+               libxdp-dev [linux-any],
+               pkg-config,
+               ragel,
+               systemd [linux-any]
+Standards-Version: 4.1.5
+Homepage: https://dnsdist.org
+
+Package: dnsdist
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: DNS loadbalancer
+ Highly DoS- and abuse-aware load balancing tool for DNS traffic,
+ with Lua scripting and configuration capability.
+ Can be configured to use various sets of rules to classify, route
+ and reject traffic.