| 1 |
commit: bd171538ea6c76c689150c983ad4069b4b5a2549 |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 6 19:24:53 2019 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 6 19:26:26 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd171538 |
| 7 |
|
| 8 |
net-libs/gnutls: build with libidn2-2.1.0 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=674690 |
| 11 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 13 |
|
| 14 |
net-libs/gnutls/files/gnutls-3.5.19-idn2.patch | 47 ++++++++++++++++++++++++++ |
| 15 |
net-libs/gnutls/gnutls-3.5.19-r1.ebuild | 6 +++- |
| 16 |
net-libs/gnutls/gnutls-3.5.19.ebuild | 6 +++- |
| 17 |
3 files changed, 57 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch b/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..1f16302c81b |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch |
| 24 |
@@ -0,0 +1,47 @@ |
| 25 |
+From b0dfccd2149086cf5d2db44c329664a56b126216 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 27 |
+Date: Sun, 6 Jan 2019 20:02:50 +0200 |
| 28 |
+Subject: [PATCH] idn2: do not use deprecated idn2_to_unicode_8z8z in |
| 29 |
+ idn2-2.1.0 |
| 30 |
+ |
| 31 |
+Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 32 |
+--- |
| 33 |
+ lib/str-idna.c | 6 +++--- |
| 34 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
| 35 |
+ |
| 36 |
+https://gitlab.com/gnutls/gnutls/merge_requests/864 |
| 37 |
+ |
| 38 |
+diff --git a/lib/str-idna.c b/lib/str-idna.c |
| 39 |
+index 3bf2db877..95ca9b769 100644 |
| 40 |
+--- a/lib/str-idna.c |
| 41 |
++++ b/lib/str-idna.c |
| 42 |
+@@ -145,7 +145,7 @@ int gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsig |
| 43 |
+ return ret; |
| 44 |
+ } |
| 45 |
+ |
| 46 |
+-#ifdef HAVE_LIBIDN2 |
| 47 |
++#if defined(HAVE_LIBIDN2) && IDN2_VERSION_NUMBER < 0x02000000 |
| 48 |
+ int _idn2_punycode_decode( |
| 49 |
+ size_t input_length, |
| 50 |
+ const char input[], |
| 51 |
+@@ -153,7 +153,7 @@ int _idn2_punycode_decode( |
| 52 |
+ uint32_t output[], |
| 53 |
+ unsigned char case_flags[]); |
| 54 |
+ |
| 55 |
+-static int _idn2_to_unicode_8z8z(const char *src, char **dst) |
| 56 |
++static int idn2_to_unicode_8z8z(const char *src, char **dst, int flags) |
| 57 |
+ { |
| 58 |
+ int rc, run; |
| 59 |
+ size_t out_len = 0; |
| 60 |
+@@ -253,7 +253,7 @@ int gnutls_idna_reverse_map(const char *input, unsigned ilen, gnutls_datum_t *ou |
| 61 |
+ |
| 62 |
+ #ifdef HAVE_LIBIDN2 |
| 63 |
+ /* currently libidn2 just converts single labels, thus a wrapper function */ |
| 64 |
+- rc = _idn2_to_unicode_8z8z((char*)istr.data, &u8); |
| 65 |
++ rc = idn2_to_unicode_8z8z((char*)istr.data, &u8, 0); |
| 66 |
+ if (rc != IDN2_OK) { |
| 67 |
+ gnutls_assert(); |
| 68 |
+ _gnutls_debug_log("unable to convert ACE name '%s' to UTF-8 format: %s\n", istr.data, idn2_strerror(rc)); |
| 69 |
+-- |
| 70 |
+2.19.2 |
| 71 |
+ |
| 72 |
|
| 73 |
diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
| 74 |
index 9fc06eac7ed..379e758cd88 100644 |
| 75 |
--- a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
| 76 |
+++ b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
| 77 |
@@ -1,4 +1,4 @@ |
| 78 |
-# Copyright 1999-2018 Gentoo Foundation |
| 79 |
+# Copyright 1999-2019 Gentoo Authors |
| 80 |
# Distributed under the terms of the GNU General Public License v2 |
| 81 |
|
| 82 |
EAPI=7 |
| 83 |
@@ -54,6 +54,10 @@ DOCS=( |
| 84 |
|
| 85 |
HTML_DOCS=() |
| 86 |
|
| 87 |
+PATCHES=( |
| 88 |
+ "${FILESDIR}/${P}-idn2.patch" |
| 89 |
+) |
| 90 |
+ |
| 91 |
pkg_setup() { |
| 92 |
# bug#520818 |
| 93 |
export TZ=UTC |
| 94 |
|
| 95 |
diff --git a/net-libs/gnutls/gnutls-3.5.19.ebuild b/net-libs/gnutls/gnutls-3.5.19.ebuild |
| 96 |
index 39244f5c2a3..77cc3480387 100644 |
| 97 |
--- a/net-libs/gnutls/gnutls-3.5.19.ebuild |
| 98 |
+++ b/net-libs/gnutls/gnutls-3.5.19.ebuild |
| 99 |
@@ -1,4 +1,4 @@ |
| 100 |
-# Copyright 1999-2018 Gentoo Foundation |
| 101 |
+# Copyright 1999-2019 Gentoo Authors |
| 102 |
# Distributed under the terms of the GNU General Public License v2 |
| 103 |
|
| 104 |
EAPI=6 |
| 105 |
@@ -54,6 +54,10 @@ DOCS=( |
| 106 |
|
| 107 |
HTML_DOCS=() |
| 108 |
|
| 109 |
+PATCHES=( |
| 110 |
+ "${FILESDIR}/${P}-idn2.patch" |
| 111 |
+) |
| 112 |
+ |
| 113 |
pkg_setup() { |
| 114 |
# bug#520818 |
| 115 |
export TZ=UTC |
Archives