From patchwork Tue Feb 6 21:27:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7537 Return-Path: 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 ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4TTxDW22fSz3wvv for ; Tue, 6 Feb 2024 21:27:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4TTxDQ3Yh9z2Tx; Tue, 6 Feb 2024 21:27:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4TTxDQ33Kgz32md; Tue, 6 Feb 2024 21:27:50 +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 ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4TTxDK5ZBSz2xg5 for ; Tue, 6 Feb 2024 21:27:45 +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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4TTxDK42tNzqR; Tue, 6 Feb 2024 21:27:45 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1707254865; 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=+jCSBDYy7SUg+6K2X2DiYl69nOUYRnaBRrg5quR5YKc=; b=0m62u2OyXwPUSlPvYsqZGgJ+n9C8tw80YAujuDlQtMf9KwW8UmAL+6vDygjzIC1u8exuIc 2wEn0cS3qiFZgkAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1707254865; 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=+jCSBDYy7SUg+6K2X2DiYl69nOUYRnaBRrg5quR5YKc=; b=fWkQYRNQ+fBRfX/qDW91VrAIOLn4crtGLh4jgbPRKc0r/61BzI4vCPkvM0fH0KCDP2/9Ht B/N5zREHrACOAbcZTjuFci/mUkcFUIITlgST7U7AnLfbL2EdFRjojFsLiyl2SU8JtXIvCz tllUIZTUYkx5qfF/glnlrqG0MtqH35Ak314df6iHqfKmzwydwhHUSeAgaI2gUjljK4jV0Z WK8bbV4Wy1a/SCpKdSmNvP8nppTQoR3mGDqsixGRtNG6eJ3xp9P6pWpLzXjZV884qRht35 4T4tw6a19a0kwtCn4D01MREMXnInN9To9UDsiLdcr2Odxq1xdkiMtaYX53fNHA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 3/7] elfutils: Move from addon to core program. Required by suricata-7.0.2 for execution Date: Tue, 6 Feb 2024 22:27:35 +0100 Message-ID: <20240206212739.3270712-3-adolf.belka@ipfire.org> In-Reply-To: <20240206212739.3270712-1-adolf.belka@ipfire.org> References: <20240206212739.3270712-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: UM3GJKXNY263YWBBBV7U2OK5BSZPELKS X-Message-ID-Hash: UM3GJKXNY263YWBBBV7U2OK5BSZPELKS X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Updated lfs file to core program type - Moved rootfile from packages to common - Older suricata versions required elfutils only for building but suricata-7.0.2 fails to start if elfutils is not present due to libelf.so.1 being missing. - The requirement for elfutils is not mentioned at all in the changelog. Fixes: Bug#13516 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/{packages => common}/elfutils | 0 lfs/elfutils | 11 +---------- 2 files changed, 1 insertion(+), 10 deletions(-) rename config/rootfiles/{packages => common}/elfutils (100%) diff --git a/config/rootfiles/packages/elfutils b/config/rootfiles/common/elfutils similarity index 100% rename from config/rootfiles/packages/elfutils rename to config/rootfiles/common/elfutils diff --git a/lfs/elfutils b/lfs/elfutils index 9fb69af62..7dd95caa2 100644 --- a/lfs/elfutils +++ b/lfs/elfutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team # +# Copyright (C) 2007-2024 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 # @@ -33,12 +33,6 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = elfutils -PAK_VER = 10 - -DEPS = - -SERVICES = ############################################################################### # Top-level Rules @@ -58,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) b2 : $(subst %,%_BLAKE2,$(objects)) -dist: - @$(PAK) - ############################################################################### # Downloading, checking, b2sum ###############################################################################