From 5fe5a4f898191d2995d9b4a179609604ad781f98 Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 28 Aug 2022 16:20:29 -0400 Subject: [PATCH] Compile fixes Signed-off-by: Tad --- .../0001-External_Permission.patch | 2 +- Patches/Linux | 2 +- Scripts/Common/Fix_CVE_Patchers.sh | 4 ++-- .../CVE_Patchers/android_kernel_amazon_hdx-common.sh | 3 +-- .../CVE_Patchers/android_kernel_cyanogen_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_fairphone_msm8974.sh | 3 +-- .../LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh | 3 +-- Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh | 3 +-- .../LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_motorola_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_oppo_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_samsung_msm8974.sh | 3 +-- 12 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Patches/LineageOS-15.1/android_packages_providers_MediaProvider/0001-External_Permission.patch b/Patches/LineageOS-15.1/android_packages_providers_MediaProvider/0001-External_Permission.patch index 580777f4..60b5f89c 100644 --- a/Patches/LineageOS-15.1/android_packages_providers_MediaProvider/0001-External_Permission.patch +++ b/Patches/LineageOS-15.1/android_packages_providers_MediaProvider/0001-External_Permission.patch @@ -12,7 +12,7 @@ Change-Id: Id4dd5e287c1162f4c8b7fbb2411b834fe98f2516 1 file changed, 1 insertion(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml -index 05e6d77d..2e33a3a4 100644 +index 05e6d77d7..2e33a3a4b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -13,6 +13,7 @@ diff --git a/Patches/Linux b/Patches/Linux index 83b6d5f0..a2881937 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 83b6d5f019ef3c809460d49e3501144d483baae3 +Subproject commit a288193735fa07419d96402be5be366a7c592756 diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index 9640a099..0e4efec1 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -35,13 +35,13 @@ commentPatches() { # 0006-AndroidHardening-Kernel_Hardening/3.10/0009.patch # CVE-2017-13218/4.4/0025.patch -commentPatches android_kernel_amazon_hdx-common.sh "CVE-2019-14070/3.4/0008.patch" "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch"; +commentPatches android_kernel_amazon_hdx-common.sh "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch"; commentPatches android_kernel_asus_fugu.sh "CVE-2014-2568" "CVE-2014-8559" "CVE-2015-8746" "CVE-2017-5551" "LVT-2017-0003/3.10/0001.patch"; commentPatches android_kernel_asus_grouper.sh "CVE-2017-15868" "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch"; commentPatches android_kernel_asus_msm8916.sh "CVE-2018-13913/ANY/0001.patch"; commentPatches android_kernel_asus_msm8953.sh "CVE-2017-13162/3.18/0001.patch"; commentPatches android_kernel_cyanogen_msm8916.sh "CVE-2018-13913/ANY/0001.patch" "CVE-2018-5897" "CVE-2018-9514" "CVE-2018-11266"; -commentPatches android_kernel_cyanogen_msm8974.sh "CVE-2017-7373" "CVE-2019-14070/3.4/0008.patch"; +commentPatches android_kernel_cyanogen_msm8974.sh "CVE-2017-7373"; commentPatches android_kernel_essential_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2017-13218" "CVE-2019-14047/ANY/0002.patch"; commentPatches android_kernel_fairphone_msm8974.sh "CVE-2018-20169"; commentPatches android_kernel_fairphone_sdm632.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-3347" "CVE-2021-20322"; 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 b3a4b3d5..4df14b1c 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 @@ -624,7 +624,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0003.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/3.18/0003.patch @@ -781,5 +780,5 @@ 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.p781" +editKernelLocalversion "-dos.p780" 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 662c9e78..aec96440 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 @@ -203,7 +203,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0003.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/3.18/0003.patch @@ -397,5 +396,5 @@ 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.p397" +editKernelLocalversion "-dos.p396" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh index 29f84267..238c5138 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -139,7 +139,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11810/3.18/0003.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/3.4/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14896/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15216/3.18/0003.patch @@ -253,5 +252,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/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc2/3.4/0008.patch -editKernelLocalversion "-dos.p253" +editKernelLocalversion "-dos.p252" 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 7cfd5717..52ed9bd3 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 @@ -307,7 +307,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/3.18/0003.patch @@ -498,5 +497,5 @@ 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.p498" +editKernelLocalversion "-dos.p497" 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 fa427218..a519f201 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 @@ -238,7 +238,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/3.18/0003.patch @@ -423,5 +422,5 @@ 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.p423" +editKernelLocalversion "-dos.p422" 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 58453782..7e4a9872 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 @@ -225,7 +225,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/3.18/0003.patch @@ -408,5 +407,5 @@ 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.p408" +editKernelLocalversion "-dos.p407" 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 cf297186..8557905e 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 @@ -299,7 +299,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/3.18/0003.patch @@ -474,5 +473,5 @@ 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.p474" +editKernelLocalversion "-dos.p473" 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 d9bb4a23..cd4494c3 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 @@ -222,7 +222,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11810/3.18/0003.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 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14896/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15216/3.18/0003.patch @@ -348,5 +347,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.p348" +editKernelLocalversion "-dos.p347" 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 4fe7e318..fb1d0ecc 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 @@ -130,7 +130,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11810/3.18/0003.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/3.4/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14896/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15216/3.18/0003.patch @@ -235,5 +234,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.p235" +editKernelLocalversion "-dos.p234" cd "$DOS_BUILD_BASE"