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

gregoa pushed a commit to branch master
in repository libio-socket-socks-perl.

commit 14e9c5d6b9905fd43231425a5a660da13ade4646
Author: gregor herrmann <gre...@debian.org>
Date:   Sat Jul 4 22:45:54 2015 +0200

    Drop Fix-t-06_accept_mixed.t-by-enabling-SocksResolve.patch.
    
    Merged upstream.
---
 ...6_accept_mixed.t-by-enabling-SocksResolve.patch | 23 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 24 deletions(-)

diff --git 
a/debian/patches/Fix-t-06_accept_mixed.t-by-enabling-SocksResolve.patch 
b/debian/patches/Fix-t-06_accept_mixed.t-by-enabling-SocksResolve.patch
deleted file mode 100644
index daf33f0..0000000
--- a/debian/patches/Fix-t-06_accept_mixed.t-by-enabling-SocksResolve.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: intrigeri <intrig...@boum.org>
-Date: Wed, 27 Aug 2014 20:39:12 +0000
-Subject: Fix t/06_accept_mixed.t by enabling SocksResolve: this is needed for
- SOCKS4 clients when the tests are run without a network connection.
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=98365
-
----
- t/06_accept_mixed.t | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/06_accept_mixed.t b/t/06_accept_mixed.t
-index 04887c1..96f2200 100644
---- a/t/06_accept_mixed.t
-+++ b/t/06_accept_mixed.t
-@@ -17,7 +17,7 @@ my $ver5_cnt = 0;
- for (1..10) {
-     my $ver = rand() < 0.5 ? 4 : 5;
-     $ver == 4 ? $ver4_cnt++ : $ver5_cnt++;
--    my $client = IO::Socket::Socks->new(SocksVersion => $ver, Blocking => 0, 
ProxyAddr => $serveraddr, ProxyPort => $serverport, ConnectAddr => '2gis.com', 
ConnectPort => 8080);
-+    my $client = IO::Socket::Socks->new(SocksVersion => $ver, Blocking => 0, 
ProxyAddr => $serveraddr, ProxyPort => $serverport, ConnectAddr => '2gis.com', 
ConnectPort => 8080, SocksResolve => 1);
-     ok(defined($client), "Socks $ver client non-blocking connection $_ 
started");
-     $local_clients{$client} = $client;
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b1c9679..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-Fix-t-06_accept_mixed.t-by-enabling-SocksResolve.patch

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

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to