From c1f58ea4191416c21a72f36c32520b7db0695e02 Mon Sep 17 00:00:00 2001 From: Tavi Date: Tue, 13 Feb 2024 20:33:56 -0500 Subject: [PATCH] Churn Signed-off-by: Tavi --- .../CVE_Patchers/android_kernel_fairphone_sm7225.sh | 4 +--- .../CVE_Patchers/android_kernel_fxtec_sm6115.sh | 4 +--- .../CVE_Patchers/android_kernel_oneplus_sm8250.sh | 4 +--- Scripts/LineageOS-20.0/Functions.sh | 1 - 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh index e535f83a..43d7a812 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh @@ -83,14 +83,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4134/^6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4623/4.12-^6.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-6040/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28553/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31083/^6.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-46838/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/^6.7/0001.patch -editKernelLocalversion "-dos.p90" +editKernelLocalversion "-dos.p88" else echo "kernel_fairphone_sm7225 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh index 143634ac..4f0186e9 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh @@ -83,14 +83,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4134/^6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4623/4.12-^6.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-6040/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28553/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31083/^6.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-46838/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/^6.7/0001.patch -editKernelLocalversion "-dos.p90" +editKernelLocalversion "-dos.p88" else echo "kernel_fxtec_sm6115 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh index 677ded1d..72cd511f 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh @@ -81,14 +81,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4134/^6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4623/4.12-^6.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-6040/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28553/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31083/^6.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-46838/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/^6.7/0001.patch -editKernelLocalversion "-dos.p88" +editKernelLocalversion "-dos.p86" else echo "kernel_oneplus_sm8250 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index e6257824..4e4d5a69 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -161,7 +161,6 @@ patchWorkspaceReal() { source build/envsetup.sh; repopick -i 361248; #Launcher3: Allow toggling monochrome icons for all apps - repopick -t T_asb_2024-02; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";