From c4a23756a55782edb9aa8d860ef13946d8238a14 Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 25 Mar 2023 20:36:02 -0400 Subject: [PATCH] Churn Signed-off-by: Tad --- .../0004-Private_DNS.patch | 4 ++-- .../android_kernel_oneplus_sm7250.sh | 5 +---- .../android_kernel_razer_msm8998.sh | 17 +++-------------- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0004-Private_DNS.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0004-Private_DNS.patch index 97c66466..486c5a7d 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0004-Private_DNS.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_Settings/0004-Private_DNS.patch @@ -81,10 +81,10 @@ index 12e29e693b..b6745806b5 100644 android:id="@+id/private_dns_mode_opportunistic" layout="@layout/preference_widget_dialog_radiobutton"/> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml -index 45bab9b84f..b532e8c020 100644 +index 1b120c170a..ec6789f819 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml -@@ -148,6 +148,21 @@ +@@ -143,6 +143,21 @@ Wi\u2011Fi data Enable usage of Wi\u2011Fi data diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh index 60370e37..c36f021c 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh @@ -1,7 +1,5 @@ #!/bin/bash if cd "$DOS_BUILD_BASE""kernel/oneplus/sm7250"; then -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0272-0273.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0274-0275.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.19/0003.patch @@ -68,7 +66,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3108/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3625/^5.19/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3707/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/^6.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/4.19/0004.patch @@ -79,7 +76,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0030/^4.20/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1118/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch -editKernelLocalversion "-dos.p79" +editKernelLocalversion "-dos.p76" else echo "kernel_oneplus_sm7250 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh index 31faef47..bf3062c4 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -102,23 +102,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3646/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3649/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4378/4.9/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/4.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20399/4.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25654/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25664/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25743/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25677/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch @@ -147,8 +137,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896-extra/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47929/4.4/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc4/4.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc4/4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0045/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0047/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0394/4.4/0007.patch @@ -161,7 +150,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26545/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/4.4/0001.patch -editKernelLocalversion "-dos.p161" +editKernelLocalversion "-dos.p150" else echo "kernel_razer_msm8998 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE"