Merge pull request #231 from zonemaster/develop

Merge develop branch into master (Zonemaster-LDNS)

Author: matsduf

.github/workflows/ci.yml

@@ -5,22 +5,25 @@ on:
     branches:
       - develop
       - master
-      - 'releases/**'
+      - 'release/**'
 
   pull_request:
     branches:
       - develop
       - master
-      - 'releases/**'
+      - 'release/**'
+
+env:
+  TEST_WITH_NETWORK: 1
 
 jobs:
   run-tests:
     strategy:
       fail-fast: false 
       matrix:
         perl:
-          - '5.38'
-          - '5.34'
+          - '5.40'
+          - '5.36'
           - '5.26'
         runner:
           - ubuntu-22.04

.travis.yml

@@ -1,5 +1,20 @@
 Release history for Zonemaster component Zonemaster-LDNS
 
+
+5.0.0 2025-06-26 (part of Zonemaster v2025.1 release)
+
+ [Breaking changes]
+- Raises minimum Perl version to v5.26.0 #228
+
+ [Features]
+- Improves performance by removing dubious code #217
+
+ [Fixes]
+- Updates Dockerfile for release 2025.1 #229
+- Removes unused feature "randomized capitalization" #207
+- Fixes export of methods #219
+
+
 4.1.0 2024-12-09 (part of Zonemaster v2024.2 release)
 
  [Deprecation]

Changes

@@ -1,4 +1,4 @@
-FROM alpine:3.14 as build
+FROM alpine:3.22 as build
 
 RUN apk add --no-cache \
     # Compile-time dependencies
@@ -9,10 +9,14 @@ RUN apk add --no-cache \
     perl-app-cpanminus \
     perl-dev \
     perl-devel-checklib \
+    perl-extutils-depends \
     perl-extutils-pkgconfig \
     perl-lwp-protocol-https \
+    perl-mime-base32 \
     perl-module-install \
+    perl-test-differences \
     perl-test-fatal \
+    perl-test-nowarnings \
  && cpanm --notest --no-wget --from=https://cpan.metacpan.org/ \
     Module::Install::XSUtil
 
@@ -23,7 +27,7 @@ COPY ./Zonemaster-LDNS-${version}.tar.gz ./Zonemaster-LDNS-${version}.tar.gz
 RUN cpanm --notest --no-wget \
     ./Zonemaster-LDNS-${version}.tar.gz
 
-FROM alpine:3.14
+FROM alpine:3.22
 
 # Include only Zonemaster LDNS modules
 COPY --from=build /usr/local/lib/perl5/site_perl/auto/Zonemaster /usr/local/lib/perl5/site_perl/auto/Zonemaster

Dockerfile

@@ -194,6 +194,5 @@ t/resolver.t
 t/rr.t
 t/rrlist.t
 t/serialize.t
-t/threads.t
 t/utils.t
 t/wireformat.t

MANIFEST

@@ -40,12 +40,6 @@ Zonemaster::LDNS.
 When disabled, libldns is dynamically linked just like other dependencies.
 Enabled by default.
 
-=item --[no-]randomize
-
-This feature is deprecated and will be removed in Zonemaster 2025.1.
-Randomizes the capitalization of returned domain names.
-Disabled by default.
-
 =item --prefix-openssl=PATH
 
 Search for OpenSSL headers and libraries in PATH.
@@ -88,7 +82,6 @@ Enable debug mode, more verbose output.
 my $opt_ed25519        = 1;
 my $opt_idn            = 1;
 my $opt_internal_ldns  = 1;
-my $opt_randomize      = 0;
 my $opt_debug          = 0;
 my $opt_assets         = {
     openssl => {
@@ -110,7 +103,6 @@ GetOptions(
     'ed25519!'         => \$opt_ed25519,
     'idn!'             => \$opt_idn,
     'internal-ldns!'   => \$opt_internal_ldns,
-    'randomize!'       => \$opt_randomize,
     'debug!'           => \$opt_debug,
     'prefix-openssl=s' => \$$opt_assets{openssl}{prefix},
     'openssl-inc=s'    => \$$opt_assets{openssl}{inc},
@@ -121,6 +113,8 @@ GetOptions(
     'ldns-lib=s'       => \$$opt_assets{ldns}{lib},
 );
 
+perl_version '5.026000'; # Perl v5.26.0 or higher is required for installation.
+
 configure_requires 'Devel::CheckLib'         => 0;
 configure_requires 'ExtUtils::PkgConfig'     => 0;
 configure_requires 'Module::Install'         => 1.19;
@@ -317,19 +311,6 @@ else {
     print "Feature idn disabled\n";
 }
 
-
-# Internals
-
-if ( $opt_randomize ) {
-    print "Feature randomized capitalization enabled\n";
-    print "WARNING: This feature is DEPRECATED and will be removed in Zonemaster v2025.1.\n";
-    cc_define '-DRANDOMIZE';
-}
-else {
-    print "Feature randomized capitalization disabled\n";
-}
-
-
 sub MY::postamble {
 
     my $contributors_make = <<'END_CONTRIBUTORS';

Makefile.PL

@@ -14,7 +14,6 @@
   * [Ed25519]
   * [IDN]
   * [Internal ldns]
-  * [Randomized capitalization (deprecated)](#randomized-capitalization-deprecated)
   * [Custom OpenSSL]
   * [Custom LDNS]
   * [Custom Libidn]
@@ -167,16 +166,6 @@ When enabled, an included version of ldns is statically linked into
 Zonemaster::LDNS.
 When disabled, libldns is dynamically linked just like other dependencies.
 
-### Randomized capitalization (deprecated)
-
-Disabled by default.
-Enable with `--randomize`.
-
-> **Note:** This feature is deprecated and will be removed in Zonemaster 2025.1.
-
-Randomizes the capitalization of returned domain names.
-
-
 ### Custom OpenSSL
 
 Disabled by default.

README.md

@@ -107,7 +107,6 @@ typedef ldns_rr *Zonemaster__LDNS__RR__X25;
 #define D_U32(what,where) ldns_rdf2native_int32(ldns_rr_rdf(what,where))
 
 SV *rr2sv(ldns_rr *rr);
-char *randomize_capitalization(char *in);
 void strip_newline(char* in);
 
 #ifdef USE_ITHREADS

include/LDNS.h

@@ -2,10 +2,10 @@ package Zonemaster::LDNS;
 
 use 5.014;
 
-our $VERSION = '4.1.0';
+our $VERSION = '5.0.0';
 
 use parent 'Exporter';
-our @EXPORT_OK = qw[to_idn has_idn ldns_version load_zonefile];
+our @EXPORT_OK = qw[lib_version to_idn has_idn has_gost load_zonefile];
 our %EXPORT_TAGS = ( all => \@EXPORT_OK );
 
 require XSLoader;
@@ -37,7 +37,7 @@ C<Zonemaster::LDNS> represents a resolver, which is the part of the system respo
 
 =item lib_version()
 
-Returns the ldns version string. Can be exported, but is not by default.
+Returns the ldns version string.
 
 =item to_idn($name, ...)