Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-05-12 19:32:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Churn + Fixes

Browse source 
Fixes https://github.com/Divested-Mobile/DivestOS-Build/issues/338

Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-09-07 22:07:04 -04:00
parent c6299eef89
commit 1245d6fad3
No known key found for this signature in database
GPG key ID: E599F62ECBAEAF2E
7 changed files with 13 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Scripts/Common/Fix_CVE_Patchers.sh
View file

@ -96,7 +96,7 @@ commentPatches android_kernel_samsung_msm8930-common.sh "CVE-2017-11015/prima" "
commentPatches android_kernel_samsung_smdk4412.sh "CVE-2012-2127" "CVE-2016-8463/ANY/0001.patch";
commentPatches android_kernel_samsung_tuna.sh "CVE-2012-2127";
commentPatches android_kernel_samsung_universal8890.sh "0008-Graphene-Kernel_Hardening-ro" "CVE-2016-7917" "CVE-2018-1092" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166" "CVE-2022-42896/4.9";
commentPatches android_kernel_samsung_exynos9810.sh "CVE-2020-1749" "CVE-2019-ctnl-addr-leak" "CVE-2019-18282" "CVE-2019-11599" "CVE-2022-20566" "CVE-2019-16746" "CVE-2021-45469" "CVE-2020-0305" "CVE-2021-3506/4.19" "CVE-2024-26934/4.19";
commentPatches android_kernel_samsung_exynos9810.sh "CVE-2020-1749" "CVE-2019-ctnl-addr-leak" "CVE-2019-18282" "CVE-2019-11599" "CVE-2022-20566" "CVE-2019-16746" "CVE-2021-45469" "CVE-2020-0305" "CVE-2021-3506/4.19" "CVE-2024-26934/4.19" "CVE-2024-26934" "CVE-2024-44944";
commentPatches android_kernel_samsung_universal9810.sh "CVE-2020-1749";
commentPatches android_kernel_sony_sdm660.sh "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch" "CVE-2019-19319" "CVE-2020-0305" "CVE-2020-8992" "CVE-2020-16166";
commentPatches android_kernel_sony_sdm845.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992";
@ -157,7 +157,7 @@ do
done
#4.14
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" "android_kernel_xiaomi_vayu.sh");
for script in "${fourDotFourteen[@]}"
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" "CVE-2024-35910";

1
Scripts/LineageOS-19.1/Patch.sh
View file

@ -128,6 +128,7 @@ sed -i -e '22,24d;' androidtest/Android.bp; #fix compile under A12
fi;
if enterAndClear "external/SecureCamera"; then
git revert --no-edit 36f2dd34e1d0c2b7d26153969cca56a7ff665329;
sed -i '/LOCAL_MODULE/s/Camera/SecureCamera/' Android.mk; #Change module name
sed -i '11iLOCAL_OVERRIDES_PACKAGES := Camera Camera2 LegacyCamera Snap OpenCamera' Android.mk; #Replace the others
fi;

4
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_samsung_exynos9810.sh
View file

@ -912,7 +912,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26880/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26889/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26894/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26901/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26934/4.14/0009.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26934/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26956/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26961/^6.7/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26965/4.14/0009.patch
@ -1064,7 +1064,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43884/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43890/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43914/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44939/^6.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44944/4.19/0002.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44944/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44946/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44947/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44987/4.19/0002.patch

12
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh
View file

@ -55,7 +55,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16921/^4.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18786/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19252/4.19/0002.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19252/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19602/^5.4/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.2/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11146/ANY/0001.patch
@ -72,7 +72,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/4.19/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/4.19/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35085/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46912/^5.12/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/4.19/0002.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46958/^5.12/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46982/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46998/4.19/0002.patch
@ -126,7 +126,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-45863/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-46343/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-46838/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-47233/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51043/4.19/0002.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51043/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52429/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52435/4.19/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52436/4.14/0009.patch
@ -143,7 +143,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52475/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52477/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52478/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52486/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52486/^6.7/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52486/^6.7/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52504/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52507/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52510/4.14/0002.patch
@ -327,7 +327,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-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-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-35922/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35925/4.14/0008.patch
@ -386,7 +386,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38599/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38601/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38612/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38613/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38618/4.14/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38618/4.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38619/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38621/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38627/4.14/0009.patch

4
Scripts/LineageOS-20.0/Functions.sh
View file

@ -53,6 +53,8 @@ buildAll() {
#frontloaded for testing
buildDevice bluejay avb;
buildDevice taimen avb;
buildDevice fajita avb;
buildDevice flame avb;
#SD820
buildDevice h830;
buildDevice h850;
@ -85,7 +87,6 @@ buildAll() {
buildDevice kirin;
buildDevice mermaid;
#SD845
buildDevice fajita avb;
buildDevice enchilada avb;
buildDevice aura avb;
buildDevice beryllium avb;
@ -107,7 +108,6 @@ buildAll() {
buildDevice hotdog avb;
buildDevice hotdogb avb;
buildDevice coral avb;
buildDevice flame avb;
#buildDevice vayu avb; #XXX: no Wi-Fi
#SD730
buildDevice sunfish avb;

1
Scripts/LineageOS-20.0/Patch.sh
View file

@ -313,7 +313,6 @@ applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/0001-constify_JNINativeMethod
fi;
if enterAndClear "packages/apps/Settings"; then
applyPatch "$DOS_PATCHES/android_packages_apps_Settings/316891059-20.patch"; #x-asb_2024-05 Replace getCallingActivity() with getLaunchedFromPackage()
git revert --no-edit 41b4ed345a91da1dd46c00ee11a151c2b5ff4f43;
applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0004-Private_DNS.patch"; #More 'Private DNS' options (heavily based off of a CalyxOS patch)
applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0005-Automatic_Reboot.patch"; #Timeout for reboot (GrapheneOS)