Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-perl/Net-LibIDN2/files/
Date: Sun, 05 Dec 2021 21:46:03
Message-Id: 1638740715.065701d25d95d8768d1f3f379385d8bd3e129cb7.conikost@gentoo
1 commit: 065701d25d95d8768d1f3f379385d8bd3e129cb7
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Thu Nov 25 16:56:04 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 5 21:45:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=065701d2
7
8 dev-perl/Net-LibIDN2: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 .../files/Net-LibIDN2-1.0.0-libidn-2.0.5.patch | 98 ----------------------
15 1 file changed, 98 deletions(-)
16
17 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
18 deleted file mode 100644
19 index e7fb47bd0acd..000000000000
20 --- a/dev-perl/Net-LibIDN2/files/Net-LibIDN2-1.0.0-libidn-2.0.5.patch
21 +++ /dev/null
22 @@ -1,98 +0,0 @@
23 -From 1fb29989acde21148e5c36b3bdccbf2a4a88059c Mon Sep 17 00:00:00 2001
24 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@××××××.com>
25 -Date: Thu, 31 May 2018 15:02:02 +0200
26 -Subject: [PATCH] Adapt to libidn-2.0.5
27 -MIME-Version: 1.0
28 -Content-Type: text/plain; charset=UTF-8
29 -Content-Transfer-Encoding: 8bit
30 -
31 -libidn-2.0.5 enabled non-transitional TR46 by default. This caused
32 -a test failure. This patch adds IDN2_NO_TR46 flag, document the
33 -change and adapts the test.
34 -
35 -CPAN RT#125440
36 -
37 -Signed-off-by: Petr Písař <ppisar@××××××.com>
38 ----
39 - lib/Net/LibIDN2.pm | 11 +++++++++--
40 - lib/Net/LibIDN2.xs | 3 +++
41 - t/001_basic.t | 6 +++++-
42 - 3 files changed, 17 insertions(+), 3 deletions(-)
43 -
44 -diff --git a/lib/Net/LibIDN2.pm b/lib/Net/LibIDN2.pm
45 -index b27aaa4..c6ca3bd 100644
46 ---- a/lib/Net/LibIDN2.pm
47 -+++ b/lib/Net/LibIDN2.pm
48 -@@ -32,6 +32,7 @@ our %EXPORT_TAGS = ( 'all' => [ qw(
49 - IDN2_NONTRANSITIONAL
50 - IDN2_ALLOW_UNASSIGNED
51 - IDN2_USE_STD3_ASCII_RULES
52 -+ IDN2_NO_TR46
53 - ) ] );
54 -
55 - our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
56 -@@ -50,6 +51,7 @@ our @EXPORT = qw(
57 - IDN2_NONTRANSITIONAL
58 - IDN2_ALLOW_UNASSIGNED
59 - IDN2_USE_STD3_ASCII_RULES
60 -+ IDN2_NO_TR46
61 - );
62 - our $VERSION = '1.00';
63 -
64 -@@ -102,8 +104,10 @@ Pass B<IDN2_ALABEL_ROUNDTRIP> in flags to convert any input A-labels
65 - to U-labels and perform additional testing (not yet implemented).
66 - Pass IDN2_TRANSITIONAL to enable Unicode
67 - TR46 transitional processing, and IDN2_NONTRANSITIONAL to enable Unicode TR46
68 --non-transitional processing. Multiple flags may be specified
69 --by binary or:ing them together, for example B<IDN2_NFC_INPUT> | B<IDN2_ALABEL_ROUNDTRIP>.
70 -+non-transitional processing. Pass IDN2_NO_TR46 (available since Libidn 2.0.5)
71 -+to disable any TR46 transitional or non-transitional processing. Multiple
72 -+flags may be specified by binary or:ing them together, for example
73 -+B<IDN2_NFC_INPUT> | B<IDN2_ALABEL_ROUNDTRIP>.
74 -
75 - If linked to library GNU Libidn version > 2.0.3: IDN2_USE_STD3_ASCII_RULES disabled by default.
76 - Previously we were eliminating non-STD3 characters from domain strings such as
77 -@@ -112,6 +116,9 @@ That was an unexpected regression for applications switching from libidn
78 - and thus it is no longer applied by default. Use IDN2_USE_STD3_ASCII_RULES
79 - to enable that behavior again.
80 -
81 -+If linked to library GNU Libidn version >= 2.0.5: IDNA2008 behavior amended by TR46
82 -+(non-transitional) is default.
83 -+
84 - On error, returns undef. If a scalar variable is provided in I<$rc>,
85 - returns the internal libidn2 C library result code as well.
86 -
87 -diff --git a/lib/Net/LibIDN2.xs b/lib/Net/LibIDN2.xs
88 -index 5b2f7c3..027285a 100644
89 ---- a/lib/Net/LibIDN2.xs
90 -+++ b/lib/Net/LibIDN2.xs
91 -@@ -25,6 +25,9 @@ BOOT:
92 - newCONSTSUB(stash, "IDN2_NONTRANSITIONAL", newSViv(IDN2_NONTRANSITIONAL));
93 - newCONSTSUB(stash, "IDN2_ALLOW_UNASSIGNED", newSViv(IDN2_ALLOW_UNASSIGNED));
94 - newCONSTSUB(stash, "IDN2_USE_STD3_ASCII_RULES", newSViv(IDN2_USE_STD3_ASCII_RULES));
95 -+#if IDN2_VERSION_NUMBER >= 0x02000005
96 -+ newCONSTSUB(stash, "IDN2_NO_TR46", newSViv(IDN2_NO_TR46));
97 -+#endif
98 -
99 -
100 - const char *
101 -diff --git a/t/001_basic.t b/t/001_basic.t
102 -index 3171478..ada1091 100644
103 ---- a/t/001_basic.t
104 -+++ b/t/001_basic.t
105 -@@ -76,7 +76,11 @@ my $muesli_dot_de_punycode = "xn--mli-5ka8l.de";
106 - my $rc = 0;
107 - my $result = Net::LibIDN2::idn2_lookup_u8(
108 - "\x65\x78\x61\x6d\x70\x6c\x65\x2e\xe1\x84\x80\xe1\x85\xa1\xe1\x86\xa8",
109 -- 0,
110 -+ (IDN2_VERSION_MAJOR > 2 ||
111 -+ (IDN2_VERSION_MAJOR == 2 && (IDN2_VERSION_MINOR > 0 ||
112 -+ IDN2_VERSION_MINOR == 0 && IDN2_VERSION_PATCH >= 5)
113 -+ )
114 -+ ) ? IDN2_NO_TR46 : 0,
115 - $rc);
116 -
117 - is(Net::LibIDN2::idn2_strerror_name($rc), "IDN2_NOT_NFC");
118 ---
119 -2.14.4
120 -