Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
wtoorop authored Jul 12, 2024
2 parents 1751641 + 8f1640d commit 41037cf
Show file tree
Hide file tree
Showing 84 changed files with 1,098 additions and 468 deletions.
112 changes: 103 additions & 9 deletions .github/workflows/testsuite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,130 @@ on:

jobs:
linux:
name: Linux (Ubuntu)

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@main
with:
submodules: recursive
- run: libtoolize -ci
- run: autoreconf -fi
- run: libtoolize -vci
- run: autoreconf -vfi
- run: ./configure
env:
CFLAGS: -g2 -O0 -fsanitize=address,undefined -fno-sanitize-recover
- run: make test

mac:
name: macOS

runs-on: macos-latest

steps:
- run: brew install automake libtool
- uses: actions/checkout@v3
- uses: actions/checkout@main
with:
submodules: recursive
- run: glibtoolize -ci
- run: autoreconf -fi
- run: glibtoolize -vci
- run: autoreconf -vfi

# macOS’s system OpenSSL (LibreSSL, actually) isn’t meant for linking,
# and Homebrew’s# OpenSSL isn’t CI-friendly. So build without OpenSSL.
- run: ./configure --without-ssl --disable-sha2 --disable-gost --disable-ecdsa --disable-dane
env:
CFLAGS: -g2 -O0 -fsanitize=address,undefined -fno-sanitize-recover
- run: make test

# Pending https://github.com/NLnetLabs/ldns/issues/197,
# only builds succeed here.
cygwin:
name: Cygwin

runs-on: windows-latest

steps:
- name: Make git ignore line breaks
run: git config --global core.autocrlf false
- name: Set up Cygwin
uses: cygwin/cygwin-install-action@master
with:
packages: make gcc-g++ bash libtool automake autoconf libssl-devel bind-utils
- uses: actions/checkout@main
with:
submodules: recursive
- shell: C:\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'
name: Build
run: |
cd $GITHUB_WORKSPACE
libtoolize -vci
autoreconf -vfi
./configure
make
qemu-alpine:
name: Linux (Alpine, ${{ matrix.platform }})

runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
platform:
- i386
- arm32v6
- arm32v7
- arm64v8
- s390x

steps:
- uses: actions/checkout@main
with:
submodules: recursive
- name: Get the qemu container
run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: "${{ matrix.platform }}: Build and test"
run: docker run --rm --interactive --mount type=bind,source=$(pwd),target=/host ${{ matrix.platform }}/alpine sh -c "apk add make gcc libc-dev libtool automake autoconf openssl-dev m4 indent bash bind-tools && cd /host && libtoolize -vci && autoreconf -vfi && ./configure && make test"


# As of now the test suite requires OpenSSL, so no tests.
# cf. https://github.com/NLnetLabs/ldns/issues/162
- run: make
# BSDs:
# name: ${{ matrix.os.dispname }} ${{ matrix.os.version }}
#
# runs-on: macos-latest
#
# strategy:
# fail-fast: false
# matrix:
# os:
# - name: freebsd
# dispname: FreeBSD
# version: '13.0'
# pkginstall: pkg install -y libtool automake bind-tools gmake gindent
# env:
# configure_args:
#
# # OpenBSD seems to require explicit auto* versions.
# - name: openbsd
# dispname: OpenBSD
# version: '7.1'
# pkginstall: pkg_add -v libtool gmake gindent automake-1.16.3 autoconf-2.71
# env: AUTOCONF_VERSION=2.71 AUTOMAKE_VERSION=1.16
# configure_args: --disable-dane-verify
#
# steps:
# - uses: actions/checkout@main
# with:
# submodules: recursive
# - name: Build and test on ${{ matrix.os.name }}
# uses: cross-platform-actions/action@master
# with:
# operating_system: ${{ matrix.os.name }}
# version: ${{ matrix.os.version }}
# shell: bash
# run: |
# export DUMMY12345=1 ${{ matrix.os.env }}
# sudo ${{ matrix.os.pkginstall }} || ${{ matrix.os.pkginstall }}
# libtoolize -vci
# autoreconf -vfi
# ./configure ${{ matrix.os.configure_args }}
# gmake test
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
/compat/strlcpy.lo
/compat/timegm.o
/compat/timegm.lo
/compile
/config.guess
/config.h
/config.log
Expand Down Expand Up @@ -158,10 +159,12 @@
/ldns/config.h
/ldns/config.h.in
/ldns/net.h
/ldns/stamp-h1
/ldns/util.h
/ldns_wrapper.lo
/ldns_wrapper.o
/lib
/libdns.doxygen
/libldns.la
/libtool
/linktest
Expand All @@ -170,6 +173,7 @@
/ltmain.sh
/m4/lt*.m4
/m4/libtool.m4
/missing
/net.lo
/net.o
/packaging/ldns-config
Expand Down
34 changes: 33 additions & 1 deletion Changelog
Original file line number Diff line number Diff line change
@@ -1,6 +1,38 @@
1.8.4 2022-??-??
1.8.4 2024-07-??
* Fix building documentation in build directory.
Thanks Michael Tokarev
* Updated the configure script for split openssl directories.
* Fix for windows compile; asctime_r compat, search for inet_ntop
in ws2_32, avoid double decl of inet_ntop, check for symlink call,
include config.h in edns.c, have socket compare use correct
signedness, add -u repo option to makewin.sh, fix quoting in
makewin.sh and check return value of bind and connect in net.c
for failure instead of a socket type. And fix to install .exe files.
* Fix to compile with OpenSSL 3.2. Update acx_nlnetlabs.m4 to 48.
* Fix to compile DLLs, and pick out of the lib64 dir, and include
libssp-0.dll and ldns-config.
* bugfix #237: Resolver uses nameserver commented out in
/etc/resolv.conf. Thanks grembo.
* Added RESINFO rrtype.
* Added WALLET rrtype.
* PR #241: Fix coverity cited problems. Thanks Enji Cooper.
* PR #233: Several Python SWIG issues. Thanks Florian Weimer.
* PR #231: const ldns_rdf * typemap fixes to support swig-4.2.0
Thanks William S Fulton
* PR #227: keys.c: fix build with libressl >= 3.8.1
Thanks Fabrice Fontaine
* PR #224: Portable executable progs don't underlink to libldns
Thanks Ørjan Malde
* PR #216: Update declaration for function with no argument
Thanks Ed Maste
* PR #214: fix the build in FreeBSD's base system
Thanks Pierre Pronchery and Dag-Erling Smørgrav
* PR #206: improve 'next-label' algorithm in ldns-walk
Thanks Jelte Jansen
* PR #205: Add functions to extract RFC 8914 extended errors
Thanks Roland van Rijswijk-Deij
* PR #203: Expand CI: Cygwin, BSDs, musl libc, 32-bit, and big-endian
Thanks Felipe Gasper

1.8.3 2022-08-15
* bugfix #183: Assertion failure with OPT record without rdata.
Expand Down
Loading

0 comments on commit 41037cf

Please sign in to comment.