From b77bdaa5ce9b7f2ab1f02de044b228f53e71e54e 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/upforwd/ans4/ans.pl  | 22 ++++++++++++++++++----
 5 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6124f3e52b..f679ff6597 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 2b078a666c..b18b9803ef 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 43eaa6d1c4..15e13bfaea 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 50e36bd4c5..83eb8d2b5d 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/upforwd/ans4/ans.pl b/bin/tests/system/upforwd/ans4/ans.pl
index 858e07e9f6..a2a933d79e 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);