From fd0e3e81170764371ca2a7a4a8f2777d3e0c15df Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 22 Nov 2022 06:09:06 -0500 Subject: [PATCH] Update CVE patchers Signed-off-by: Tad --- .../android_build/0004-keymaps.patch | 22 ------------------- Patches/Linux | 2 +- .../android_kernel_amazon_hdx-common.sh | 4 +++- .../android_kernel_asus_grouper.sh | 3 ++- .../android_kernel_htc_msm8960.sh | 3 ++- .../CVE_Patchers/android_kernel_samsung_d2.sh | 6 ++++- .../android_kernel_samsung_manta.sh | 3 ++- .../android_kernel_samsung_smdk4412.sh | 3 ++- .../android_kernel_samsung_tuna.sh | 3 ++- .../CVE_Patchers/android_kernel_google_msm.sh | 3 ++- .../android_kernel_lge_hammerhead.sh | 6 ++++- .../android_kernel_cyanogen_msm8974.sh | 8 ++++--- .../android_kernel_lge_hammerhead.sh | 6 ++++- .../CVE_Patchers/android_kernel_google_msm.sh | 3 ++- .../android_kernel_htc_msm8974.sh | 8 ++++--- .../CVE_Patchers/android_kernel_lge_g3.sh | 8 ++++--- .../CVE_Patchers/android_kernel_lge_mako.sh | 6 ++++- .../android_kernel_lge_msm8974.sh | 8 ++++--- .../android_kernel_motorola_msm8974.sh | 8 ++++--- .../android_kernel_oppo_msm8974.sh | 10 ++++++--- .../CVE_Patchers/android_kernel_samsung_jf.sh | 3 ++- .../android_kernel_samsung_msm8930-common.sh | 6 ++++- .../android_kernel_samsung_msm8974.sh | 6 ++++- .../android_kernel_oneplus_msm8998.sh | 3 +-- Scripts/LineageOS-20.0/Patch.sh | 1 - 25 files changed, 83 insertions(+), 59 deletions(-) delete mode 100644 Patches/LineageOS-20.0/android_build/0004-keymaps.patch diff --git a/Patches/LineageOS-20.0/android_build/0004-keymaps.patch b/Patches/LineageOS-20.0/android_build/0004-keymaps.patch deleted file mode 100644 index b2b3d716..00000000 --- a/Patches/LineageOS-20.0/android_build/0004-keymaps.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Daniel Micay -Date: Thu, 18 Aug 2022 13:38:55 -0400 -Subject: [PATCH] add bluetooth/sdk_sandbox to standard key mapping - ---- - tools/releasetools/sign_target_files_apks.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py -index 6f96d8f6a..732f80251 100755 ---- a/tools/releasetools/sign_target_files_apks.py -+++ b/tools/releasetools/sign_target_files_apks.py -@@ -1150,6 +1150,8 @@ def BuildKeyMap(misc_info, key_mapping_options): - devkeydir + "/shared": d + "/shared", - devkeydir + "/platform": d + "/platform", - devkeydir + "/networkstack": d + "/networkstack", -+ devkeydir + "/bluetooth": d + "/bluetooth", -+ devkeydir + "/sdk_sandbox": d + "/sdk_sandbox", - }) - else: - OPTIONS.key_map[s] = d diff --git a/Patches/Linux b/Patches/Linux index 7715533e..d67f614f 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 7715533ef0d4fc37073595c407e171f17653131f +Subproject commit d67f614f059b0ed7e2cf56152ffb61006109d51e diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh index 9094fed8..f7c014b9 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh @@ -764,6 +764,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22058/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch @@ -783,5 +784,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6752/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p783" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p785" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh index ef0f62d0..9528159e 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh @@ -440,5 +440,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p440" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p441" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh index f402b9c0..597f322a 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh @@ -477,5 +477,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p477" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p478" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_d2.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_d2.sh index 361d79c8..27ff8889 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_d2.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_d2.sh @@ -534,6 +534,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1836/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0041.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0042.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0043.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch @@ -549,5 +552,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p549" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p553" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh index a88f66b9..1ab2d0bd 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh @@ -353,5 +353,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p353" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p354" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh index d90efe1d..c380dcb2 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh @@ -408,5 +408,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p408" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p409" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh index d161f28b..50936f8f 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh @@ -402,5 +402,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p402" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p403" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh index 829f020d..821a6d7d 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh @@ -433,5 +433,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p433" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p434" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh index 88a51377..9aa203b2 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -612,6 +612,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1836/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0041.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0042.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0043.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch @@ -628,5 +631,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p628" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p632" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh index 81485e2d..2fd8fc0a 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh @@ -384,12 +384,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/3.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22064/prima/0005.patch --directory=drivers/staging/prima +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22058/3.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22064/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/prima/0002.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0001.patch @@ -402,5 +403,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6752/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p402" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p404" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh index 0326b2b9..4fcbbfb1 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -612,6 +612,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1836/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0041.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0042.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0043.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch @@ -628,5 +631,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p628" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p632" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh index 6ac27b67..a2f92e9d 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh @@ -400,5 +400,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p400" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p401" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh index e1f0af2f..19643457 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -486,12 +486,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/3.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22064/prima/0005.patch --directory=drivers/staging/prima +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22058/3.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22064/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/prima/0002.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0001.patch @@ -504,5 +505,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6752/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p504" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p506" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh index 1ac79bda..91d89ed7 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -412,12 +412,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/3.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22064/prima/0005.patch --directory=drivers/staging/prima +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22058/3.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22064/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/prima/0002.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0001.patch @@ -429,5 +430,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6752/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p429" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p431" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh index f14fb0bc..8f12f130 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -36,10 +36,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0041.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0042.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0043.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0008.patch -editKernelLocalversion "-dos.p41" +editKernelLocalversion "-dos.p45" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh index 62d9dbc7..91d6b0aa 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -397,12 +397,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/3.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22064/prima/0005.patch --directory=drivers/staging/prima +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22058/3.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22064/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/prima/0002.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0001.patch @@ -414,5 +415,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p414" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p416" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index b5e44cdd..6a029dae 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -462,13 +462,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22064/prima/0005.patch --directory=drivers/staging/prima +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22058/3.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22064/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/prima/0002.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0001.patch @@ -481,5 +482,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6752/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p481" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p483" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh index 79d1aa8f..69767015 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh @@ -341,9 +341,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1836/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/^5.19/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22064/prima/0005.patch --directory=drivers/staging/prima +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0041.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0042.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0043.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22064/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25720/prima/0002.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0001.patch @@ -353,5 +357,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch -editKernelLocalversion "-dos.p353" +editKernelLocalversion "-dos.p357" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh index d660006a..f69fe4d1 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh @@ -438,5 +438,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p438" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p439" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh index b1a29fa3..cdd9b390 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh @@ -497,6 +497,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1836/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0041.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0042.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/3.4/0043.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch @@ -516,5 +519,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch -editKernelLocalversion "-dos.p516" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +editKernelLocalversion "-dos.p520" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8974.sh index e9cb0fa0..710a6b14 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -208,6 +208,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30262/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39800/3.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39800/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42008/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch @@ -230,6 +232,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1836/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22058/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0001.patch @@ -238,5 +242,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0008.patch -editKernelLocalversion "-dos.p238" +editKernelLocalversion "-dos.p242" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh index 5fa7e12b..6f948c88 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -95,7 +95,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25654/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch @@ -116,5 +115,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch -editKernelLocalversion "-dos.p116" +editKernelLocalversion "-dos.p115" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index 9048d2d2..c8da4ade 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -93,7 +93,6 @@ git revert --no-edit 9b41333a849d14683f9c4ac30fcfd48a27945018; #Re-enable the do applyPatch "$DOS_PATCHES/android_build/0001-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS) #applyPatch "$DOS_PATCHES/android_build/0002-OTA_Keys.patch"; #Add correct keys to recovery for OTA verification (DivestOS) if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_build/0003-Exec_Based_Spawning.patch"; fi; #Add exec-based spawning support (GrapheneOS) #XXX: most devices override this -applyPatch "$DOS_PATCHES/android_build/0004-keymaps.patch"; #Add bluetooth/sdk_sandbox to standard key mapping (GrapheneOS) sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches. awk -i inplace '!/updatable_apex.mk/' target/product/generic_system.mk; #Disable APEX sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_util.mk; #Set the minimum supported target SDK to Pie (GrapheneOS)