Merge develop branch into master (zonemaster-engine) - #1511

Changes

@@ -1,5 +1,15 @@
 Release history for Zonemaster component Zonemaster-Engine
 
+v9.0.1 2026-09-30 (part of Zonemaster v2026.1.2 release)
+
+ [Fixes]
+ - Updates the CNAME resolution (#1518)
+ - Rewrites test case Zone09 implementation (#1543)
+ - Rewrites test case Consistency05 implementation (#1547)
+ - Fixes MethodsV2 when dealing with fake delegation (#1546)
+ - Adds missing DNSKEY/DS algorithm comparison in DNSSEC02 (#1551)
+
+
 v9.0.0 2026-06-29 (part of Zonemaster v2026.1 release)
 
  [Breaking changes]

MANIFEST

@@ -23,6 +23,7 @@ lib/Zonemaster/Engine/Nameserver/Cache/LocalCache.pm
 lib/Zonemaster/Engine/Nameserver/Cache.pm
 lib/Zonemaster/Engine/Nameserver/Cache/RedisCache.pm
 lib/Zonemaster/Engine/Nameserver.pm
+lib/Zonemaster/Engine/NameserverSet.pm
 lib/Zonemaster/Engine/Normalization/Error.pm
 lib/Zonemaster/Engine/Normalization.pm
 lib/Zonemaster/Engine/NSArray.pm
@@ -80,6 +81,7 @@ t/nameserver-axfr.data
 t/nameserver-axfr.t
 t/nameserver.data
 t/nameserver.t
+t/nameserverset.t
 t/normalization.t
 t/packet.t
 t/pod-coverage.t
@@ -237,8 +239,6 @@ t/Test-zone01-A.data
 t/Test-zone01-A.t
 t/Test-zone01-B.data
 t/Test-zone01-B.t
-t/Test-zone09-1.data
-t/Test-zone09-1.t
 t/Test-zone09.data
 t/Test-zone09.t
 t/Test-zone11-1.data

lib/Zonemaster/Engine.pm

@@ -3,7 +3,7 @@ package Zonemaster::Engine;
 use v5.16.0;
 use warnings;
 
-use version; our $VERSION = version->declare("v9.0.0");
+use version; our $VERSION = version->declare("v9.0.1");
 
 BEGIN {
     # Locale::TextDomain (<= 1.20) doesn't know about File::ShareDir so give a helping hand.

lib/Zonemaster/Engine/DNSName.pm

@@ -99,13 +99,17 @@ sub str_cmp {
     # Treat undefined value as root
     my $other = $_[1] // q{};
 
-    if ( blessed $other and $other->isa( 'Zonemaster::Engine::DNSName' ) ) {
-        return $me cmp uc( $other->{_string} // $other->string() );
-    }
-    else {
-        # Assume $other is a string; remove trailing dot except if only character
-        return $me cmp uc( $other =~ s/.\K [.] \z//xr );
-    }
+    my $comparison = do {
+        if ( blessed $other and $other->isa( 'Zonemaster::Engine::DNSName' ) ) {
+            $me cmp uc( $other->{_string} // $other->string() );
+        }
+        else {
+            # Assume $other is a string; remove trailing dot except if only character
+            $me cmp uc( $other =~ s/.\K [.] \z//xr );
+        }
+    };
+
+    return $_[2] ? -$comparison : $comparison;
 }
 
 sub next_higher {

lib/Zonemaster/Engine/Nameserver.pm

@@ -577,7 +577,20 @@ sub string {
 sub compare {
     my ( $self, $other, $reverse ) = @_;
 
-    return $self->string cmp $other->string;
+    my $comparison = do {
+        if ( ref $other and $other->isa('Zonemaster::Engine::Nameserver') ) {
+            $self->name cmp $other->name ||
+                $self->address->version <=> $other->address->version ||
+                $self->address->intip <=> $other->address->intip;
+        }
+        else {
+            $self->string cmp $other
+        }
+    };
+
+    $comparison = -$comparison if $reverse;
+
+    return $comparison;
 }