From 890dcc7bb453f8de904ce3a909b14226b940c359 Mon Sep 17 00:00:00 2001

From: Pablo Greco <pgreco@centosproject.org>

Date: Fri, 7 Aug 2020 02:59:05 +0000

Subject: [PATCH] configs 2711

---

 arch/arm/configs/bcm2711_defconfig   | 32 ++++++++++++++++++++++++++--

 arch/arm64/configs/bcm2711_defconfig | 32 ++++++++++++++++++++++++++--

 2 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig

index 2014e54..394399d 100644

--- a/arch/arm/configs/bcm2711_defconfig

+++ b/arch/arm/configs/bcm2711_defconfig

@@ -2,6 +2,7 @@ CONFIG_LOCALVERSION="-v7l"

 # CONFIG_LOCALVERSION_AUTO is not set

 CONFIG_SYSVIPC=y

 CONFIG_POSIX_MQUEUE=y

+CONFIG_AUDIT=y

 CONFIG_GENERIC_IRQ_DEBUGFS=y

 CONFIG_NO_HZ=y

 CONFIG_HIGH_RES_TIMERS=y

@@ -126,6 +127,7 @@ CONFIG_IPV6_SUBTREES=y

 CONFIG_IPV6_MROUTE=y

 CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y

 CONFIG_IPV6_PIMSM_V2=y

+CONFIG_NETLABEL=y

 CONFIG_NETFILTER=y

 CONFIG_NF_CONNTRACK=m

 CONFIG_NF_CONNTRACK_ZONES=y

@@ -173,6 +175,7 @@ CONFIG_NFT_FIB_NETDEV=m

 CONFIG_NF_FLOW_TABLE_INET=m

 CONFIG_NF_FLOW_TABLE=m

 CONFIG_NETFILTER_XT_SET=m

+CONFIG_NETFILTER_XT_TARGET_AUDIT=m

 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m

@@ -280,6 +283,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m

 CONFIG_IP_NF_TARGET_ECN=m

 CONFIG_IP_NF_TARGET_TTL=m

 CONFIG_IP_NF_RAW=m

+CONFIG_IP_NF_SECURITY=m

 CONFIG_IP_NF_ARPTABLES=m

 CONFIG_IP_NF_ARPFILTER=m

 CONFIG_IP_NF_ARP_MANGLE=m

@@ -301,6 +305,7 @@ CONFIG_IP6_NF_FILTER=m

 CONFIG_IP6_NF_TARGET_REJECT=m

 CONFIG_IP6_NF_MANGLE=m

 CONFIG_IP6_NF_RAW=m

+CONFIG_IP6_NF_SECURITY=m

 CONFIG_IP6_NF_NAT=m

 CONFIG_IP6_NF_TARGET_MASQUERADE=m

 CONFIG_IP6_NF_TARGET_NPT=m

@@ -1392,6 +1397,7 @@ CONFIG_NILFS2_FS=m

 CONFIG_F2FS_FS=y

 CONFIG_FS_ENCRYPTION=y

 CONFIG_FANOTIFY=y

+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

 CONFIG_QFMT_V1=m

 CONFIG_QFMT_V2=m

 CONFIG_AUTOFS4_FS=y

@@ -1434,6 +1440,7 @@ CONFIG_NFS_FSCACHE=y

 CONFIG_NFSD=m

 CONFIG_NFSD_V3_ACL=y

 CONFIG_NFSD_V4=y

+CONFIG_NFSD_V4_SECURITY_LABEL=y

 CONFIG_CIFS=m

 CONFIG_CIFS_WEAK_PW_HASH=y

 CONFIG_CIFS_UPCALL=y

@@ -1483,8 +1490,12 @@ CONFIG_NLS_KOI8_R=m

 CONFIG_NLS_KOI8_U=m

 CONFIG_DLM=m

 CONFIG_SECURITY=y

-CONFIG_SECURITY_APPARMOR=y

-CONFIG_LSM=""

+CONFIG_SECURITY_NETWORK=y

+CONFIG_SECURITY_PATH=y

+CONFIG_SECURITY_SELINUX=y

+CONFIG_SECURITY_SELINUX_BOOTPARAM=y

+CONFIG_SECURITY_SELINUX_DISABLE=y

+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1

 CONFIG_CRYPTO_USER=m

 CONFIG_CRYPTO_CHACHA20POLY1305=m

 CONFIG_CRYPTO_XCBC=m

@@ -1517,3 +1528,20 @@ CONFIG_FUNCTION_PROFILER=y

 CONFIG_KGDB=y

 CONFIG_KGDB_KDB=y

 CONFIG_KDB_KEYBOARD=y

+CONFIG_NET_TEAM=m

+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m

+CONFIG_NET_TEAM_MODE_BROADCAST=m

+CONFIG_NET_TEAM_MODE_LOADBALANCE=m

+CONFIG_NET_TEAM_MODE_RANDOM=m

+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m

+CONFIG_CRYPTO_BLAKE2S=m

+CONFIG_CRYPTO_CURVE25519=m

+CONFIG_CRYPTO_CURVE25519_NEON=m

+CONFIG_CRYPTO_LIB_BLAKE2S=m

+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

+CONFIG_CRYPTO_LIB_CHACHA=m

+CONFIG_CRYPTO_LIB_CURVE25519=m

+CONFIG_CRYPTO_LIB_POLY1305=m

+CONFIG_CRYPTO_POLY1305_ARM=m

+# CONFIG_WIREGUARD_DEBUG is not set

+CONFIG_WIREGUARD=m

diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig

index ba3afaa..6fb1eb1 100644

--- a/arch/arm64/configs/bcm2711_defconfig

+++ b/arch/arm64/configs/bcm2711_defconfig

@@ -2,6 +2,7 @@ CONFIG_LOCALVERSION="-v8"

 # CONFIG_LOCALVERSION_AUTO is not set

 CONFIG_SYSVIPC=y

 CONFIG_POSIX_MQUEUE=y

+CONFIG_AUDIT=y

 CONFIG_GENERIC_IRQ_DEBUGFS=y

 CONFIG_NO_HZ=y

 CONFIG_HIGH_RES_TIMERS=y

@@ -125,6 +126,7 @@ CONFIG_IPV6_SUBTREES=y

 CONFIG_IPV6_MROUTE=y

 CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y

 CONFIG_IPV6_PIMSM_V2=y

+CONFIG_NETLABEL=y

 CONFIG_NETFILTER=y

 CONFIG_NF_CONNTRACK=m

 CONFIG_NF_CONNTRACK_ZONES=y

@@ -172,6 +174,7 @@ CONFIG_NFT_FIB_NETDEV=m

 CONFIG_NF_FLOW_TABLE_INET=m

 CONFIG_NF_FLOW_TABLE=m

 CONFIG_NETFILTER_XT_SET=m

+CONFIG_NETFILTER_XT_TARGET_AUDIT=m

 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m

@@ -279,6 +282,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m

 CONFIG_IP_NF_TARGET_ECN=m

 CONFIG_IP_NF_TARGET_TTL=m

 CONFIG_IP_NF_RAW=m

+CONFIG_IP_NF_SECURITY=m

 CONFIG_IP_NF_ARPTABLES=m

 CONFIG_IP_NF_ARPFILTER=m

 CONFIG_IP_NF_ARP_MANGLE=m

@@ -300,6 +304,7 @@ CONFIG_IP6_NF_FILTER=m

 CONFIG_IP6_NF_TARGET_REJECT=m

 CONFIG_IP6_NF_MANGLE=m

 CONFIG_IP6_NF_RAW=m

+CONFIG_IP6_NF_SECURITY=m

 CONFIG_IP6_NF_NAT=m

 CONFIG_IP6_NF_TARGET_MASQUERADE=m

 CONFIG_IP6_NF_TARGET_NPT=m

@@ -1384,6 +1389,7 @@ CONFIG_NILFS2_FS=m

 CONFIG_F2FS_FS=y

 CONFIG_FS_ENCRYPTION=y

 CONFIG_FANOTIFY=y

+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

 CONFIG_QFMT_V1=m

 CONFIG_QFMT_V2=m

 CONFIG_AUTOFS4_FS=y

@@ -1426,6 +1432,7 @@ CONFIG_NFS_FSCACHE=y

 CONFIG_NFSD=m

 CONFIG_NFSD_V3_ACL=y

 CONFIG_NFSD_V4=y

+CONFIG_NFSD_V4_SECURITY_LABEL=y

 CONFIG_CIFS=m

 CONFIG_CIFS_WEAK_PW_HASH=y

 CONFIG_CIFS_UPCALL=y

@@ -1475,8 +1482,12 @@ CONFIG_NLS_KOI8_R=m

 CONFIG_NLS_KOI8_U=m

 CONFIG_DLM=m

 CONFIG_SECURITY=y

-CONFIG_SECURITY_APPARMOR=y

-CONFIG_LSM=""

+CONFIG_SECURITY_NETWORK=y

+CONFIG_SECURITY_PATH=y

+CONFIG_SECURITY_SELINUX=y

+CONFIG_SECURITY_SELINUX_BOOTPARAM=y

+CONFIG_SECURITY_SELINUX_DISABLE=y

+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1

 CONFIG_CRYPTO_USER=m

 CONFIG_CRYPTO_CHACHA20POLY1305=m

 CONFIG_CRYPTO_XCBC=m

@@ -1508,3 +1519,20 @@ CONFIG_FUNCTION_PROFILER=y

 CONFIG_KGDB=y

 CONFIG_KGDB_KDB=y

 CONFIG_KDB_KEYBOARD=y

+CONFIG_NET_TEAM=m

+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m

+CONFIG_NET_TEAM_MODE_BROADCAST=m

+CONFIG_NET_TEAM_MODE_LOADBALANCE=m

+CONFIG_NET_TEAM_MODE_RANDOM=m

+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m

+CONFIG_CRYPTO_BLAKE2S=m

+CONFIG_CRYPTO_CURVE25519=m

+CONFIG_CRYPTO_LIB_BLAKE2S=m

+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

+CONFIG_CRYPTO_LIB_CHACHA=m

+CONFIG_CRYPTO_LIB_CURVE25519=m

+CONFIG_CRYPTO_LIB_POLY1305=m

+CONFIG_CRYPTO_POLY1305_NEON=m

+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set

+# CONFIG_WIREGUARD_DEBUG is not set

+CONFIG_WIREGUARD=m

-- 

2.18.2