From 33b694780d7ea03aa66aa3184261311e96c05888 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 26 Jul 2020 14:18:23 +1000
Subject: [PATCH] rpi-kernel: add nftables support.

Applied from upstream.

Closes #23662.

[ci skip]
---
 ...5debc1925397f78db8bbfc9f488b0ce4e009.patch | 85 +++++++++++++++++++
 srcpkgs/rpi-kernel/template                   |  2 +-
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/rpi-kernel/patches/fe915debc1925397f78db8bbfc9f488b0ce4e009.patch

diff --git a/srcpkgs/rpi-kernel/patches/fe915debc1925397f78db8bbfc9f488b0ce4e009.patch b/srcpkgs/rpi-kernel/patches/fe915debc1925397f78db8bbfc9f488b0ce4e009.patch
new file mode 100644
index 00000000000..ac160b1e74f
--- /dev/null
+++ b/srcpkgs/rpi-kernel/patches/fe915debc1925397f78db8bbfc9f488b0ce4e009.patch
@@ -0,0 +1,85 @@
+From fe915debc1925397f78db8bbfc9f488b0ce4e009 Mon Sep 17 00:00:00 2001
+From: digital <digital@dinid.net>
+Date: Fri, 26 Jun 2020 17:30:49 +0200
+Subject: [PATCH] Enable nf_tables support for aarch64
+
+---
+ arch/arm64/configs/bcmrpi3_defconfig | 44 ++++++++++++++++++++++++++++
+ 1 file changed, 44 insertions(+)
+
+diff --git arch/arm64/configs/bcmrpi3_defconfig arch/arm64/configs/bcmrpi3_defconfig
+index 63e0cc8ab89f9..d66d80f95c001 100644
+--- arch/arm64/configs/bcmrpi3_defconfig
++++ arch/arm64/configs/bcmrpi3_defconfig
+@@ -132,6 +132,33 @@ CONFIG_NF_CONNTRACK_SANE=m
+ CONFIG_NF_CONNTRACK_SIP=m
+ CONFIG_NF_CONNTRACK_TFTP=m
+ CONFIG_NF_CT_NETLINK=m
++CONFIG_NF_TABLES=m
++CONFIG_NF_TABLES_SET=m
++CONFIG_NF_TABLES_INET=y
++CONFIG_NF_TABLES_NETDEV=y
++CONFIG_NFT_NUMGEN=m
++CONFIG_NFT_CT=m
++CONFIG_NFT_COUNTER=m
++CONFIG_NFT_CONNLIMIT=m
++CONFIG_NFT_LOG=m
++CONFIG_NFT_LIMIT=m
++CONFIG_NFT_MASQ=m
++CONFIG_NFT_REDIR=m
++CONFIG_NFT_NAT=m
++CONFIG_NFT_TUNNEL=m
++CONFIG_NFT_OBJREF=m
++CONFIG_NFT_QUEUE=m
++CONFIG_NFT_QUOTA=m
++CONFIG_NFT_REJECT=m
++CONFIG_NFT_COMPAT=m
++CONFIG_NFT_HASH=m
++CONFIG_NFT_FIB_INET=m
++CONFIG_NFT_SOCKET=m
++CONFIG_NFT_OSF=m
++CONFIG_NFT_TPROXY=m
++CONFIG_NFT_DUP_NETDEV=m
++CONFIG_NFT_FWD_NETDEV=m
++CONFIG_NFT_FIB_NETDEV=m
+ CONFIG_NETFILTER_XT_SET=m
+ CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+@@ -220,6 +247,14 @@ CONFIG_IP_VS_SED=m
+ CONFIG_IP_VS_NQ=m
+ CONFIG_IP_VS_FTP=m
+ CONFIG_IP_VS_PE_SIP=m
++CONFIG_NFT_CHAIN_ROUTE_IPV4=m
++CONFIG_NFT_DUP_IPV4=m
++CONFIG_NFT_FIB_IPV4=m
++CONFIG_NF_TABLES_ARP=y
++CONFIG_NF_LOG_ARP=m
++CONFIG_NFT_CHAIN_NAT_IPV4=m
++CONFIG_NFT_MASQ_IPV4=m
++CONFIG_NFT_REDIR_IPV4=m
+ CONFIG_IP_NF_IPTABLES=m
+ CONFIG_IP_NF_MATCH_AH=m
+ CONFIG_IP_NF_MATCH_ECN=m
+@@ -239,6 +274,12 @@ CONFIG_IP_NF_RAW=m
+ CONFIG_IP_NF_ARPTABLES=m
+ CONFIG_IP_NF_ARPFILTER=m
+ CONFIG_IP_NF_ARP_MANGLE=m
++CONFIG_NFT_CHAIN_ROUTE_IPV6=m
++CONFIG_NFT_CHAIN_NAT_IPV6=m
++CONFIG_NFT_MASQ_IPV6=m
++CONFIG_NFT_REDIR_IPV6=m
++CONFIG_NFT_DUP_IPV6=m
++CONFIG_NFT_FIB_IPV6=m
+ CONFIG_IP6_NF_IPTABLES=m
+ CONFIG_IP6_NF_MATCH_AH=m
+ CONFIG_IP6_NF_MATCH_EUI64=m
+@@ -257,6 +298,9 @@ CONFIG_IP6_NF_RAW=m
+ CONFIG_IP6_NF_NAT=m
+ CONFIG_IP6_NF_TARGET_MASQUERADE=m
+ CONFIG_IP6_NF_TARGET_NPT=m
++CONFIG_NF_TABLES_BRIDGE=y
++CONFIG_NFT_BRIDGE_REJECT=m
++CONFIG_NF_LOG_BRIDGE=m
+ CONFIG_BRIDGE_NF_EBTABLES=m
+ CONFIG_BRIDGE_EBT_BROUTE=m
+ CONFIG_BRIDGE_EBT_T_FILTER=m
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 5e3de2045a4..a406f6a1178 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -10,7 +10,7 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
 version=4.19.127
-revision=2
+revision=3
 wrksrc="linux-${_githash}"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 homepage="http://www.kernel.org"