From 03958ad4b9fd6b2d6f1fbf20e85d8ff2a1f9d069 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 19 Dec 2012 08:46:36 +1100
Subject: [PATCH] 3442.   [port]          Net::DNS 0.69 introduced a non
 backwards compatible                         change. [RT #32216]

---
 CHANGES                                 |  3 +++
 bin/tests/system/ans.pl                 | 22 ++++++++++++++++++----
 bin/tests/system/resolver/ans2/ans.pl   | 12 ++++++++++--
 bin/tests/system/resolver/ans3/ans.pl   | 12 ++++++++++--
 bin/tests/system/statistics/ans4/ans.pl | 12 ++++++++++--
 bin/tests/system/upforwd/ans4/ans.pl    | 22 ++++++++++++++++++----
 6 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index 75adcff5a1..a0def2e0a5 100644
--- 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 650743d77d..f86fa48ce5 100644
--- 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 c9471b766e..9944ccabeb 100644
--- 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 e8a6ba52c8..f1fd59f40e 100644
--- 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 a45449dea7..6296e3f461 100644
--- 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 af0e89780a..12e67b7c08 100644
--- 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;
 
-        my ($packet, $err) = new Net::DNS::Packet(\$buf, 0);
-        $err and die $err;
+	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;
 
-	my ($packet, $err) = new Net::DNS::Packet(\$buf, 0);
-	$err and die $err;
+	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);