From 2841ab2761d62ae0eeb5570e3f5ae2d5b010ef0b Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Thu, 18 Jan 2018 08:59:42 -0800 Subject: Enable CONFIG_IP6_NF_TARGET_NPT (rhbz 1435884) --- configs/fedora/generic/CONFIG_IP6_NF_TARGET_NPT | 2 +- kernel-aarch64-debug.config | 2 +- kernel-aarch64.config | 2 +- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 2 +- kernel-armv7hl-lpae.config | 2 +- kernel-armv7hl.config | 2 +- kernel-i686-PAE.config | 2 +- kernel-i686-PAEdebug.config | 2 +- kernel-i686-debug.config | 2 +- kernel-i686.config | 2 +- kernel-ppc64-debug.config | 2 +- kernel-ppc64.config | 2 +- kernel-ppc64le-debug.config | 2 +- kernel-ppc64le.config | 2 +- kernel-s390x-debug.config | 2 +- kernel-s390x.config | 2 +- kernel-x86_64-debug.config | 2 +- kernel-x86_64.config | 2 +- kernel.spec | 3 +++ 20 files changed, 22 insertions(+), 19 deletions(-) diff --git a/configs/fedora/generic/CONFIG_IP6_NF_TARGET_NPT b/configs/fedora/generic/CONFIG_IP6_NF_TARGET_NPT index bb6d2f77a..e9a67d4fe 100644 --- a/configs/fedora/generic/CONFIG_IP6_NF_TARGET_NPT +++ b/configs/fedora/generic/CONFIG_IP6_NF_TARGET_NPT @@ -1 +1 @@ -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 658b04305..a3152a988 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2335,7 +2335,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 83439a0f4..00f82def1 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2318,7 +2318,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 5ba04c115..44809c3e7 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2487,7 +2487,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 35ec79f2b..3f63064dd 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2356,7 +2356,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index df0ca473b..b42356542 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2339,7 +2339,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index bc2d5f279..8f496beb2 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2470,7 +2470,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index f78ad4fe6..7d2eeff10 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -2226,7 +2226,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 545dda738..66eff4bd4 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -2244,7 +2244,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index eb7ef75d1..ae3147718 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2244,7 +2244,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-i686.config b/kernel-i686.config index 9d6358db5..e6a81c4fb 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2226,7 +2226,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 1c51b6127..1d25295e0 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -2095,7 +2095,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 4cccc862d..d5d3f5d0d 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -2077,7 +2077,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 79bacb6aa..6d5162f79 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2040,7 +2040,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 27c1533a9..6b1a70787 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2022,7 +2022,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 80b5c6d56..598d7165f 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1993,7 +1993,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index e3b9eadaf..1f7a53fa7 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1975,7 +1975,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 297ca0b76..a9ce3a5a6 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2301,7 +2301,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 7889f76e2..e35b4df4c 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2283,7 +2283,7 @@ CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_MASQUERADE=m -# CONFIG_IP6_NF_TARGET_NPT is not set +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m # CONFIG_IPACK_BUS is not set diff --git a/kernel.spec b/kernel.spec index 29d78cbf1..7168d15a6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1903,6 +1903,9 @@ fi # # %changelog +* Thu Jan 18 2018 Laura Abbott +- Enable CONFIG_IP6_NF_TARGET_NPT (rhbz 1435884) + * Thu Jan 18 2018 Laura Abbott - 4.15.0-0.rc8.git2.1 - Linux v4.15-rc8-104-g1d966eb4d632 -- cgit