Enable a few NFT options (rhbz 1651813)

2019-10-07 13:58:22 -04:00 · 2019-10-07 13:58:22 -04:00 · 7d533eb54e
parent f35031adaa
commit 7d533eb54e
18 changed files with 48 additions and 45 deletions
--- a/configs/fedora/generic/CONFIG_NFT_SOCKET
+++ b/configs/fedora/generic/CONFIG_NFT_SOCKET
@ -1 +1 @@
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
--- a/configs/fedora/generic/CONFIG_NFT_TPROXY
+++ b/configs/fedora/generic/CONFIG_NFT_TPROXY
@ -1 +1 @@
-# CONFIG_NFT_TPROXY is not set
+CONFIG_NFT_TPROXY=m
--- a/configs/fedora/generic/CONFIG_NFT_TUNNEL
+++ b/configs/fedora/generic/CONFIG_NFT_TUNNEL
@ -1 +1 @@
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TUNNEL=m
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@ -4170,10 +4170,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@ -4150,10 +4150,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@ -4245,10 +4245,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@ -4119,10 +4119,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@ -4100,10 +4100,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@ -4226,10 +4226,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@ -3861,10 +3861,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
--- a/kernel-i686.config
+++ b/kernel-i686.config
@ -3842,10 +3842,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@ -3583,10 +3583,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@ -3562,10 +3562,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@ -3556,10 +3556,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 # CONFIG_N_GSM is not set
 CONFIG_N_HDLC=m
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@ -3535,10 +3535,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 # CONFIG_N_GSM is not set
 CONFIG_N_HDLC=m
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@ -3906,10 +3906,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@ -3887,10 +3887,10 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_TUNNEL is not set
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
--- a/kernel.spec
+++ b/kernel.spec
@ -1763,6 +1763,9 @@ fi
 #
 #
 %changelog
+* Mon Oct 07 2019 Laura Abbott <labbott@redhat.com>
+- Enable a few NFT options (rhbz 1651813)
+
 * Mon Oct 07 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc2.git0.1
 - Linux v5.4-rc2