diff --git a/Patches/Linux b/Patches/Linux index 40fef121..a867b0a2 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 40fef12125acdad0b4512580335642725353839d +Subproject commit a867b0a2807d1cad0f2243250d31547524b33945 diff --git a/PrebuiltApps b/PrebuiltApps index 4f119151..0417fe25 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 4f1191515d1ebef56c9e0d0a6dc6ad96dadc2c2e +Subproject commit 0417fe253af8c392d255ca87604f4f066883bf43 diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index 41a6397a..78b18242 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -28,7 +28,7 @@ commentPatches() { fi; } -commentPatches android_kernel_asus_fugu.sh "CVE-2015-8746/^4.2.2/0001.patch" "CVE-2017-5551" "LVT-2017-0003/3.10/0001.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"; 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"; @@ -39,18 +39,21 @@ commentPatches android_kernel_fairphone_msm8974.sh "CVE-2018-20169"; commentPatches android_kernel_fxtec_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" "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"; commentPatches android_kernel_google_bonito.sh "CVE-2020-0067"; commentPatches android_kernel_google_coral.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992"; -commentPatches android_kernel_google_dragon.sh "CVE-2015-4167/^3.19.1/0001.patch" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214"; +commentPatches android_kernel_google_dragon.sh "CVE-2015-4167" "CVE-2017-15951" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214"; 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" "CVE-2017-15951" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166"; 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" "CVE-2020-16166"; commentPatches android_kernel_google_yellowstone.sh "0001-LinuxIncrementals/3.10/3.10.0098-0099.patch" "CVE-2018-9514"; +commentPatches android_kernel_huawei_angler.sh "CVE-2014-8559"; commentPatches android_kernel_htc_flounder.sh "CVE-2018-9514"; commentPatches android_kernel_htc_msm8994.sh "CVE-2016-8394/ANY/0001.patch" "CVE-2017-13166" "CVE-2018-3585" "CVE-2018-9514"; +commentPatches android_kernel_lge_bullhead.sh "CVE-2014-8559"; commentPatches android_kernel_lge_msm8992.sh "CVE-2018-5897" "CVE-2018-11266"; commentPatches android_kernel_lge_msm8996.sh "CVE-2016-6198" "CVE-2017-13162/3.18/0001.patch" "CVE-2017-15951" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166"; -commentPatches android_kernel_motorola_msm8916.sh "0001-LinuxIncrementals/3.10/3.10.0050-0051.patch" "CVE-2018-9514"; +commentPatches android_kernel_moto_shamu.sh "CVE-2014-8559"; +commentPatches android_kernel_motorola_msm8916.sh "0001-LinuxIncrementals/3.10/3.10.0050-0051.patch" "CVE-2014-8559" "CVE-2018-9514"; commentPatches android_kernel_motorola_msm8974.sh "CVE-2016-5696" "CVE-2017-7373" "CVE-2017-17770/3.4/0002.patch"; commentPatches android_kernel_motorola_msm8992.sh "CVE-2017-5551/3.10/0002.patch" "CVE-2017-14880/3.10/0001.patch" "CVE-2018-3585/3.10/0001.patch"; commentPatches android_kernel_motorola_msm8996.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "CVE-2017-8266" "CVE-2017-13162/3.18/0001.patch" "CVE-2017-15951" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166"; @@ -60,10 +63,11 @@ commentPatches android_kernel_oneplus_msm8996.sh "CVE-2017-13162/3.18/0001.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" "CVE-2019-19319" "CVE-2020-0305" "CVE-2020-8992" "CVE-2020-16166"; 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" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-14070/ANY/0005.patch" "CVE-2020-16166"; -commentPatches android_kernel_samsung_smdk4412.sh "CVE-2016-8463/ANY/0001.patch"; +commentPatches android_kernel_samsung_smdk4412.sh "CVE-2012-2127" "CVE-2016-8463/ANY/0001.patch"; +commentPatches android_kernel_samsung_tuna.sh "CVE-2012-2127"; commentPatches android_kernel_samsung_universal8890.sh "CVE-2016-7917" "CVE-2018-1092" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166"; 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" "CVE-2020-16166"; -commentPatches android_kernel_zte_msm8930.sh "CVE-2015-2922/^3.19.6/0001.patch" "CVE-2017-11015/prima"; +commentPatches android_kernel_zte_msm8930.sh "CVE-2015-2922" "CVE-2017-11015/prima"; commentPatches android_kernel_zte_msm8996.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "CVE-2017-13162" "CVE-2017-16939" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166"; 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-1616"; diff --git a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh index 3f576db1..f386cf1e 100644 --- a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh +++ b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh @@ -209,8 +209,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0006.patch @@ -570,5 +568,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p570" +editKernelLocalversion "-dos.p568" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-11.0/Functions.sh b/Scripts/LineageOS-11.0/Functions.sh index 4bc2c422..061ba806 100644 --- a/Scripts/LineageOS-11.0/Functions.sh +++ b/Scripts/LineageOS-11.0/Functions.sh @@ -35,18 +35,21 @@ scanWorkspaceForMalware() { export -f scanWorkspaceForMalware; buildDevice() { + cd "$DOS_BUILD_BASE"; export OTA_PACKAGE_SIGNING_KEY="$DOS_SIGNING_KEYS/$1/releasekey"; brunch "cm_$1-user" && processRelease $1 false; } export -f buildDevice; buildDeviceDebug() { + cd "$DOS_BUILD_BASE"; unset OTA_PACKAGE_SIGNING_KEY; brunch "cm_$1-eng"; } export -f buildDeviceDebug; buildAll() { + cd "$DOS_BUILD_BASE"; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi; if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi; brunch lineage_nex-user && processRelease nex false; #broken encryption 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 de73f8e6..263d3e79 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 @@ -195,8 +195,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0006.patch @@ -539,5 +537,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p539" +editKernelLocalversion "-dos.p537" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh index c429a41e..1c310667 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh @@ -69,7 +69,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1739/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2039/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2309/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2523/3.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2568/3.10/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2568/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2672/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2673/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2678/3.10/0002.patch @@ -130,14 +130,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8160/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8173/3.9-^3.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8369/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8480/^3.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8884/3.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0012.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0013.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0014.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9419/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9420/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9584/3.10/0002.patch @@ -512,5 +507,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p512" +editKernelLocalversion "-dos.p507" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh index 5ff59d3f..f8d89a1e 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh @@ -18,8 +18,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9895/ANY/0001.patch @@ -261,5 +259,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p261" +editKernelLocalversion "-dos.p259" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh index 9147457a..4707446d 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh @@ -188,8 +188,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4652/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0006.patch @@ -517,5 +515,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p517" +editKernelLocalversion "-dos.p515" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh index 0b3a9148..50efdf30 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -184,8 +184,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0006.patch @@ -450,5 +448,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p450" +editKernelLocalversion "-dos.p448" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh index 3051ddb7..594bfc15 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh @@ -28,11 +28,6 @@ git apply $DOS_PATCHES_LINUX_CVES/0090-Unknown/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4312/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8134/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8159/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.18/0019.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.18/0021.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.18/0022.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.18/0023.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9419/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9428/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9710/3.18/0003.patch @@ -67,7 +62,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-3339/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4003/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4036/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4167/3.18/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4167/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4177/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4178/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4692/3.18/0003.patch @@ -622,8 +617,8 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p625" +editKernelLocalversion "-dos.p620" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh index 5fc088c7..b7a5d535 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh @@ -186,8 +186,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0006.patch @@ -456,5 +454,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a5232 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p456" +editKernelLocalversion "-dos.p454" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh index 6cf5bf22..3ac467b7 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -16,7 +16,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -262,5 +261,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p262" +editKernelLocalversion "-dos.p261" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh index ecadb6b2..32f3d14c 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh @@ -36,8 +36,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8159/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8160/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8173/3.9-^3.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8480/^3.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9710/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/^3.18.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh index ad21a721..f307ea78 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh @@ -35,8 +35,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8159/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8160/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8173/3.9-^3.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8480/^3.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9710/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/^3.18.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh index 49a084cd..adc4923b 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -23,7 +23,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -273,5 +272,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p273" +editKernelLocalversion "-dos.p272" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh index 981846ea..f65510e2 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -175,8 +175,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0006.patch @@ -427,5 +425,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p427" +editKernelLocalversion "-dos.p425" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh index 2e29bf0d..96291d5a 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -177,8 +177,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0006.patch @@ -412,5 +410,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p412" +editKernelLocalversion "-dos.p410" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh index e8f18c1f..8ebf9b6d 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -23,7 +23,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -229,5 +228,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p229" +editKernelLocalversion "-dos.p228" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh index 0694b277..27828bf5 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh @@ -86,14 +86,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8160/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8173/3.9-^3.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8369/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8480/^3.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8884/3.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0012.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0013.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0014.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9090/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9419/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9420/3.10/0002.patch @@ -439,5 +434,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p439" +editKernelLocalversion "-dos.p434" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh index 42d320b4..a5549c09 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh @@ -45,10 +45,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3673/^3.17.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3687/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3690/3.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/3.10/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/3.10/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/3.10/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/3.10/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6410/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.10/0004.patch @@ -62,14 +58,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8134/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8159/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8369/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8480/^3.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8884/3.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0012.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0013.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0014.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9090/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9419/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9420/3.10/0002.patch @@ -349,5 +340,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p349" +editKernelLocalversion "-dos.p340" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index 89d8816e..99588c3a 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -132,8 +132,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0006.patch @@ -439,5 +437,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p439" +editKernelLocalversion "-dos.p437" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh index 9302a74f..2b618f34 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh @@ -26,8 +26,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -305,5 +303,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p305" +editKernelLocalversion "-dos.p303" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh index e9fcae5c..a7a86064 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh @@ -14,7 +14,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9870/ANY/0001.patch @@ -112,5 +111,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p112" +editKernelLocalversion "-dos.p111" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh index 62d0138c..cf4ee76a 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh @@ -24,7 +24,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9410/ANY/msm.git-43b4ff3bf3fbb02e85defcea939629f46506a217.patch @@ -201,5 +200,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p201" +editKernelLocalversion "-dos.p200" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh index 58004f26..1f4e3e8c 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh @@ -17,8 +17,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9922/3.4/0001.patch @@ -212,5 +210,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p212" +editKernelLocalversion "-dos.p210" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh index 16a22383..72f0cfc5 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -15,7 +15,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -111,5 +110,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p111" +editKernelLocalversion "-dos.p110" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh index b5314b47..0997d506 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh @@ -8,7 +8,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4132/^3.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4347/^3.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4347/^3.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-5327/^3.1/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2127/^3.2/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2127/^3.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2372/^3.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2375/^3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-3375/^3.2.24/0001.patch @@ -47,7 +47,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/^3.15.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/^3.15.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/^3.15.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/^3.15.8/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/^3.16.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/^3.16.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/^3.16.3/0002.patch @@ -194,5 +193,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p194" +editKernelLocalversion "-dos.p193" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh index a5366aa7..5385e15b 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh @@ -8,7 +8,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4132/^3.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4347/^3.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4347/^3.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-5327/^3.1/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2127/^3.2/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2127/^3.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2372/^3.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2375/^3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-3375/^3.2.24/0001.patch @@ -47,7 +47,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/^3.15.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/^3.15.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/^3.15.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/^3.15.8/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/^3.16.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/^3.16.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/^3.16.3/0002.patch @@ -189,5 +188,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p189" +editKernelLocalversion "-dos.p188" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index f9103768..4dc46e25 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -35,24 +35,28 @@ scanWorkspaceForMalware() { export -f scanWorkspaceForMalware; buildDevice() { + cd "$DOS_BUILD_BASE"; export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; brunch "lineage_$1-user" && processRelease $1 true $2; } export -f buildDevice; buildDeviceUserDebug() { + cd "$DOS_BUILD_BASE"; export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; brunch "lineage_$1-userdebug" && processRelease $1 true $2; } export -f buildDeviceUserDebug; buildDeviceDebug() { + cd "$DOS_BUILD_BASE"; unset OTA_KEY_OVERRIDE_DIR; brunch "lineage_$1-eng"; } export -f buildDeviceDebug; buildAll() { + cd "$DOS_BUILD_BASE"; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi; if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi; #Select devices are userdebug due to SELinux policy issues @@ -121,7 +125,6 @@ patchWorkspace() { repopick -it n_asb_09-2018-qcom; #repopick -it bt-sbc-hd-dualchannel-nougat; repopick -it n-asb-2021-01; - repopick -it 302271; #update webview export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 0a006afc..0da19782 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -76,6 +76,9 @@ enterAndClear "device/qcom/sepolicy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/248649.patch"; #msm_irqbalance: Allow read for stats and interrupts patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH +enterAndClear "external/chromium-webview"; +git fetch "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/71/302271/1 && git checkout FETCH_HEAD; #update webview + enterAndClear "external/sqlite"; patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (CopperheadOS-13.0) diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh index 4e33c6f0..61d2acab 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh @@ -66,7 +66,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1738/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2039/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2309/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2523/3.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2568/3.10/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2568/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2672/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2673/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2678/3.10/0002.patch @@ -98,9 +98,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4943/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/3.10/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/3.10/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/3.10/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6410/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.10/0003.patch @@ -121,14 +118,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8160/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8173/3.9-^3.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8369/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8480/^3.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8884/3.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0012.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0013.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0014.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9419/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9420/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9584/3.10/0002.patch @@ -472,5 +464,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p472" +editKernelLocalversion "-dos.p464" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh index 55bbab31..c444790b 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh @@ -16,7 +16,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -249,5 +248,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p249" +editKernelLocalversion "-dos.p248" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh index bedfffec..97f177fe 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -181,7 +181,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0006.patch @@ -411,5 +410,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p411" +editKernelLocalversion "-dos.p410" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh index 6c2548ad..e8ea0b87 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh @@ -28,11 +28,6 @@ git apply $DOS_PATCHES_LINUX_CVES/0090-Unknown/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4312/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8134/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8159/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.18/0019.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.18/0021.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.18/0022.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.18/0023.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9419/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9428/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9710/3.18/0003.patch @@ -67,7 +62,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-3339/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4003/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4036/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4167/3.18/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4167/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4177/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4178/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4692/3.18/0003.patch @@ -565,8 +560,8 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p568" +editKernelLocalversion "-dos.p563" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh index 9898f656..8c90cc90 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh @@ -25,7 +25,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4738/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -253,5 +252,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p253" +editKernelLocalversion "-dos.p252" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh index b7b53f02..69a4018f 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -16,7 +16,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -264,5 +263,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p264" +editKernelLocalversion "-dos.p263" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh index 2689475b..19972011 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh @@ -36,8 +36,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8159/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8160/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8173/3.9-^3.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8480/^3.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9710/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/^3.18.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh index 9c1b34c4..8f08e5ba 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh @@ -35,8 +35,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8159/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8160/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8173/3.9-^3.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8480/^3.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9710/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/^3.18.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh index 7871f0ef..634b7e1a 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -23,7 +23,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -275,5 +274,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p275" +editKernelLocalversion "-dos.p274" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh index 3658c8d1..413e7f4a 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -174,7 +174,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0006.patch @@ -447,5 +446,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p447" +editKernelLocalversion "-dos.p446" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh index 88d0ea79..2e1cc962 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -16,7 +16,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -191,5 +190,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p191" +editKernelLocalversion "-dos.p190" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8974.sh index 05a0ab96..aebc9c63 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -23,7 +23,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -215,5 +214,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p215" +editKernelLocalversion "-dos.p214" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index d59f6b67..3faffcce 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -24,7 +24,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -290,5 +289,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p290" +editKernelLocalversion "-dos.p289" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oppo_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oppo_msm8974.sh index 008aa649..e9a2c55b 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oppo_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oppo_msm8974.sh @@ -24,7 +24,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -247,5 +246,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p247" +editKernelLocalversion "-dos.p246" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh index 16a22383..72f0cfc5 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -15,7 +15,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -111,5 +110,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p111" +editKernelLocalversion "-dos.p110" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh index b5314b47..0997d506 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh @@ -8,7 +8,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4132/^3.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4347/^3.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4347/^3.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-5327/^3.1/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2127/^3.2/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2127/^3.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2372/^3.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2375/^3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-3375/^3.2.24/0001.patch @@ -47,7 +47,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/^3.15.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/^3.15.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/^3.15.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/^3.15.8/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/^3.16.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/^3.16.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/^3.16.3/0002.patch @@ -194,5 +193,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p194" +editKernelLocalversion "-dos.p193" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index d6c9951b..a041c905 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -35,24 +35,28 @@ scanWorkspaceForMalware() { export -f scanWorkspaceForMalware; buildDevice() { + cd "$DOS_BUILD_BASE"; export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; brunch "lineage_$1-user" && processRelease $1 true $2; } export -f buildDevice; buildDeviceUserDebug() { + cd "$DOS_BUILD_BASE"; export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; brunch "lineage_$1-userdebug" && processRelease $1 true $2; } export -f buildDeviceUserDebug; buildDeviceDebug() { + cd "$DOS_BUILD_BASE"; unset OTA_KEY_OVERRIDE_DIR; brunch "lineage_$1-eng"; } export -f buildDeviceDebug; buildAll() { + cd "$DOS_BUILD_BASE"; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi; if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi; buildDevice bullhead verity; @@ -111,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 302271; #update webview + #source build/envsetup.sh; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 807841f8..a5c33dea 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -78,6 +78,9 @@ git revert --no-edit c9b0d95630b82cd0ad1a0fc633c6d59c2cb8aad7 37422f7df389f3ae5a enterAndClear "device/qcom/sepolicy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH +enterAndClear "external/chromium-webview"; +git fetch "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/71/302271/1 && git checkout FETCH_HEAD; #update webview + enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh index 75ef4166..a0da0089 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh @@ -66,7 +66,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1738/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2039/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2309/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2523/3.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2568/3.10/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2568/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2672/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2673/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2678/3.10/0002.patch @@ -98,9 +98,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4943/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/3.10/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/3.10/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/3.10/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6410/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.10/0003.patch @@ -121,14 +118,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8160/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8173/3.9-^3.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8369/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8480/^3.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8559/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8884/3.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0012.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0013.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0014.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8989/3.10/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9419/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9420/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9584/3.10/0002.patch @@ -471,5 +463,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p471" +editKernelLocalversion "-dos.p463" 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 f8057035..80086f8e 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 @@ -15,7 +15,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -181,5 +180,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p181" +editKernelLocalversion "-dos.p180" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fairphone_msm8974.sh index 2d4ae5e2..a6e62814 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -180,7 +180,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0006.patch @@ -392,5 +391,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p392" +editKernelLocalversion "-dos.p391" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_msm.sh index bdace615..65d1732b 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_msm.sh @@ -24,7 +24,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4738/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -251,5 +250,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p251" +editKernelLocalversion "-dos.p250" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_htc_msm8974.sh index d3545763..1a365028 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -16,7 +16,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -262,5 +261,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p262" +editKernelLocalversion "-dos.p261" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_g3.sh index fc07c103..052a59e9 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_g3.sh @@ -22,7 +22,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -206,5 +205,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p206" +editKernelLocalversion "-dos.p205" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh index 47e48efa..59599b9f 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -174,7 +174,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/3.4/0006.patch @@ -446,5 +445,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p446" +editKernelLocalversion "-dos.p445" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_mako.sh index 9beb92b1..9bfabcdc 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_mako.sh @@ -19,7 +19,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4312/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4738/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -246,5 +245,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p246" +editKernelLocalversion "-dos.p245" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_msm8974.sh index e766a506..cdd594bf 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -22,7 +22,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -208,5 +207,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p208" +editKernelLocalversion "-dos.p207" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8974.sh index d59f6b67..3faffcce 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -24,7 +24,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -290,5 +289,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p290" +editKernelLocalversion "-dos.p289" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oppo_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oppo_msm8974.sh index c8bc4e13..eeb54989 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oppo_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oppo_msm8974.sh @@ -23,7 +23,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -246,5 +245,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p246" +editKernelLocalversion "-dos.p245" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_jf.sh index b92dd089..7e8eab02 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_jf.sh @@ -17,7 +17,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4737/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9410/ANY/msm.git-43b4ff3bf3fbb02e85defcea939629f46506a217.patch @@ -54,6 +53,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6480/^4.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8404/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8646/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10142/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10233/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10318/^4.7.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_msm8974.sh index 09d4159d..db0f5fb8 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -14,7 +14,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -108,5 +107,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p108" +editKernelLocalversion "-dos.p107" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_smdk4412.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_smdk4412.sh index d74695e3..642f8d36 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_smdk4412.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_smdk4412.sh @@ -8,7 +8,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4132/^3.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4347/^3.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4347/^3.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-5327/^3.1/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2127/^3.2/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2127/^3.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2372/^3.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2375/^3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/3.0/0006.patch @@ -47,7 +47,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/^3.15.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/^3.15.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/^3.15.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/^3.15.8/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/^3.16.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/^3.16.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/^3.16.3/0002.patch @@ -193,5 +192,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p193" +editKernelLocalversion "-dos.p192" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 1b48eb2a..42748b3d 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -35,24 +35,28 @@ scanWorkspaceForMalware() { export -f scanWorkspaceForMalware; buildDevice() { + cd "$DOS_BUILD_BASE"; export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; brunch "lineage_$1-user" && processRelease $1 true $2; } export -f buildDevice; buildDeviceUserDebug() { + cd "$DOS_BUILD_BASE"; export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; brunch "lineage_$1-userdebug" && processRelease $1 true $2; } export -f buildDeviceUserDebug; buildDeviceDebug() { + cd "$DOS_BUILD_BASE"; unset OTA_KEY_OVERRIDE_DIR; brunch "lineage_$1-eng"; } export -f buildDeviceDebug; buildAll() { + cd "$DOS_BUILD_BASE"; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi; if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi; #SDS4P @@ -128,11 +132,10 @@ 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; + #source build/envsetup.sh; repopick -it hh-p-sepolicy; repopick -i 232948; #wahoo: liblight: close fd #repopick -it pie-firewall; - repopick -it 302271; #update webview source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 298f00aa..c34945ee 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -77,6 +77,9 @@ 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/chromium-webview"; +git fetch "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/71/302271/1 && git checkout FETCH_HEAD; #update webview + enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh index 462b950f..e6781d24 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -14,7 +14,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -111,5 +110,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p111" +editKernelLocalversion "-dos.p110" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm.sh index c86f12f2..ed89c43b 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm.sh @@ -24,7 +24,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4738/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -250,5 +249,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p250" +editKernelLocalversion "-dos.p249" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh index d3545763..1a365028 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -16,7 +16,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -262,5 +261,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p262" +editKernelLocalversion "-dos.p261" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_g3.sh index fc07c103..052a59e9 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -22,7 +22,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -206,5 +205,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p206" +editKernelLocalversion "-dos.p205" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_mako.sh index 9beb92b1..9bfabcdc 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -19,7 +19,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4312/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4738/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -246,5 +245,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p246" +editKernelLocalversion "-dos.p245" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8974.sh index e766a506..cdd594bf 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -22,7 +22,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -208,5 +207,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p208" +editKernelLocalversion "-dos.p207" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index d25eed87..5975e764 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -22,7 +22,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -262,5 +261,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p262" +editKernelLocalversion "-dos.p261" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oppo_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oppo_msm8974.sh index 5212509e..c7abfdac 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oppo_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oppo_msm8974.sh @@ -23,7 +23,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch @@ -141,5 +140,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p141" +editKernelLocalversion "-dos.p140" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_jf.sh index 01882e13..5cadbee4 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_jf.sh @@ -17,7 +17,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4737/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9410/ANY/msm.git-43b4ff3bf3fbb02e85defcea939629f46506a217.patch @@ -54,6 +53,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6480/^4.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8404/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8646/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10142/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10233/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10318/^4.7.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_msm8974.sh index 09d4159d..db0f5fb8 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -14,7 +14,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5206/^3.16.1/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch @@ -108,5 +107,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p108" +editKernelLocalversion "-dos.p107" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 28272ac7..53f20661 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -35,24 +35,28 @@ scanWorkspaceForMalware() { export -f scanWorkspaceForMalware; buildDevice() { + cd "$DOS_BUILD_BASE"; export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; brunch "lineage_$1-user" && processRelease $1 true $2; } export -f buildDevice; buildDeviceUserDebug() { + cd "$DOS_BUILD_BASE"; export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; brunch "lineage_$1-userdebug" && processRelease $1 true $2; } export -f buildDeviceUserDebug; buildDeviceDebug() { + cd "$DOS_BUILD_BASE"; unset OTA_KEY_OVERRIDE_DIR; brunch "lineage_$1-eng"; } export -f buildDeviceDebug; buildAll() { + cd "$DOS_BUILD_BASE"; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi; if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi; #SDS4P @@ -126,10 +130,9 @@ 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; + #source build/envsetup.sh; repopick -i 271361; #releasetools: python3 fix, 287339 (alt) #repopick -it ten-firewall; - repopick -it 302271; #update webview repopick -it tzdb2020f_Q; source "$DOS_SCRIPTS/Patch.sh"; diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 52b5f17e..954a775d 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -75,6 +75,9 @@ 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/chromium-webview"; +git fetch "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/71/302271/1 && git checkout FETCH_HEAD; #update webview + enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie