commit | 755c4a3f3fff91a89840b4e6fd8f8eb5d633963c | [log] [tgz] |
---|---|---|
author | Roy Yang <royyang@google.com> | Fri Oct 09 12:05:14 2020 -0700 |
committer | Roy Yang <royyang@google.com> | Fri Oct 09 12:44:19 2020 -0700 |
tree | fd5717efcb4bc78f6d01cf4db2eca51dea8c1fad | |
parent | a8ca515f3d43c6e7a50816245d1089b50baf5734 [diff] |
lakitu: Enable PPP loadable modules PPP was disabled because of CVE-2020-14416. Upstream fix is already in our kernel. However, some customers are using PPP for their VPN service. We need to bring them back. BUG=b/170439985 TEST=tryjob RELEASE_NOTE=Added PPP loadable modules back. Change-Id: I46b6e5eb59518ec8563d7b7c3c6e603b297452b7
diff --git a/overlay-lakitu/sys-kernel/lakitu-kernel-4_19/files/base.config b/overlay-lakitu/sys-kernel/lakitu-kernel-4_19/files/base.config index 4557827..786b538 100644 --- a/overlay-lakitu/sys-kernel/lakitu-kernel-4_19/files/base.config +++ b/overlay-lakitu/sys-kernel/lakitu-kernel-4_19/files/base.config
@@ -1976,7 +1976,17 @@ # CONFIG_TERANETICS_PHY is not set # CONFIG_VITESSE_PHY is not set # CONFIG_XILINX_GMII2RGMII is not set -# CONFIG_PPP is not set +CONFIG_PPP=m +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_FILTER is not set +# CONFIG_PPP_MPPE is not set +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPPOE is not set +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=m # # Host-side USB support is needed for USB Network Adapter support
diff --git a/overlay-lakitu/sys-kernel/lakitu-kernel-4_19/lakitu-kernel-4_19-4.19.127-r537.ebuild b/overlay-lakitu/sys-kernel/lakitu-kernel-4_19/lakitu-kernel-4_19-4.19.127-r538.ebuild similarity index 100% rename from overlay-lakitu/sys-kernel/lakitu-kernel-4_19/lakitu-kernel-4_19-4.19.127-r537.ebuild rename to overlay-lakitu/sys-kernel/lakitu-kernel-4_19/lakitu-kernel-4_19-4.19.127-r538.ebuild
diff --git a/overlay-lakitu/sys-kernel/lakitu-kernel-5_4/files/base.config b/overlay-lakitu/sys-kernel/lakitu-kernel-5_4/files/base.config index ffe8675..c44d9dd 100644 --- a/overlay-lakitu/sys-kernel/lakitu-kernel-5_4/files/base.config +++ b/overlay-lakitu/sys-kernel/lakitu-kernel-5_4/files/base.config
@@ -2063,8 +2063,17 @@ # CONFIG_TERANETICS_PHY is not set # CONFIG_VITESSE_PHY is not set # CONFIG_XILINX_GMII2RGMII is not set -# CONFIG_PPP is not set +CONFIG_PPP=m +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_FILTER is not set +# CONFIG_PPP_MPPE is not set +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPPOE is not set +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set # CONFIG_SLIP is not set +CONFIG_SLHC=m # # Host-side USB support is needed for USB Network Adapter support
diff --git a/overlay-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-5.4.70-r41.ebuild b/overlay-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-5.4.70-r42.ebuild similarity index 100% rename from overlay-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-5.4.70-r41.ebuild rename to overlay-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-5.4.70-r42.ebuild