aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Liske <thomas@fiasko-nw.net>2019-04-07 13:20:22 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2019-05-06 14:30:12 +0200
commit2b605d1b36cbddbc152ca2743d7500c926ea435b (patch)
treed6f0c6915e6229295c3b5a5b9260d15397491200
parent77c0937af70ce7ae2bc8e08d35d0d888000e7bdf (diff)
downloadaports-2b605d1b36cbddbc152ca2743d7500c926ea435b.tar.bz2
aports-2b605d1b36cbddbc152ca2743d7500c926ea435b.tar.xz
main/linux-vanilla: enable ipset set type hash:ip,mac
(cherry picked from commit affc173481ca6bc814aa1e89b0ef54fd741207a5)
-rw-r--r--main/linux-vanilla/APKBUILD20
-rw-r--r--main/linux-vanilla/config-vanilla.aarch642
-rw-r--r--main/linux-vanilla/config-vanilla.armhf2
-rw-r--r--main/linux-vanilla/config-vanilla.ppc64le2
-rw-r--r--main/linux-vanilla/config-vanilla.s390x2
-rw-r--r--main/linux-vanilla/config-vanilla.x862
-rw-r--r--main/linux-vanilla/config-vanilla.x86_642
-rw-r--r--main/linux-vanilla/config-virt.aarch642
-rw-r--r--main/linux-vanilla/config-virt.x862
-rw-r--r--main/linux-vanilla/config-virt.x86_642
10 files changed, 19 insertions, 19 deletions
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index 057b1cc431..00b91f63ed 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -222,15 +222,15 @@ _dev() {
}
sha512sums="ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 linux-4.19.tar.xz
-546b2102d4ac909fd11312602748cc844bed299973636d60f60225805f1e7144a9e3415c0b78139b06246e4626b406d2bec074c4e76155c089f4986df66ec9b9 config-vanilla.aarch64
-17cd16a91f2788e6c7ec39f5aeba7b0c5c5bc4ab304bef98381f36fad8d5f14a897f70ac59eeea79ec024fa8477ed0fb860655fe8db54cb04c47ea55391644cb config-vanilla.armhf
-17cd16a91f2788e6c7ec39f5aeba7b0c5c5bc4ab304bef98381f36fad8d5f14a897f70ac59eeea79ec024fa8477ed0fb860655fe8db54cb04c47ea55391644cb config-vanilla.armv7
-4188fa1f26bfc7dd9e87c1115759ca21b4fab0adbce73aa896a55110ca56a0a12e3b6a13316e17270fb73509b19cbc0513c066b2b41be9678b5dca6b9c9b25b6 config-vanilla.x86
-f565cd00f1f356019172e37e798e86dd8a8d9d799181ac2be4045f8bec736f1e7bdb12bf708ebb0a326845f0b4889759fdaac3a4544e30173485ad512f219427 config-vanilla.x86_64
+67a6c04b8a683561ca733851fbd8a0b6352d18692c0b2c4067f42b30a7dca079888454d5010618effc1ea1e75751e89c181195e813b3cb406fef000503991f2d config-vanilla.aarch64
+1e5016637c6cec4ddf5b8d78c081001749cc4f041aea8e400bdc0e4dec86b02ff13262fbeda7dfaf69b98ea88dea612608d073b629f4ecae522383eca53baa42 config-vanilla.armhf
+1e5016637c6cec4ddf5b8d78c081001749cc4f041aea8e400bdc0e4dec86b02ff13262fbeda7dfaf69b98ea88dea612608d073b629f4ecae522383eca53baa42 config-vanilla.armv7
+f91a1f3fb9d17697a7edab09587ec9e933950460362141409b64c0537e8998f50c1c998388ab0d292870bdded4c794167474fe83ffae32763b1faf6fd02ed3c6 config-vanilla.x86
+828c2832fc6e0184f8af962dd2025294f844d2dc2d81e997c9478005b66426dd5fedfb4c2c071a91c64f2bd44a2dc709ff2b5af2f9d91ef196aee334646cd3f9 config-vanilla.x86_64
96651aca476c905c04d616565a2dd08066167c1d4887e2ddc86c4b7cdda44257ef633a9bcf745a91f00f88023dde8f1804c56b258e7e99232bb8bfa25d0ba4db config-vanilla.ppc
-3d90dfaa35142977945cdb0d8a6260861d89e5e36a6fd3a3602c4538a41bac8680c4e53617d4d072b3554bc3a01a26278e5d8da6d161254f07b51dd00666c27d config-vanilla.ppc64le
-622fd889d7b80c267c73f62981f5025e35a2429191aeeb222fca921790fb32f68154dbcece4a12ab975de8a441ebd1d7947880ce92fc9d22ea1324e8b0457ca0 config-vanilla.s390x
-26c6aa63baf022aa57e92e9fd79f662b18bec3bc34935ffb08e7f60c07b03ceb15d240ddd068d53132250a59070d5daeaa6bd17e90ec264f3239b4d9daa28b97 config-virt.aarch64
-2bea88a681c18d63d35fbb4014bf68be46eaa6df9824cd07ea0eaf46ffb7a91170cef2678594ca6f250849630efaebd3813e61708cc31c1a46c3d161116cb7db config-virt.x86
-56258c34b4dcebf3d0724ec8c7a714776fae965daf659a427e59852cc54d9650416baa4e6beb849b5cc29899b6c52c083dfbd6af7cc188e2b9d860d6360e5538 config-virt.x86_64
+6b840d2dab3168c754ee051b6012acbc06d4748a259d76b5bea21b3916de0055a78ed6bedf8a6401285884c6432f054d70a2aa1a53fceba8b13e78a2c6841fa0 config-vanilla.ppc64le
+c2773411ce22aebad984063f877d49761a4cfff151492ad4e2d0155a37851bb76d53a98f25852c9c04af62f52a4237f90a75f80bcddd350e23a2b7eb90a4f94d config-vanilla.s390x
+ba180b92fe9995ce2fb3c89053a127082f1cf7d55516095264f66d65fa025ea3ecb8e5280d73af4bca2053d43c2a8a340919f9760384f2ca464810c7fdc66276 config-virt.aarch64
+4984ac56593d2a2b6f4bc3aee15c5a528d2192730d18257e5ac1849551ff71f2008611859e5d751e50b6841581e3f72634551b526d754ad3745f36306a9c7dab config-virt.x86
+53542824b808edcb95a1c43ffe9cbdd22fd7b137a90e5aadca964db07b91798101abca143e691c8dc046b683f2764abeb508946ba8d01b769ee1554e73aa002b config-virt.x86_64
28786359f5157550df78f412f1830b86bb708d32a7e0d8d2a23857c3b7eb4e7e2f80b36a676a32a1f5b5a240bd4f4bcdd7deca8be926b988b50dee7ce74984fd patch-4.19.34.xz"
diff --git a/main/linux-vanilla/config-vanilla.aarch64 b/main/linux-vanilla/config-vanilla.aarch64
index 818234cb28..f6f58a731f 100644
--- a/main/linux-vanilla/config-vanilla.aarch64
+++ b/main/linux-vanilla/config-vanilla.aarch64
@@ -1228,7 +1228,7 @@ 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 is not set
+CONFIG_IP_SET_HASH_IPMAC=m
CONFIG_IP_SET_HASH_MAC=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
diff --git a/main/linux-vanilla/config-vanilla.armhf b/main/linux-vanilla/config-vanilla.armhf
index d53dfcd28d..daf4cc2399 100644
--- a/main/linux-vanilla/config-vanilla.armhf
+++ b/main/linux-vanilla/config-vanilla.armhf
@@ -1130,7 +1130,7 @@ 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 is not set
+CONFIG_IP_SET_HASH_IPMAC=m
CONFIG_IP_SET_HASH_MAC=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
diff --git a/main/linux-vanilla/config-vanilla.ppc64le b/main/linux-vanilla/config-vanilla.ppc64le
index bf88f08ecb..d8132b14d5 100644
--- a/main/linux-vanilla/config-vanilla.ppc64le
+++ b/main/linux-vanilla/config-vanilla.ppc64le
@@ -992,7 +992,7 @@ 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 is not set
+CONFIG_IP_SET_HASH_IPMAC=m
CONFIG_IP_SET_HASH_MAC=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
diff --git a/main/linux-vanilla/config-vanilla.s390x b/main/linux-vanilla/config-vanilla.s390x
index 8d362a3c40..9873554eb1 100644
--- a/main/linux-vanilla/config-vanilla.s390x
+++ b/main/linux-vanilla/config-vanilla.s390x
@@ -982,7 +982,7 @@ 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 is not set
+CONFIG_IP_SET_HASH_IPMAC=m
CONFIG_IP_SET_HASH_MAC=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
diff --git a/main/linux-vanilla/config-vanilla.x86 b/main/linux-vanilla/config-vanilla.x86
index ddc7090970..7c4d65b2df 100644
--- a/main/linux-vanilla/config-vanilla.x86
+++ b/main/linux-vanilla/config-vanilla.x86
@@ -1220,7 +1220,7 @@ 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 is not set
+CONFIG_IP_SET_HASH_IPMAC=m
CONFIG_IP_SET_HASH_MAC=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
diff --git a/main/linux-vanilla/config-vanilla.x86_64 b/main/linux-vanilla/config-vanilla.x86_64
index 27e0f9f77b..be3e3479cf 100644
--- a/main/linux-vanilla/config-vanilla.x86_64
+++ b/main/linux-vanilla/config-vanilla.x86_64
@@ -1259,7 +1259,7 @@ 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 is not set
+CONFIG_IP_SET_HASH_IPMAC=m
CONFIG_IP_SET_HASH_MAC=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
diff --git a/main/linux-vanilla/config-virt.aarch64 b/main/linux-vanilla/config-virt.aarch64
index bf59660b1b..d3435f06e3 100644
--- a/main/linux-vanilla/config-virt.aarch64
+++ b/main/linux-vanilla/config-virt.aarch64
@@ -1182,7 +1182,7 @@ 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 is not set
+CONFIG_IP_SET_HASH_IPMAC=m
CONFIG_IP_SET_HASH_MAC=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
diff --git a/main/linux-vanilla/config-virt.x86 b/main/linux-vanilla/config-virt.x86
index 70fedc3b24..7c49936f4f 100644
--- a/main/linux-vanilla/config-virt.x86
+++ b/main/linux-vanilla/config-virt.x86
@@ -1157,7 +1157,7 @@ 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 is not set
+CONFIG_IP_SET_HASH_IPMAC=m
CONFIG_IP_SET_HASH_MAC=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
diff --git a/main/linux-vanilla/config-virt.x86_64 b/main/linux-vanilla/config-virt.x86_64
index 93c6a8530c..06d4bb218d 100644
--- a/main/linux-vanilla/config-virt.x86_64
+++ b/main/linux-vanilla/config-virt.x86_64
@@ -1205,7 +1205,7 @@ 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 is not set
+CONFIG_IP_SET_HASH_IPMAC=m
CONFIG_IP_SET_HASH_MAC=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m