diff --git a/Patches/Linux b/Patches/Linux index 96ec19a6..927eaf56 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 96ec19a64b217532e9580f62362348c22f08fce1 +Subproject commit 927eaf56c786ecaf866b9e4171bea72147e9bf02 diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index 3947a415..db7ae574 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -270,7 +270,7 @@ processRelease() { mkdir -vp $ARCHIVE/fastboot; mkdir -vp $ARCHIVE/incrementals; - cp -v $OUT_DIR/$PREFIX-target_files.zip* $ARCHIVE/target_files/; + if [[ " ${DOS_GENERATE_DELTAS_DEVICES[@]} " =~ " ${DEVICE} " ]]; then cp -v $OUT_DIR/$PREFIX-target_files.zip* $ARCHIVE/target_files/; fi; cp -v $OUT_DIR/$PREFIX-fastboot.zip* $ARCHIVE/fastboot/ || true; cp -v $OUT_DIR/$PREFIX-ota.zip* $ARCHIVE/; cp -v $OUT_DIR/$PREFIX-incremental_*.zip* $ARCHIVE/incrementals/ || true; diff --git a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh index 7b34b69a..6738ef4d 100644 --- a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh +++ b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh @@ -508,7 +508,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch @@ -589,5 +588,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p589" +editKernelLocalversion "-dos.p588" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh index aed8c360..bd3e1782 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh @@ -476,7 +476,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch @@ -559,5 +558,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p559" +editKernelLocalversion "-dos.p558" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh index 0e655fdc..1747ff31 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh @@ -203,7 +203,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.4/0002.patch @@ -277,5 +276,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p277" +editKernelLocalversion "-dos.p276" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh index f7e45d0e..8da987c6 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh @@ -218,7 +218,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch @@ -297,5 +296,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p297" +editKernelLocalversion "-dos.p296" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh index 823769ac..424233bd 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh @@ -154,7 +154,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.4/0002.patch @@ -228,5 +227,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p228" +editKernelLocalversion "-dos.p227" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh index 07977dc9..8f1e933c 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh @@ -193,7 +193,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch @@ -273,5 +272,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p273" +editKernelLocalversion "-dos.p272" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh index 3fca6b27..a9494d38 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -387,7 +387,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch @@ -468,5 +467,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p468" +editKernelLocalversion "-dos.p467" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh index b3d485d0..5e839a54 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh @@ -122,7 +122,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch @@ -202,5 +201,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p202" +editKernelLocalversion "-dos.p201" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh index 8dedc095..0b5bf937 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -386,7 +386,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch @@ -467,5 +466,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p467" +editKernelLocalversion "-dos.p466" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh index 89a9cda3..98f31c96 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -203,7 +203,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch @@ -283,5 +282,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p283" +editKernelLocalversion "-dos.p282" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh index 0c06d2b8..4550f25e 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh @@ -187,7 +187,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11477/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch @@ -267,5 +266,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p267" +editKernelLocalversion "-dos.p266" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh index 249150b2..39b9b82f 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -201,7 +201,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11477/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch @@ -280,5 +279,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p280" +editKernelLocalversion "-dos.p279" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh index 6900180a..43128bbe 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -147,7 +147,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11477/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch @@ -227,5 +226,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p227" +editKernelLocalversion "-dos.p226" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh index deca93e7..91fefd5d 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -185,7 +185,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11477/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch @@ -262,5 +261,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p262" +editKernelLocalversion "-dos.p261" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh index ccdb4557..356bb5c3 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -149,7 +149,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11477/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch @@ -229,5 +228,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p229" +editKernelLocalversion "-dos.p228" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index f88356a1..c893ff39 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -197,7 +197,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11477/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.4/0002.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11599/^4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch @@ -274,5 +273,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p274" +editKernelLocalversion "-dos.p273" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh index f68dbb64..da9558db 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh @@ -116,7 +116,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2215/3.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/^5.0.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15216/^5.0.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15807/^5.1.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18806/^5.3.5/0001.patch @@ -151,5 +150,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p151" +editKernelLocalversion "-dos.p150" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh index 24d852d7..a034bcf7 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh @@ -187,7 +187,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.4/0002.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11599/^4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch @@ -265,5 +264,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0004/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p265" +editKernelLocalversion "-dos.p264" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh index 3988f4a6..385f8dfd 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh @@ -238,7 +238,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.4/0002.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11599/^4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch @@ -316,5 +315,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0004/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p316" +editKernelLocalversion "-dos.p315" cd "$DOS_BUILD_BASE"