From 91807acf21c5b90f367b0206861e62793cbf6a24 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 18 Jan 2023 15:54:53 -0500 Subject: [PATCH] various small fixes - loose versioning fixes for 4.9 - remove GPG commit verification for GOS repos, they use SSH now. TODO: support that - 20.0: fixup AudioFX stray lines - 20.0: broken fix for gs101/201 stray iwlan lines Signed-off-by: Tad --- Scripts/Common/Fix_CVE_Patchers.sh | 7 +++++++ Scripts/LineageOS-15.1/Functions.sh | 1 - Scripts/LineageOS-16.0/Functions.sh | 1 - Scripts/LineageOS-17.1/Functions.sh | 1 - Scripts/LineageOS-18.1/Functions.sh | 1 - .../CVE_Patchers/android_kernel_fairphone_sdm632.sh | 12 ++++++------ Scripts/LineageOS-19.1/Functions.sh | 2 -- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 12 ++++++------ .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 12 ++++++------ .../CVE_Patchers/android_kernel_razer_sdm845.sh | 12 ++++++------ .../CVE_Patchers/android_kernel_sony_sdm845.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 12 ++++++------ Scripts/LineageOS-20.0/Functions.sh | 4 +--- Scripts/LineageOS-20.0/Patch.sh | 7 ++++++- 14 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index 5b06a2ff..26b622f5 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -130,8 +130,15 @@ do done #4.4 declare -a fourDotFour=("${threeDotEighteen[@]}" "android_kernel_essential_msm8998.sh" "android_kernel_fxtec_msm8998.sh" "android_kernel_zuk_msm8996.sh" "android_kernel_xiaomi_sdm660.sh" "android_kernel_sony_sdm660.sh" "android_kernel_razer_msm8998.sh" "android_kernel_oneplus_msm8998.sh" "android_kernel_google_wahoo.sh" "android_kernel_yandex_sdm660.sh" "android_kernel_zuk_msm8996.sh"); +#for script in "${fourDotFour[@]}" #do # commentPatches $script ""; #handle 4.9 #done +#4.9 +declare -a fourDotNine=("${fourDotFour[@]}" "android_kernel_fairphone_sdm632.sh" "android_kernel_google_msm-4.9.sh" "android_kernel_oneplus_sdm845.sh" "android_kernel_razer_sdm845.sh" "android_kernel_sony_sdm845.sh" "android_kernel_xiaomi_sdm845.sh"); +for script in "${fourDotNine[@]}" +do + commentPatches $script "CVE-2018-11412/4.14" "CVE-2022-1204/4.14"; #handle 4.14 +done echo -e "\e[0;32m[SCRIPT COMPLETE] Fixed CVE patchers\e[0m"; diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index e3e91735..af0f03dc 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -80,7 +80,6 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; verifyAllPlatformTags; - #gpgVerifyGitTag "$DOS_BUILD_BASE/external/hardened_malloc"; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; #source build/envsetup.sh; diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 43b12bd0..7cfe64cb 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -72,7 +72,6 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; verifyAllPlatformTags; - gpgVerifyGitTag "$DOS_BUILD_BASE/external/hardened_malloc"; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; source build/envsetup.sh; diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 8466243d..0c56f6e8 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -78,7 +78,6 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; verifyAllPlatformTags; - gpgVerifyGitTag "$DOS_BUILD_BASE/external/hardened_malloc"; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; source build/envsetup.sh; diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index cd5319fc..88c7edce 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -107,7 +107,6 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; verifyAllPlatformTags; - gpgVerifyGitTag "$DOS_BUILD_BASE/external/hardened_malloc"; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; source build/envsetup.sh; diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh index ff7d4c61..da32c26a 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh @@ -45,7 +45,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11412/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11412/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20855/^4.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-25020/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch @@ -69,11 +69,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0012.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0010.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0007.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0008.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0009.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0002.patch diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index 9869e1fb..c15101b7 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -72,8 +72,6 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; verifyAllPlatformTags; - gpgVerifyGitTag "$DOS_BUILD_BASE/external/hardened_malloc"; - gpgVerifyGitTag "$DOS_BUILD_BASE/external/SecureCamera"; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; source build/envsetup.sh; diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.9.sh index 7df79735..da04530e 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -46,7 +46,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9462/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9519/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11412/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11412/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20855/^4.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-25020/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10503/ANY/0001.patch @@ -68,11 +68,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0010.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0007.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0008.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0009.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0002.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh index 94415bc4..1a3cfeca 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -41,7 +41,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11412/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11412/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20855/^4.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-25020/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch @@ -62,11 +62,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35084/qca-wifi-host-cmn/0001.patch -- git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35119/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39792/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0010.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0007.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0008.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0009.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0002.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh index f91b431e..72a9891f 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh @@ -41,7 +41,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11412/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11412/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20855/^4.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-25020/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch @@ -62,11 +62,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35084/qca-wifi-host-cmn/0001.patch -- git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35119/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39792/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0010.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0007.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0008.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0009.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0002.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh index 001788a6..2025ec5a 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh @@ -50,7 +50,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/4.9/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11412/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11412/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20855/^4.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-25020/4.14/0002.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index c740ae84..8fdb193f 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -41,7 +41,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11412/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11412/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20855/^4.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-25020/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch @@ -64,11 +64,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35119/qca-wifi-host-cmn/0001.patch -- git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39792/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0010.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0007.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0008.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0009.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0002.patch diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index aeb1ce12..55f8a30d 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -92,7 +92,7 @@ buildAll() { buildDevice bonito avb; #unb buildDevice sargo avb; #unb #Tensor - buildDevice oriole avb; #unb #requires manual patching for stray iwlan include in device.mk + buildDevice oriole avb; #unb buildDevice raven avb; #unb buildDevice panther avb; #unb buildDevice cheetah avb; #unb @@ -105,8 +105,6 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; verifyAllPlatformTags; - gpgVerifyGitTag "$DOS_BUILD_BASE/external/hardened_malloc"; - gpgVerifyGitTag "$DOS_BUILD_BASE/external/SecureCamera"; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; source build/envsetup.sh; diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index f8d31822..f1fa7927 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -395,7 +395,7 @@ if [ "$DOS_HOSTS_BLOCKING" = true ]; then awk -i inplace '!/50-lineage.sh/' conf awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' config/*.mk; #Remove Lineage extra keys awk -i inplace '!/security\/lineage/' config/*.mk; #Remove Lineage extra keys awk -i inplace '!/def_backup_transport/' overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml; #Unset default backup provider -if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then sed -i '20d' config/common_mobile.mk && awk -i inplace '!/AudioFX/' config/*.mk; fi; #Remove AudioFX +if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then sed -i '/TARGET_EXCLUDES_AUDIOFX/,+3d' config/common_mobile.mk; fi; #Remove AudioFX sed -i 's/LINEAGE_BUILDTYPE := UNOFFICIAL/LINEAGE_BUILDTYPE := dos/' config/*.mk; #Change buildtype echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations #cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list @@ -419,7 +419,12 @@ fi; # #START OF DEVICE CHANGES # +#if enterAndClear "device/google/gs101"; then +#if [ "$DOS_DEBLOBBER_REMOVE_CNE" = true ]; then sed -i '/google iwlan/,+5d' device.mk; fi; #fix stray #FIXME +#fi; + if enterAndClear "device/google/gs201"; then +#if [ "$DOS_DEBLOBBER_REMOVE_CNE" = true ]; then sed -i '/google iwlan/,+5d' device.mk; fi; #fix stray #FIXME awk -i inplace '!/PRODUCT_PACKAGES/' widevine/device.mk; fi;