Hello,

This looks good to me:

  Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

I also checked what is currently linking against the old version of libidn: kdig and Ghostscript.

kdig can be built with libidn2 as well, and I believe that Ghostscript is on the list if being dropped with CUPS, if so, we should be able to drop the older version of libidn.

-Michael

> On 15 Nov 2024, at 21:37, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/rootfiles/common/libidn2 |  7 +++
> lfs/libidn2                     | 82 +++++++++++++++++++++++++++++++++
> make.sh                         |  1 +
> 3 files changed, 90 insertions(+)
> create mode 100644 config/rootfiles/common/libidn2
> create mode 100644 lfs/libidn2
> 
> diff --git a/config/rootfiles/common/libidn2 b/config/rootfiles/common/libidn2
> new file mode 100644
> index 000000000..45a4c84ea
> --- /dev/null
> +++ b/config/rootfiles/common/libidn2
> @@ -0,0 +1,7 @@
> +usr/bin/idn2
> +#usr/include/idn2.h
> +#usr/lib/libidn2.la
> +#usr/lib/libidn2.so
> +usr/lib/libidn2.so.0
> +usr/lib/libidn2.so.0.4.0
> +#usr/lib/pkgconfig/libidn2.pc
> diff --git a/lfs/libidn2 b/lfs/libidn2
> new file mode 100644
> index 000000000..b0e51e1e9
> --- /dev/null
> +++ b/lfs/libidn2
> @@ -0,0 +1,82 @@
> +###############################################################################
> +#                                                                             #
> +# IPFire.org - A linux based firewall                                         #
> +# Copyright (C) 2007-2024  IPFire Team  <info(a)ipfire.org>                     #
> +#                                                                             #
> +# This program is free software: you can redistribute it and/or modify        #
> +# it under the terms of the GNU General Public License as published by        #
> +# the Free Software Foundation, either version 3 of the License, or           #
> +# (at your option) any later version.                                         #
> +#                                                                             #
> +# This program is distributed in the hope that it will be useful,             #
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
> +# GNU General Public License for more details.                                #
> +#                                                                             #
> +# You should have received a copy of the GNU General Public License           #
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
> +#                                                                             #
> +###############################################################################
> +
> +###############################################################################
> +# Definitions
> +###############################################################################
> +
> +include Config
> +
> +VER        = 2.3.7
> +
> +THISAPP    = libidn2-$(VER)
> +DL_FILE    = $(THISAPP).tar.gz
> +DL_FROM    = $(URL_IPFIRE)
> +DIR_APP    = $(DIR_SRC)/$(THISAPP)
> +TARGET     = $(DIR_INFO)/$(THISAPP)
> +
> +###############################################################################
> +# Top-level Rules
> +###############################################################################
> +
> +objects = $(DL_FILE)
> +
> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> +
> +$(DL_FILE)_BLAKE2 = 40fde88e6be1e4665738855608a65c949834728463a3fb466192403f1076e99f7d399b9631308ff6776a28915251a0136ddfe6a67e8e010c7ccdb7fc64125d39
> +
> +
> +install : $(TARGET)
> +
> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> +
> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
> +
> +b2 : $(subst %,%_BLAKE2,$(objects))
> +
> +###############################################################################
> +# Downloading, checking, b2sum
> +###############################################################################
> +
> +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> + @$(CHECK)
> +
> +$(patsubst %,$(DIR_DL)/%,$(objects)) :
> + @$(LOAD)
> +
> +$(subst %,%_BLAKE2,$(objects)) :
> + @$(B2SUM)
> +
> +###############################################################################
> +# Installation Details
> +###############################################################################
> +
> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> + @$(PREBUILD)
> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> + cd $(DIR_APP) && ./configure \
> + --prefix=/usr \
> + --disable-nls \
> + --disable-doc \
> + --disable-static
> + cd $(DIR_APP) && make $(MAKETUNING)
> + cd $(DIR_APP) && make install
> + @rm -rf $(DIR_APP)
> + @$(POSTBUILD)
> diff --git a/make.sh b/make.sh
> index 35a602f62..9092b8da9 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1659,6 +1659,7 @@ build_system() {
> lfsmake2 libnet
> lfsmake2 libnl-3
> lfsmake2 libidn
> + lfsmake2 libidn2
> lfsmake2 nasm
> lfsmake2 libjpeg
> lfsmake2 openjpeg
> -- 
> 2.47.0
>