diff --git a/Patches/LineageOS-14.1/android_harware_qcom_gps/0001-rollover.patch b/Patches/LineageOS-14.1/android_hardware_qcom_gps/0001-rollover.patch similarity index 100% rename from Patches/LineageOS-14.1/android_harware_qcom_gps/0001-rollover.patch rename to Patches/LineageOS-14.1/android_hardware_qcom_gps/0001-rollover.patch diff --git a/Patches/Linux b/Patches/Linux index ab3a85ca..15b6a50a 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit ab3a85cacd34c83d6150adbec35ed9823e169897 +Subproject commit 15b6a50a7fca233279d5f680a844cceaa8ee3909 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 9ce63a61..15e870d8 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 @@ -383,7 +383,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -401,5 +400,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.p401" +editKernelLocalversion "-dos.p400" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh index eac2502a..741cb63a 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh @@ -197,7 +197,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -214,5 +213,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.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.p214" +editKernelLocalversion "-dos.p213" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh index 5b142fa6..af14b1da 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh @@ -221,7 +221,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -239,5 +238,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.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.p239" +editKernelLocalversion "-dos.p238" 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 8005d7b0..442a022e 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 @@ -407,7 +407,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -434,5 +433,5 @@ 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-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p434" +editKernelLocalversion "-dos.p433" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh index 08a39330..bbf6826c 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -507,7 +507,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -536,5 +535,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.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.p536" +editKernelLocalversion "-dos.p535" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh index 7f53f950..668d116a 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh @@ -233,7 +233,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -251,5 +250,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/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-14283/^5.2.3/0001.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-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh index 3b492035..56683228 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh @@ -311,7 +311,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -328,5 +327,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.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.p328" +editKernelLocalversion "-dos.p327" 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 fceb710b..a8d79a4f 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 @@ -370,7 +370,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -387,5 +386,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.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.p387" +editKernelLocalversion "-dos.p386" cd "$DOS_BUILD_BASE" 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 24e4ad33..2f6c4f3a 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 @@ -368,7 +368,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -385,5 +384,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.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.p385" +editKernelLocalversion "-dos.p384" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh index 2c58d2a5..5723b1f4 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh @@ -382,7 +382,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -399,5 +398,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.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.p399" +editKernelLocalversion "-dos.p398" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 07848cde..a7792d6b 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -421,7 +421,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch @@ -449,5 +448,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.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.p449" +editKernelLocalversion "-dos.p448" 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 2f6c49c2..94f8c5c3 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 @@ -328,7 +328,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -348,5 +347,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.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.p348" +editKernelLocalversion "-dos.p347" 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 329f3610..0d36b6cb 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 @@ -264,7 +264,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -281,5 +280,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.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.p281" +editKernelLocalversion "-dos.p280" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh index 1f3d0e7d..eceea040 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh @@ -387,7 +387,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -403,5 +402,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.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.p403" +editKernelLocalversion "-dos.p402" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh index fd3c4d9b..fde3003b 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -494,7 +494,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -524,5 +523,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.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.p524" +editKernelLocalversion "-dos.p523" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh index 760aa8f7..8b43121d 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh @@ -206,7 +206,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -222,5 +221,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.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.p222" +editKernelLocalversion "-dos.p221" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh index f54c9cab..11f9cca8 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh @@ -201,7 +201,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -217,5 +216,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.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.p217" +editKernelLocalversion "-dos.p216" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index c6fa4646..d451d082 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -366,7 +366,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch @@ -393,5 +392,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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.p393" +editKernelLocalversion "-dos.p392" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh index 6f6b284b..027549f5 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh @@ -391,7 +391,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -415,5 +414,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.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.p415" +editKernelLocalversion "-dos.p414" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh index a2bbff67..f67417d5 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh @@ -459,7 +459,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -485,5 +484,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.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.p485" +editKernelLocalversion "-dos.p484" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 623687eb..bd8c9512 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -117,7 +117,8 @@ patchWorkspace() { source build/envsetup.sh; repopick -it n_asb_09-2018-qcom; repopick -it ibss-mode-nougat; - repopick -i 285265; #update webview + repopick -it n-asb-2020-09; + repopick -it android-hardening-cm-14.1; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails 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 d07eb686..d7b084cf 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 @@ -355,7 +355,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -373,5 +372,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.p373" +editKernelLocalversion "-dos.p372" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh index 666884fb..cf5322e8 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh @@ -194,7 +194,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -211,5 +210,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.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.p211" +editKernelLocalversion "-dos.p210" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh index c6abf1e1..77a73736 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh @@ -191,7 +191,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -208,5 +207,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.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.p208" +editKernelLocalversion "-dos.p207" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_essential_msm8998.sh index 0fe6700c..de5d20c3 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -255,7 +255,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0006.patch @@ -309,5 +308,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0008.patch -editKernelLocalversion "-dos.p309" +editKernelLocalversion "-dos.p308" 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 a717f6b8..8ff4cfbe 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 @@ -355,7 +355,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -382,5 +381,5 @@ 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-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p382" +editKernelLocalversion "-dos.p381" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh index 04e93139..5c6a4c90 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -308,7 +308,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -332,5 +331,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5853/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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.p332" +editKernelLocalversion "-dos.p331" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh index 8fd6e65a..61c7abd8 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -408,7 +408,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0006.patch @@ -457,5 +456,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch -editKernelLocalversion "-dos.p457" +editKernelLocalversion "-dos.p456" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh index ab19a7af..ebf1e7e0 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh @@ -220,7 +220,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -238,5 +237,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/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-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p238" +editKernelLocalversion "-dos.p237" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh index 07022cff..6c6ad6ab 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh @@ -325,7 +325,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -343,5 +342,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0004/3.10/0002.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.p343" +editKernelLocalversion "-dos.p342" 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 24322d4a..12fe5b57 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 @@ -293,7 +293,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -310,5 +309,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.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.p310" +editKernelLocalversion "-dos.p309" cd "$DOS_BUILD_BASE" 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 27d2546f..5df247db 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 @@ -284,7 +284,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -301,5 +300,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.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.p301" +editKernelLocalversion "-dos.p300" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 19d2c79e..02a36578 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -249,7 +249,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch @@ -272,5 +271,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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.p272" +editKernelLocalversion "-dos.p271" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh index 31e3257f..ff38dea8 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh @@ -140,7 +140,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19966/^5.1.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -160,5 +159,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.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.p160" +editKernelLocalversion "-dos.p159" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh index 1199c84c..70e0afda 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -344,7 +344,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch @@ -366,5 +365,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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.p366" +editKernelLocalversion "-dos.p365" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh index 37b5ea30..8d8e581c 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh @@ -206,7 +206,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -222,5 +221,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.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.p222" +editKernelLocalversion "-dos.p221" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh index f31b138b..57ab307f 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh @@ -180,7 +180,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -196,5 +195,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.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.p196" +editKernelLocalversion "-dos.p195" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index e1d32a68..6df3dbc6 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -285,7 +285,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch @@ -307,5 +306,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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.p307" +editKernelLocalversion "-dos.p306" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh index 03467e84..c0d81bd3 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -335,7 +335,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0006.patch @@ -384,5 +383,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch -editKernelLocalversion "-dos.p384" +editKernelLocalversion "-dos.p383" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh index 2876ac11..c265a9a0 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -369,7 +369,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch @@ -416,5 +415,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10853/4.9/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.9/0006.patch -editKernelLocalversion "-dos.p416" +editKernelLocalversion "-dos.p415" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh index e20a5ae9..c511334a 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh @@ -247,7 +247,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0030/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch @@ -292,5 +291,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.9/0006.patch -editKernelLocalversion "-dos.p292" +editKernelLocalversion "-dos.p291" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index dcd3e997..79c8ce98 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -366,7 +366,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch @@ -413,5 +412,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10853/4.9/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.9/0006.patch -editKernelLocalversion "-dos.p413" +editKernelLocalversion "-dos.p412" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh index a0fd29fd..4c9db99f 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh @@ -313,7 +313,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch @@ -335,5 +334,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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.p335" +editKernelLocalversion "-dos.p334" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 70b305b7..5255ee75 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -107,7 +107,7 @@ 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 -i 285265; #update webview + repopick -it O_asb_2020-09; 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 f1c79087..e99f0321 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/sonivox"; +git pull "https://github.com/LineageOS/android_external_sonivox" refs/changes/04/285904/1; #O_asb_2020-09 + 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 3e8ce848..4019ca87 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 @@ -354,7 +354,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -372,5 +371,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.p372" +editKernelLocalversion "-dos.p371" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh index 595b6f1e..23f5276f 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh @@ -129,7 +129,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0040/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch @@ -150,5 +149,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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.p150" +editKernelLocalversion "-dos.p149" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh index 1a5efe16..bd5676c4 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh @@ -188,7 +188,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -205,5 +204,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.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.p205" +editKernelLocalversion "-dos.p204" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh index d84031c1..d4282339 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -219,7 +219,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/4.4/0005.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0006.patch @@ -271,5 +270,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch -editKernelLocalversion "-dos.p271" +editKernelLocalversion "-dos.p270" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh index 41d5cc93..3a2422a6 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh @@ -294,7 +294,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.9/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch @@ -344,5 +343,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.9/0006.patch -editKernelLocalversion "-dos.p344" +editKernelLocalversion "-dos.p343" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh index dc8cde93..705788ce 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh @@ -271,7 +271,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.9/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch @@ -323,5 +322,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.9/0006.patch -editKernelLocalversion "-dos.p323" +editKernelLocalversion "-dos.p322" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh index 96a53ac3..5995a10f 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh @@ -185,7 +185,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -210,5 +209,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5853/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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.p210" +editKernelLocalversion "-dos.p209" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh index 222735e2..db9e3449 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh @@ -253,7 +253,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0030/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0007.patch @@ -305,5 +304,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch -editKernelLocalversion "-dos.p305" +editKernelLocalversion "-dos.p304" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh index 4b3ab64e..75ec0776 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh @@ -137,7 +137,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19965/^5.4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19966/^5.1.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -157,5 +156,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.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.p157" +editKernelLocalversion "-dos.p156" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh index 94248616..0471ff93 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -208,7 +208,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch @@ -231,5 +230,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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.p231" +editKernelLocalversion "-dos.p230" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_nextbit_msm8992.sh index 6b5c6694..6148e39e 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_nextbit_msm8992.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_nextbit_msm8992.sh @@ -204,7 +204,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -220,5 +219,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.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.p220" +editKernelLocalversion "-dos.p219" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8994.sh index 2493e35a..236872b5 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8994.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8994.sh @@ -162,7 +162,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -178,5 +177,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.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.p178" +editKernelLocalversion "-dos.p177" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh index 13368d69..822f9efa 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -204,7 +204,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch @@ -228,5 +227,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.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.p228" +editKernelLocalversion "-dos.p227" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh index 5226f339..83fa0dee 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -266,7 +266,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch @@ -316,5 +315,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14088/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.9/0006.patch -editKernelLocalversion "-dos.p316" +editKernelLocalversion "-dos.p315" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh index e210eb6d..c5c94d05 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -292,7 +292,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.14/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0430/ANY/0001.patch @@ -346,5 +345,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0003.patch -editKernelLocalversion "-dos.p346" +editKernelLocalversion "-dos.p345" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh index ca21fddf..47bb5dcd 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -157,7 +157,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0006.patch @@ -212,5 +211,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0008.patch -editKernelLocalversion "-dos.p212" +editKernelLocalversion "-dos.p211" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index 9b79526a..248c9d48 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -128,7 +128,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch @@ -177,5 +176,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch -editKernelLocalversion "-dos.p177" +editKernelLocalversion "-dos.p176" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh index 7179010d..afb0097b 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh @@ -170,7 +170,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0006.patch @@ -225,5 +224,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0008.patch -editKernelLocalversion "-dos.p225" +editKernelLocalversion "-dos.p224" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_zuk_msm8996.sh index a66ba306..59cac8a8 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_zuk_msm8996.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_zuk_msm8996.sh @@ -160,7 +160,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0006.patch @@ -214,5 +213,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0008.patch -editKernelLocalversion "-dos.p214" +editKernelLocalversion "-dos.p213" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index d7c85cee..bbc4bb4d 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -132,7 +132,8 @@ patchWorkspace() { source build/envsetup.sh; repopick -it hh-p-sepolicy; repopick -i 232948; #wahoo: liblight: close fd - repopick -i 285265; #update webview + repopick -it P_asb_2020-09; + repopick -it android-hardening-16.0; 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 69390302..75e9d082 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/sonivox"; +git pull "https://github.com/LineageOS/android_external_sonivox" refs/changes/82/285882/1; #P_asb_2020-09 + enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh index 1a5efe16..bd5676c4 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh @@ -188,7 +188,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -205,5 +204,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.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.p205" +editKernelLocalversion "-dos.p204" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh index 910785b0..e9d50506 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -183,7 +183,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0040/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -207,5 +206,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5853/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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.p207" +editKernelLocalversion "-dos.p206" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 3e5d3dfe..a441dfcd 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -242,7 +242,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch @@ -265,5 +264,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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.p265" +editKernelLocalversion "-dos.p264" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh index 4b3ab64e..75ec0776 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh @@ -137,7 +137,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19965/^5.4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19966/^5.1.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -157,5 +156,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.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.p157" +editKernelLocalversion "-dos.p156" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh index 94248616..0471ff93 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -208,7 +208,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch @@ -231,5 +230,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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.p231" +editKernelLocalversion "-dos.p230" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh index 6b5c6694..6148e39e 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh @@ -204,7 +204,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -220,5 +219,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.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.p220" +editKernelLocalversion "-dos.p219" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh index 2493e35a..236872b5 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh @@ -162,7 +162,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -178,5 +177,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.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.p178" +editKernelLocalversion "-dos.p177" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index 97ed6875..afaf0410 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -178,7 +178,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch @@ -200,5 +199,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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.p200" +editKernelLocalversion "-dos.p199" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh index f10d3ea9..62cefbe6 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -213,7 +213,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0041/ANY/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/3.9+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0430/ANY/0001.patch @@ -269,5 +268,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0003.patch -editKernelLocalversion "-dos.p269" +editKernelLocalversion "-dos.p268" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index bc6e7f58..5bbfdab3 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -116,7 +116,7 @@ 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 -i 285265; #update webview + repopick -it Q_asb_2020-09; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index e5efc331..4a996ca1 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -74,6 +74,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/sonivox"; +git pull "https://github.com/LineageOS/android_external_sonivox" refs/changes/35/285835/1; #Q_asb_2020-09 + enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie