From b359042d4d4e91690e6c6b3d5c3d68daa58218a7 Mon Sep 17 00:00:00 2001 From: Vincent Li Date: Fri, 9 May 2025 20:26:29 -0700 Subject: [PATCH] xdp-tools: upgrade to upstream 1.5.4 rebase xdp-tools from upstream xdp-tools 1.5.4. there is Makefile conflict when rebase because 1.5.4 added xdp-forward. manually resolve the rebase conflict by put loongfire xdp program at the end: for example instruction from deepseek: Open the Makefile in a text editor and locate the conflict: makefile ifneq ($(BPFTOOL),) <<<<<<< HEAD UTILS += xdp-bench xdp-forward xdp-monitor xdp-trafficgen ======= UTILS += xdp-bench xdp-monitor xdp-trafficgen xdp-synproxy >>>>>>> d8ebb16 (Add xdp-synproxy) endif Understand the conflict: The HEAD (upstream/main) version includes xdp-forward. Your commit (d8ebb16) adds xdp-synproxy but removes xdp-forward. Resolve the conflict by including both changes: Keep xdp-forward from HEAD. Add xdp-synproxy from your commit. The merged line should look like this: makefile UTILS += xdp-bench xdp-forward xdp-monitor xdp-trafficgen xdp-synproxy Remove the conflict markers (<<<<<<<, =======, >>>>>>>). edit result: ifneq ($(BPFTOOL),) UTILS += xdp-bench xdp-forward xdp-monitor xdp-trafficgen xdp-synproxy endif Save the file after making these changes. Stage the resolved Makefile and continue the rebase: git add Makefile git rebase --continue repeat editing Makefile and git rebase --continue for below program xdp-dnsrrl xdp-udp xdp-dns xdp-sni xdp-geoip xdp-udpddos xdp-tailcall xdp-synproxy-tailcall xdp-ddos Signed-off-by: Vincent Li --- config/rootfiles/common/xdp-tools | 3 ++- lfs/xdp-tools | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/xdp-tools b/config/rootfiles/common/xdp-tools index cf535f95f..bf47a53f2 100644 --- a/config/rootfiles/common/xdp-tools +++ b/config/rootfiles/common/xdp-tools @@ -34,7 +34,7 @@ usr/lib/bpf/xsk_def_xdp_prog_5.3.o usr/lib/libxdp.a usr/lib/libxdp.so usr/lib/libxdp.so.1 -usr/lib/libxdp.so.1.4.0 +usr/lib/libxdp.so.1.5.0 usr/lib/pkgconfig/libxdp.pc usr/sbin/xdp-bench usr/sbin/xdp-filter @@ -46,3 +46,4 @@ usr/sbin/xdp-udp usr/sbin/xdpdump usr/share/xdp-tools/xdp_drop.o usr/share/xdp-tools/xdp_pass.o +usr/sbin/xdp-forward diff --git a/lfs/xdp-tools b/lfs/xdp-tools index 50797ba15..905a93010 100644 --- a/lfs/xdp-tools +++ b/lfs/xdp-tools @@ -2,7 +2,7 @@ # # # IPFire.org - A linux based firewall # # Copyright (C) 2007-2023 IPFire Team # -# Copyright (C) 2024 BPFire # +# Copyright (C) 2024-2025 BPFire # # # # 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 # @@ -25,7 +25,7 @@ include Config -VER = 1.4.3 +VER = 1.5.4 THISAPP = xdp-tools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 0f3543c9cf865af49d3d05a7f9a5188a01a54ab1fb63191b96347a994c0eafccf4b50dff19a30ee718e5c72f035ae6bc30d7b87c2886db05d02746b40031d638 +$(DL_FILE)_BLAKE2 = 37ec5bbe751e21f169e1901644c1824ae023ed0558ec1cdbb9580f15676146f67c107adf4c547638138cbfc3cc66c9c3e2816ed8aebe0544572514df9dea5dd6 install : $(TARGET)