Skip to content

[pull] master from PowerDNS:master #828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 7 commits into from
May 29, 2026
Merged

[pull] master from PowerDNS:master #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a172517
dnsdist debian deps: replace boost-all with more specific list
Habbie Mar 16, 2026
b7f0623
add ubuntu-resolute build target
Habbie Mar 16, 2026
297bae1
bump meson to 1.11.1
Habbie May 29, 2026
17aabab
bump alpine version for sdist stage to 3.23
Habbie May 29, 2026
84b9d90
Merge pull request #17481 from Habbie/meson-1.11.1
Habbie May 29, 2026
d39f97c
Merge pull request #17482 from Habbie/alpine-3.23
Habbie May 29, 2026
556f4b3
Merge pull request #16986 from Habbie/ubuntu-resolute
Habbie May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion builder-support/debian/dnsdist/debian-bookworm/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ Maintainer: PowerDNS.COM BV <powerdns.support.sales@powerdns.com>
Uploaders: PowerDNS.COM BV <powerdns.support.sales@powerdns.com>
Build-Depends: debhelper (>= 10),
clang,
libboost-all-dev,
libboost-dev,
libboost-container-dev,
libboost-test-dev,
libbpf-dev [linux-any],
libcap-dev,
libcdb-dev,
Expand Down
2 changes: 1 addition & 1 deletion builder-support/dockerfiles/Dockerfile.authoritative
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.21 AS pdns-authoritative
FROM alpine:3.23 AS pdns-authoritative
ARG BUILDER_CACHE_BUSTER=

RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
Expand Down
2 changes: 1 addition & 1 deletion builder-support/dockerfiles/Dockerfile.dnsdist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.21 AS dnsdist
FROM alpine:3.23 AS dnsdist
ARG BUILDER_CACHE_BUSTER=

RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
Expand Down
2 changes: 1 addition & 1 deletion builder-support/dockerfiles/Dockerfile.recursor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.21 AS pdns-recursor
FROM alpine:3.23 AS pdns-recursor
ARG BUILDER_CACHE_BUSTER=

RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
Expand Down
2 changes: 1 addition & 1 deletion builder-support/dockerfiles/Dockerfile.target.sdist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@INCLUDE Dockerfile.dnsdist
@ENDIF

FROM alpine:3.21 AS sdist
FROM alpine:3.23 AS sdist
ARG BUILDER_CACHE_BUSTER=

@IF [ -z "$M_authoritative$M_recursor$M_dnsdist$M_all" ]
Expand Down
28 changes: 28 additions & 0 deletions builder-support/dockerfiles/Dockerfile.target.ubuntu-resolute
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# First do the source builds
@INCLUDE Dockerfile.target.sdist

FROM ubuntu:resolute AS dist-base

ARG BUILDER_CACHE_BUSTER=
ARG APT_URL
RUN apt-get update && apt-get -y dist-upgrade

@INCLUDE Dockerfile.debbuild-prepare

@IF [ -n "$M_authoritative$M_all" ]
ADD builder-support/debian/authoritative/debian-buster/ pdns-${BUILDER_VERSION}/debian/
@ENDIF

@IF [ -n "$M_recursor$M_all" ]
ADD builder-support/debian/recursor/debian-buster/ pdns-recursor-${BUILDER_VERSION}/debian/
@ENDIF

@IF [ -n "$M_dnsdist$M_all" ]
ADD builder-support/debian/dnsdist/debian-bookworm/ dnsdist-${BUILDER_VERSION}/debian/
@ENDIF

@INCLUDE Dockerfile.debbuild

# Do a test install and verify
# Can be skipped with skiptests=1 in the environment
# @EXEC [ "$skiptests" = "" ] && include Dockerfile.debtest
4 changes: 2 additions & 2 deletions builder-support/helpers/meson.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "1.7.0",
"version": "1.11.1",
"license": "Apache-2.0",
"publisher": "https://github.com/mesonbuild/meson",
"SHA256SUM": "a6ca46e2a11a0278bb6492ecd4e0520ff441b164ebfdef1e012b11beb848d26e"
"SHA256SUM": "1a2219422be4a66ad0e8daed125c2a3d5c963458e289203eae22edf3224f5d3e"
}
Loading