From 6e1632046823a65956ea015043d19a1656360b71 Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 13 Sep 2020 19:52:37 -0400 Subject: [PATCH] Small fixes --- Patches/Linux | 2 +- Scripts/Common/Fix_CVE_Patchers.sh | 10 +++++----- .../CVE_Patchers/android_kernel_google_wahoo.sh | 2 +- Scripts/LineageOS-15.1/Patch.sh | 1 + .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 14 +++++++------- .../CVE_Patchers/android_kernel_google_wahoo.sh | 2 +- .../CVE_Patchers/android_kernel_razer_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_yandex_sdm660.sh | 2 +- .../CVE_Patchers/android_kernel_zuk_msm8996.sh | 2 +- Scripts/LineageOS-16.0/Functions.sh | 1 - Scripts/LineageOS-16.0/Patch.sh | 4 +--- .../CVE_Patchers/android_kernel_google_wahoo.sh | 2 +- .../CVE_Patchers/android_kernel_razer_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_yandex_sdm660.sh | 2 +- .../CVE_Patchers/android_kernel_zuk_msm8996.sh | 2 +- Scripts/LineageOS-17.1/Functions.sh | 5 ++--- Scripts/LineageOS-17.1/Patch.sh | 5 ++--- 17 files changed, 28 insertions(+), 32 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 15b6a50a..555e0c05 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 15b6a50a7fca233279d5f680a844cceaa8ee3909 +Subproject commit 555e0c05210b3adea767be7fb967758cdc7a961d diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index ae57f0d3..8d87d1dd 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -34,14 +34,14 @@ 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"; commentPatches android_kernel_essential_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2017-13218/4.4/0026.patch" "CVE-2019-14047/ANY/0002.patch"; -commentPatches android_kernel_fxtec_msm8998.sh "CVE-2019-11599" "CVE-2019-16746" "CVE-2019-18282" "CVE-2019-19319" "CVE-2019-ctnl-addr-leak" "CVE-2020-1749" "CVE-2020-8992"; +commentPatches android_kernel_fxtec_msm8998.sh "CVE-2019-11599" "CVE-2019-16746" "CVE-2019-18282" "CVE-2019-19319" "CVE-2019-ctnl-addr-leak" "CVE-2020-0429" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166/4.4/0002.patch"; commentPatches android_kernel_google_bonito.sh "CVE-2020-0067"; commentPatches android_kernel_google_dragon.sh "CVE-2015-4167/^3.19.1/0001.patch"; commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067"; commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-Copperhead-Kernel_Hardening/3.18/0048.patch" "0006-Copperhead-Kernel_Hardening/3.18/0049.patch" "CVE-2017-13162/3.18/0001.patch"; commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima"; commentPatches android_kernel_google_msm-4.9.sh "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-1749" "CVE-2020-8992"; -commentPatches android_kernel_google_wahoo.sh "CVE-2019-14047/ANY/0002.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992"; +commentPatches android_kernel_google_wahoo.sh "CVE-2019-14047/ANY/0002.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166/4.4/0002.patch"; commentPatches android_kernel_htc_flounder.sh "CVE-2018-9514/ANY/0001.patch"; commentPatches android_kernel_htc_msm8994.sh "CVE-2016-8394/ANY/0001.patch" "CVE-2017-13166"; commentPatches android_kernel_lge_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2018-17972" "CVE-2019-14070/ANY/0006.patch"; @@ -54,10 +54,10 @@ commentPatches android_kernel_oneplus_msm8994.sh "CVE-2018-3585/3.10/0001.patch" commentPatches android_kernel_oneplus_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2019-14070/ANY/0006.patch"; commentPatches android_kernel_oneplus_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-11599"; commentPatches android_kernel_oneplus_sm8150.sh "CVE-2019-16746" "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-8992"; -commentPatches android_kernel_razer_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "CVE-2019-14070/ANY/0005.patch"; +commentPatches android_kernel_razer_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "CVE-2019-14070/ANY/0005.patch" "CVE-2020-16166/4.4/0002.patch"; commentPatches android_kernel_samsung_smdk4412.sh "CVE-2016-8463/ANY/0001.patch"; commentPatches android_kernel_samsung_universal8890.sh "CVE-2016-7917" "CVE-2018-1092" "CVE-2018-17972"; commentPatches android_kernel_samsung_universal9810.sh "CVE-2020-1749"; -commentPatches android_kernel_yandex_sdm660.sh "CVE-2019-11599" "CVE-2019-14070/ANY/0005.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992"; +commentPatches android_kernel_yandex_sdm660.sh "CVE-2019-11599" "CVE-2019-14070/ANY/0005.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166/4.4/0002.patch"; commentPatches android_kernel_zte_msm8930.sh "CVE-2015-2922/^3.19.6/0001.patch" "CVE-2017-11015/prima"; -commentPatches android_kernel_zuk_msm8996.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992"; +commentPatches android_kernel_zuk_msm8996.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166/4.4/0002.patch"; diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh index 61c7abd8..eca21255 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -451,7 +451,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0005.patch diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index e99f0321..83ea1b76 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -265,6 +265,7 @@ sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" ker sed -i "s/CONFIG_RANDOMIZE_BASE=y/# CONFIG_RANDOMIZE_BASE is not set/" kernel/samsung/universal9810/arch/arm64/configs/*_defconfig; #Breaks on compile sed -i 's/YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10 +rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk; # #END OF DEVICE CHANGES # diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh index d4282339..91025087 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -219,11 +219,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/4.4/0005.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0010.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0007.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0002.patch @@ -264,11 +264,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch editKernelLocalversion "-dos.p270" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh index db9e3449..2568e407 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh @@ -299,7 +299,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0005.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh index 47bb5dcd..1010966d 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -204,7 +204,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh index afb0097b..539eeb59 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh @@ -217,7 +217,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_zuk_msm8996.sh index 59cac8a8..3928b9e6 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_zuk_msm8996.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_zuk_msm8996.sh @@ -207,7 +207,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0005.patch diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index bbc4bb4d..0c358cb7 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -132,7 +132,6 @@ patchWorkspace() { source build/envsetup.sh; repopick -it hh-p-sepolicy; repopick -i 232948; #wahoo: liblight: close fd - repopick -it P_asb_2020-09; repopick -it android-hardening-16.0; source "$DOS_SCRIPTS/Patch.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 75e9d082..be61c6e6 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -77,9 +77,6 @@ enterAndClear "device/qcom/sepolicy-legacy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices -enterAndClear "external/sonivox"; -git pull "https://github.com/LineageOS/android_external_sonivox" refs/changes/82/285882/1; #P_asb_2020-09 - enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie @@ -295,6 +292,7 @@ sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" ker sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/oneplus/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile sed -i 's/YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10 +rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk; # #END OF DEVICE CHANGES # diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh index e58859ec..f4bc09f0 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -133,7 +133,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_razer_msm8998.sh index 484f1b18..d350c619 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -66,6 +66,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12771/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch editKernelLocalversion "-dos.p67" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh index 7ddf94e4..e5c3792f 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh @@ -130,7 +130,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh index 0860b124..cb3ec678 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh @@ -129,7 +129,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 5bbfdab3..cd7e3871 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -70,7 +70,7 @@ buildAll() { buildDevice d855; buildDevice FP2; buildDevice m8; - buildDevice victara; + buildDevice victara; #error: +out/target/product/victara/recovery.img too large (10522624 > 10485760) #SD805 buildDevice shamu verity; #SD808 @@ -115,8 +115,7 @@ export -f buildAll; patchWorkspace() { 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 -it Q_asb_2020-09; + #source build/envsetup.sh; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 4a996ca1..89b2548c 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -74,9 +74,6 @@ enterAndClear "device/qcom/sepolicy-legacy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices -enterAndClear "external/sonivox"; -git pull "https://github.com/LineageOS/android_external_sonivox" refs/changes/35/285835/1; #Q_asb_2020-09 - enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie @@ -212,6 +209,7 @@ echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All enterAndClear "device/google/bonito"; enableVerity; #Resurrect dm-verity +awk -i inplace '!/INODE_COUNT/' BoardConfig-lineage.mk; #mke2fs -1 incompatibility (?) enterAndClear "device/google/crosshatch"; enableVerity; #Resurrect dm-verity @@ -297,6 +295,7 @@ sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" ker sed -i "s/CONFIG_RANDOMIZE_BASE=y/# CONFIG_RANDOMIZE_BASE is not set/" kernel/samsung/universal9810/arch/arm64/configs/*_defconfig; #Breaks on compile sed -i 's/YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10 +rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk; # #END OF DEVICE CHANGES #