SliTaz Repositories

     1.1 --- a/gnutls/receipt	Thu Jan 24 02:07:21 2019 +0200
     1.2 +++ b/gnutls/receipt	Thu Jan 24 03:36:19 2019 +0200
     1.3 @@ -14,7 +14,15 @@
     1.4  
     1.5  BUILD_DEPENDS="nettle-dev libtasn1-dev libunistring-dev gettext-dev openssl-dev \
     1.6  libidn2-dev unbound-dev p11-kit-dev zlib-dev"
     1.7 -SPLIT="libgnutls $PACKAGE-dev"
     1.8 +SPLIT="lib$PACKAGE $PACKAGE $PACKAGE-dev"
     1.9 +
    1.10 +CAT_libgnutls="security|shared libraries"
    1.11 +
    1.12 +DEPENDS_libgnutls="gmp libidn2 libp11-kit libtasn1 libunistring nettle unbound \
    1.13 +zlib   cacerts"
    1.14 +DEPENDS_std="lib$PACKAGE libtasn1"
    1.15 +DEPENDS_dev="$PACKAGE lib$PACKAGE gmp-dev libidn2-dev libtasn1-dev nettle-dev \
    1.16 +p11-kit-dev unbound-dev zlib-dev"
    1.17  
    1.18  compile_rules() {
    1.19  	./configure \
    1.20 @@ -26,24 +34,3 @@
    1.21  	make install &&
    1.22  	make -C doc/reference install-data-local
    1.23  }
    1.24 -
    1.25 -genpkg_rules() {
    1.26 -	case $PACKAGE in
    1.27 -		gnutls)
    1.28 -			copy bin/
    1.29 -			DEPENDS="libgnutls libtasn1"
    1.30 -			;;
    1.31 -		libgnutls)
    1.32 -			copy *.so*
    1.33 -			CAT="security|shared libraries"
    1.34 -			DEPENDS="gmp libidn2 libp11-kit libtasn1 libunistring nettle \
    1.35 -			unbound zlib   cacerts"
    1.36 -			;;
    1.37 -		*-dev)
    1.38 -			copy @dev
    1.39 -			DEPENDS="gnutls libgnutls \
    1.40 -			gmp-dev libidn2-dev libtasn1-dev nettle-dev p11-kit-dev \
    1.41 -			unbound-dev zlib-dev"
    1.42 -			;;
    1.43 -	esac
    1.44 -}

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/gnutls/stuff/patches/gnutls-3.5.19-idn2.patch	Thu Jan 24 03:36:19 2019 +0200
     2.3 @@ -0,0 +1,47 @@
     2.4 +From b0dfccd2149086cf5d2db44c329664a56b126216 Mon Sep 17 00:00:00 2001
     2.5 +From: Alon Bar-Lev <alon.barlev@gmail.com>
     2.6 +Date: Sun, 6 Jan 2019 20:02:50 +0200
     2.7 +Subject: [PATCH] idn2: do not use deprecated idn2_to_unicode_8z8z in
     2.8 + idn2-2.1.0
     2.9 +
    2.10 +Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
    2.11 +---
    2.12 + lib/str-idna.c | 6 +++---
    2.13 + 1 file changed, 3 insertions(+), 3 deletions(-)
    2.14 +
    2.15 +https://gitlab.com/gnutls/gnutls/merge_requests/864
    2.16 +
    2.17 +diff --git a/lib/str-idna.c b/lib/str-idna.c
    2.18 +index 3bf2db877..95ca9b769 100644
    2.19 +--- a/lib/str-idna.c
    2.20 ++++ b/lib/str-idna.c
    2.21 +@@ -145,7 +145,7 @@ int gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsig
    2.22 + 	return ret;
    2.23 + }
    2.24 + 
    2.25 +-#ifdef HAVE_LIBIDN2
    2.26 ++#if defined(HAVE_LIBIDN2) && IDN2_VERSION_NUMBER < 0x02000000
    2.27 + int _idn2_punycode_decode(
    2.28 + 	size_t input_length,
    2.29 + 	const char input[],
    2.30 +@@ -153,7 +153,7 @@ int _idn2_punycode_decode(
    2.31 + 	uint32_t output[],
    2.32 + 	unsigned char case_flags[]);
    2.33 + 
    2.34 +-static int _idn2_to_unicode_8z8z(const char *src, char **dst)
    2.35 ++static int idn2_to_unicode_8z8z(const char *src, char **dst, int flags)
    2.36 + {
    2.37 + 	int rc, run;
    2.38 + 	size_t out_len = 0;
    2.39 +@@ -253,7 +253,7 @@ int gnutls_idna_reverse_map(const char *input, unsigned ilen, gnutls_datum_t *ou
    2.40 + 
    2.41 + #ifdef HAVE_LIBIDN2
    2.42 + 	/* currently libidn2 just converts single labels, thus a wrapper function */
    2.43 +-	rc = _idn2_to_unicode_8z8z((char*)istr.data, &u8);
    2.44 ++	rc = idn2_to_unicode_8z8z((char*)istr.data, &u8, 0);
    2.45 + 	if (rc != IDN2_OK) {
    2.46 + 		gnutls_assert();
    2.47 + 		_gnutls_debug_log("unable to convert ACE name '%s' to UTF-8 format: %s\n", istr.data, idn2_strerror(rc));
    2.48 +-- 
    2.49 +2.19.2
    2.50 +

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/gnutls/stuff/patches/series	Thu Jan 24 03:36:19 2019 +0200
     3.3 @@ -0,0 +1,1 @@
     3.4 +gnutls-3.5.19-idn2.patch