Remove support for libunistring and libidn2 < 0.14

* configure.ac: Remove support for libidn2 < 0.14 and libunistring
* libwget/encoding.c: Same
* README.md: Same

Author: Darshit Shah

NEWS

@@ -6,6 +6,9 @@ See the end for copying conditions.
 
 Please send GNU Wget2 bug reports to <[email protected]>.
 
+XX.XX.XXXX Release 1.99.2
+  * Remove support for libidn2 < 0.14 and libunistring
+
 30.05.2018 Release 1.99.1 (alpha)
   * Enhance docs
   * Enhance building on many platforms

README.md

@@ -114,7 +114,7 @@ The following packages are needed to build the software
 * libbz2 >= 1.0.6 (optional, if you want HTTP bzip2 decompression)
 * libbrotlidec >= 1.0.0 (optional, if you want HTTP brotli decompression)
 * libgnutls (3.3, 3.5 or 3.6)
-* libidn2 >= 0.9 + libunistring >= 0.9.3 (libidn >= 1.25 if you don't have libidn2)
+* libidn2 >= 0.14 (libidn >= 1.25 if you don't have libidn2)
 * flex >= 2.5.35
 * libpsl >= 0.5.0
 * libnghttp2 >= 1.3.0 (optional, if you want HTTP/2 support)

configure.ac

@@ -581,36 +581,23 @@ AM_CONDITIONAL([WITH_BROTLIDEC], [test "x$with_brotlidec" = xyes])
 # Support for internationalized domain names.
 # IDN support in Wget2 is provided in multiple ways:
 #   1. libidn2 >= 0.14.0 (IDNA 2008)
-#   2. libidn2 < 0.14.0 + libunistring (IDNA 2008)
 #   3. libidn (IDNA 2003)
 #
-# Versions of libidn2 prior to 0.14.0 did not provide a pkg-config file. Hence,
-# if detection of libidn2 with pkg-config fails, we assume that either
-# libidn2 is not available or it is an older version. Older versions of libidn2
-# also require libunistring to support IDN2008 on uppercase domain names.
-#
 # If libidn2 is not found at all, we try to fallback to libidn.
 AC_ARG_WITH(libidn2, AS_HELP_STRING([--without-libidn2], [disable IDN2 support]), with_libidn2=$withval, with_libidn2=yes)
 AS_IF([test "x$with_libidn2" != xno], [
-  PKG_CHECK_MODULES([LIBIDN2], libidn2, [
+  PKG_CHECK_MODULES([LIBIDN2], [libidn2 >= 0.14.0], [
     with_libidn2=yes
-	IDNA_INFO="IDNA 2008 (libidn2)"
+    IDNA_INFO="IDNA 2008 (libidn2)"
     LIBS="$LIBIDN2_LIBS $LIBS"
     CFLAGS="$LIBIDN2_CFLAGS $CFLAGS"
     AC_DEFINE([WITH_LIBIDN2], [1], [Use libidn2])
   ], [
-    AC_SEARCH_LIBS(idn2_lookup_u8, idn2,
-      [with_libidn2=yes; AC_DEFINE([WITH_LIBIDN2], [1], [Use libidn2]) IDNA_INFO="IDNA 2008 (libidn2)"],
-      [with_libidn2=no;  AC_MSG_WARN(*** LIBIDN2 was not found. You will not be able to use IDN2008 support)],
-      -lunistring)
-    AS_IF([test "x$with_libidn2" = xyes], [
-      AC_SEARCH_LIBS(u8_tolower, unistring,
-        [with_libunistring=yes; AC_DEFINE([WITH_LIBUNISTRING], [1], [Use libunistring]) IDNA_INFO="IDNA 2008 (libidn2+libunistring)"],
-        [with_libunistring=no;  AC_MSG_WARN(*** LIBUNISTRING was not found. You will not be able to use IDN2008 on uppercase domains)])
+    with_libidn2=no
+    AC_MSG_WARN(*** LIBIDN2 was not found. You will not be able to use IDN2008 support)
     ])
-  ])
 ])
-AM_CONDITIONAL([WITH_LIBUNISTRING], [test "x$with_libunistring" = xyes])
+
 AM_CONDITIONAL([WITH_LIBIDN2], [test "x$with_libidn2" = xyes])
 
 AS_IF([test "x$with_libidn2" != xyes], [

libwget/encoding.c

@@ -38,12 +38,6 @@
 
 #if defined HAVE_IDN2_H && defined WITH_LIBIDN2
 # include <idn2.h>
-# if IDN2_VERSION_NUMBER < 0x00140000
-#  if defined HAVE_UNICASE_H && defined WITH_LIBUNISTRING
-#   include <unicase.h>
-#   include <unistr.h>
-#  endif
-# endif
 #elif defined HAVE_IDNA_H && defined WITH_LIBIDN
 # include <idna.h>
 # ifdef _WIN32
@@ -234,42 +228,9 @@ const char *wget_str_to_ascii(const char *src)
 	if (wget_str_needs_encoding(src)) {
 		char *asc = NULL;
 		int rc;
-# if defined WITH_LIBUNISTRING && IDN2_VERSION_NUMBER < 0x00140000
-		uint8_t *lower, resbuf[256];
-		size_t len = sizeof(resbuf) - 1; // leave space for additional \0 byte
-
-		// we need a conversion to lowercase
-		lower = u8_tolower((uint8_t *)src, u8_strlen((uint8_t *)src), 0, UNINORM_NFKC, resbuf, &len);
-		if (!lower) {
-			error_printf(_("u8_tolower(%s) failed (%d)\n"), src, errno);
-			return src;
-		}
-
-		// u8_tolower() does not terminate the result string
-		if (lower == resbuf) {
-			lower[len]=0;
-		} else {
-			uint8_t *tmp = lower;
-			lower = (uint8_t *)wget_strmemdup((char *)lower, len);
-			xfree(tmp);
-		}
-
-		if ((rc = idn2_lookup_u8(lower, (uint8_t **)&asc, 0)) == IDN2_OK) {
-			debug_printf("idn2 '%s' -> '%s'\n", src, asc);
-			src = asc;
-		} else
-			error_printf(_("toASCII(%s) failed (%d): %s\n"), lower, rc, idn2_strerror(rc));
-
-		if (lower != resbuf)
-			xfree(lower);
-# else
-#  if IDN2_VERSION_NUMBER < 0x00140000
-		if ((rc = idn2_lookup_u8((uint8_t *)src, (uint8_t **)&asc, 0)) == IDN2_OK)
-#  else
 		if ((rc = idn2_lookup_u8((uint8_t *)src, (uint8_t **)&asc, IDN2_NONTRANSITIONAL)) != IDN2_OK)
 			rc = idn2_lookup_u8((uint8_t *)src, (uint8_t **)&asc, IDN2_TRANSITIONAL);
 		if (rc == IDN2_OK)
-#  endif
 		{
 			debug_printf("idn2 '%s' -> '%s'\n", src, asc);
 #  ifdef _WIN32
@@ -280,7 +241,6 @@ const char *wget_str_to_ascii(const char *src)
 #  endif
 		} else
 			error_printf(_("toASCII(%s) failed (%d): %s\n"), src, rc, idn2_strerror(rc));
-# endif
 	}
 #elif defined WITH_LIBIDN
 	if (wget_str_needs_encoding(src)) {