From 60dab9f9580fc10f5db35a067307bfd6bc9fc8d4 Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Mon, 29 Oct 2018 12:00:33 +0100 Subject: [PATCH] packages: add fixes for netfilter from #1386 Signed-off-by: Zoltan HERPAI --- package/kernel/linux/modules/netfilter.mk | 8 ++++-- .../riscv64/base-files/lib/preinit/80_debug | 2 +- x.patch | 26 +++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 x.patch diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 109d1fd37b..1a1a91244c 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -539,7 +539,7 @@ define KernelPackage/nf-nathelper-extra KCONFIG:=$(KCONFIG_NF_NATHELPER_EXTRA) FILES:=$(foreach mod,$(NF_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NATHELPER_EXTRA-m))) - DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch + DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch +LINUX_4_19:kmod-crypto-rsa endef define KernelPackage/nf-nathelper-extra/description @@ -649,7 +649,11 @@ define KernelPackage/ipt-tproxy CONFIG_NETFILTER_XT_MATCH_SOCKET \ CONFIG_NETFILTER_XT_TARGET_TPROXY FILES:= \ - $(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko) + $(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko) \ + $(LINUX_DIR)/net/ipv4/netfilter/nf_socket_ipv4.ko@ge4.19 \ + $(LINUX_DIR)/net/ipv4/netfilter/nf_tproxy_ipv4.ko@ge4.19 \ + $(LINUX_DIR)/net/ipv6/netfilter/nf_socket_ipv6.ko@ge4.19 \ + $(LINUX_DIR)/net/ipv6/netfilter/nf_tproxy_ipv6.ko@ge4.19 AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_TPROXY-m))) $(call AddDepends/ipt) endef diff --git a/target/linux/riscv64/base-files/lib/preinit/80_debug b/target/linux/riscv64/base-files/lib/preinit/80_debug index 10ab6a4174..ec895c5327 100644 --- a/target/linux/riscv64/base-files/lib/preinit/80_debug +++ b/target/linux/riscv64/base-files/lib/preinit/80_debug @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2012-2015 OpenWrt.org +# Copyright (C) 2012-2018 OpenWrt.org riscv_debug() { cat /proc/cpuinfo diff --git a/x.patch b/x.patch new file mode 100644 index 0000000000..049346163c --- /dev/null +++ b/x.patch @@ -0,0 +1,26 @@ +diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk +index 109d1fd37b..88f17d07bc 100644 +--- a/package/kernel/linux/modules/netfilter.mk ++++ b/package/kernel/linux/modules/netfilter.mk +@@ -539,7 +539,7 @@ define KernelPackage/nf-nathelper-extra + KCONFIG:=$(KCONFIG_NF_NATHELPER_EXTRA) + FILES:=$(foreach mod,$(NF_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) + AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NATHELPER_EXTRA-m))) +- DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch ++ DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch +kmod-crypto-rsa + endef + + define KernelPackage/nf-nathelper-extra/description +@@ -649,7 +649,11 @@ define KernelPackage/ipt-tproxy + CONFIG_NETFILTER_XT_MATCH_SOCKET \ + CONFIG_NETFILTER_XT_TARGET_TPROXY + FILES:= \ +- $(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko) ++ $(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko) \ ++ $(LINUX_DIR)/net/ipv4/netfilter/nf_socket_ipv4.ko \ ++ $(LINUX_DIR)/net/ipv4/netfilter/nf_tproxy_ipv4.ko \ ++ $(LINUX_DIR)/net/ipv6/netfilter/nf_socket_ipv6.ko \ ++ $(LINUX_DIR)/net/ipv6/netfilter/nf_tproxy_ipv6.ko + AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_TPROXY-m))) + $(call AddDepends/ipt) + endef -- 2.30.2