From da15dc05d53513e16b9993d178c116157291255c Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 26 Aug 2022 14:00:29 -0400 Subject: [PATCH] Fixup Signed-off-by: Tad --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 3 +-- .../CVE_Patchers/android_kernel_xiaomi_sdm660.sh | 3 +-- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 3 +-- .../CVE_Patchers/android_kernel_fairphone_sm7225.sh | 3 +-- .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 3 +-- .../CVE_Patchers/android_kernel_google_msm-4.14.sh | 3 +-- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 3 +-- .../CVE_Patchers/android_kernel_google_redbull.sh | 3 +-- .../CVE_Patchers/android_kernel_google_wahoo.sh | 3 +-- .../CVE_Patchers/android_kernel_oneplus_msm8998.sh | 3 +-- .../CVE_Patchers/android_kernel_oneplus_sm8250.sh | 3 +-- .../CVE_Patchers/android_kernel_oneplus_sm8350.sh | 3 +-- .../CVE_Patchers/android_kernel_razer_msm8998.sh | 3 +-- .../CVE_Patchers/android_kernel_razer_sdm845.sh | 3 +-- .../CVE_Patchers/android_kernel_sony_sdm660.sh | 3 +-- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 3 +-- Scripts/LineageOS-19.1/Functions.sh | 9 ++++----- 18 files changed, 21 insertions(+), 38 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index a34607b6..83b6d5f0 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit a34607b6fee9b08d22c70431d07448ad173fd4a5 +Subproject commit 83b6d5f019ef3c809460d49e3501144d483baae3 diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh index b654f520..01531905 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh @@ -251,7 +251,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1419/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/4.14/0002.patch @@ -299,5 +298,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p299" +editKernelLocalversion "-dos.p298" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh index d8240dd9..14a41c16 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh @@ -60,7 +60,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/^5.19/0001.patch @@ -97,5 +96,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch -editKernelLocalversion "-dos.p97" +editKernelLocalversion "-dos.p96" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_essential_msm8998.sh index 656d92aa..eac06fa6 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -113,7 +113,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/^5.19/0001.patch @@ -147,5 +146,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch -editKernelLocalversion "-dos.p147" +editKernelLocalversion "-dos.p146" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sm7225.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sm7225.sh index 1154f89f..51c14e4c 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sm7225.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sm7225.sh @@ -250,7 +250,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/4.19/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/4.19/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1419/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1678/4.19/0002.patch @@ -302,5 +301,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p302" +editKernelLocalversion "-dos.p301" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh index a36e71aa..17caf9e1 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -62,7 +62,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/^5.19/0001.patch @@ -95,5 +94,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch -editKernelLocalversion "-dos.p95" +editKernelLocalversion "-dos.p94" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.14.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.14.sh index cb411df0..dac18cb9 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.14.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.14.sh @@ -100,7 +100,6 @@ 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-1353/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1419/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/4.14/0002.patch @@ -143,5 +142,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.14/0006.patch -editKernelLocalversion "-dos.p143" +editKernelLocalversion "-dos.p142" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.9.sh index c5d68122..e7858b95 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -71,7 +71,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0812/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1011/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1966/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0001.patch @@ -90,5 +89,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33744/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch -editKernelLocalversion "-dos.p90" +editKernelLocalversion "-dos.p89" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_redbull.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_redbull.sh index bef9d64b..e1fba847 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_redbull.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_redbull.sh @@ -94,7 +94,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.19/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.19/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1419/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1678/4.19/0002.patch @@ -148,5 +147,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.19/0005.patch -editKernelLocalversion "-dos.p148" +editKernelLocalversion "-dos.p147" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_wahoo.sh index 07f042e9..74f07997 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -84,7 +84,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/^5.19/0001.patch @@ -121,5 +120,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch -editKernelLocalversion "-dos.p121" +editKernelLocalversion "-dos.p120" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh index 699879eb..f5d3501f 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -63,7 +63,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/^5.19/0001.patch @@ -97,5 +96,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch -editKernelLocalversion "-dos.p97" +editKernelLocalversion "-dos.p96" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8250.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8250.sh index fb6bc6e7..c28678f7 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8250.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8250.sh @@ -276,7 +276,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/4.19/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/4.19/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1419/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1678/4.19/0002.patch @@ -336,5 +335,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p336" +editKernelLocalversion "-dos.p335" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8350.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8350.sh index ccffdd7b..fd8397e7 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8350.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8350.sh @@ -36,7 +36,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1048/5.4/0023.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1048/5.4/0024.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/5.4/0013.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/^5.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/5.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/5.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1729/5.4/0007.patch @@ -64,5 +63,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33744/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/5.4/0007.patch -editKernelLocalversion "-dos.p64" +editKernelLocalversion "-dos.p63" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_msm8998.sh index 0cfa399d..dfc333f6 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -61,7 +61,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/^5.19/0001.patch @@ -98,5 +97,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch -editKernelLocalversion "-dos.p98" +editKernelLocalversion "-dos.p97" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_sdm845.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_sdm845.sh index 2957071c..9e439c5f 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_sdm845.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_sdm845.sh @@ -67,7 +67,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0812/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1011/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1966/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0001.patch @@ -86,5 +85,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33744/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch -editKernelLocalversion "-dos.p86" +editKernelLocalversion "-dos.p85" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_sony_sdm660.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_sony_sdm660.sh index 3fb6861d..fcea4441 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_sony_sdm660.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_sony_sdm660.sh @@ -65,7 +65,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/^5.19/0001.patch @@ -102,5 +101,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch -editKernelLocalversion "-dos.p102" +editKernelLocalversion "-dos.p101" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index 73126715..8777aa85 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -69,7 +69,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0494/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0812/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1011/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1462/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1966/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0001.patch @@ -88,5 +87,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33744/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch -editKernelLocalversion "-dos.p88" +editKernelLocalversion "-dos.p87" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index 0d75fe65..a62a5fd8 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -91,9 +91,9 @@ buildAll() { buildDevice flame avb; buildDevice vayu avb; #SD865 - buildDevice instantnoodle avb; #unb - buildDevice instantnoodlep avb; #unb - buildDevice kebab avb; #unb + buildDevice instantnoodle avb; + buildDevice instantnoodlep avb; + buildDevice kebab avb; buildDevice lmi avb; #SD870 buildDevice alioth avb; @@ -116,8 +116,7 @@ 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; - source build/envsetup.sh; - repopick -i 335090; #FP4 Bluetooth fixes + #source build/envsetup.sh; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";