diff mbox series

ebtables: Update to version 2.0.11

Message ID 20230718200426.1961914-1-adolf.belka@ipfire.org
State Staged
Commit 85c32fb39409f8ef379c3c50739df05bbaf8f922
Headers
Series ebtables: Update to version 2.0.11 |

Commit Message

Adolf Belka July 18, 2023, 8:04 p.m. UTC 
  - Update from version 2.0.10-4 (Sep 2014) to 2.0.11 (Dec 2019)
- Update of rootfile
- Deletion of patch to prevent installing in usr/local as new tarball now has a ./configure
   file that enables setting prefix to /usr and sysconfdir to /etc

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/packages/ebtables            | 36 +++++--------------
 lfs/ebtables                                  | 14 ++++----
 ...-should-install-nothing-in-usr-local.patch | 28 ---------------
 3 files changed, 17 insertions(+), 61 deletions(-)
 delete mode 100644 src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
diff mbox series

Patch

diff --git a/config/rootfiles/packages/ebtables b/config/rootfiles/packages/ebtables
index 8eab1f62a..fac1cecaa 100644
--- a/config/rootfiles/packages/ebtables
+++ b/config/rootfiles/packages/ebtables
@@ -1,29 +1,11 @@ 
 etc/ethertypes
-#etc/rc.d/init.d/ebtables
-#etc/sysconfig/ebtables-config
-usr/lib/libebt_802_3.so
-usr/lib/libebt_among.so
-usr/lib/libebt_arp.so
-usr/lib/libebt_arpreply.so
-usr/lib/libebt_ip.so
-usr/lib/libebt_ip6.so
-usr/lib/libebt_limit.so
-usr/lib/libebt_log.so
-usr/lib/libebt_mark.so
-usr/lib/libebt_mark_m.so
-usr/lib/libebt_nat.so
-usr/lib/libebt_nflog.so
-usr/lib/libebt_pkttype.so
-usr/lib/libebt_redirect.so
-usr/lib/libebt_standard.so
-usr/lib/libebt_stp.so
-usr/lib/libebt_ulog.so
-usr/lib/libebt_vlan.so
-usr/lib/libebtable_broute.so
-usr/lib/libebtable_filter.so
-usr/lib/libebtable_nat.so
+usr/lib/libebtc.la
 usr/lib/libebtc.so
-#usr/man/man8/ebtables.8
-usr/sbin/ebtables
-usr/sbin/ebtables-restore
-usr/sbin/ebtables-save
+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
index fae20359f..35f158032 100644
--- a/lfs/ebtables
+++ b/lfs/ebtables
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# 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        #
@@ -26,15 +26,15 @@  include Config
 
 SUMMARY    = Ethernet Bridge Tables
 
-VER        = 2.0.10-4
+VER        = 2.0.11
 
-THISAPP    = ebtables-v$(VER)
+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    = 3
+PAK_VER    = 4
 
 DEPS       =
 
@@ -48,7 +48,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 01995c701c6dbc7495bdf1f0fce61dce51a379dd1a304d2a5174e0190c040ee958833c65be9fd9d6a7601a2f81461ce1f2e9db989081b4fe7dabc5bfcecd57d6
+$(DL_FILE)_BLAKE2 = 62af4c38ad21498e43f41ef96c8abb5704e8d8a48f1327c587b664f36fdfa9849a9a37e59958db56d38019465d8bf1775914f7387fde99a441615913702cf504
 
 install : $(TARGET)
 
@@ -81,7 +81,9 @@  $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
+	cd $(DIR_APP) && ./configure \
+				--prefix=/usr \
+				--sysconfdir=/etc
 	cd $(DIR_APP) && make $(MAKETUNING) CFLAGS="$(CFLAGS)"
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch b/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
deleted file mode 100644
index 2cccb9073..000000000
--- a/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
+++ /dev/null
@@ -1,28 +0,0 @@ 
-From 373fb7d2d22fcf3328702e719793526e215822ca Mon Sep 17 00:00:00 2001
-From: Jonatan Schlag <jonatan.schlag@ipfire.org>
-Date: Thu, 24 Mar 2016 18:35:51 +0100
-Subject: [PATCH] ebtables should install nothing in usr local
-
-Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index c1106a4..b5f4447 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,8 +10,8 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed 's/\(.*\)\/.*/\1/')/
- 
- # default paths
- LIBDIR:=/usr/lib
--MANDIR:=/usr/local/man
--BINDIR:=/usr/local/sbin
-+MANDIR:=/usr/man
-+BINDIR:=/usr/sbin
- ETCDIR:=/etc
- INITDIR:=/etc/rc.d/init.d
- SYSCONFIGDIR:=/etc/sysconfig
--- 
-2.1.4
-