public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5504f0d4682d4162c223c5817ad30d23764fb37f
@ 2026-01-14 12:33 Michael Tremer
  0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-01-14 12:33 UTC (permalink / raw)
  To: ipfire-scm

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  5504f0d4682d4162c223c5817ad30d23764fb37f (commit)
       via  84c8869b18066c320ec5e8234ac23faa021d7ff2 (commit)
       via  8327aee007397d7bb0b8eeac82073cf4155d27bc (commit)
       via  cdee44f01fd0a05dc02d7f17df3fd84bef47884c (commit)
       via  837aa9472b727a49fa8927223f211b2044640060 (commit)
       via  f48c52774aba32891b33cacc40c420e7cc8d9b2d (commit)
       via  5c09836eb5357f9ce6d90518e17e2df2c634fb20 (commit)
       via  73dac3a63e37605d4145479bb43b4761a4e26575 (commit)
       via  d8e905d71940e3488244f7bcb23965edc13e71ea (commit)
       via  10941ff49e536f00ecb9947a71df50e754ca3039 (commit)
      from  32a07cec68d0bbb420524c193a46bbb7d6d6bb71 (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 5504f0d4682d4162c223c5817ad30d23764fb37f
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Jan 14 12:31:44 2026 +0000

    core200: Ship iptables/nftables changes
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 84c8869b18066c320ec5e8234ac23faa021d7ff2
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Jan 14 12:30:17 2026 +0000

    libvirt: Increment release again
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 8327aee007397d7bb0b8eeac82073cf4155d27bc
Merge: 32a07cec6 cdee44f01
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Jan 14 12:29:59 2026 +0000

    Merge remote-tracking branch 'ms/nftables' into next

commit cdee44f01fd0a05dc02d7f17df3fd84bef47884c
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Thu Nov 27 17:06:14 2025 +0000

    make.sh: Build jansson much earlier
    
    This is required by nftables.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 837aa9472b727a49fa8927223f211b2044640060
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Thu Nov 27 17:05:09 2025 +0000

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

commit f48c52774aba32891b33cacc40c420e7cc8d9b2d
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Thu Nov 27 17:02:52 2025 +0000

    iptables: Make all tools use the nft compat layer
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 5c09836eb5357f9ce6d90518e17e2df2c634fb20
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Nov 26 16:23:11 2025 +0000

    ebtables: Drop package
    
    This is now being provided by iptables as a wrapper to nftables.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 73dac3a63e37605d4145479bb43b4761a4e26575
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Nov 26 16:20:30 2025 +0000

    iptables: Migrate towards nftables
    
    This patches changes that iptables will now use the nftables backend by
    default. This way, we are able to migrate to nftables inside the kernel
    without changing anything in the firewall scripts.
    
    Fixes: #13911 - Migrate from iptables-legacy to iptables-nft
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit d8e905d71940e3488244f7bcb23965edc13e71ea
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Nov 26 12:29:30 2025 +0000

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

commit 10941ff49e536f00ecb9947a71df50e754ca3039
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Nov 25 15:54:56 2025 +0000

    installer: Don't try to load the NTFS module
    
    For some reason, this could not be packaged and therefore was not
    loaded. Since nobody has reported any problems, we can simply drop this
    here.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/iptables                   | 60 ++++++++++++++-
 config/rootfiles/common/libnftnl                   | 19 +++++
 config/rootfiles/common/nftables                   | 37 +++++++++
 .../{oldcore/123 => core/200}/filelists/iptables   |  0
 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 ---
 lfs/ebtables                                       | 90 ----------------------
 lfs/iptables                                       | 12 ++-
 lfs/{sysstat => libnftnl}                          |  6 +-
 lfs/libvirt                                        |  4 +-
 lfs/{sysstat => nftables}                          | 13 +++-
 make.sh                                            |  5 +-
 14 files changed, 146 insertions(+), 115 deletions(-)
 create mode 100644 config/rootfiles/common/libnftnl
 create mode 100644 config/rootfiles/common/nftables
 copy config/rootfiles/{oldcore/123 => core/200}/filelists/iptables (100%)
 create mode 120000 config/rootfiles/core/200/filelists/libnftnl
 create mode 120000 config/rootfiles/core/200/filelists/nftables
 delete mode 100644 config/rootfiles/packages/ebtables
 delete mode 100644 lfs/ebtables
 copy lfs/{sysstat => libnftnl} (93%)
 copy lfs/{sysstat => nftables} (90%)

Difference in files:
diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables
index 06e4ab7b49..fa4ecefed1 100644
--- a/config/rootfiles/common/iptables
+++ b/config/rootfiles/common/iptables
@@ -1,3 +1,4 @@
+etc/ethertypes
 #lib/libip4tc.la
 lib/libip4tc.so
 lib/libip4tc.so.2
@@ -15,6 +16,23 @@ 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
@@ -121,23 +139,49 @@ 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-legacy-multi
+sbin/xtables-monitor
+sbin/xtables-nft-multi
 #usr/include/libipq.h
 #usr/include/libiptc
 #usr/include/libiptc/ipt_kernel_headers.h
@@ -164,16 +208,30 @@ sbin/xtables-legacy-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
new file mode 100644
index 0000000000..b78e565f09
--- /dev/null
+++ b/config/rootfiles/common/libnftnl
@@ -0,0 +1,19 @@
+#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
new file mode 100644
index 0000000000..cb8a5bb229
--- /dev/null
+++ b/config/rootfiles/common/nftables
@@ -0,0 +1,37 @@
+#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/iptables b/config/rootfiles/core/200/filelists/iptables
new file mode 120000
index 0000000000..8caf12bccb
--- /dev/null
+++ b/config/rootfiles/core/200/filelists/iptables
@@ -0,0 +1 @@
+../../../common/iptables
\ No newline at end of file
diff --git a/config/rootfiles/core/200/filelists/libnftnl b/config/rootfiles/core/200/filelists/libnftnl
new file mode 120000
index 0000000000..de3f8b8d0d
--- /dev/null
+++ b/config/rootfiles/core/200/filelists/libnftnl
@@ -0,0 +1 @@
+../../../common/libnftnl
\ No newline at end of file
diff --git a/config/rootfiles/core/200/filelists/nftables b/config/rootfiles/core/200/filelists/nftables
new file mode 120000
index 0000000000..f1d3aa00be
--- /dev/null
+++ b/config/rootfiles/core/200/filelists/nftables
@@ -0,0 +1 @@
+../../../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 68a80e8c72..40e07cc8d0 100644
--- a/config/rootfiles/core/200/update.sh
+++ b/config/rootfiles/core/200/update.sh
@@ -86,7 +86,7 @@ rm -rvf \
 
 
 # Remove dropped packages
-for package in libassuan; do \
+for package in ebtables 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
deleted file mode 100644
index fac1cecaa9..0000000000
--- a/config/rootfiles/packages/ebtables
+++ /dev/null
@@ -1,11 +0,0 @@
-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/iptables b/lfs/iptables
index e8c4069d6e..a2b19c20b1 100644
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -89,11 +89,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--bindir=/sbin \
 		--sbindir=/sbin \
 		--mandir=/usr/share/man \
-		--disable-nftables \
+		--sysconfdir=/etc \
+		--enable-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/ebtables b/lfs/libnftnl
similarity index 82%
rename from lfs/ebtables
rename to lfs/libnftnl
index 35f158032a..a6f674cdf7 100644
--- a/lfs/ebtables
+++ b/lfs/libnftnl
@@ -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        #
@@ -24,21 +24,13 @@
 
 include Config
 
-SUMMARY    = Ethernet Bridge Tables
+VER        = 1.3.0
 
-VER        = 2.0.11
-
-THISAPP    = ebtables-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = libnftnl-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = ebtables
-PAK_VER    = 4
-
-DEPS       =
-
-SERVICES   =
 
 ###############################################################################
 # Top-level Rules
@@ -48,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 62af4c38ad21498e43f41ef96c8abb5704e8d8a48f1327c587b664f36fdfa9849a9a37e59958db56d38019465d8bf1775914f7387fde99a441615913702cf504
+$(DL_FILE)_BLAKE2 = 2aeab26089676d3e5231e1dc93ca4e20d1e5cbdf65cfe926a9e5dd3a51162c16f9f32087e3c0b082cacc11f1b5018d0ce3da49acbcce042a2bceac754442bbb8
 
 install : $(TARGET)
 
@@ -58,9 +50,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 b2 : $(subst %,%_BLAKE2,$(objects))
 
-dist:
-	@$(PAK)
-
 ###############################################################################
 # Downloading, checking, b2sum
 ###############################################################################
@@ -80,11 +69,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) && ./configure \
-				--prefix=/usr \
-				--sysconfdir=/etc
-	cd $(DIR_APP) && make $(MAKETUNING) CFLAGS="$(CFLAGS)"
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/libvirt b/lfs/libvirt
index 6e3f1c8749..443cb9edd1 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    = 44
+PAK_VER    = 45
 
-DEPS       = ebtables libpciaccess ovmf swtpm qemu
+DEPS       = libpciaccess ovmf swtpm qemu
 
 SERVICES   = libvirtd virtlogd
 
diff --git a/lfs/nftables b/lfs/nftables
new file mode 100644
index 0000000000..f2d37b8ceb
--- /dev/null
+++ b/lfs/nftables
@@ -0,0 +1,82 @@
+###############################################################################
+#                                                                             #
+# 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/make.sh b/make.sh
index 522474567c..5372c6be20 100755
--- a/make.sh
+++ b/make.sh
@@ -1543,12 +1543,15 @@ build_system() {
 	lfsmake2 cpio
 	lfsmake2 libaio
 	lfsmake2 freetype
+	lfsmake2 jansson
 	lfsmake2 libmnl
 	lfsmake2 libnfnetlink
 	lfsmake2 libnetfilter_queue
 	lfsmake2 libnetfilter_conntrack
 	lfsmake2 libnetfilter_cthelper
 	lfsmake2 libnetfilter_cttimeout
+	lfsmake2 libnftnl
+	lfsmake2 nftables
 	lfsmake2 iptables
 	lfsmake2 iproute2
 	lfsmake2 screen
@@ -1826,7 +1829,6 @@ build_system() {
 	lfsmake2 pango
 	lfsmake2 rrdtool
 	lfsmake2 setup
-	lfsmake2 jansson
 	lfsmake2 yaml
 	lfsmake2 colm
 	lfsmake2 ragel
@@ -1922,7 +1924,6 @@ 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-14 12:33 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-01-14 12:33 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5504f0d4682d4162c223c5817ad30d23764fb37f Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox