From fea884dd87666d477211d08b54a82efd9d4955e4 Mon Sep 17 00:00:00 2001
From: Wazup <6kpFoFHbr@gmail.com>
Date: Wed, 24 Jun 2020 23:32:48 +0200
Subject: [PATCH] main/linux-postmarketos-allwiner: enable IP_SET module (MR
 1372)

---
 main/linux-postmarketos-allwinner/APKBUILD    |  5 +++--
 .../config-postmarketos-allwinner.aarch64     | 21 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD
index 76403329c..7ad2bdf02 100644
--- a/main/linux-postmarketos-allwinner/APKBUILD
+++ b/main/linux-postmarketos-allwinner/APKBUILD
@@ -2,7 +2,7 @@ _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
 pkgver=5.6.0_git20200528
-pkgrel=0
+pkgrel=1
 arch="aarch64"
 pkgdesc="Kernel fork with Pine64 patches"
 url="https://gitlab.com/pine64-org/linux/"
@@ -63,7 +63,8 @@ dev() {
 		ARCH="$_carch" \
 		INSTALL_HDR_PATH="$subpkgdir"/usr
 }
+
 sha512sums="b26791eb313fe0b0059ede16042e4b344751affc1fc8522072b95a8a08fe8010daf5a969ce706b694d9c95419c2c64b40a52fc0341307a0d9bf34a1a5d6da11f  linux-postmarketos-allwinner-be7bb465172f294e407757313b76e8d509f56626.tar.gz
-4110573d164bf89487d70dba4e31961ea310010d2912c0285c5dc4b660f066d3cec5115b8eb5d5969a4fae7be2c5937d8045cdc33f8bbc67002afb26c943942a  config-postmarketos-allwinner.aarch64
+0e8c3a22a563a482799ad14abba68019d3bef324f7e599597a22a35baf6f0ceb68530d365aa9dd49d563ba2abca9736c8ee4672d02c039da7a37b797de62ee04  config-postmarketos-allwinner.aarch64
 6826e5541b1abcb64f6cf7fb03dd013c278e3173ef500bdebafdb66baca45908d96a9424a6d3a2bcd38b93aa74b30a60fe577ab817241eb3d557c023a21e2a58  disable-power-save.patch
 c6e1ff1c060f68a59fa57a7cfc573a500fc8d200f56193530f7c1967e4f70f17cb2c930496f6a6489a6a10de130a2e66f5cd328eb6c4ae936f4af348a7413c3b  touch-dts.patch"
diff --git a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
index 219523850..f233dc10b 100644
--- a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
+++ b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
@@ -903,6 +903,7 @@ CONFIG_BRIDGE_NETFILTER=m
 # Core Netfilter Configuration
 #
 CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_FAMILY_BRIDGE=y
 # CONFIG_NETFILTER_NETLINK_ACCT is not set
 # CONFIG_NETFILTER_NETLINK_QUEUE is not set
@@ -943,6 +944,7 @@ CONFIG_NETFILTER_XTABLES=y
 #
 # CONFIG_NETFILTER_XT_MARK is not set
 # CONFIG_NETFILTER_XT_CONNMARK is not set
+CONFIG_NETFILTER_XT_SET=m
 
 #
 # Xtables targets
@@ -1018,7 +1020,24 @@ CONFIG_NETFILTER_XT_MATCH_TIME=m
 # CONFIG_NETFILTER_XT_MATCH_U32 is not set
 # end of Core Netfilter Configuration
 
-# CONFIG_IP_SET is not set
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
 # CONFIG_IP_VS is not set
 
 #