From 97ce53667f598df65e54fc89ee440175cd214407 Mon Sep 17 00:00:00 2001
From: Tavi <tavi@divested.dev>
Date: Thu, 4 Apr 2024 14:41:28 -0400
Subject: [PATCH] Churn

Signed-off-by: Tavi <tavi@divested.dev>
---
 .../0029-Strict_Package_Checks-2.patch                        | 2 +-
 .../android_frameworks_base/0031-appops_reset_fix-1.patch     | 4 ++--
 .../android_frameworks_base/0031-appops_reset_fix-2.patch     | 4 ++--
 Patches/Linux                                                 | 2 +-
 Scripts/Common/Fix_CVE_Patchers.sh                            | 4 ++--
 .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh              | 1 -
 .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh              | 1 -
 .../CVE_Patchers/android_kernel_fairphone_sm7225.sh           | 1 -
 .../CVE_Patchers/android_kernel_fxtec_sm6115.sh               | 1 -
 .../android_kernel_google_gs101_private_gs-google.sh          | 3 +--
 .../android_kernel_google_gs201_private_gs-google.sh          | 3 +--
 .../CVE_Patchers/android_kernel_google_msm-4.14.sh            | 1 -
 .../CVE_Patchers/android_kernel_google_redbull.sh             | 1 -
 .../CVE_Patchers/android_kernel_oneplus_sm7250.sh             | 1 -
 .../CVE_Patchers/android_kernel_oneplus_sm8150.sh             | 1 -
 .../CVE_Patchers/android_kernel_oneplus_sm8250.sh             | 1 -
 .../CVE_Patchers/android_kernel_oneplus_sm8350.sh             | 1 -
 .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh              | 1 -
 .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh              | 1 -
 .../LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh | 1 -
 Scripts/LineageOS-20.0/Patch.sh                               | 1 +
 21 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0029-Strict_Package_Checks-2.patch b/Patches/LineageOS-20.0/android_frameworks_base/0029-Strict_Package_Checks-2.patch
index 0624a706..c1c4130c 100644
--- a/Patches/LineageOS-20.0/android_frameworks_base/0029-Strict_Package_Checks-2.patch
+++ b/Patches/LineageOS-20.0/android_frameworks_base/0029-Strict_Package_Checks-2.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] perform additional boot-time checks on system package updates
  create mode 100644 services/core/java/com/android/server/pm/PackageVerityExt.java
 
 diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
-index a56ac9de6ebe..7d1eca4df94a 100644
+index 0ec70238ff64..adf3e172d192 100644
 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
 +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
 @@ -3827,6 +3827,13 @@ final class InstallPackageHelper {
diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0031-appops_reset_fix-1.patch b/Patches/LineageOS-20.0/android_frameworks_base/0031-appops_reset_fix-1.patch
index 6fa959af..19c319a0 100644
--- a/Patches/LineageOS-20.0/android_frameworks_base/0031-appops_reset_fix-1.patch
+++ b/Patches/LineageOS-20.0/android_frameworks_base/0031-appops_reset_fix-1.patch
@@ -38,10 +38,10 @@ Such ops are being constructed due to another bug.
  1 file changed, 3 insertions(+), 5 deletions(-)
 
 diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
-index 20f0c17bb9d9..748ff6bc0d0d 100644
+index 6fde3b531fbb..2d26cc53832f 100644
 --- a/services/core/java/com/android/server/appop/AppOpsService.java
 +++ b/services/core/java/com/android/server/appop/AppOpsService.java
-@@ -5193,15 +5193,13 @@ public class AppOpsService extends IAppOpsService.Stub {
+@@ -5231,15 +5231,13 @@ public class AppOpsService extends IAppOpsService.Stub {
                      String lastPkg = null;
                      for (int i=0; i<allOps.size(); i++) {
                          AppOpsManager.PackageOps pkg = allOps.get(i);
diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0031-appops_reset_fix-2.patch b/Patches/LineageOS-20.0/android_frameworks_base/0031-appops_reset_fix-2.patch
index 46b7105a..c1af7930 100644
--- a/Patches/LineageOS-20.0/android_frameworks_base/0031-appops_reset_fix-2.patch
+++ b/Patches/LineageOS-20.0/android_frameworks_base/0031-appops_reset_fix-2.patch
@@ -15,10 +15,10 @@ crashes.
  1 file changed, 3 insertions(+)
 
 diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
-index 748ff6bc0d0d..f8feeaad0fa7 100644
+index 2d26cc53832f..425b36da5ed9 100644
 --- a/services/core/java/com/android/server/appop/AppOpsService.java
 +++ b/services/core/java/com/android/server/appop/AppOpsService.java
-@@ -5193,6 +5193,9 @@ public class AppOpsService extends IAppOpsService.Stub {
+@@ -5231,6 +5231,9 @@ public class AppOpsService extends IAppOpsService.Stub {
                      String lastPkg = null;
                      for (int i=0; i<allOps.size(); i++) {
                          AppOpsManager.PackageOps pkg = allOps.get(i);
diff --git a/Patches/Linux b/Patches/Linux
index f30d8d85..c3f6f963 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit f30d8d85e75c2e0e2d983ace0971b954b7a759d7
+Subproject commit c3f6f9630e168a421f79c67b1a024c8914198f99
diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh
index 0098df82..2ee649b1 100644
--- a/Scripts/Common/Fix_CVE_Patchers.sh
+++ b/Scripts/Common/Fix_CVE_Patchers.sh
@@ -55,8 +55,8 @@ commentPatches android_kernel_google_bonito.sh "CVE-2020-0067";
 commentPatches android_kernel_google_coral.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324";
 commentPatches android_kernel_google_dragon.sh "0006-AndroidHardening-Kernel_Hardening/3.18/0026.patch" "0008-Graphene-Kernel_Hardening-ro" "CVE-2015-4167" "CVE-2017-15951" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214" "CVE-2021-39715/ANY/0001.patch";
 commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067";
-commentPatches android_kernel_google_gs101_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch";
-commentPatches android_kernel_google_gs201_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch";
+commentPatches android_kernel_google_gs101_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch" "CVE-2024-26733/5.10/0002.patch";
+commentPatches android_kernel_google_gs201_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch" "CVE-2024-26733/5.10/0002.patch";
 commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0048.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0049.patch" "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2017-14883" "CVE-2017-15951" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166" "CVE-2021-39715/ANY/0001.patch" "CVE-2022-42896/4.9";
 commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima" "CVE-2021-Misc2/ANY/0031.patch";
 commentPatches android_kernel_google_msm-4.9.sh "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324" "CVE-2021-45469";
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
index 6ccad59f..bb5c23c3 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
@@ -544,7 +544,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26635/^6.7/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26636/^6.7/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26651/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26675/^6.8/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26679/^6.8/0002.patch
diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh
index 756a6c4e..a1d5b445 100644
--- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh
+++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh
@@ -633,7 +633,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26635/^6.7/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26636/^6.7/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26651/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26675/^6.8/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26679/^6.8/0002.patch
diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh
index cfec5829..bb9bdcf6 100644
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh
@@ -130,7 +130,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26636/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26643/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26654/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26664/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26671/4.19/0002.patch
diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh
index 7b527910..faf32cbe 100644
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh
@@ -130,7 +130,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26636/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26643/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26654/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26664/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26671/4.19/0002.patch
diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh
index 8a44acf2..59a11c04 100644
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh
@@ -309,7 +309,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26644/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26651/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26654/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26664/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26665/5.10/0002.patch
@@ -330,7 +329,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26710/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26712/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26720/5.10/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26722/5.10/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26733/5.10/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26733/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26735/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26736/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26743/5.10/0002.patch
diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh
index f4f8eb25..9efbf615 100644
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh
@@ -307,7 +307,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26644/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26651/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26654/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26664/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26665/5.10/0002.patch
@@ -328,7 +327,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26710/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26712/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26720/5.10/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26722/5.10/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26733/5.10/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26733/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26735/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26736/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26743/5.10/0002.patch
diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh
index 4b347ee7..d63d3f2c 100644
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh
@@ -111,7 +111,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26635/^6.7/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26636/^6.7/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26651/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26675/^6.8/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26679/^6.8/0002.patch
diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh
index f6030cf5..6181259a 100644
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh
@@ -280,7 +280,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26643/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26651/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26654/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26664/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26671/4.19/0002.patch
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 01216270..ff62a314 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
@@ -149,7 +149,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26643/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26651/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26654/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26664/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26671/4.19/0002.patch
diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh
index 0c6411fe..3692fc3c 100644
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh
@@ -600,7 +600,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26635/^6.7/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26636/^6.7/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26651/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26675/^6.8/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26679/^6.8/0002.patch
diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh
index 26a2fa05..d313944f 100644
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh
@@ -128,7 +128,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26636/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26643/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26654/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26664/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26671/4.19/0002.patch
diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh
index 8cb560ca..3a20a625 100644
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh
@@ -95,7 +95,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26643/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/5.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26651/5.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26654/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/5.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26664/5.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26671/5.4/0005.patch
diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
index 95ff5038..dcb0a05e 100644
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
@@ -121,7 +121,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26635/^6.7/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26636/^6.7/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26651/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26675/^6.8/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26679/^6.8/0002.patch
diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh
index 3da12026..5b050837 100644
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh
@@ -130,7 +130,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26636/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26643/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26654/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26664/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26671/4.19/0002.patch
diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh
index 35fa25fa..d96c6b87 100644
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh
@@ -126,7 +126,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26635/^6.7/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26636/^6.7/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26645/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26651/^6.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26659/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26663/^6.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26675/^6.8/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26679/^6.8/0002.patch
diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh
index 41e0382c..9ed8fcb7 100644
--- a/Scripts/LineageOS-20.0/Patch.sh
+++ b/Scripts/LineageOS-20.0/Patch.sh
@@ -97,6 +97,7 @@ applyPatch "$DOS_PATCHES/android_build/0004-Selective_APEX.patch"; #Only enable
 sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
 sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_util.mk; #Set the minimum supported target SDK to Pie (GrapheneOS)
 #sed -i 's/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false/' core/product_config.mk; #broken by hardenDefconfig
+sed -i 's/2024-03-05/2024-04-05/' core/version_defaults.mk; #Bump Security String #T_asb_2024-04
 fi;
 
 if enterAndClear "build/soong"; then