[perlbal] 04/08: Add 2 patches from upstream git and CPAN RT.

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository perlbal.

commit 19fb81ccc3905242d7c3b14cf349b3c164bb48bf
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat May 16 22:03:19 2015 +0200

    Add 2 patches from upstream git and CPAN RT.
---
 debian/patches/IO::Socket::SSL-typo.patch | 20 ++++++++++++++++++++
 debian/patches/precedence.patch           | 18 ++++++++++++++++++
 debian/patches/series                     |  2 ++
 3 files changed, 40 insertions(+)

diff --git a/debian/patches/IO::Socket::SSL-typo.patch b/debian/patches/IO::Socket::SSL-typo.patch
new file mode 100644
index 0000000..be7e5bf
--- /dev/null
+++ b/debian/patches/IO::Socket::SSL-typo.patch
@@ -0,0 +1,20 @@
+From 85d65f15f5ddcc69867a9f55080d005767e146d8 Mon Sep 17 00:00:00 2001
+From: David Steinbrunner <dsteinbrunner at pobox.com>
+Date: Tue, 26 Nov 2013 06:48:49 -0500
+Subject: [PATCH] typo fix to resolve RT#79497
+
+---
+ lib/Perlbal/Service.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/Perlbal/Service.pm
++++ b/lib/Perlbal/Service.pm
+@@ -1644,7 +1644,7 @@
+                 (defined $self->{ssl_ca_path} ? (SSL_ca_path => $self->{ssl_ca_path}) : ()),
+                 (defined $self->{ssl_verify_mode} ? (SSL_verify_mode => $self->{ssl_verify_mode}) : ()),
+             };
+-            return $mc->err("IO::Socket:SSL (0.98+) not available.  Can't do SSL.") unless eval "use IO::Socket::SSL 0.98 (); 1;";
++            return $mc->err("IO::Socket::SSL (0.98+) not available.  Can't do SSL.") unless eval "use IO::Socket::SSL 0.98 (); 1;";
+             return $mc->err("SSL key file ($self->{ssl_key_file}) doesn't exist")   unless -f $self->{ssl_key_file};
+             return $mc->err("SSL cert file ($self->{ssl_cert_file}) doesn't exist") unless -f $self->{ssl_cert_file};
+         }
diff --git a/debian/patches/precedence.patch b/debian/patches/precedence.patch
new file mode 100644
index 0000000..d417e3d
--- /dev/null
+++ b/debian/patches/precedence.patch
@@ -0,0 +1,18 @@
+Description: fix precedence problem with return/or
+Origin: CPAN RT
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=87206
+Author: rurban [...] x-ray.at
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2015-05-16
+
+--- a/t/32-pipelining.t
++++ b/t/32-pipelining.t
+@@ -46,7 +46,7 @@
+ my $sock;
+ my $get_sock = sub {
+     return IO::Socket::INET->new(PeerAddr => "127.0.0.1:$port")
+-        or die "Failed to connect to perlbal";
++        || die "Failed to connect to perlbal";
+ };
+ 
+ $sock = $get_sock->();
diff --git a/debian/patches/series b/debian/patches/series
index 7401562..c18f7e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ fix-test-more-0.94-use
 spelling-errors
 bad-manpage-perlbal-util
 pod-encoding.patch
+IO::Socket::SSL-typo.patch
+precedence.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/perlbal.git