1 |
commit: 201c42c9b3d80d3d7916b37444fbc5cb27cf8776 |
2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 29 06:33:12 2017 +0000 |
4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 29 06:33:58 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=201c42c9 |
7 |
|
8 |
dev-perl/Net-XMPP: Fix tests re bug #623002 and bug #612256 |
9 |
|
10 |
- Fix test failures without '.' in @INC (#623002) |
11 |
- Update network-test patch to skip another network test (#612256) |
12 |
- Simplify patching logic |
13 |
- use DIST_EXAMPLES feature for examples |
14 |
|
15 |
Bug: https://bugs.gentoo.org/623002 |
16 |
Bug: https://bugs.gentoo.org/612256 |
17 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
18 |
|
19 |
dev-perl/Net-XMPP/Manifest | 2 +- |
20 |
dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild | 22 ++-- |
21 |
dev-perl/Net-XMPP/files/1.05-no-dot-inc.patch | 133 +++++++++++++++++++++ |
22 |
.../Net-XMPP/files/1.05-no-network-tests.patch | 53 ++++++-- |
23 |
4 files changed, 186 insertions(+), 24 deletions(-) |
24 |
|
25 |
diff --git a/dev-perl/Net-XMPP/Manifest b/dev-perl/Net-XMPP/Manifest |
26 |
index 7dcb553ebc5..22faef46128 100644 |
27 |
--- a/dev-perl/Net-XMPP/Manifest |
28 |
+++ b/dev-perl/Net-XMPP/Manifest |
29 |
@@ -1,2 +1,2 @@ |
30 |
DIST Net-XMPP-1.02.tar.gz 121653 SHA256 69761441e214042b10b6608afaffbb1b5262e4aaaddb4b315dbf2ea48c4742ea SHA512 7a373e627de7e909ef50d6525b438dd7f094c7e6ad3cb66fff6087048fe9b127e376cf45d1621e55deec2c59fe043ff19f180d0b264fa1dd0c392701dfc43497 WHIRLPOOL e3238e9dac4caf00de645c9eadbc530b725a6872a89ee82043931b7d21a6375419554020dc573aeed3b4415f8a65ddc4685c497bfe1951dd5d802d4fb8557b70 |
31 |
-DIST Net-XMPP-1.05.tar.gz 103876 SHA256 4c02200577c2b235a163a09bfaa152bf000fe5f1499ad80ce16ab66808949362 SHA512 cdd5474fcbdf7ff6c7d1247f9828f5dfb1828c258af366a831bab8e5faab423b73aa16c34228818526ebcc3180ef0ccc52d6e6cb61e2fe689458b87ec7fab699 WHIRLPOOL 9aee53ba25515722c88c4e810fdae78751b811426c70df39d57c2b606436278c143f2592230f605fee49edab7617cd37faf1e1fd20eaed7908f364049e4ee3da |
32 |
+DIST Net-XMPP-1.05.tar.gz 103876 BLAKE2B 5ddc98125b26518c59aa4ab39a974b9cbf1575bd59bb66d5329a43e1d5c3d150f34cc93f545f2cd56846e7b4e46142c47aff7da9b279181a02a57bf95ff1757b SHA512 cdd5474fcbdf7ff6c7d1247f9828f5dfb1828c258af366a831bab8e5faab423b73aa16c34228818526ebcc3180ef0ccc52d6e6cb61e2fe689458b87ec7fab699 |
33 |
|
34 |
diff --git a/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild b/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild |
35 |
index 15a7bce7219..328c3526915 100644 |
36 |
--- a/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild |
37 |
+++ b/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild |
38 |
@@ -1,10 +1,11 @@ |
39 |
-# Copyright 1999-2016 Gentoo Foundation |
40 |
+# Copyright 1999-2017 Gentoo Foundation |
41 |
# Distributed under the terms of the GNU General Public License v2 |
42 |
|
43 |
EAPI=6 |
44 |
|
45 |
DIST_AUTHOR=DAPATRICK |
46 |
DIST_VERSION=1.05 |
47 |
+DIST_EXAMPLES=( "examples/*" ) |
48 |
inherit perl-module |
49 |
|
50 |
DESCRIPTION="XMPP Perl Library" |
51 |
@@ -12,7 +13,7 @@ DESCRIPTION="XMPP Perl Library" |
52 |
LICENSE="LGPL-2.1" |
53 |
SLOT="0" |
54 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
55 |
-IUSE="test examples" |
56 |
+IUSE="test" |
57 |
|
58 |
RDEPEND=" |
59 |
>=dev-perl/Authen-SASL-2.120.0 |
60 |
@@ -28,16 +29,7 @@ DEPEND="${RDEPEND} |
61 |
>=virtual/perl-Test-Simple-0.920.0 |
62 |
) |
63 |
" |
64 |
-src_test() { |
65 |
- eapply "${FILESDIR}/${DIST_VERSION}-no-network-tests.patch" |
66 |
- perl-module_src_test |
67 |
-} |
68 |
- |
69 |
-src_install() { |
70 |
- perl-module_src_install |
71 |
- if use examples; then |
72 |
- docompress -x /usr/share/doc/${PF}/examples |
73 |
- insinto /usr/share/doc/${PF}/examples |
74 |
- doins -r examples/* |
75 |
- fi |
76 |
-} |
77 |
+PATCHES=( |
78 |
+ "${FILESDIR}/${DIST_VERSION}-no-network-tests.patch" |
79 |
+ "${FILESDIR}/${DIST_VERSION}-no-dot-inc.patch" |
80 |
+) |
81 |
|
82 |
diff --git a/dev-perl/Net-XMPP/files/1.05-no-dot-inc.patch b/dev-perl/Net-XMPP/files/1.05-no-dot-inc.patch |
83 |
new file mode 100644 |
84 |
index 00000000000..773b9f014b6 |
85 |
--- /dev/null |
86 |
+++ b/dev-perl/Net-XMPP/files/1.05-no-dot-inc.patch |
87 |
@@ -0,0 +1,133 @@ |
88 |
+From bad1310f14223c12c1d8933ef5de17fd323374f5 Mon Sep 17 00:00:00 2001 |
89 |
+From: Kent Fredric <kentnl@g.o> |
90 |
+Date: Wed, 29 Nov 2017 19:07:38 +1300 |
91 |
+Subject: Fix tests failing under Perl 5.26 w/ PERL_USE_UNSAFE_INC=0 |
92 |
+ |
93 |
+ require t/foo.pl |
94 |
+ |
95 |
+Used to work as a result of the assumed '.' at the end of `@INC`. |
96 |
+This is no longer true under Perl 5.26 without PERL_USE_UNSAFE_INC=1 |
97 |
+in your environment (which gets defaulted on under CPAN installers and |
98 |
+under Test::Harness if not explicitly disabled, and will be hard-off |
99 |
+in Perl 5.30) |
100 |
+ |
101 |
+Bug: https://bugs.gentoo.org/623002 |
102 |
+Bug: https://github.com/dap/Net-XMPP/pull/16 |
103 |
+--- |
104 |
+ t/iq.t | 2 +- |
105 |
+ t/jid.t | 2 +- |
106 |
+ t/message.t | 2 +- |
107 |
+ t/packet_iqauth.t | 2 +- |
108 |
+ t/packet_iqroster.t | 2 +- |
109 |
+ t/presence.t | 2 +- |
110 |
+ t/rawxml.t | 2 +- |
111 |
+ t/roster.t | 2 +- |
112 |
+ 8 files changed, 8 insertions(+), 8 deletions(-) |
113 |
+ |
114 |
+diff --git a/t/iq.t b/t/iq.t |
115 |
+index 9174e6d..1742d6c 100644 |
116 |
+--- a/t/iq.t |
117 |
++++ b/t/iq.t |
118 |
+@@ -3,7 +3,7 @@ use Test::More tests=>115; |
119 |
+ |
120 |
+ BEGIN{ use_ok( "Net::XMPP" ); } |
121 |
+ |
122 |
+-require "t/mytestlib.pl"; |
123 |
++require "./t/mytestlib.pl"; |
124 |
+ |
125 |
+ my $debug = Net::XMPP::Debug->new(setdefault=>1, |
126 |
+ level=>-1, |
127 |
+diff --git a/t/jid.t b/t/jid.t |
128 |
+index dc07440..fa426a4 100644 |
129 |
+--- a/t/jid.t |
130 |
++++ b/t/jid.t |
131 |
+@@ -3,7 +3,7 @@ use Test::More tests=>15; |
132 |
+ |
133 |
+ BEGIN{ use_ok( "Net::XMPP" ); } |
134 |
+ |
135 |
+-require "t/mytestlib.pl"; |
136 |
++require "./t/mytestlib.pl"; |
137 |
+ |
138 |
+ my $jid = Net::XMPP::JID->new('host.com/xxx@×××.com/zzz'); |
139 |
+ ok( defined($jid), "new()" ); |
140 |
+diff --git a/t/message.t b/t/message.t |
141 |
+index 70bcef8..7c2f554 100644 |
142 |
+--- a/t/message.t |
143 |
++++ b/t/message.t |
144 |
+@@ -3,7 +3,7 @@ use Test::More tests=>136; |
145 |
+ |
146 |
+ BEGIN{ use_ok( "Net::XMPP" ); } |
147 |
+ |
148 |
+-require "t/mytestlib.pl"; |
149 |
++require "./t/mytestlib.pl"; |
150 |
+ |
151 |
+ my $debug = Net::XMPP::Debug->new(setdefault=>1, |
152 |
+ level=>-1, |
153 |
+diff --git a/t/packet_iqauth.t b/t/packet_iqauth.t |
154 |
+index 748917b..f80b5ae 100644 |
155 |
+--- a/t/packet_iqauth.t |
156 |
++++ b/t/packet_iqauth.t |
157 |
+@@ -3,7 +3,7 @@ use Test::More tests=>55; |
158 |
+ |
159 |
+ BEGIN{ use_ok( "Net::XMPP" ); } |
160 |
+ |
161 |
+-require "t/mytestlib.pl"; |
162 |
++require "./t/mytestlib.pl"; |
163 |
+ |
164 |
+ my $debug = Net::XMPP::Debug->new(setdefault=>1, |
165 |
+ level=>-1, |
166 |
+diff --git a/t/packet_iqroster.t b/t/packet_iqroster.t |
167 |
+index 706e5f0..4bd48e8 100644 |
168 |
+--- a/t/packet_iqroster.t |
169 |
++++ b/t/packet_iqroster.t |
170 |
+@@ -3,7 +3,7 @@ use Test::More tests=>57; |
171 |
+ |
172 |
+ BEGIN{ use_ok( "Net::XMPP" ); } |
173 |
+ |
174 |
+-require "t/mytestlib.pl"; |
175 |
++require "./t/mytestlib.pl"; |
176 |
+ |
177 |
+ my $debug = Net::XMPP::Debug->new(setdefault=>1, |
178 |
+ level=>-1, |
179 |
+diff --git a/t/presence.t b/t/presence.t |
180 |
+index ce6980d..14f9516 100644 |
181 |
+--- a/t/presence.t |
182 |
++++ b/t/presence.t |
183 |
+@@ -3,7 +3,7 @@ use Test::More tests=>132; |
184 |
+ |
185 |
+ BEGIN{ use_ok( "Net::XMPP" ); } |
186 |
+ |
187 |
+-require "t/mytestlib.pl"; |
188 |
++require "./t/mytestlib.pl"; |
189 |
+ |
190 |
+ my $debug = Net::XMPP::Debug->new(setdefault=>1, |
191 |
+ level=>-1, |
192 |
+diff --git a/t/rawxml.t b/t/rawxml.t |
193 |
+index b4f091b..43b6380 100644 |
194 |
+--- a/t/rawxml.t |
195 |
++++ b/t/rawxml.t |
196 |
+@@ -3,7 +3,7 @@ use Test::More tests=>54; |
197 |
+ |
198 |
+ BEGIN{ use_ok( "Net::XMPP" ); } |
199 |
+ |
200 |
+-require "t/mytestlib.pl"; |
201 |
++require "./t/mytestlib.pl"; |
202 |
+ |
203 |
+ my $message = Net::XMPP::Message->new(); |
204 |
+ ok( defined($message), "new()"); |
205 |
+diff --git a/t/roster.t b/t/roster.t |
206 |
+index 19ed87b..a365d2e 100644 |
207 |
+--- a/t/roster.t |
208 |
++++ b/t/roster.t |
209 |
+@@ -11,7 +11,7 @@ BEGIN { |
210 |
+ } |
211 |
+ BEGIN{ use_ok( "Net::XMPP" ); } |
212 |
+ |
213 |
+-require "t/mytestlib.pl"; |
214 |
++require "./t/mytestlib.pl"; |
215 |
+ |
216 |
+ my $debug = Net::XMPP::Debug->new(setdefault=>1, |
217 |
+ level=>-1, |
218 |
+-- |
219 |
+2.14.3 |
220 |
+ |
221 |
|
222 |
diff --git a/dev-perl/Net-XMPP/files/1.05-no-network-tests.patch b/dev-perl/Net-XMPP/files/1.05-no-network-tests.patch |
223 |
index 921121805de..e20b39316b9 100644 |
224 |
--- a/dev-perl/Net-XMPP/files/1.05-no-network-tests.patch |
225 |
+++ b/dev-perl/Net-XMPP/files/1.05-no-network-tests.patch |
226 |
@@ -1,7 +1,20 @@ |
227 |
-diff -Naur Net-XMPP-1.05/t/gtalk.t Net-XMPP-1.05b/t/gtalk.t |
228 |
---- Net-XMPP-1.05/t/gtalk.t 2014-12-22 21:28:51.000000000 +0000 |
229 |
-+++ Net-XMPP-1.05b/t/gtalk.t 2016-03-06 07:14:13.313580716 +0000 |
230 |
-@@ -2,7 +2,12 @@ |
231 |
+From ce5bd091758174c06e0b250040d85b1cc1c8bad0 Mon Sep 17 00:00:00 2001 |
232 |
+From: Kent Fredric <kentnl@g.o> |
233 |
+Date: Sun, 6 Mar 2016 20:35:45 +1300 |
234 |
+Subject: Disable network tests when tests forcibly required by ENV |
235 |
+ |
236 |
+Bug: https://bugs.gentoo.org/612256 |
237 |
+--- |
238 |
+ t/gtalk.t | 7 ++++++- |
239 |
+ t/lib/Net/XMPP/Test/Utils.pm | 1 + |
240 |
+ t/roster.t | 10 +++++++++- |
241 |
+ 3 files changed, 16 insertions(+), 2 deletions(-) |
242 |
+ |
243 |
+diff --git a/t/gtalk.t b/t/gtalk.t |
244 |
+index 747b7df..3b1af73 100644 |
245 |
+--- a/t/gtalk.t |
246 |
++++ b/t/gtalk.t |
247 |
+@@ -2,7 +2,12 @@ use strict; |
248 |
use warnings; |
249 |
|
250 |
use Test::More; |
251 |
@@ -15,10 +28,11 @@ diff -Naur Net-XMPP-1.05/t/gtalk.t Net-XMPP-1.05b/t/gtalk.t |
252 |
######################## XML::Stream mocking starts |
253 |
#{ |
254 |
# package XML::Stream; |
255 |
-diff -Naur Net-XMPP-1.05/t/lib/Net/XMPP/Test/Utils.pm Net-XMPP-1.05b/t/lib/Net/XMPP/Test/Utils.pm |
256 |
---- Net-XMPP-1.05/t/lib/Net/XMPP/Test/Utils.pm 2014-12-22 21:28:51.000000000 +0000 |
257 |
-+++ Net-XMPP-1.05b/t/lib/Net/XMPP/Test/Utils.pm 2016-03-06 06:59:57.227261659 +0000 |
258 |
-@@ -23,6 +23,7 @@ |
259 |
+diff --git a/t/lib/Net/XMPP/Test/Utils.pm b/t/lib/Net/XMPP/Test/Utils.pm |
260 |
+index d69eca3..3c4565e 100644 |
261 |
+--- a/t/lib/Net/XMPP/Test/Utils.pm |
262 |
++++ b/t/lib/Net/XMPP/Test/Utils.pm |
263 |
+@@ -23,6 +23,7 @@ sub can_run_tests { |
264 |
} |
265 |
|
266 |
sub conn_is_available { |
267 |
@@ -26,3 +40,26 @@ diff -Naur Net-XMPP-1.05/t/lib/Net/XMPP/Test/Utils.pm Net-XMPP-1.05b/t/lib/Net/X |
268 |
return online(); |
269 |
} |
270 |
|
271 |
+diff --git a/t/roster.t b/t/roster.t |
272 |
+index 25ee505..19ed87b 100644 |
273 |
+--- a/t/roster.t |
274 |
++++ b/t/roster.t |
275 |
+@@ -1,6 +1,14 @@ |
276 |
+ use lib "t/lib"; |
277 |
+-use Test::More tests=>75; |
278 |
+ |
279 |
++BEGIN { |
280 |
++ require Test::More; |
281 |
++ if ($ENV{NO_NETWORK_TESTING}) { |
282 |
++ Test::More->import(skip_all => "NO_NETWORK_TESTS set"); |
283 |
++ } |
284 |
++ else { |
285 |
++ Test::More->import( tests => 75 ); |
286 |
++ } |
287 |
++} |
288 |
+ BEGIN{ use_ok( "Net::XMPP" ); } |
289 |
+ |
290 |
+ require "t/mytestlib.pl"; |
291 |
+-- |
292 |
+2.14.3 |
293 |
+ |