Revert "ebtables: Drop package"

This reverts commit 5c09836eb5357f9ce6d90518e17e2df2c634fb20.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/ebtables b/config/rootfiles/packages/ebtables
new file mode 100644 (file)
index 0000000..fac1cec
--- /dev/null
+++ b/config/rootfiles/packages/ebtables
@@ -0,0 +1,11 @@
+etc/ethertypes
+usr/lib/libebtc.la
+usr/lib/libebtc.so
+usr/lib/libebtc.so.0
+usr/lib/libebtc.so.0.0.0
+usr/sbin/ebtables-legacy
+usr/sbin/ebtables-legacy-restore
+usr/sbin/ebtables-legacy-save
+usr/sbin/ebtablesd
+usr/sbin/ebtablesu
+#usr/share/man/man8/ebtables-legacy.8

diff --git a/lfs/ebtables b/lfs/ebtables
new file mode 100644 (file)
index 0000000..35f1580
--- /dev/null
+++ b/lfs/ebtables
@@ -0,0 +1,90 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2023  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        #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+SUMMARY    = Ethernet Bridge Tables
+
+VER        = 2.0.11
+
+THISAPP    = ebtables-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = ebtables
+PAK_VER    = 4
+
+DEPS       =
+
+SERVICES   =
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 62af4c38ad21498e43f41ef96c8abb5704e8d8a48f1327c587b664f36fdfa9849a9a37e59958db56d38019465d8bf1775914f7387fde99a441615913702cf504
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+       @$(PAK)
+
+###############################################################################
+# 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 zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure \
+                               --prefix=/usr \
+                               --sysconfdir=/etc
+       cd $(DIR_APP) && make $(MAKETUNING) CFLAGS="$(CFLAGS)"
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/libvirt b/lfs/libvirt
index 443cb9edd14c6cd72c8e26b6b981e45deca63df9..7e6fac180f8e55b60abfd8a19773f83bc4305d00 100644 (file)
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -35,9 +35,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 aarch64
 PROG       = libvirt
-PAK_VER    = 45
+PAK_VER    = 46
 
-DEPS       = libpciaccess ovmf swtpm qemu
+DEPS       = ebtables libpciaccess ovmf swtpm qemu
 
 SERVICES   = libvirtd virtlogd
 

diff --git a/make.sh b/make.sh
index c3454921389516c75f9af43a92d06983e2d9fbe4..2f9ca866c0ca5414357e365320260c5af6f0622e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1922,6 +1922,7 @@ build_system() {
        lfsmake2 nagios_nrpe
        lfsmake2 nagios-plugins
        lfsmake2 observium-agent
+       lfsmake2 ebtables
        lfsmake2 faad2
        lfsmake2 alac
        lfsmake2 ffmpeg