From d3f28918e579d8871cac8eac1b18f25e16866522 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 6 Jan 2020 18:25:36 -0500 Subject: [PATCH] Update CVE patchers --- Patches/Linux | 2 +- PrebuiltApps | 2 +- Scripts/LineageOS-11.0/Functions.sh | 1 + Scripts/LineageOS-14.1/Functions.sh | 1 - .../CVE_Patchers/android_kernel_google_bonito.sh | 3 ++- .../CVE_Patchers/android_kernel_google_crosshatch.sh | 3 ++- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 92535930..53fc110d 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 92535930f21ea63ad38102935ab7ae9a5bdddb4b +Subproject commit 53fc110d30c90ced38a8404ed8bdb21a3a1b2018 diff --git a/PrebuiltApps b/PrebuiltApps index 5b918939..0be89e79 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 5b9189398baa3ab8e9da851124cf2e33ba1aaf6c +Subproject commit 0be89e79fa522747592a8c5aa97a9406cd1eaed6 diff --git a/Scripts/LineageOS-11.0/Functions.sh b/Scripts/LineageOS-11.0/Functions.sh index 09ccfa76..d06fd8fc 100644 --- a/Scripts/LineageOS-11.0/Functions.sh +++ b/Scripts/LineageOS-11.0/Functions.sh @@ -68,6 +68,7 @@ patchWorkspace() { repopick -it asb-2019.09-cm11; repopick -it asb-2019.10-cm11; repopick -it asb-2019.11-cm11; + repopick -it asb-2019.12-cm11; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index e328a8d2..48b42b36 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -118,7 +118,6 @@ patchWorkspace() { repopick -it ibss-mode-nougat; repopick -it n-netd; repopick 264489; #update chromium - repopick -it n-asb-2019-12; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh index 3c2a718d..26a057c1 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh @@ -78,6 +78,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10555/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10571/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10572/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10584/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10585/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10614/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11810/^5.0.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/^5.1.2/0001.patch @@ -156,5 +157,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9451/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9466/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch -editKernelLocalversion "-dos.p156" +editKernelLocalversion "-dos.p157" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh index 1b2b48ce..b04fd912 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh @@ -74,6 +74,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10565/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10571/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10572/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10584/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10585/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10614/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11810/^5.0.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/^5.1.2/0001.patch @@ -150,5 +151,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9451/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9466/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch -editKernelLocalversion "-dos.p150" +editKernelLocalversion "-dos.p151" cd "$DOS_BUILD_BASE"