From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
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, 06 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>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8734410404223428229=="
List-Id: <development.lists.ipfire.org>

--===============8734410404223428229==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- 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(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/rootfiles/{packages =3D> common}/elfutils |  0
 lfs/elfutils                                   | 11 +----------
 2 files changed, 1 insertion(+), 10 deletions(-)
 rename config/rootfiles/{packages =3D> common}/elfutils (100%)

diff --git a/config/rootfiles/packages/elfutils b/config/rootfiles/common/elf=
utils
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  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2024  IPFire Team  <info(a)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    =3D $(THISAPP).tar.bz2
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
-PROG       =3D elfutils
-PAK_VER    =3D 10
-
-DEPS       =3D
-
-SERVICES   =3D
=20
 ############################################################################=
###
 # Top-level Rules
@@ -58,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
=20
 b2 : $(subst %,%_BLAKE2,$(objects))
=20
-dist:
-	@$(PAK)
-
 ############################################################################=
###
 # Downloading, checking, b2sum
 ############################################################################=
###
--=20
2.43.0


--===============8734410404223428229==--