From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Jan 2026 12:25:09 +0000 (+0000)
Subject: Revert "libnftnl: New package"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=191ff5685c004b110abf9775f263fc209fd163e2;p=ipfire-2.x.git

Revert "libnftnl: New package"

This reverts commit d8e905d71940e3488244f7bcb23965edc13e71ea.

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

diff --git a/config/rootfiles/common/libnftnl b/config/rootfiles/common/libnftnl
deleted file mode 100644
index b78e565f0..000000000
--- 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/lfs/libnftnl b/lfs/libnftnl
deleted file mode 100644
index a6f674cdf..000000000
--- a/lfs/libnftnl
+++ /dev/null
@@ -1,77 +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.3.0
-
-THISAPP    = libnftnl-$(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 = 2aeab26089676d3e5231e1dc93ca4e20d1e5cbdf65cfe926a9e5dd3a51162c16f9f32087e3c0b082cacc11f1b5018d0ce3da49acbcce042a2bceac754442bbb8
-
-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
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 2f9ca866c..e4c6032c7 100755
--- a/make.sh
+++ b/make.sh
@@ -1550,7 +1550,6 @@ build_system() {
 	lfsmake2 libnetfilter_conntrack
 	lfsmake2 libnetfilter_cthelper
 	lfsmake2 libnetfilter_cttimeout
-	lfsmake2 libnftnl
 	lfsmake2 iptables
 	lfsmake2 iproute2
 	lfsmake2 screen