From 835fbb7d2cf12edcd4bf46e3093a734e1860ee6a Mon Sep 17 00:00:00 2001 From: Tavi Date: Mon, 8 Apr 2024 14:38:51 -0400 Subject: [PATCH] Fixup Signed-off-by: Tavi --- Scripts/Common/Fix_CVE_Patchers.sh | 2 +- .../CVE_Patchers/android_kernel_htc_flounder.sh | 2 +- Scripts/LineageOS-18.1/Patch.sh | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index ea380010..ae793fdb 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -65,7 +65,7 @@ commentPatches android_kernel_google_sunfish.sh "CVE-2021-30324"; commentPatches android_kernel_google_wahoo.sh "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch" "CVE-2019-14047/ANY/0002.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166" "CVE-2021-30324"; commentPatches android_kernel_google_yellowstone.sh "0001-LinuxIncrementals/3.10/3.10.0098-0099.patch" "CVE-2018-9514" "CVE-2021-47122"; commentPatches android_kernel_huawei_angler.sh "CVE-2014-8559"; -commentPatches android_kernel_htc_flounder.sh "CVE-2018-9514" "CVE-2018-14614/3.4"; +commentPatches android_kernel_htc_flounder.sh "CVE-2018-9514" "CVE-2018-14614/3.4" "CVE-2021-47122"; commentPatches android_kernel_htc_msm8960.sh "CVE-2018-10876" "CVE-2021-0695" "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch"; commentPatches android_kernel_htc_msm8974.sh "CVE-2016-8393" "CVE-2022-22058" "CVE-2016-10284/3.18/0001.patch"; commentPatches android_kernel_htc_msm8994.sh "CVE-2016-8394/ANY/0001.patch" "CVE-2017-13166" "CVE-2018-3585" "CVE-2018-9514"; diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh index 911119b0..8edf4b18 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh @@ -411,7 +411,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47114/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47117/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47118/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47121/3.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47122/3.18/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47122/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47145/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47149/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47153/3.18/0001.patch diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index 9d663452..8a503e1d 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -542,6 +542,10 @@ sed -i 's/libinit_msm8974/libinit_msm8974-oppo/' BoardConfigCommon.mk init/Andro sed -i "s/TZ.BF.2.0-2.0.0134/TZ.BF.2.0-2.0.0134|TZ.BF.2.0-2.0.0137/" board-info.txt; #Suport new TZ firmware https://review.lineageos.org/#/c/178999/ fi; +if enterAndClear "device/samsung/jf-common"; then +sed -i 's/TARGET_RECOVERY_DENSITY := xxhdpi/TARGET_RECOVERY_DENSITY := xhdpi/' BoardConfigCommon.mk; #no space +fi; + if enterAndClear "device/samsung/jactivelte"; then smallerSystem; fi;