SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/gnutls/stuff/patches/gnutls-3.5.19-idn2.patch	Tue Sep 01 10:31:46 2020 +0000
     1.3 @@ -0,0 +1,47 @@
     1.4 +From b0dfccd2149086cf5d2db44c329664a56b126216 Mon Sep 17 00:00:00 2001
     1.5 +From: Alon Bar-Lev <alon.barlev@gmail.com>
     1.6 +Date: Sun, 6 Jan 2019 20:02:50 +0200
     1.7 +Subject: [PATCH] idn2: do not use deprecated idn2_to_unicode_8z8z in
     1.8 + idn2-2.1.0
     1.9 +
    1.10 +Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
    1.11 +---
    1.12 + lib/str-idna.c | 6 +++---
    1.13 + 1 file changed, 3 insertions(+), 3 deletions(-)
    1.14 +
    1.15 +https://gitlab.com/gnutls/gnutls/merge_requests/864
    1.16 +
    1.17 +diff --git a/lib/str-idna.c b/lib/str-idna.c
    1.18 +index 3bf2db877..95ca9b769 100644
    1.19 +--- a/lib/str-idna.c
    1.20 ++++ b/lib/str-idna.c
    1.21 +@@ -145,7 +145,7 @@ int gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsig
    1.22 + 	return ret;
    1.23 + }
    1.24 + 
    1.25 +-#ifdef HAVE_LIBIDN2
    1.26 ++#if defined(HAVE_LIBIDN2) && IDN2_VERSION_NUMBER < 0x02000000
    1.27 + int _idn2_punycode_decode(
    1.28 + 	size_t input_length,
    1.29 + 	const char input[],
    1.30 +@@ -153,7 +153,7 @@ int _idn2_punycode_decode(
    1.31 + 	uint32_t output[],
    1.32 + 	unsigned char case_flags[]);
    1.33 + 
    1.34 +-static int _idn2_to_unicode_8z8z(const char *src, char **dst)
    1.35 ++static int idn2_to_unicode_8z8z(const char *src, char **dst, int flags)
    1.36 + {
    1.37 + 	int rc, run;
    1.38 + 	size_t out_len = 0;
    1.39 +@@ -253,7 +253,7 @@ int gnutls_idna_reverse_map(const char *input, unsigned ilen, gnutls_datum_t *ou
    1.40 + 
    1.41 + #ifdef HAVE_LIBIDN2
    1.42 + 	/* currently libidn2 just converts single labels, thus a wrapper function */
    1.43 +-	rc = _idn2_to_unicode_8z8z((char*)istr.data, &u8);
    1.44 ++	rc = idn2_to_unicode_8z8z((char*)istr.data, &u8, 0);
    1.45 + 	if (rc != IDN2_OK) {
    1.46 + 		gnutls_assert();
    1.47 + 		_gnutls_debug_log("unable to convert ACE name '%s' to UTF-8 format: %s\n", istr.data, idn2_strerror(rc));
    1.48 +-- 
    1.49 +2.19.2
    1.50 +