* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 764c254bc63effb698dc0f50cb4886f30aacb126
@ 2026-01-18 12:27 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-01-18 12:27 UTC (permalink / raw)
To: ipfire-scm
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 25194 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 764c254bc63effb698dc0f50cb4886f30aacb126 (commit)
via 191ff5685c004b110abf9775f263fc209fd163e2 (commit)
via eac7c0c2931fa1b6e085e22f5219d55b8b918627 (commit)
via 97fd7359a9dc37d44b2a196ceaa0091d02162c5b (commit)
via 491647ccbda1c4786d6dcf3765d8575d356a697e (commit)
via 0cad672a2099054e34f787e7b2fea37f465f05bb (commit)
via 04e8c53865f829ea3efa869cce6cbec13940f20d (commit)
via a64cc3267a014b9ea8435f3109f67db32ae79f19 (commit)
from da2448190e4b27d0cfeb97306a96fc8ad0ae50e7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 764c254bc63effb698dc0f50cb4886f30aacb126
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun Jan 18 12:25:49 2026 +0000
core200: Don't ship nftables any more and don't uninstall ebtables
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 191ff5685c004b110abf9775f263fc209fd163e2
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun Jan 18 12:25:09 2026 +0000
Revert "libnftnl: New package"
This reverts commit d8e905d71940e3488244f7bcb23965edc13e71ea.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit eac7c0c2931fa1b6e085e22f5219d55b8b918627
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun Jan 18 12:24:59 2026 +0000
Revert "iptables: Migrate towards nftables"
This reverts commit 73dac3a63e37605d4145479bb43b4761a4e26575.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 97fd7359a9dc37d44b2a196ceaa0091d02162c5b
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun Jan 18 12:24:49 2026 +0000
Revert "ebtables: Drop package"
This reverts commit 5c09836eb5357f9ce6d90518e17e2df2c634fb20.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 491647ccbda1c4786d6dcf3765d8575d356a697e
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun Jan 18 12:24:12 2026 +0000
Revert "iptables: Make all tools use the nft compat layer"
This reverts commit f48c52774aba32891b33cacc40c420e7cc8d9b2d.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 0cad672a2099054e34f787e7b2fea37f465f05bb
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun Jan 18 12:23:33 2026 +0000
Revert "nftables: New package"
This reverts commit 837aa9472b727a49fa8927223f211b2044640060.
We cannot migrate to nftables, yet, as collectd does not support it.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 04e8c53865f829ea3efa869cce6cbec13940f20d
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Fri Jan 16 21:56:22 2026 +0100
tshark: Update to version 4.6.3
- Update from version 4.6.2 to 4.6.3
- Update of rootfile
- Changelog
4.6.3
The following vulnerabilities have been fixed:
wnpa-sec-2026-01 BLF file parser crash. Issue 20880.
wnpa-sec-2026-02 IEEE 802.11 dissector crash. Issue 20939.
wnpa-sec-2026-03 SOME/IP-SD dissector crash. Issue 20945.
wnpa-sec-2026-04 HTTP3 dissector infinite loop. Issue 20944.
The following bugs have been fixed:
Wireshark 4.6.0 build fails on Solaris: pcapio.c:441:21: error: request for
member '_flag' in something not a structure or union. Issue 20773.
RTP Player streams cannot be stopped. Issue 20879.
Additional ABI/API compatibility fixes. Issue 20881.
Missing data in pinfo→cinfo in HomePlug message CM_ATTEN_CHAR.IND.
Issue 20893.
maxmind_db: crash when switching from a profile where it’s disabled to one
where it’s enabled. Issue 20903.
Compilation warning or error if CFLAGS defines _FORTIFY_SOURCE to other
than 3 without first undefining it. Issue 20904.
IEEE 802.11: Incorrect parsing of QoS and Mesh Control Field when the frame
body contains an A-MSDU. Issue 20905.
OSS-Fuzz 473164101: Heap-buffer-overflow in dissect_idn_laser_data.
Issue 20936.
Bug in decoding 5G NAS message - Extended CAG information list IE.
Issue 20946.
Updated Protocol Support
DCT2000, DHCP, H.248, H.265, HomePlug AV, HTTP3, IDN, IEEE 802.11,
LTE RRC, NAS-5GS, PKCS12, QUIC, RTPS, SOME/IP-SD, SSH, and Thrift
New and Updated Capture File Support
3GPP TS 32.423 Trace, BLF, NetScreen, and Viavi Observer
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit a64cc3267a014b9ea8435f3109f67db32ae79f19
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Jan 16 10:05:35 2026 +0000
gnupg: Ship all binaries
On new installations, GnuPG complained that it could not start gpg-agent
when it was importing the Pakfire keys for the first time. Although the
keys were imported successfully and fully functional, there was an error
message being shown at first boot which we don't want to see.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/gnupg | 54 +++++++++---------
config/rootfiles/common/iptables | 60 +-------------------
config/rootfiles/common/libnftnl | 19 -------
config/rootfiles/common/nftables | 37 -------------
config/rootfiles/core/200/filelists/libnftnl | 1 -
config/rootfiles/core/200/filelists/nftables | 1 -
config/rootfiles/core/200/update.sh | 2 +-
config/rootfiles/packages/ebtables | 11 ++++
config/rootfiles/packages/tshark | 4 +-
lfs/{minicom => ebtables} | 23 ++++----
lfs/iptables | 12 +---
lfs/libnftnl | 77 --------------------------
lfs/libvirt | 4 +-
lfs/nftables | 82 ----------------------------
lfs/tshark | 6 +-
make.sh | 3 +-
16 files changed, 59 insertions(+), 337 deletions(-)
delete mode 100644 config/rootfiles/common/libnftnl
delete mode 100644 config/rootfiles/common/nftables
delete mode 120000 config/rootfiles/core/200/filelists/libnftnl
delete mode 120000 config/rootfiles/core/200/filelists/nftables
create mode 100644 config/rootfiles/packages/ebtables
copy lfs/{minicom => ebtables} (88%)
delete mode 100644 lfs/libnftnl
delete mode 100644 lfs/nftables
Difference in files:
diff --git a/config/rootfiles/common/gnupg b/config/rootfiles/common/gnupg
index 5deaadcf75..e05714fad4 100644
--- a/config/rootfiles/common/gnupg
+++ b/config/rootfiles/common/gnupg
@@ -1,32 +1,32 @@
-#usr/bin/dirmngr
-#usr/bin/dirmngr-client
+usr/bin/dirmngr
+usr/bin/dirmngr-client
usr/bin/gpg
-#usr/bin/gpg-agent
-#usr/bin/gpg-card
-#usr/bin/gpg-connect-agent
-#usr/bin/gpg-mail-tube
-#usr/bin/gpg-wks-client
-#usr/bin/gpg-wks-server
-#usr/bin/gpgconf
-#usr/bin/gpgparsemail
-#usr/bin/gpgscm
-#usr/bin/gpgsm
-#usr/bin/gpgsplit
-#usr/bin/gpgtar
-#usr/bin/gpgv
-#usr/bin/kbxutil
-#usr/bin/watchgnupg
-#usr/lib/dirmngr_ldap
-#usr/lib/gpg-auth
-#usr/lib/gpg-check-pattern
-#usr/lib/gpg-pair-tool
-#usr/lib/gpg-preset-passphrase
-#usr/lib/gpg-protect-tool
-#usr/lib/gpg-wks-client
+usr/bin/gpg-agent
+usr/bin/gpg-card
+usr/bin/gpg-connect-agent
+usr/bin/gpg-mail-tube
+usr/bin/gpg-wks-client
+usr/bin/gpg-wks-server
+usr/bin/gpgconf
+usr/bin/gpgparsemail
+usr/bin/gpgscm
+usr/bin/gpgsm
+usr/bin/gpgsplit
+usr/bin/gpgtar
+usr/bin/gpgv
+usr/bin/kbxutil
+usr/bin/watchgnupg
+usr/lib/dirmngr_ldap
+usr/lib/gpg-auth
+usr/lib/gpg-check-pattern
+usr/lib/gpg-pair-tool
+usr/lib/gpg-preset-passphrase
+usr/lib/gpg-protect-tool
+usr/lib/gpg-wks-client
usr/lib/keyboxd
-#usr/lib/scdaemon
-#usr/sbin/addgnupghome
-#usr/sbin/applygnupgdefaults
+usr/lib/scdaemon
+usr/sbin/addgnupghome
+usr/sbin/applygnupgdefaults
#usr/share/doc/gnupg
#usr/share/doc/gnupg/DCO
#usr/share/doc/gnupg/DETAILS
diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables
index fa4ecefed1..06e4ab7b49 100644
--- a/config/rootfiles/common/iptables
+++ b/config/rootfiles/common/iptables
@@ -1,4 +1,3 @@
-etc/ethertypes
#lib/libip4tc.la
lib/libip4tc.so
lib/libip4tc.so.2
@@ -16,23 +15,6 @@ lib/libxtables.so
lib/libxtables.so.12
lib/libxtables.so.12.7.0
#lib/xtables
-lib/xtables/libarpt_mangle.so
-lib/xtables/libebt_802_3.so
-lib/xtables/libebt_among.so
-lib/xtables/libebt_arp.so
-lib/xtables/libebt_arpreply.so
-lib/xtables/libebt_dnat.so
-lib/xtables/libebt_ip.so
-lib/xtables/libebt_ip6.so
-lib/xtables/libebt_log.so
-lib/xtables/libebt_mark.so
-lib/xtables/libebt_mark_m.so
-lib/xtables/libebt_nflog.so
-lib/xtables/libebt_pkttype.so
-lib/xtables/libebt_redirect.so
-lib/xtables/libebt_snat.so
-lib/xtables/libebt_stp.so
-lib/xtables/libebt_vlan.so
lib/xtables/libip6t_DNPT.so
lib/xtables/libip6t_HL.so
lib/xtables/libip6t_NETMAP.so
@@ -139,49 +121,23 @@ lib/xtables/libxt_time.so
lib/xtables/libxt_tos.so
lib/xtables/libxt_u32.so
lib/xtables/libxt_udp.so
-sbin/arptables
-#sbin/arptables-nft
-#sbin/arptables-nft-restore
-#sbin/arptables-nft-save
-sbin/arptables-restore
-sbin/arptables-save
-#sbin/arptables-translate
-sbin/ebtables
-#sbin/ebtables-nft
-#sbin/ebtables-nft-restore
-#sbin/ebtables-nft-save
-sbin/ebtables-restore
-sbin/ebtables-save
-#sbin/ebtables-translate
sbin/ip6tables
sbin/ip6tables-apply
#sbin/ip6tables-legacy
#sbin/ip6tables-legacy-restore
#sbin/ip6tables-legacy-save
-#sbin/ip6tables-nft
-#sbin/ip6tables-nft-restore
-#sbin/ip6tables-nft-save
sbin/ip6tables-restore
-#sbin/ip6tables-restore-translate
sbin/ip6tables-save
-#sbin/ip6tables-translate
sbin/iptables
sbin/iptables-apply
#sbin/iptables-legacy
#sbin/iptables-legacy-restore
#sbin/iptables-legacy-save
-#sbin/iptables-nft
-#sbin/iptables-nft-restore
-#sbin/iptables-nft-save
sbin/iptables-restore
-#sbin/iptables-restore-translate
sbin/iptables-save
-#sbin/iptables-translate
sbin/iptables-xml
#sbin/nfnl_osf
-#sbin/xtables-legacy-multi
-sbin/xtables-monitor
-sbin/xtables-nft-multi
+sbin/xtables-legacy-multi
#usr/include/libipq.h
#usr/include/libiptc
#usr/include/libiptc/ipt_kernel_headers.h
@@ -208,30 +164,16 @@ sbin/xtables-nft-multi
#usr/share/man/man3/ipq_set_mode.3
#usr/share/man/man3/ipq_set_verdict.3
#usr/share/man/man3/libipq.3
-#usr/share/man/man8/arptables-nft-restore.8
-#usr/share/man/man8/arptables-nft-save.8
-#usr/share/man/man8/arptables-nft.8
-#usr/share/man/man8/arptables-translate.8
-#usr/share/man/man8/ebtables-nft.8
-#usr/share/man/man8/ebtables-translate.8
#usr/share/man/man8/ip6tables-apply.8
-#usr/share/man/man8/ip6tables-restore-translate.8
#usr/share/man/man8/ip6tables-restore.8
#usr/share/man/man8/ip6tables-save.8
-#usr/share/man/man8/ip6tables-translate.8
#usr/share/man/man8/ip6tables.8
#usr/share/man/man8/iptables-apply.8
#usr/share/man/man8/iptables-extensions.8
-#usr/share/man/man8/iptables-restore-translate.8
#usr/share/man/man8/iptables-restore.8
#usr/share/man/man8/iptables-save.8
-#usr/share/man/man8/iptables-translate.8
#usr/share/man/man8/iptables.8
#usr/share/man/man8/nfnl_osf.8
-#usr/share/man/man8/xtables-legacy.8
-#usr/share/man/man8/xtables-monitor.8
-#usr/share/man/man8/xtables-nft.8
-#usr/share/man/man8/xtables-translate.8
#usr/share/xtables
usr/share/xtables/iptables.xslt
usr/share/xtables/pf.os
diff --git a/config/rootfiles/common/libnftnl b/config/rootfiles/common/libnftnl
deleted file mode 100644
index b78e565f09..0000000000
--- a/config/rootfiles/common/libnftnl
+++ /dev/null
@@ -1,19 +0,0 @@
-#usr/include/libnftnl
-#usr/include/libnftnl/batch.h
-#usr/include/libnftnl/chain.h
-#usr/include/libnftnl/common.h
-#usr/include/libnftnl/expr.h
-#usr/include/libnftnl/flowtable.h
-#usr/include/libnftnl/gen.h
-#usr/include/libnftnl/object.h
-#usr/include/libnftnl/rule.h
-#usr/include/libnftnl/ruleset.h
-#usr/include/libnftnl/set.h
-#usr/include/libnftnl/table.h
-#usr/include/libnftnl/trace.h
-#usr/include/libnftnl/udata.h
-#usr/lib/libnftnl.la
-#usr/lib/libnftnl.so
-usr/lib/libnftnl.so.11
-usr/lib/libnftnl.so.11.6.0
-#usr/lib/pkgconfig/libnftnl.pc
diff --git a/config/rootfiles/common/nftables b/config/rootfiles/common/nftables
deleted file mode 100644
index cb8a5bb229..0000000000
--- a/config/rootfiles/common/nftables
+++ /dev/null
@@ -1,37 +0,0 @@
-#etc/nftables
-#etc/nftables/osf
-etc/nftables/osf/pf.os
-#usr/include/nftables
-#usr/include/nftables/libnftables.h
-#usr/lib/libnftables.la
-#usr/lib/libnftables.so
-usr/lib/libnftables.so.1
-usr/lib/libnftables.so.1.1.0
-#usr/lib/pkgconfig/libnftables.pc
-usr/sbin/nft
-#usr/share/doc/nftables
-#usr/share/doc/nftables/examples
-#usr/share/doc/nftables/examples/ct_helpers.nft
-#usr/share/doc/nftables/examples/load_balancing.nft
-#usr/share/doc/nftables/examples/secmark.nft
-#usr/share/doc/nftables/examples/sets_and_maps.nft
-#usr/share/doc/nftables/main.nft
-#usr/share/man/man3/libnftables.3
-#usr/share/man/man5/libnftables-json.5
-#usr/share/man/man8/nft.8
-#usr/share/man/man8/nftables.service.8
-#usr/share/nftables
-#usr/share/nftables/all-in-one.nft
-#usr/share/nftables/arp-filter.nft
-#usr/share/nftables/bridge-filter.nft
-#usr/share/nftables/inet-filter.nft
-#usr/share/nftables/inet-nat.nft
-#usr/share/nftables/ipv4-filter.nft
-#usr/share/nftables/ipv4-mangle.nft
-#usr/share/nftables/ipv4-nat.nft
-#usr/share/nftables/ipv4-raw.nft
-#usr/share/nftables/ipv6-filter.nft
-#usr/share/nftables/ipv6-mangle.nft
-#usr/share/nftables/ipv6-nat.nft
-#usr/share/nftables/ipv6-raw.nft
-#usr/share/nftables/netdev-ingress.nft
diff --git a/config/rootfiles/core/200/filelists/libnftnl b/config/rootfiles/core/200/filelists/libnftnl
deleted file mode 120000
index de3f8b8d0d..0000000000
--- a/config/rootfiles/core/200/filelists/libnftnl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libnftnl
\ No newline at end of file
diff --git a/config/rootfiles/core/200/filelists/nftables b/config/rootfiles/core/200/filelists/nftables
deleted file mode 120000
index f1d3aa00be..0000000000
--- a/config/rootfiles/core/200/filelists/nftables
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/nftables
\ No newline at end of file
diff --git a/config/rootfiles/core/200/update.sh b/config/rootfiles/core/200/update.sh
index 22b090abf2..b52f1ab82f 100644
--- a/config/rootfiles/core/200/update.sh
+++ b/config/rootfiles/core/200/update.sh
@@ -90,7 +90,7 @@ rm -rvf \
# Remove dropped packages
-for package in ebtables libassuan; do \
+for package in libassuan; do \
if [ -e "/opt/pakfire/db/installed/meta-${package}" ]; then
stop_service "${package}"
for i in $(</opt/pakfire/db/rootfiles/${package}); do
diff --git a/config/rootfiles/packages/ebtables b/config/rootfiles/packages/ebtables
new file mode 100644
index 0000000000..fac1cecaa9
--- /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/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
index 2686a23e40..6d67fb4eda 100644
--- a/config/rootfiles/packages/tshark
+++ b/config/rootfiles/packages/tshark
@@ -11,10 +11,10 @@ usr/bin/dumpcap
usr/bin/tshark
#usr/lib/libwireshark.so
usr/lib/libwireshark.so.19
-usr/lib/libwireshark.so.19.0.2
+usr/lib/libwireshark.so.19.0.3
#usr/lib/libwiretap.so
usr/lib/libwiretap.so.16
-usr/lib/libwiretap.so.16.0.2
+usr/lib/libwiretap.so.16.0.3
#usr/lib/libwsutil.so
usr/lib/libwsutil.so.17
usr/lib/libwsutil.so.17.0.0
diff --git a/lfs/libnftnl b/lfs/ebtables
similarity index 82%
rename from lfs/libnftnl
rename to lfs/ebtables
index a6f674cdf7..35f158032a 100644
--- a/lfs/libnftnl
+++ b/lfs/ebtables
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2024 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 #
@@ -24,13 +24,21 @@
include Config
-VER = 1.3.0
+SUMMARY = Ethernet Bridge Tables
-THISAPP = libnftnl-$(VER)
-DL_FILE = $(THISAPP).tar.xz
+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
@@ -40,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2aeab26089676d3e5231e1dc93ca4e20d1e5cbdf65cfe926a9e5dd3a51162c16f9f32087e3c0b082cacc11f1b5018d0ce3da49acbcce042a2bceac754442bbb8
+$(DL_FILE)_BLAKE2 = 62af4c38ad21498e43f41ef96c8abb5704e8d8a48f1327c587b664f36fdfa9849a9a37e59958db56d38019465d8bf1775914f7387fde99a441615913702cf504
install : $(TARGET)
@@ -50,6 +58,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
b2 : $(subst %,%_BLAKE2,$(objects))
+dist:
+ @$(PAK)
+
###############################################################################
# Downloading, checking, b2sum
###############################################################################
@@ -69,9 +80,11 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
+ @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/iptables b/lfs/iptables
index a2b19c20b1..e8c4069d6e 100644
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -89,21 +89,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--bindir=/sbin \
--sbindir=/sbin \
--mandir=/usr/share/man \
- --sysconfdir=/etc \
- --enable-nftables \
+ --disable-nftables \
--with-pkgconfigdir=/usr/lib/pkgconfig
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
- # Use iptables-nft by default
- ln -svf xtables-nft-multi /sbin/iptables
- ln -svf xtables-nft-multi /sbin/iptables-restore
- ln -svf xtables-nft-multi /sbin/iptables-save
- ln -svf xtables-nft-multi /sbin/iptables-xml
- ln -svf xtables-nft-multi /sbin/ip6tables
- ln -svf xtables-nft-multi /sbin/ip6tables-restore
- ln -svf xtables-nft-multi /sbin/ip6tables-save
-
@rm -rf $(DIR_APP) $(DIR_SRC)/netfilter-layer7*
@$(POSTBUILD)
diff --git a/lfs/libvirt b/lfs/libvirt
index 443cb9edd1..7e6fac180f 100644
--- 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/lfs/nftables b/lfs/nftables
deleted file mode 100644
index f2d37b8ceb..0000000000
--- a/lfs/nftables
+++ /dev/null
@@ -1,82 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# 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 #
-# 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
-
-VER = 1.1.5
-
-THISAPP = nftables-$(VER)
-DL_FILE = $(THISAPP).tar.xz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 4c391e316f5c04cffe16a64df60217d74e37ab4f87c614003e2d2f702b8a4fe81c2ca7f42b3429e948078b2b0ecf0ad61b8cc2f7b95384fff9c004bcc3837317
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# 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 axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && \
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --without-xtables \
- --with-json
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/tshark b/lfs/tshark
index 9ccfda104b..f3ec2f7237 100644
--- a/lfs/tshark
+++ b/lfs/tshark
@@ -26,7 +26,7 @@ include Config
SUMMARY = A Network Traffic Analyser
-VER = 4.6.2
+VER = 4.6.3
THISAPP = wireshark-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tshark
DEPS = c-ares libxxhash
-PAK_VER = 32
+PAK_VER = 33
SERVICES =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1f7a7c73d610e00c9c5718e67dbc48b1a3872f9a72769017b266f7fbbf8b1d834878319514bae069ee3ba17de0fb35eb88f24e9809ac6c821e0f4e4bbaf195d1
+$(DL_FILE)_BLAKE2 = 635c2cd0f6298d0e5d5a812e502ccbed7a82ad0c67e144484f99cfe7e94b0dfb07016cddc1e81aef7ec35c945b16b0ad14ba42e7eb216ab1520f56443fd8bf30
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 433bd70f78..e4c6032c7c 100755
--- a/make.sh
+++ b/make.sh
@@ -1550,8 +1550,6 @@ build_system() {
lfsmake2 libnetfilter_conntrack
lfsmake2 libnetfilter_cthelper
lfsmake2 libnetfilter_cttimeout
- lfsmake2 libnftnl
- lfsmake2 nftables
lfsmake2 iptables
lfsmake2 iproute2
lfsmake2 screen
@@ -1923,6 +1921,7 @@ build_system() {
lfsmake2 nagios_nrpe
lfsmake2 nagios-plugins
lfsmake2 observium-agent
+ lfsmake2 ebtables
lfsmake2 faad2
lfsmake2 alac
lfsmake2 ffmpeg
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-01-18 12:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-01-18 12:27 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 764c254bc63effb698dc0f50cb4886f30aacb126 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox