gentoo resync : 17.12.2017

3 files changed, 63 insertions, 0 deletions

diff --git a/dev-perl/Net-SNPP/Manifest b/dev-perl/Net-SNPP/Manifest
index c95c027da87c..903fcd460707 100644
--- a/dev-perl/Net-SNPP/Manifest
+++ b/dev-perl/Net-SNPP/Manifest
@@ -1,3 +1,5 @@
+AUX Net-SNPP-1.17-dummy-timeout.patch 1307 BLAKE2B c69dc13842f2ef0eca4c974bbc0c36dbc68df2ed522d0c91d8c191091bd86d1b90d30912428ce59f039d8462e84dd8c8a3209d8ea7324fd1b62905a4952e7ba6 SHA512 82320a2c40a25a66365c9375470782c7f4f609da3b0509115cde2540d011d147c7d0980794d9807cd2370ed990b7b8da14d4f519d5bfad45584fd962b7398a72
 DIST Net-SNPP-1.17.tar.gz 16099 BLAKE2B fb6a2186f1621b9ce06af45e707f8da8816a7e20412cb92082625fa3cdbe2ca135cd3dc4149c9f427c27f72341785d86f22417117a017034da73477d03ec82e9 SHA512 aa1e47736226cc528513f5339579aa20f1aabbc5c0ddee2e4ca24beb0f797f50805fcf547fc6b8d0564be9331256706894d2619ee5a32c574a21d3738d86dcda
 EBUILD Net-SNPP-1.170.0-r1.ebuild 299 BLAKE2B 4b0bf1d8b248595367e2bb2d2cf0abd0f83200e1e00888aaa65b53156d255791df545998bfaea4572c29c56751b93b5e0da76e17eca1a935cbd43eb49c8063a9 SHA512 8f44772cb6d4db1336b1be4c4cd9ad5f691997a071234ef6996fa047bb24b3ba66a8a880d9e45593fdec8dac30b971ebc0541acabf661d2d5b68fcaff914373b
+EBUILD Net-SNPP-1.170.0-r2.ebuild 401 BLAKE2B 21d95c9e08c93d57a691695b66071f0098aa8607d9725a97f97e37cf1f367355291811e9bc13cd83dd9a65d3c24d825d0fc2328a5f5c41766718b8f752756027 SHA512 41d9e2687392738487d8830b06c58dde71be3c6dd79cb31203a80abea9f57a3cb48a9b77d52d720d83c8c89429212a875b6c6c3b96104d783b66b3a5e5b43e7f
 MISC metadata.xml 517 BLAKE2B 394f23e47bc0b3c4262ad7e7db40b5d166a67ee184f77f6e3a8906895b78e58e3ff685e4f39ff5c6318666386e7c041bc99570f646f9fcc27a1089b095e2440b SHA512 56c7df829746577210954b5a9442935a3cd964f3cc226165d3b8946a23f0cb1ab57731a6dbdef95454e051cb84dbd089a457769da842f1fc96db4ad33e4cca7e
diff --git a/dev-perl/Net-SNPP/Net-SNPP-1.170.0-r2.ebuild b/dev-perl/Net-SNPP/Net-SNPP-1.170.0-r2.ebuild
new file mode 100644
index 000000000000..254e516e4518
--- /dev/null
+++ b/dev-perl/Net-SNPP/Net-SNPP-1.170.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=TOBEYA
+DIST_VERSION=1.17
+DIST_EXAMPLES=( "bin/*" )
+inherit perl-module
+
+DESCRIPTION="libnet SNPP component"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/perl-libnet"
+DEPEND="${RDEPEND}"
+PATCHES=("${FILESDIR}/${PN}-1.17-dummy-timeout.patch")
diff --git a/dev-perl/Net-SNPP/files/Net-SNPP-1.17-dummy-timeout.patch b/dev-perl/Net-SNPP/files/Net-SNPP-1.17-dummy-timeout.patch
new file mode 100644
index 000000000000..6b952e6643c6
--- /dev/null
+++ b/dev-perl/Net-SNPP/files/Net-SNPP-1.17-dummy-timeout.patch
@@ -0,0 +1,42 @@
+From bf788b84b81d244912c4d729d21fb5fa6b131ecd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Mon, 18 Jan 2016 14:33:00 +0100
+Subject: Define dummy Net::SNPP::Server->timeout
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since libnet-3.08, Net::Cmd subclasses should provide timeout()
+method. Otherwise tests fail like in CPAN RT#111013. See #110978.
+
+This patch returns static 0 value because the first timeout() argument
+is not an object reference. This is probably because Net::SNPP::Server
+does not subclass Net::Cmd properly. See libnet's t/datasend.t for
+example.
+
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=111013
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ lib/Net/SNPP/Server.pm | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/lib/Net/SNPP/Server.pm b/lib/Net/SNPP/Server.pm
+index 5cb999f..1482ca7 100644
+--- a/lib/Net/SNPP/Server.pm
++++ b/lib/Net/SNPP/Server.pm
+@@ -129,6 +129,12 @@ sub new {
+     return bless( $self, $class );
+ }
+ 
++# Required by Net::Cmd, CPAN RT#111013, #110978
++sub timeout {
++    # The $_[0] is not an object reference, cannot use $self->{Timeout}
++    0;
++}
++
+ =item client()
+ 
+ Calls accept() for you and returns a client handle.  This method
+-- 
+2.15.1
+