gentoo resync : 22.01.2019

3 files changed, 102 insertions, 1 deletions

diff --git a/dev-perl/Net-LibIDN2/Manifest b/dev-perl/Net-LibIDN2/Manifest
index e370ba6f6c69..d58b949d73f9 100644
--- a/dev-perl/Net-LibIDN2/Manifest
+++ b/dev-perl/Net-LibIDN2/Manifest
@@ -1,3 +1,4 @@
+AUX Net-LibIDN2-1.0.0-libidn-2.0.5.patch 3614 BLAKE2B 06197281422b373e4456cfe487d974722270af6c5e7f71315b226a967a4395382cc74239b88f762b4541d6b63a2dcaf686f56ab51e81de494594a50565338a13 SHA512 8ed3455ec2445418a76cb259f70d67055506bffa212511e59d54a230d4082cbadce05c54d772506ae3805d618a88cf2bfa8d027f1627b1a8b76971f3ccfafadc
 DIST Net-LibIDN2-1.00.tar.gz 23603 BLAKE2B 61d16265263e934c45cbed9427636e73a2abae8f41f7294d4b682b0129c2a7bb2c316f522b5ee36988a0d860b53514f6c44d360c12479f26887a0d2873741993 SHA512 0b0c3bba9b2c8e748fd416ba465e6b4eb76fbdad1ee2d3459be032b7d5bdb0706da97e8ebb9de57a92acae06ce84aed357f5baa516ad40268797abda6d7fb38e
-EBUILD Net-LibIDN2-1.0.0.ebuild 631 BLAKE2B 15507fc48940426be2477cb50bd2e195d0261039fcb213c3736c2feca878e10988aab00a58385c1d74ea39a4007486b4d503251c4d3abcc97f26cedc6461fb4f SHA512 eae471c7eec5956e79aa15f7fb26ceb0be0b5f953c74d330ac2e5d52c339adc6c83e6c61b0d8db96e0ae1dda88161b89bdd8b5b18a2ec6b9ff2c3412dc4613aa
+EBUILD Net-LibIDN2-1.0.0-r1.ebuild 682 BLAKE2B 0a7516be58b57f817aa7af56601aa64001f1a443e9485a06318d86feab78226bc18afbccab3e9f22bac78cc9dc88e67bb4539c2399b09132f05cf25dff66e488 SHA512 54924774cad26d03796fd99ae1b9dbb72a2867d57b70102e284ecd293f1852264f8e13f7e77c52c672349d730bd4bf315e69fd61a8dd53ebeece3240e44b6934
 MISC metadata.xml 394 BLAKE2B 0e04894c656ca9bb0623be50369ef992244fd627478f8e23232fe937123df5e8f136247e6d2708dcaa1e9e475e6967466a756dae6c1b39d243b7777a36eaa81d SHA512 66adec760ee1638b405b6f14878ed1239a4efa0dc3708ae88c6a623138bcf765175cfd8a0a2a7a63ad606cf249e35496371a56e1bc257f7325dffc9fa62cd4a0
diff --git a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0.ebuild b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild
index d7df6b24a255..488f3283a249 100644
--- a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0.ebuild
+++ b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild
@@ -21,3 +21,5 @@ DEPEND="${RDEPEND}
 		>=virtual/perl-Test-Simple-0.10.0
 	)
 "
+
+PATCHES=( "${FILESDIR}/${P}"-libidn-2.0.5.patch )
diff --git a/dev-perl/Net-LibIDN2/files/Net-LibIDN2-1.0.0-libidn-2.0.5.patch b/dev-perl/Net-LibIDN2/files/Net-LibIDN2-1.0.0-libidn-2.0.5.patch
new file mode 100644
index 000000000000..e7fb47bd0acd
--- /dev/null
+++ b/dev-perl/Net-LibIDN2/files/Net-LibIDN2-1.0.0-libidn-2.0.5.patch
@@ -0,0 +1,98 @@
+From 1fb29989acde21148e5c36b3bdccbf2a4a88059c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Thu, 31 May 2018 15:02:02 +0200
+Subject: [PATCH] Adapt to libidn-2.0.5
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+libidn-2.0.5 enabled non-transitional TR46 by default. This caused
+a test failure. This patch adds IDN2_NO_TR46 flag, document the
+change and adapts the test.
+
+CPAN RT#125440
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ lib/Net/LibIDN2.pm | 11 +++++++++--
+ lib/Net/LibIDN2.xs |  3 +++
+ t/001_basic.t      |  6 +++++-
+ 3 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/lib/Net/LibIDN2.pm b/lib/Net/LibIDN2.pm
+index b27aaa4..c6ca3bd 100644
+--- a/lib/Net/LibIDN2.pm
++++ b/lib/Net/LibIDN2.pm
+@@ -32,6 +32,7 @@ our %EXPORT_TAGS = ( 'all' => [ qw(
+ 	IDN2_NONTRANSITIONAL
+ 	IDN2_ALLOW_UNASSIGNED
+ 	IDN2_USE_STD3_ASCII_RULES
++	IDN2_NO_TR46
+ ) ] );
+ 
+ our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+@@ -50,6 +51,7 @@ our @EXPORT = qw(
+ 	IDN2_NONTRANSITIONAL
+ 	IDN2_ALLOW_UNASSIGNED
+ 	IDN2_USE_STD3_ASCII_RULES
++	IDN2_NO_TR46
+ );
+ our $VERSION = '1.00';
+ 
+@@ -102,8 +104,10 @@ Pass B<IDN2_ALABEL_ROUNDTRIP> in flags to convert any input A-labels
+ to U-labels and perform additional testing (not yet implemented).
+ Pass IDN2_TRANSITIONAL to enable Unicode
+ TR46 transitional processing, and IDN2_NONTRANSITIONAL to enable Unicode TR46
+-non-transitional processing.  Multiple flags may be specified
+-by binary or:ing them together, for example B<IDN2_NFC_INPUT> | B<IDN2_ALABEL_ROUNDTRIP>.
++non-transitional processing. Pass IDN2_NO_TR46 (available since Libidn 2.0.5)
++to disable any TR46 transitional or non-transitional processing. Multiple
++flags may be specified by binary or:ing them together, for example
++B<IDN2_NFC_INPUT> | B<IDN2_ALABEL_ROUNDTRIP>.
+ 
+ If linked to library GNU Libidn version > 2.0.3: IDN2_USE_STD3_ASCII_RULES disabled by default.
+ Previously we were eliminating non-STD3 characters from domain strings such as
+@@ -112,6 +116,9 @@ That was an unexpected regression for applications switching from libidn
+ and thus it is no longer applied by default. Use IDN2_USE_STD3_ASCII_RULES
+ to enable that behavior again.
+ 
++If linked to library GNU Libidn version >= 2.0.5: IDNA2008 behavior amended by TR46
++(non-transitional) is default.
++
+ On error, returns undef. If a scalar variable is provided in I<$rc>, 
+ returns the internal libidn2 C library result code as well.
+ 
+diff --git a/lib/Net/LibIDN2.xs b/lib/Net/LibIDN2.xs
+index 5b2f7c3..027285a 100644
+--- a/lib/Net/LibIDN2.xs
++++ b/lib/Net/LibIDN2.xs
+@@ -25,6 +25,9 @@ BOOT:
+ 	newCONSTSUB(stash, "IDN2_NONTRANSITIONAL", newSViv(IDN2_NONTRANSITIONAL));
+ 	newCONSTSUB(stash, "IDN2_ALLOW_UNASSIGNED", newSViv(IDN2_ALLOW_UNASSIGNED));
+ 	newCONSTSUB(stash, "IDN2_USE_STD3_ASCII_RULES", newSViv(IDN2_USE_STD3_ASCII_RULES));
++#if IDN2_VERSION_NUMBER >= 0x02000005
++	newCONSTSUB(stash, "IDN2_NO_TR46", newSViv(IDN2_NO_TR46));
++#endif
+ 
+ 
+ const char *
+diff --git a/t/001_basic.t b/t/001_basic.t
+index 3171478..ada1091 100644
+--- a/t/001_basic.t
++++ b/t/001_basic.t
+@@ -76,7 +76,11 @@ my $muesli_dot_de_punycode = "xn--mli-5ka8l.de";
+ 	my $rc = 0;
+ 	my $result = Net::LibIDN2::idn2_lookup_u8(
+ 		"\x65\x78\x61\x6d\x70\x6c\x65\x2e\xe1\x84\x80\xe1\x85\xa1\xe1\x86\xa8",
+-		0,
++		(IDN2_VERSION_MAJOR > 2 ||
++			(IDN2_VERSION_MAJOR == 2 && (IDN2_VERSION_MINOR > 0 ||
++				IDN2_VERSION_MINOR == 0 && IDN2_VERSION_PATCH >= 5)
++			)
++		) ?  IDN2_NO_TR46 : 0,
+ 		$rc);
+ 
+ 	is(Net::LibIDN2::idn2_strerror_name($rc), "IDN2_NOT_NFC");
+-- 
+2.14.4
+