Merge pull request #164 from matsduf/merge-develop-into-master

Merge develop into master (zonemaster-ldns)

Changes

@@ -1,5 +1,28 @@
 Release history for Zonemaster component Zonemaster-LDNS
 
+3.0.0 2022-12-19
+
+ [Breaking change]
+ - Improves access to text data in TXT and SPF resource records
+   (#157, #155)
+
+ [Features]
+ - Uses internal LDNS for docker image (#162)
+ - Adds support for NSID option (#151)
+ - Updates internal LDNS to 1.8.3 (#151, #143)
+ - Adds options to build with Libidn and LDNS in custom locations
+   (#152)
+
+ [Fixes]
+ - Fixes a bug when building LDNS with link to OpenSSL (#161)
+ - Corrects the license statement in LDNS.pm (#159)
+ - Fixes unsafe string manipulations in XS code (#153, #149)
+ - Automatically reconfigures internal libldns on "ldns/Changelog"
+   updates (#158)
+ - URL fragments referring to internal headings in lowercase
+   (#154)
+
+
 2.2.2 2022-06-09
 
  [Features]

Dockerfile

@@ -3,7 +3,6 @@ FROM alpine:3.14 as build
 RUN apk add --no-cache \
     # Compile-time dependencies
     build-base \
-    ldns-dev \
     libidn2-dev \
     make \
     openssl-dev \
@@ -20,7 +19,7 @@ ARG version
 
 COPY ./Zonemaster-LDNS-${version}.tar.gz ./Zonemaster-LDNS-${version}.tar.gz
 
-RUN cpanm --notest --no-wget --configure-args="--no-internal-ldns" \
+RUN cpanm --notest --no-wget \
     ./Zonemaster-LDNS-${version}.tar.gz
 
 FROM alpine:3.14
@@ -31,6 +30,5 @@ COPY --from=build /usr/local/lib/perl5/site_perl/Zonemaster /usr/local/lib/perl5
 
 RUN apk add --no-cache \
     # Run-time dependencies
-    ldns \
     libidn2 \
     perl

MANIFEST

@@ -11,7 +11,10 @@ inc/Module/Install/Win32.pm
 inc/Module/Install/WriteAll.pm
 inc/Module/Install/XSUtil.pm
 include/LDNS.h
+ldns/.github/FUNDING.yml
+ldns/.github/workflows/testsuite.yml
 ldns/buffer.c
+ldns/Changelog
 ldns/compat/b64_ntop.c
 ldns/compat/b64_pton.c
 ldns/compat/strlcpy.c
@@ -25,6 +28,7 @@ ldns/dnssec_sign.c
 ldns/dnssec_verify.c
 ldns/dnssec_zone.c
 ldns/duration.c
+ldns/edns.c
 ldns/error.c
 ldns/higher.c
 ldns/host2str.c
@@ -41,6 +45,7 @@ ldns/ldns/dnssec_sign.h
 ldns/ldns/dnssec_verify.h
 ldns/ldns/dnssec_zone.h
 ldns/ldns/duration.h
+ldns/ldns/edns.h
 ldns/ldns/error.h
 ldns/ldns/higher.h
 ldns/ldns/host2str.h
@@ -64,6 +69,7 @@ ldns/ldns/update.h
 ldns/ldns/util.h.in
 ldns/ldns/wire2host.h
 ldns/ldns/zone.h
+ldns/libdns.doxygen.in
 ldns/LICENSE
 ldns/ltmain.sh
 ldns/Makefile.in
@@ -75,6 +81,7 @@ ldns/parse.c
 ldns/radix.c
 ldns/rbtree.c
 ldns/rdata.c
+ldns/README-Travis.md
 ldns/resolver.c
 ldns/rr.c
 ldns/rr_functions.c
@@ -180,6 +187,7 @@ t/example.org
 t/idn.t
 t/load_zonefile.t
 t/netldns.t
+t/nsid.t
 t/packet.t
 t/regression.t
 t/resolver.t

MANIFEST.SKIP

@@ -16,7 +16,6 @@
 \.ac$
 
 # Avoid ldns files we don't need
-^ldns/Changelog$
 ^ldns/README$
 ^ldns/README\.
 ^ldns/\.libs/