Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixup + Churn

Browse Source 
run tested: flame, fajita

Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-08-17 21:34:17 -04:00
parent 22c1d450ce
commit f7bb9e0c06
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
8 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Patches/LineageOS-20.0/android_packages_apps_Settings/0004-Private_DNS.patch
View File

@ -89,7 +89,7 @@ index 12e29e693b..b264bef20a 100644
android:id="@+id/private_dns_mode_opportunistic" android:id="@+id/private_dns_mode_opportunistic"
layout="@layout/preference_widget_dialog_radiobutton"/> layout="@layout/preference_widget_dialog_radiobutton"/>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index d9ca157167..73c78cc87e 100644 index 698965172f..444f2f9131 100644
--- a/res/values/cm_strings.xml --- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml
@@ -15,6 +15,52 @@ @@ -15,6 +15,52 @@

2
Scripts/Common/Fix_CVE_Patchers.sh
View File

@ -160,7 +160,7 @@ done
declare -a fourDotFourteen=("${fourDotNine[@]}" "android_kernel_google_msm-4.14.sh" "android_kernel_xiaomi_sm6150.sh" "android_kernel_oneplus_sm8150.sh" "android_kernel_xiaomi_sm8150.sh"); declare -a fourDotFourteen=("${fourDotNine[@]}" "android_kernel_google_msm-4.14.sh" "android_kernel_xiaomi_sm6150.sh" "android_kernel_oneplus_sm8150.sh" "android_kernel_xiaomi_sm8150.sh");
for script in "${fourDotFourteen[@]}" for script in "${fourDotFourteen[@]}"
do do
commentPatches $script "CVE-2019-19252/4.19" "CVE-2021-46921/4.19" "CVE-2023-51043/4.19" "CVE-2024-38618" "CVE-2023-52486/^6.7"; commentPatches $script "CVE-2019-19252/4.19" "CVE-2021-46921/4.19" "CVE-2023-51043/4.19" "CVE-2024-38618" "CVE-2023-52486/^6.7" "CVE-2024-35910";
done done
echo -e "\e[0;32m[SCRIPT COMPLETE] Fixed CVE patchers\e[0m"; echo -e "\e[0;32m[SCRIPT COMPLETE] Fixed CVE patchers\e[0m";

2
Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
View File

@ -897,7 +897,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35877/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35879/^6.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35879/^6.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35886/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35886/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35893/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35893/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35910/4.14/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35910/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35915/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35915/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35922/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35922/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35925/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35925/4.14/0008.patch

2
Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh
View File

@ -979,7 +979,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35877/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35879/^6.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35879/^6.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35886/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35886/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35893/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35893/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35910/4.14/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35910/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35915/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35915/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35922/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35922/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35925/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35925/4.14/0008.patch

2
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh
View File

@ -282,7 +282,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35877/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35879/^6.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35879/^6.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35886/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35886/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35893/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35893/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35910/4.14/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35910/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35915/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35915/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35922/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35922/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35925/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35925/4.14/0008.patch

2
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh
View File

@ -945,7 +945,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35877/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35879/^6.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35879/^6.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35886/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35886/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35893/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35893/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35910/4.14/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35910/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35915/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35915/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35922/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35922/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35925/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35925/4.14/0008.patch

2
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
View File

@ -317,7 +317,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35877/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35879/^6.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35879/^6.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35886/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35886/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35893/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35893/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35910/4.14/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35910/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35915/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35915/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35922/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35922/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35925/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35925/4.14/0008.patch

3
Scripts/LineageOS-20.0/Functions.sh
View File

@ -162,8 +162,7 @@ patchWorkspaceReal() {
verifyAllPlatformTags; verifyAllPlatformTags;
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
source build/envsetup.sh; #source build/envsetup.sh;
repopick -it T_asb_2024-08;
sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";