From 33178ef4e1a0acbf0fb7c686ffefc7e2a3df345c Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 20 Nov 2023 09:18:12 +0100
Subject: [PATCH] Remove self-compiled libidn and, instead, use libidn2 as
 provided by Alpine itself

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 ftl-build/Dockerfile | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/ftl-build/Dockerfile b/ftl-build/Dockerfile
index a2ea6df..9f0c9e6 100644
--- a/ftl-build/Dockerfile
+++ b/ftl-build/Dockerfile
@@ -2,7 +2,6 @@ ARG CONTAINER="alpine:edge"
 FROM ${CONTAINER} AS builder
 
 ARG TARGETPLATFORM
-ARG idnversion=1.41
 ARG readlineversion=8.1
 ARG termcapversion=1.3.1
 ARG nettleversion=3.9.1
@@ -28,6 +27,10 @@ RUN apk add --no-cache \
         py3-yaml \
         zip \
         py3-requests \
+        libidn2-dev \
+        libidn2-static \
+        libunistring-dev \
+        libunistring-static \
         perl
 
 # Install pdns from community repo
@@ -42,13 +45,6 @@ RUN echo "@community http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VER}/communi
 ENV STATIC true
 ENV TEST true
 
-RUN curl -sSL https://ftl.pi-hole.net/libraries/libidn-${idnversion}.tar.gz | tar -xz \
-    && cd libidn-${idnversion} \
-    && ./configure --enable-static --disable-shared --disable-doc --disable-valgrind-tests \
-    && make -j $(nproc) install \
-    && cd .. \
-    && rm -r libidn-${idnversion}
-
 RUN curl -sSL https://ftl.pi-hole.net/libraries/termcap-${termcapversion}.tar.gz | tar -xz \
     && cd termcap-${termcapversion} \
     && ./configure --enable-static --disable-shared --disable-doc --without-examples \