From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4bYfMH6vcRz34Qb for ; Fri, 4 Jul 2025 16:33:15 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4bYfMD31Slz34Jn for ; Fri, 4 Jul 2025 16:33:12 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4bYfMD0JhFz27Z; Fri, 4 Jul 2025 16:33:12 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1751646792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f4B14cZtHOhj6S7PHZFc3IFjPrzA+xCKV+/Qt34Ku9M=; b=pRkgy+oB0fSUvmL5Zm239P385Yq2OcJ/HTwfTIFcxgdhb7/HxOc/S6XVJUAn+VTvZMlST0 bviroS5nST+N2wCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1751646792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f4B14cZtHOhj6S7PHZFc3IFjPrzA+xCKV+/Qt34Ku9M=; b=IDqFsC7ulpgNJgK0bddmKbFLVPuGDaaSiqLBtLVJExaQwzHYHViPYOQY8p+T2U1Aovaws+ C7ZMZ2HTS+9y8dzUuE0KseO7Uz+Dng0ODhl1KbK8s4hjqy+YRhyUEnlatG+r1wlXGZTiF4 rzc1DyuXZvzEMEkrkKlCqkB/q1+fk0EFLt8+9Wke2LZ7BKCB2yFiMl30MGLcyrtXHKOU/3 eVuS2eSnsHvBNaOgd6zCqXo/N3B4ix3HxDYq3TFMmWVUAYcpTMd0C5UpJa1FFb1gb0ixvq wZZESfgjKnHI1xBrruLZEM0te53ru1JS5gijHgNQzE3xqm+XIwhWXdrxg8XasQ== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 3/6] libunistring: New package to replace bundled version in gnutls Date: Fri, 4 Jul 2025 18:33:01 +0200 Message-ID: <20250704163304.589703-3-adolf.belka@ipfire.org> In-Reply-To: <20250704163304.589703-1-adolf.belka@ipfire.org> References: <20250704163304.589703-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Signed-off-by: Adolf Belka --- config/rootfiles/common/libunistring | 53 ++++++++++++++++++ lfs/libunistring | 82 ++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 136 insertions(+) create mode 100644 config/rootfiles/common/libunistring create mode 100644 lfs/libunistring diff --git a/config/rootfiles/common/libunistring b/config/rootfiles/common/libunistring new file mode 100644 index 000000000..0811a695d --- /dev/null +++ b/config/rootfiles/common/libunistring @@ -0,0 +1,53 @@ +#usr/include/unicase.h +#usr/include/uniconv.h +#usr/include/unictype.h +#usr/include/unigbrk.h +#usr/include/unilbrk.h +#usr/include/unimetadata.h +#usr/include/uniname.h +#usr/include/uninorm.h +#usr/include/unistdio.h +#usr/include/unistr.h +#usr/include/unistring +#usr/include/unistring/cdefs.h +#usr/include/unistring/iconveh.h +#usr/include/unistring/inline.h +#usr/include/unistring/localcharset.h +#usr/include/unistring/stdint.h +#usr/include/unistring/version.h +#usr/include/unistring/woe32dll.h +#usr/include/unitypes.h +#usr/include/uniwbrk.h +#usr/include/uniwidth.h +#usr/lib/libunistring.la +#usr/lib/libunistring.so +usr/lib/libunistring.so.5 +usr/lib/libunistring.so.5.2.0 +#usr/share/doc/libunistring +#usr/share/doc/libunistring/libunistring_1.html +#usr/share/doc/libunistring/libunistring_10.html +#usr/share/doc/libunistring/libunistring_11.html +#usr/share/doc/libunistring/libunistring_12.html +#usr/share/doc/libunistring/libunistring_13.html +#usr/share/doc/libunistring/libunistring_14.html +#usr/share/doc/libunistring/libunistring_15.html +#usr/share/doc/libunistring/libunistring_16.html +#usr/share/doc/libunistring/libunistring_17.html +#usr/share/doc/libunistring/libunistring_18.html +#usr/share/doc/libunistring/libunistring_19.html +#usr/share/doc/libunistring/libunistring_2.html +#usr/share/doc/libunistring/libunistring_20.html +#usr/share/doc/libunistring/libunistring_21.html +#usr/share/doc/libunistring/libunistring_22.html +#usr/share/doc/libunistring/libunistring_23.html +#usr/share/doc/libunistring/libunistring_3.html +#usr/share/doc/libunistring/libunistring_4.html +#usr/share/doc/libunistring/libunistring_5.html +#usr/share/doc/libunistring/libunistring_6.html +#usr/share/doc/libunistring/libunistring_7.html +#usr/share/doc/libunistring/libunistring_8.html +#usr/share/doc/libunistring/libunistring_9.html +#usr/share/doc/libunistring/libunistring_abt.html +#usr/share/doc/libunistring/libunistring_fot.html +#usr/share/doc/libunistring/libunistring_toc.html +#usr/share/info/libunistring.info diff --git a/lfs/libunistring b/lfs/libunistring new file mode 100644 index 000000000..1ea398d39 --- /dev/null +++ b/lfs/libunistring @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2025 IPFire Team # +# # +# 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 . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.3 + +THISAPP = libunistring-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +CFLAGS += -fcommon + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 213d24ea4ba5e960a030bd83fc1b6c9d9a5e33d63ade8874e2a15d1b7a0acbe4b2d03df18065f6c17f01bfed94f7e70ef474e713f5c5ad2375cf2438457b0379 + +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) + $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --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 8bf452c37..1bcb4f42c 100755 --- a/make.sh +++ b/make.sh @@ -1536,6 +1536,7 @@ build_system() { lfsmake2 aprutil lfsmake2 unbound lfsmake2 libtasn1 + lfsmake2 libunistring lfsmake2 gnutls lfsmake2 libuv lfsmake2 liburcu -- 2.50.0