From: Adolf Belka <adolf.belka@ipfire.org>
Date: Tue, 6 Feb 2024 21:27:35 +0000 (+0100)
Subject: elfutils: Move from addon to core program. Required by suricata-7.0.2 for execution
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=816af4dfb78eb5f7b95390d1bd3e444f7fbb42fe;p=people%2Fms%2Fipfire-2.x.git

elfutils: Move from addon to core program. Required by suricata-7.0.2 for execution

- 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 <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

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 9fb69af625..7dd95caa25 100644
--- a/lfs/elfutils
+++ b/lfs/elfutils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
+# 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        #
@@ -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
 ###############################################################################