From 6a415071751aff450343ce270f40174e4290dd1d Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Tue, 8 Jun 2021 16:36:12 +0200
Subject: [PATCH] Added libidn2 support.

---
 .gitignore |  2 +-
 build.sh   | 90 ++++++++++++++++++++++++++++++++----------------------
 2 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed3eca9..46810f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /*-src
 /*.exe
 /*.pem
-/.deps
+/.libs
diff --git a/build.sh b/build.sh
index a3ab34d..bebacbf 100644
--- a/build.sh
+++ b/build.sh
@@ -11,34 +11,35 @@ readonly MY_MARCH=i386
 readonly MY_MTUNE=intel
 
 readonly BASE_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
-readonly DEPS_DIR="${BASE_DIR}/.deps"
+readonly LIBS_DIR="${BASE_DIR}/.libs"
 
 find "${BASE_DIR}" -maxdepth 1 -type d -name '*-src' -exec rm -rf "{}" \;
-rm -rf "${DEPS_DIR}" && mkdir "${DEPS_DIR}" "${DEPS_DIR}/include" "${DEPS_DIR}/lib"
+rm -rf "${LIBS_DIR}" && mkdir "${LIBS_DIR}" "${LIBS_DIR}/include" "${LIBS_DIR}/lib"
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Download
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-wget -4 -P "${DEPS_DIR}" https://zlib.net/zlib-1.2.11.tar.gz
-wget -4 -P "${DEPS_DIR}" https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz
-wget -4 -P "${DEPS_DIR}" https://github.com/google/brotli/archive/v1.0.9/brotli-1.0.9.tar.gz
-wget -4 -P "${DEPS_DIR}" https://www.openssl.org/source/openssl-1.1.1k.tar.gz
-wget -4 -P "${DEPS_DIR}" https://github.com/nghttp2/nghttp2/releases/download/v1.43.0/nghttp2-1.43.0.tar.gz
-wget -4 -P "${DEPS_DIR}" https://curl.se/download/curl-7.77.0.tar.gz
-wget -4 -P "${DEPS_DIR}" https://curl.se/ca/cacert.pem
+wget -4 -P "${LIBS_DIR}" https://zlib.net/zlib-1.2.11.tar.gz
+wget -4 -P "${LIBS_DIR}" https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz
+wget -4 -P "${LIBS_DIR}" https://github.com/google/brotli/archive/v1.0.9/brotli-1.0.9.tar.gz
+wget -4 -P "${LIBS_DIR}" https://www.openssl.org/source/openssl-1.1.1k.tar.gz
+wget -4 -P "${LIBS_DIR}" https://github.com/nghttp2/nghttp2/releases/download/v1.43.0/nghttp2-1.43.0.tar.gz
+wget -4 -P "${LIBS_DIR}" https://ftp.gnu.org/gnu/libidn/libidn2-2.3.1.tar.gz
+wget -4 -P "${LIBS_DIR}" https://curl.se/download/curl-7.77.0.tar.gz
+wget -4 -P "${LIBS_DIR}" https://curl.se/ca/cacert.pem
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # zlib
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== zlib ====================\n\n"
 readonly ZLIB_DIR="${BASE_DIR}/zlib-src"
-pkg_zlib="$(find "${DEPS_DIR}" -maxdepth 1 -name 'zlib-*.tar.gz' | sort -rn | head -n1)"
+pkg_zlib="$(find "${LIBS_DIR}" -maxdepth 1 -name 'zlib-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${ZLIB_DIR}" && mkdir "${ZLIB_DIR}"
 tar -xvf ${pkg_zlib} --strip-components=1 -C "${ZLIB_DIR}"
 pushd "${ZLIB_DIR}"
 make -f win32/Makefile.gcc libz.a LOC="-march=${MY_MARCH} -mtune=${MY_MTUNE}"
-cp -vf libz.a "${DEPS_DIR}/lib"
-cp -vf zlib.h zconf.h "${DEPS_DIR}/include"
+cp -vf libz.a "${LIBS_DIR}/lib"
+cp -vf zlib.h zconf.h "${LIBS_DIR}/include"
 popd
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -46,13 +47,13 @@ popd
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== Zstandard ====================\n\n"
 readonly ZSTD_DIR="${BASE_DIR}/zstd-src"
-pkg_zstd="$(find "${DEPS_DIR}" -maxdepth 1 -name 'zstd-*.tar.gz' | sort -rn | head -n1)"
+pkg_zstd="$(find "${LIBS_DIR}" -maxdepth 1 -name 'zstd-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${ZSTD_DIR}" && mkdir "${ZSTD_DIR}"
 tar -xvf ${pkg_zstd} --strip-components=1 -C "${ZSTD_DIR}"
 pushd "${ZSTD_DIR}"
-CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE}" make lib
-cp -vf lib/libzstd.a "${DEPS_DIR}/lib"
-cp -vf lib/zstd.h lib/zstd_errors.h "${DEPS_DIR}/include"
+CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I\"${LIBS_DIR}/include\"" LDFLAGS="-L\"${LIBS_DIR}/lib\"" make lib
+cp -vf lib/libzstd.a "${LIBS_DIR}/lib"
+cp -vf lib/zstd.h lib/zstd_errors.h "${LIBS_DIR}/include"
 popd
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -60,15 +61,15 @@ popd
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== Brotli ====================\n\n"
 readonly BROT_DIR="${BASE_DIR}/brotli-src"
-pkg_brot="$(find "${DEPS_DIR}" -maxdepth 1 -name 'brotli-*.tar.gz' | sort -rn | head -n1)"
+pkg_brot="$(find "${LIBS_DIR}" -maxdepth 1 -name 'brotli-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${BROT_DIR}" && mkdir "${BROT_DIR}"
 tar -xvf ${pkg_brot} --strip-components=1 -C "${BROT_DIR}"
 pushd "${BROT_DIR}"
-CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE}" make lib
-mkdir -p "${DEPS_DIR}/include/brotli"
-cp -vf libbrotli.a "${DEPS_DIR}/lib/libbrotlienc.a"
-cp -vf libbrotli.a "${DEPS_DIR}/lib/libbrotlidec.a"
-cp -vf c/include/brotli/*.h "${DEPS_DIR}/include/brotli"
+CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I\"${LIBS_DIR}/include\"" LDFLAGS="-L\"${LIBS_DIR}/lib\"" make lib
+mkdir -p "${LIBS_DIR}/include/brotli"
+cp -vf libbrotli.a "${LIBS_DIR}/lib/libbrotlienc.a"
+cp -vf libbrotli.a "${LIBS_DIR}/lib/libbrotlidec.a"
+cp -vf c/include/brotli/*.h "${LIBS_DIR}/include/brotli"
 popd
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -76,16 +77,16 @@ popd
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== OpenSSL ====================\n\n"
 readonly OSSL_DIR="${BASE_DIR}/openssl-src"
-pkg_ossl="$(find "${DEPS_DIR}" -maxdepth 1 -name 'openssl-*.tar.gz' | sort -rn | head -n1)"
+pkg_ossl="$(find "${LIBS_DIR}" -maxdepth 1 -name 'openssl-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${OSSL_DIR}" && mkdir "${OSSL_DIR}"
 tar -xvf ${pkg_ossl} --strip-components=1 -C "${OSSL_DIR}"
 pushd "${OSSL_DIR}"
-./Configure no-hw no-shared no-engine no-capieng no-dso 386 zlib -static -march=${MY_MARCH} -mtune=${MY_MTUNE} -I"${DEPS_DIR}/include" -L"${DEPS_DIR}/lib" -latomic mingw
+./Configure no-hw no-shared no-engine no-capieng no-dso 386 zlib -static -march=${MY_MARCH} -mtune=${MY_MTUNE} -I"${LIBS_DIR}/include" -L"${LIBS_DIR}/lib" -latomic mingw
 make build_libs
-mkdir -p "${DEPS_DIR}/include/crypto" "${DEPS_DIR}/include/openssl"
-cp -vf libcrypto.a libssl.a "${DEPS_DIR}/lib"
-cp -vf include/crypto/*.h "${DEPS_DIR}/include/crypto"
-cp -vf include/openssl/*.h "${DEPS_DIR}/include/openssl"
+mkdir -p "${LIBS_DIR}/include/crypto" "${LIBS_DIR}/include/openssl"
+cp -vf libcrypto.a libssl.a "${LIBS_DIR}/lib"
+cp -vf include/crypto/*.h "${LIBS_DIR}/include/crypto"
+cp -vf include/openssl/*.h "${LIBS_DIR}/include/openssl"
 popd
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -93,16 +94,31 @@ popd
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== nghttp2 ====================\n\n"
 readonly NGH2_DIR="${BASE_DIR}/nghttp2-src"
-pkg_ngh2="$(find "${DEPS_DIR}" -maxdepth 1 -name 'nghttp2-*.tar.gz' | sort -rn | head -n1)"
+pkg_ngh2="$(find "${LIBS_DIR}" -maxdepth 1 -name 'nghttp2-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${NGH2_DIR}" && mkdir "${NGH2_DIR}"
 tar -xvf ${pkg_ngh2} --strip-components=1 -C "${NGH2_DIR}"
 pushd "${NGH2_DIR}"
-CFLAGS="-march=i386 -mtune=intel" OPENSSL_CFLAGS="-I\"${DEPS_DIR}/include\"" OPENSSL_LIBS="-L\"${DEPS_DIR}/lib\" -lssl -lcrypto" ZLIB_CFLAGS="-I\"${DEPS_DIR}/include\"" ZLIB_LIBS="-L\"${DEPS_DIR}/lib\" -lz" ./configure --enable-lib-only --disable-threads --disable-shared
+CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I\"${LIBS_DIR}/include\"" LDFLAGS="-L\"${LIBS_DIR}/lib\"" OPENSSL_CFLAGS="-I\"${LIBS_DIR}/include\"" OPENSSL_LIBS="-L\"${LIBS_DIR}/lib\" -lssl -lcrypto" ZLIB_CFLAGS="-I\"${LIBS_DIR}/include\"" ZLIB_LIBS="-L\"${LIBS_DIR}/lib\" -lz" ./configure --enable-lib-only --disable-threads --disable-shared
 make
-mkdir -p "${DEPS_DIR}/include/nghttp2" "${DEPS_DIR}/pkgconfig"
-cp -v lib/.libs/libnghttp2.a "${DEPS_DIR}/lib"
-cp -v lib/includes/nghttp2/*.h "${DEPS_DIR}/include/nghttp2"
-cp -v lib/libnghttp2.pc "${DEPS_DIR}/pkgconfig"
+mkdir -p "${LIBS_DIR}/include/nghttp2" "${LIBS_DIR}/pkgconfig"
+cp -v lib/.libs/libnghttp2.a "${LIBS_DIR}/lib"
+cp -v lib/includes/nghttp2/*.h "${LIBS_DIR}/include/nghttp2"
+cp -v lib/libnghttp2.pc "${LIBS_DIR}/pkgconfig"
+popd
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# libidn2
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+printf "\n==================== libidn2 ====================\n\n"
+readonly IDN2_DIR="${BASE_DIR}/libidn2-src"
+pkg_ngh2="$(find "${IDN2_DIR}" -maxdepth 1 -name 'libidn2-*.tar.gz' | sort -rn | head -n1)"
+rm -rf "${IDN2_DIR}" && mkdir "${IDN2_DIR}"
+tar -xvf ${pkg_ngh2} --strip-components=1 -C "${IDN2_DIR}"
+pushd "${IDN2_DIR}"
+CCFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I\"${LIBS_DIR}/include\"" LDFLAGS="-L\"${LIBS_DIR}/lib\"" ./configure --disable-shared --disable-doc --without-libiconv-prefix --without-libunistring-prefix --disable-valgrind-tests
+make
+cp -v lib/.libs/libidn2.a "${LIBS_DIR}/lib"
+cp -v lib/idn2.h "${LIBS_DIR}/include"
 popd
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -110,15 +126,15 @@ popd
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 printf "\n==================== cURL ====================\n\n"
 readonly CURL_DIR="${BASE_DIR}/curl-src"
-pkg_curl="$(find "${DEPS_DIR}" -maxdepth 1 -name 'curl-*.tar.gz' | sort -rn | head -n1)"
+pkg_curl="$(find "${LIBS_DIR}" -maxdepth 1 -name 'curl-*.tar.gz' | sort -rn | head -n1)"
 rm -rf "${CURL_DIR}" && mkdir "${CURL_DIR}"
 tar -xvf ${pkg_curl} --strip-components=1 -C "${CURL_DIR}"
 pushd "${CURL_DIR}"
 patch -p1 -b < "${BASE_DIR}/patch/curl_mutex_init.diff"
-CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I\"${DEPS_DIR}/include\"" CPPFLAGS="-DNGHTTP2_STATICLIB" LDFLAGS="-static -no-pthread -L\"${DEPS_DIR}/lib\"" LIBS="-latomic -lcrypt32" PKG_CONFIG_PATH="${DEPS_DIR}/pkgconfig" ./configure --disable-shared --disable-pthreads --enable-static --disable-ldap --with-zlib="${DEPS_DIR}" --with-zstd="${DEPS_DIR}" --with-brotli="${DEPS_DIR}" --with-openssl="${DEPS_DIR}" --with-nghttp2="${DEPS_DIR}" --with-ca-bundle="cacert.pem"
+CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I\"${LIBS_DIR}/include\"" CPPFLAGS="-DNGHTTP2_STATICLIB" LDFLAGS="-static -no-pthread -L\"${LIBS_DIR}/lib\"" LIBS="-latomic -lcrypt32" PKG_CONFIG_PATH="${LIBS_DIR}/pkgconfig" ./configure --disable-shared --disable-pthreads --enable-static --disable-ldap --with-zlib="${LIBS_DIR}" --with-zstd="${LIBS_DIR}" --with-brotli="${LIBS_DIR}" --with-openssl="${LIBS_DIR}" --with-nghttp2="${LIBS_DIR}" --with-libidn2="${LIBS_DIR}" --with-ca-bundle="cacert.pem"
 make curl_LDFLAGS=-all-static
 cp -vf "${CURL_DIR}/src/curl.exe" "${BASE_DIR}/curl.exe"
-cp -vf "${DEPS_DIR}/cacert.pem" "${BASE_DIR}/cacert.pem"
+cp -vf "${LIBS_DIR}/cacert.pem" "${BASE_DIR}/cacert.pem"
 strip -s "${BASE_DIR}/curl.exe"
 popd