3442. [port] Net::DNS 0.69 introduced a non backwards compatible

                        change. [RT #32216]

diff --git a/CHANGES b/CHANGES
index 75adcff5a13147fb80d8e6ad38e06f3493f3f52a..a0def2e0a51fdf0a0cf7a11686c5d33873b06ce2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3442.  [port]          Net::DNS 0.69 introduced a non backwards compatible
+                       change. [RT #32216]
+
 3441.  [maint]         D.ROOT-SERVERS.NET is now 199.7.91.13.
 
 3440.  [bug]           Reorder get_key_struct to not trigger a assertion when

diff --git a/bin/tests/system/ans.pl b/bin/tests/system/ans.pl
index 650743d77df769da1ec2bcf9ed174df909273ed0..f86fa48ce51347dc02a997cd91e42c1243acfec4 100644 (file)
--- a/bin/tests/system/ans.pl
+++ b/bin/tests/system/ans.pl
@@ -107,9 +107,16 @@ $SIG{TERM} = \&rmpid;
 my @rules;
 sub handleUDP {
        my ($buf) = @_;
+       my $request;
 
-       my ($request, $err) = new Net::DNS::Packet(\$buf, 0);
-       $err and die $err;
+       if ($Net::DNS::VERSION > 0.68) {
+               $request = new Net::DNS::Packet(\$buf, 0);
+               $@ and die $@;
+       } else {
+               my $err;
+               ($request, $err) = new Net::DNS::Packet(\$buf, 0);
+               $err and die $err;
+       }
 
        my @questions = $request->question;
        my $qname = $questions[0]->qname;
@@ -288,9 +295,16 @@ sub sign_tcp_continuation {
 
 sub handleTCP {
        my ($buf) = @_;
+       my $request;
 
-       my ($request, $err) = new Net::DNS::Packet(\$buf, 0);
-       $err and die $err;
+       if ($Net::DNS::VERSION > 0.68) {
+               $request = new Net::DNS::Packet(\$buf, 0);
+               $@ and die $@;
+       } else {
+               my $err;
+               ($request, $err) = new Net::DNS::Packet(\$buf, 0);
+               $err and die $err;
+       }
        
        my @questions = $request->question;
        my $qname = $questions[0]->qname;

diff --git a/bin/tests/system/resolver/ans2/ans.pl b/bin/tests/system/resolver/ans2/ans.pl
index c9471b766e25de6fb99b119eb09628229960e182..9944ccabebc494db2f418c2eabeeb21c4a15d9a1 100644 (file)
--- a/bin/tests/system/resolver/ans2/ans.pl
+++ b/bin/tests/system/resolver/ans2/ans.pl
@@ -42,8 +42,16 @@ for (;;) {
 
        print "**** request from " , $sock->peerhost, " port ", $sock->peerport, "\n";
 
-       my ($packet, $err) = new Net::DNS::Packet(\$buf, 0);
-       $err and die $err;
+       my $packet;
+
+       if ($Net::DNS::VERSION > 0.68) {
+               $packet = new Net::DNS::Packet(\$buf, 0);
+               $@ and die $@;
+       } else {
+               my $err;
+               ($packet, $err) = new Net::DNS::Packet(\$buf, 0);
+               $err and die $err;
+       }
 
        print "REQUEST:\n";
        $packet->print;

diff --git a/bin/tests/system/resolver/ans3/ans.pl b/bin/tests/system/resolver/ans3/ans.pl
index e8a6ba52c8a08022a20f4992b58418fc68d8a933..f1fd59f40e22329b9add2740dbb912bc76c19915 100644 (file)
--- a/bin/tests/system/resolver/ans3/ans.pl
+++ b/bin/tests/system/resolver/ans3/ans.pl
@@ -42,8 +42,16 @@ for (;;) {
 
        print "**** request from " , $sock->peerhost, " port ", $sock->peerport, "\n";
 
-       my ($packet, $err) = new Net::DNS::Packet(\$buf, 0);
-       $err and die $err;
+       my $packet;
+
+       if ($Net::DNS::VERSION > 0.68) {
+               $packet = new Net::DNS::Packet(\$buf, 0);
+               $@ and die $@;
+       } else {
+               my $err;
+               ($packet, $err) = new Net::DNS::Packet(\$buf, 0);
+               $err and die $err;
+       }
 
        print "REQUEST:\n";
        $packet->print;

diff --git a/bin/tests/system/statistics/ans4/ans.pl b/bin/tests/system/statistics/ans4/ans.pl
index a45449dea74c03164ae584e507b98d6f8abe0c52..6296e3f461de964dd481578256b74c34494f7cf1 100644 (file)
--- a/bin/tests/system/statistics/ans4/ans.pl
+++ b/bin/tests/system/statistics/ans4/ans.pl
@@ -41,8 +41,16 @@ for (;;) {
 
        print "**** request from " , $sock->peerhost, " port ", $sock->peerport, "\n";
 
-       my ($packet, $err) = new Net::DNS::Packet(\$buf, 0);
-       $err and die $err;
+       my $packet;
+
+       if ($Net::DNS::VERSION > 0.68) {
+               $packet = new Net::DNS::Packet(\$buf, 0);
+               $@ and die $@;
+       } else {
+               my $err;
+               ($packet, $err) = new Net::DNS::Packet(\$buf, 0);
+               $err and die $err;
+       }
 
        print "REQUEST:\n";
        $packet->print;

diff --git a/bin/tests/system/upforwd/ans4/ans.pl b/bin/tests/system/upforwd/ans4/ans.pl
index af0e89780abc81c4497aea445f18a4a707f2caff..12e67b7c080797e3165e36879132cfdea3ff4f36 100644 (file)
--- a/bin/tests/system/upforwd/ans4/ans.pl
+++ b/bin/tests/system/upforwd/ans4/ans.pl
@@ -98,9 +98,16 @@ $SIG{TERM} = \&rmpid;
 my @rules;
 sub handleUDP {
         my ($buf) = @_;
-
-        my ($packet, $err) = new Net::DNS::Packet(\$buf, 0);
-        $err and die $err;
+       my $packet;
+
+       if ($Net::DNS::VERSION > 0.68) {
+               $packet = new Net::DNS::Packet(\$buf, 0);
+               $@ and die $@;
+       } else {
+               my $err;
+               ($packet, $err) = new Net::DNS::Packet(\$buf, 0);
+               $err and die $err;
+       }
 
         $packet->header->qr(1);
         $packet->header->aa(1);
@@ -243,9 +250,16 @@ sub sign_tcp_continuation {
 
 sub handleTCP {
        my ($buf) = @_;
-
-       my ($packet, $err) = new Net::DNS::Packet(\$buf, 0);
-       $err and die $err;
+       my $packet;
+
+       if ($Net::DNS::VERSION > 0.68) {
+               $packet = new Net::DNS::Packet(\$buf, 0);
+               $@ and die $@;
+       } else {
+               my $err;
+               ($packet, $err) = new Net::DNS::Packet(\$buf, 0);
+               $err and die $err;
+       }
        
        $packet->header->qr(1);
        $packet->header->aa(1);