Fixup + Churn

Signed-off-by: Tavi <tavi@divested.dev>
2024-10-01 01:35:54 -04:00 · 2024-08-01 00:28:48 -04:00 · 2024-08-01 00:28:48 -04:00 · 2bb4d94f88
commit 2bb4d94f88
parent 9c4c46478d
12 changed files with 3 additions and 12 deletions
--- a/Patches/LineageOS-20.0/android_packages_apps_Updater/0002-Tor_Support.patch
+++ b/Patches/LineageOS-20.0/android_packages_apps_Updater/0002-Tor_Support.patch
@ -376,7 +376,7 @@ index 774d1be..8a01e3d 100644
         android:id="@+id/preferences_auto_delete_updates"
         android:layout_width="match_parent"
 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
-index 0303481..46bb291 100644
+index 4427949..5252a8d 100644
 --- a/app/src/main/res/values/strings.xml
 +++ b/app/src/main/res/values/strings.xml
@@ -68,6 +68,7 @@
--- a/Patches/LineageOS-20.0/android_packages_apps_Updater/0003-Server_Choices.patch
+++ b/Patches/LineageOS-20.0/android_packages_apps_Updater/0003-Server_Choices.patch
@ -176,7 +176,7 @@ index cc90a3f..2940af9 100644
 +    </string-array>
 </resources>
 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
-index 46bb291..d1e634f 100644
+index 5252a8d..cf05cd9 100644
 --- a/app/src/main/res/values/strings.xml
 +++ b/app/src/main/res/values/strings.xml
@@ -68,6 +68,11 @@
--- a/Patches/Linux
+++ b/Patches/Linux
@ -1 +1 @@
-Subproject commit d11b50e0b28245236dc2bf3bad59f06a89c0ae69
+Subproject commit d7a32c6289f3adc0d0a6c11a32244402e734377c
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh
@ -383,7 +383,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41017/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41023/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41035/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41041/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41044/4.19/0002.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh
@ -383,7 +383,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41017/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41023/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41035/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41041/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41044/4.19/0002.patch
--- 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
@ -798,7 +798,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41017/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41022/5.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41023/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41040/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41041/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41044/5.10/0003.patch
--- 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
@ -796,7 +796,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41017/5.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41022/5.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41023/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41040/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41041/5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41044/5.10/0003.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh
@ -582,7 +582,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41017/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41023/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41035/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41041/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41044/4.19/0002.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh
@ -434,7 +434,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41017/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41023/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41035/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41041/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41044/4.19/0002.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh
@ -381,7 +381,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41017/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41023/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41035/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41041/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41044/4.19/0002.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh
@ -444,7 +444,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/5.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41017/5.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41022/5.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41023/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41035/5.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41041/5.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41044/5.4/0005.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh
@ -266,7 +266,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41017/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41023/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41035/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41041/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41044/4.19/0002.patch