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 4ZyDNS2hZ9z33rH for ; Wed, 14 May 2025 13:15:20 +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 "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZyDNN6HR0z33LG for ; Wed, 14 May 2025 13:15:16 +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 4ZyDNN2kJfz2r9; Wed, 14 May 2025 13:15:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1747228516; 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=tQrDBVlzjwvQw/aL43eJwE71r2BI9IOr8//8K3ImayY=; b=CC5xyPZ1uS5AIeUEyzKxwQxsRGOAaIKz/25X4TRv7pnfRc13dVGACbFUMunuO1b9UkQuMl 6Zjg3txRYdmgYxwWWBFAB2Mewi6rQy0DNxIJLiWD4c3UxK63hwkc2kfmIYlN2UumgMlYxO DbV1sxa8Yt7Y7/t/sMySlVmD1agPsy0ajj+dXovVhoDBONoCi9Ukp4ok9bLYzUgQ/8JQuv zVwf5unWhtKMCPk1bLkPQ8K9tZWITvxMlzV2Mxk25yKlTvDXZnAd3lvkqQBSRRjLTR9Hgm J5Wa6JOlcXxx6ZzaQzfxHt/Z0/aijcsLlZhUGzyspDz3v59G13hfjp5U6oMg7Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1747228516; 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=tQrDBVlzjwvQw/aL43eJwE71r2BI9IOr8//8K3ImayY=; b=KFdYTXz3Whwl5It+mBakESLA6emZMp02Svx6Rh/8NIASVWpgeRQSw4m64P1cEXwD8ppqsZ JGYYwiqrjwHRsQCw== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka , Michael Tremer Subject: [PATCH 2/4] fireperf: Addition of patch to deal with gettext update to 0.25 Date: Wed, 14 May 2025 15:15:11 +0200 Message-ID: <20250514131513.6864-2-adolf.belka@ipfire.org> In-Reply-To: <20250514131513.6864-1-adolf.belka@ipfire.org> References: <20250514131513.6864-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 Suggested-by: Michael Tremer Signed-off-by: Adolf Belka --- lfs/fireperf | 9 ++++--- .../fireperf-0.2.0_gettext-0.25_fix.patch | 26 +++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 src/patches/fireperf-0.2.0_gettext-0.25_fix.patch diff --git a/lfs/fireperf b/lfs/fireperf index 1cdd32635..497bba538 100644 --- a/lfs/fireperf +++ b/lfs/fireperf @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team # +# 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 # @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = fireperf -PAK_VER = 2 +PAK_VER = 3 DEPS = @@ -81,10 +81,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/fireperf-0.2.0_gettext-0.25_fix.patch cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --disable-man-pages + --prefix=/usr \ + --disable-man-pages cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/src/patches/fireperf-0.2.0_gettext-0.25_fix.patch b/src/patches/fireperf-0.2.0_gettext-0.25_fix.patch new file mode 100644 index 000000000..8bd152e79 --- /dev/null +++ b/src/patches/fireperf-0.2.0_gettext-0.25_fix.patch @@ -0,0 +1,26 @@ +diff -Naur fireperf-0.2.0.orig/autogen.sh fireperf-0.2.0/autogen.sh +--- fireperf-0.2.0.orig/autogen.sh 2021-02-23 16:06:33.000000000 +0100 ++++ fireperf-0.2.0/autogen.sh 2025-05-14 10:03:40.623918720 +0200 +@@ -8,8 +8,9 @@ + echo "Activated pre-commit hook." + fi + ++autopoint + intltoolize --force --automake +-autoreconf --install --symlink ++autoreconf --install --symlink --force + + libdir() { + echo $(cd $1/$(gcc -print-multi-os-directory); pwd) +diff -Naur fireperf-0.2.0.orig/configure.ac fireperf-0.2.0/configure.ac +--- fireperf-0.2.0.orig/configure.ac 2021-02-23 16:06:33.000000000 +0100 ++++ fireperf-0.2.0/configure.ac 2025-05-13 20:47:20.578717837 +0200 +@@ -28,6 +28,8 @@ + pic-only + ]) + AC_PREFIX_DEFAULT([/usr]) ++AM_GNU_GETTEXT_VERSION(0.25) ++AM_GNU_GETTEXT([external]) + + IT_PROG_INTLTOOL([0.40.0]) + -- 2.49.0