]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
libidn: Removal of package as no longer needed.
authorAdolf Belka <adolf.belka@ipfire.org>
Mon, 24 Mar 2025 17:44:26 +0000 (18:44 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 25 Mar 2025 15:43:11 +0000 (15:43 +0000)
- A while back elinks changed from using libidn to libidn2. At that time that left
   ghostscript as the only package still using libidn. With the removal of cups and
   associated packages, including ghostscript, libidn is no longer used. libidn2 is
   used where required now.
- This removes the lfs and rootfiles and removes the entry from the make.sh file.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/rootfiles/common/libidn [deleted file]
lfs/libidn [deleted file]
make.sh

diff --git a/config/rootfiles/common/libidn b/config/rootfiles/common/libidn
deleted file mode 100644 (file)
index 3d0d3a9..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-usr/bin/idn
-#usr/include/idn-free.h
-#usr/include/idn-int.h
-#usr/include/idna.h
-#usr/include/pr29.h
-#usr/include/punycode.h
-#usr/include/stringprep.h
-#usr/include/tld.h
-#usr/lib/libidn.la
-#usr/lib/libidn.so
-usr/lib/libidn.so.12
-usr/lib/libidn.so.12.6.5
-#usr/lib/pkgconfig/libidn.pc
-#usr/share/emacs/site-lisp/idna.el
-#usr/share/emacs/site-lisp/punycode.el
diff --git a/lfs/libidn b/lfs/libidn
deleted file mode 100644 (file)
index 068fefe..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2024  IPFire Team  <info@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        = 1.42
-
-THISAPP    = libidn-$(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 = 8f16d388884ad2ac9aafc46ec5eae144508ca86135184f625761c82c02ec9f99400bd4db65c9c9df54d315502cd5e2d37893d171abc6d76abe0a70f29acdb68e
-
-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 zxf $(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
-       sed -e 's/include_next/include/g' -i /usr/include/idn-int.h
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 22148bd2b35d816f83577ec221865633786a0482..6e0605e1495cbeb2a8ccad31c67a81d367775fb7 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1671,7 +1671,6 @@ build_system() {
        lfsmake2 fireinfo
        lfsmake2 libnet
        lfsmake2 libnl-3
-       lfsmake2 libidn
        lfsmake2 libidn2
        lfsmake2 nasm
        lfsmake2 libexif