[SRU][K][PATCH 2/7] UBUNTU: [Config] Enable CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES on riscv64

[Emil Renner Berthing]

BugLink: https://bugs.launchpad.net/bugs/1981437

This disables encryption types that were deprecated in Kerberos v5 as is
done on all other architectures. No setup involving a RISC-V machine
should use these encryption types.

Signed-off-by: Emil Renner Berthing <emil.renner.berthing at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 -
 debian.master/config/annotations                   | 2 +-
 debian.master/config/arm64/config.common.arm64     | 1 -
 debian.master/config/armhf/config.common.armhf     | 1 -
 debian.master/config/config.common.ubuntu          | 1 +
 debian.master/config/ppc64el/config.common.ppc64el | 1 -
 debian.master/config/riscv64/config.common.riscv64 | 1 -
 debian.master/config/s390x/config.common.s390x     | 1 -
 8 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 6787b3f7d612..fa470c2b275e 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -632,7 +632,6 @@ CONFIG_SSB=m
 CONFIG_STAGING=y
 # CONFIG_STANDALONE is not set
 CONFIG_STRICT_DEVMEM=y
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUN_PARTITION=y
 CONFIG_SURFACE_3_POWER_OPREGION=m
 CONFIG_SURFACE_PRO3_BUTTON=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 1ccaf033dda8..df95a02e1abb 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -10927,7 +10927,7 @@ CONFIG_NETWORK_FILESYSTEMS                      policy<{'amd64': 'y', 'arm64': '
 CONFIG_NFSD                                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_NFSD_V3_ACL                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
 CONFIG_RPCSEC_GSS_KRB5                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES         policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'n', 's390x': 'y'}>
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES         policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
 CONFIG_SUNRPC_DEBUG                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
 CONFIG_SUNRPC_XPRT_RDMA                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_CODA_FS                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index f4efcf61fea9..7872c36393f8 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -662,7 +662,6 @@ CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
 CONFIG_STRICT_DEVMEM=y
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUN_PARTITION=y
 # CONFIG_SURFACE_3_POWER_OPREGION is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index cbd6e7625ae7..5b76bc59006a 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -646,7 +646,6 @@ CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
 CONFIG_STRICT_DEVMEM=y
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUN_PARTITION=y
 CONFIG_SYSFB_SIMPLEFB=y
 CONFIG_SYSV68_PARTITION=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index fcb2b70b2499..017915d72f1d 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -11279,6 +11279,7 @@ CONFIG_SUNGEM_PHY=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_SWAP=y
 CONFIG_SUNRPC_XPRT_RDMA=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 310ac136d3fc..3747e951ceb2 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -641,7 +641,6 @@ CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
 CONFIG_STRICT_DEVMEM=y
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUN_PARTITION=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index d32d91c71f03..6291ce6aa9d9 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -630,7 +630,6 @@ CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
 # CONFIG_STRICT_DEVMEM is not set
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 CONFIG_SUN_PARTITION=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 CONFIG_SYSV68_PARTITION=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 2a2fcf69a943..2f9bd24159b7 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -565,7 +565,6 @@ CONFIG_SERIAL_CORE=m
 # CONFIG_STAGING is not set
 CONFIG_STANDALONE=y
 CONFIG_STRICT_DEVMEM=y
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_SYSV_FS is not set
-- 
2.36.1