diff --git a/Manifests/Manifest_LAOS-20.0.xml b/Manifests/Manifest_LAOS-20.0.xml index 83ceab4d..2814f73e 100644 --- a/Manifests/Manifest_LAOS-20.0.xml +++ b/Manifests/Manifest_LAOS-20.0.xml @@ -67,6 +67,13 @@ + + + + + + + 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 d51ff820..b5c8ba01 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 eab927953c..ba078db9e1 100644 +index fb73b642c2..55442553f6 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml -@@ -152,6 +152,21 @@ +@@ -156,6 +156,21 @@ Wi\u2011Fi data Enable usage of Wi\u2011Fi data diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index 3c36e937..b99b4a23 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -57,8 +57,8 @@ buildAll() { buildDevice cheeseburger verity; #superseded buildDevice dumpling verity; #superseded buildDevice mata verity; - buildDevice taimen avb; - buildDevice walleye avb; + buildDevice taimen avb; #superseded + buildDevice walleye avb; #superseded #SD845 buildDevice aura avb; #superseded? buildDevice beryllium avb; #superseded diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_wahoo.sh new file mode 100644 index 00000000..18ad8950 --- /dev/null +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_wahoo.sh @@ -0,0 +1,144 @@ +#!/bin/bash +cd "$DOS_BUILD_BASE""kernel/google/wahoo" +git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0014.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0015.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0016.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0017.patch +#git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0019.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0020.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0021.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0022.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0023.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7837/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/^4.6/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6187/^4.7/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8394/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10153/4.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9059/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9211/4.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9699/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11065/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14886/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17052/4.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18061/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18174/^4.10/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18204/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3575/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5902/4.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5906/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16597/4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^5.0/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374-alt/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374-alt/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374-alt/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374-alt/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0935/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4034/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.9/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33656/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0492/4.9/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0494/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1011/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/4.9/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1729/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1734/4.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1836/4.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1974/4.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1975/4.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2380/4.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2588/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/4.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2663/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2964/4.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/4.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3542/3.8-^6.0/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3565/^6.0/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3594/^6.0/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3629/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/4.9/0004.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-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 +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-30594/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-32981/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33740/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33744/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.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 +editKernelLocalversion "-dos.p140" +cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index 547a754b..c83e9298 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -19,7 +19,7 @@ umask 0022; #Last verified: 2022-10-15 patchAllKernels() { - startPatcher "kernel_fairphone_sm7225 kernel_fxtec_msm8998 kernel_google_msm-4.9 kernel_google_msm-4.14 kernel_google_redbull kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_oneplus_sm8250 kernel_oneplus_sm8350 kernel_razer_sdm845 kernel_xiaomi_sdm845"; + startPatcher "kernel_fairphone_sm7225 kernel_fxtec_msm8998 kernel_google_msm-4.9 kernel_google_msm-4.14 kernel_google_redbull kernel_google_wahoo kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_oneplus_sm8250 kernel_oneplus_sm8350 kernel_razer_sdm845 kernel_xiaomi_sdm845"; } export -f patchAllKernels; @@ -51,6 +51,8 @@ buildAll() { #SD835 buildDevice cheeseburger verity; buildDevice dumpling verity; + buildDevice taimen avb; + buildDevice walleye avb; #SD845 buildDevice aura avb; buildDevice beryllium avb; diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index 00e6b03b..94cf5963 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -414,6 +414,10 @@ if enterAndClear "device/google/redbull"; then awk -i inplace '!/sctp/' BoardConfig-common.mk modules.load; #fix compile after hardenDefconfig fi; +if enterAndClear "kernel/google/wahoo"; then +sed -i 's/asm(SET_PSTATE_UAO(1));/asm(SET_PSTATE_UAO(1)); return 0;/' arch/arm64/mm/fault.c; #fix build with CONFIG_ARM64_UAO +fi; + if enterAndClear "device/oneplus/msm8998-common"; then #awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation sed -i '/PRODUCT_SYSTEM_VERITY_PARTITION/iPRODUCT_VENDOR_VERITY_PARTITION := /dev/block/bootdevice/by-name/vendor' common.mk; #Support verity on /vendor too @@ -426,7 +430,7 @@ find "hardware/qcom/gps" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 find "device" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"'; find "vendor" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"'; find "device" -type d -name "overlay" -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationFWB "{}"'; -if [ "$DOS_DEBLOBBER_REMOVE_IMS" = "false" ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"'; fi; +#if [ "$DOS_DEBLOBBER_REMOVE_IMS" = "false" ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"'; fi; find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableDexPreOpt "{}"'; find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenUserdata "{}"'; find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenDefconfig "{}"'; diff --git a/Scripts/WebView_Compress_Repo.sh b/Scripts/WebView_Compress_Repo.sh index 6ed86b35..13cc9795 100644 --- a/Scripts/WebView_Compress_Repo.sh +++ b/Scripts/WebView_Compress_Repo.sh @@ -1 +1 @@ -tar "-I zstd -3 -T24 --long=29" -cf repo.tar.zst repo/ +tar "-I zstdmt -3 -T32 --long=29" -cf repo.tar.zst repo/ diff --git a/Scripts/WebView_Update_Repo.sh b/Scripts/WebView_Update_Repo.sh index cabbd0c9..7fe2ad57 100644 --- a/Scripts/WebView_Update_Repo.sh +++ b/Scripts/WebView_Update_Repo.sh @@ -16,7 +16,7 @@ umask 0022; set -uo pipefail; -export version="106.0.5249.126-1"; +export version="107.0.5304.91-1"; export PATH=$PATH:$HOME/Android/Sdk/build-tools/33.0.0; export webviewARM32="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm/webview.apk"; export webviewARM64="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm64/webview.apk";