From 60f645f25581b038709846cfbffc6fe7cf63c9d3 Mon Sep 17 00:00:00 2001 From: Georgi Valkov Date: Mon, 8 Jul 2024 21:40:59 +0300 Subject: [PATCH] xtables-addons: bump to 3.26 extensions/ACCOUNT/Makefile.am change ${top_srcdir} to ../../ (used in 3.24) to fix the following error cp: cannot stat '/Volumes/x64/openwrt/build_dir/target-x86_64_musl/linux-x86_64/xtables-addons-3.26/ipkg-install/usr/lib/iptables/libxt_ACCOUNT.so': No such file or directory Signed-off-by: Georgi Valkov --- net/xtables-addons/Makefile | 6 +++--- .../patches/300-fix-path-Makefile.extra.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 net/xtables-addons/patches/300-fix-path-Makefile.extra.patch diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile index 67862630ea..5c248634aa 100644 --- a/net/xtables-addons/Makefile +++ b/net/xtables-addons/Makefile @@ -7,9 +7,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=xtables-addons -PKG_VERSION:=3.24 -PKG_RELEASE:=3 -PKG_HASH:=3e823f71720519ced31c4c7d2bfaf7120d9c01c59a0843dfcbe93c95c64d81c1 +PKG_VERSION:=3.26 +PKG_RELEASE:=1 +PKG_HASH:=0b52df2117bacf2e32d1d3f98d09dbf88b274390733d3955699b108acaf9f2a6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://inai.de/files/xtables-addons/ diff --git a/net/xtables-addons/patches/300-fix-path-Makefile.extra.patch b/net/xtables-addons/patches/300-fix-path-Makefile.extra.patch new file mode 100644 index 0000000000..34791746c1 --- /dev/null +++ b/net/xtables-addons/patches/300-fix-path-Makefile.extra.patch @@ -0,0 +1,11 @@ +--- a/extensions/ACCOUNT/Makefile.am ++++ b/extensions/ACCOUNT/Makefile.am +@@ -3,7 +3,7 @@ + AM_CPPFLAGS = ${regular_CPPFLAGS} -I${abs_top_srcdir}/extensions + AM_CFLAGS = ${regular_CFLAGS} ${libxtables_CFLAGS} + +-include ${top_srcdir}/Makefile.extra ++include ../../Makefile.extra + + sbin_PROGRAMS = iptaccount + iptaccount_LDADD = libxt_ACCOUNT_cl.la -- 2.30.2