[Debian-ha-commits] [resource-agents] 01/01: Drop fix-gethostinfo-v2 patch.

[Adrian Vondendriesch]

This is an automated email from the git hooks/post-receive script.

discostu-guest pushed a commit to branch master
in repository resource-agents.

commit 39c437082dea420cd3247e3c1cf2964a8414aa23
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date:   Sat Apr 25 18:00:51 2015 +0200

    Drop fix-gethostinfo-v2 patch.
    
    The original bug is fixed by upstream commit 9d91c7 and 0d4438.
---
 debian/changelog                        |  2 ++
 debian/patches/fix-gethostinfo-v2.patch | 64 ---------------------------------
 debian/patches/series                   |  1 -
 3 files changed, 2 insertions(+), 65 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 984f686..46ddffb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ resource-agents (1:3.9.6-1) UNRELEASED; urgency=medium
 
   [ Adrian Vondendriesch ]
   * Install upstream ldirectord.service file
+  * Drop fix-gethostinfo-v2 patch. The original bug is fixed by upstream
+    commit 9d91c7 and 0d4438.
 
  -- Christoph Berg <myon at debian.org>  Fri, 17 Apr 2015 09:55:14 +0200
 
diff --git a/debian/patches/fix-gethostinfo-v2.patch b/debian/patches/fix-gethostinfo-v2.patch
deleted file mode 100644
index 8fe6c96..0000000
--- a/debian/patches/fix-gethostinfo-v2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ruN resource-agents-master.bak/ldirectord/ldirectord.in resource-agents-master/ldirectord/ldirectord.in
---- resource-agents-master.bak/ldirectord/ldirectord.in	2014-02-12 20:26:20.000000000 +0000
-+++ resource-agents-master/ldirectord/ldirectord.in	2014-02-21 12:55:51.804192404 +0000
-@@ -4055,7 +4055,7 @@
- {
- 	my ($v, $r, $force) = (@_);
- 
--	if ($r->{failcount} > 0) {
-+	if (defined($r->{failcount}) && $r->{failcount} > 0) {
- 		ld_log("Resetting soft failure count: " . $r->{server} . ":" .
- 		       $r->{port} . " (" . get_virtual_id_str($v) . ")");
- 	}
-@@ -5081,17 +5081,21 @@
- 	if ($name =~ /\[(.*)\]/) {
- 		$name = $1;
- 	}
--	my @host = getaddrinfo($name, 0, $af);
--	if (!defined($host[3])) {
--		return undef;
--	}
--	my @ret = getnameinfo($host[3], NI_NUMERICHOST | NI_NUMERICSERV);
--	if ($host[0] == AF_INET6) {
--		return "[$ret[0]]";
--	}
--	else {
--		return $ret[0];
-+	my %hints = ( family => $af );
-+	my ( $err, @res ) = getaddrinfo($name, 0, \%hints);
-+	return undef if ($err);
-+	while( my $ai = shift @res ) {
-+		my ( $err, $hostname, $servicename ) = getnameinfo( $ai->{addr}, NI_NUMERICHOST );
-+		if (!$err) {
-+			if ($ai->{family} == AF_INET6) {
-+				return "[$hostname]";
-+			}
-+			else {
-+				return $hostname;
-+			}
-+		}
- 	}
-+	return undef;
- }
- 
- # ld_gethostbyaddr
-@@ -5106,13 +5110,13 @@
- 	my ($ip)=(@_);
- 
- 	$ip = &ld_strip_brackets($ip);
--	my @host = getaddrinfo($ip,0);
--	if (!defined($host[3])) {
--		return undef;
-+	my ( $err, @res ) = getaddrinfo($ip,0);
-+	return undef if ($err);
-+	while( my $ai = shift @res ) {
-+		my ( $err, $host, $service ) = getnameinfo($ai->{addr}, NI_NAMEREQD);
-+		return $host unless($err);
- 	}
--	my @ret = getnameinfo($host[3], NI_NAMEREQD);
--	return undef unless(scalar(@ret) == 2);
--	return $ret[0];
-+	return undef;
- }
- 
- # ld_getservbyname
diff --git a/debian/patches/series b/debian/patches/series
index d5ef104..44d3e6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_docbook_patch.patch
 02_spelling_fixes.patch
 mysql-path.patch
-fix-gethostinfo-v2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/resource-agents.git