Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-02-13 05:11:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
Tad 2020-11-09 00:29:29 -05:00
parent dfe516fc3d
commit e7a65ff912
9 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Scripts/Common/Fix_CVE_Patchers.sh
View File

@ -38,7 +38,8 @@ commentPatches android_kernel_essential_msm8998.sh "0008-Graphene-Kernel_Hardeni
commentPatches android_kernel_fairphone_msm8974.sh "CVE-2018-20169"; commentPatches android_kernel_fairphone_msm8974.sh "CVE-2018-20169";
commentPatches android_kernel_fxtec_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-11599" "CVE-2019-16746" "CVE-2019-18282" "CVE-2019-19319" "CVE-2019-ctnl-addr-leak" "CVE-2020-0429" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166"; commentPatches android_kernel_fxtec_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-11599" "CVE-2019-16746" "CVE-2019-18282" "CVE-2019-19319" "CVE-2019-ctnl-addr-leak" "CVE-2020-0429" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166";
commentPatches android_kernel_google_bonito.sh "CVE-2020-0067"; commentPatches android_kernel_google_bonito.sh "CVE-2020-0067";
commentPatches android_kernel_google_dragon.sh "CVE-2015-4167/^3.19.1/0001.patch" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214"; commentPatches android_kernel_google_coral.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992";
commentPatches android_kernel_google_dragon.sh "CVE-2015-4167/^3.19.1/0001.patch" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214";
commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067"; commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067";
commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-Copperhead-Kernel_Hardening/3.18/0048.patch" "0006-Copperhead-Kernel_Hardening/3.18/0049.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166"; commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-Copperhead-Kernel_Hardening/3.18/0048.patch" "0006-Copperhead-Kernel_Hardening/3.18/0049.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166";
commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima"; commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima";

2
Scripts/Common/Functions.sh
View File

@ -92,7 +92,7 @@ scanForMalware() {
echo -e "\e[0;31m----------------------------------------------------------------\e[0m"; echo -e "\e[0;31m----------------------------------------------------------------\e[0m";
echo -e "\e[0;31mWARNING: MALWARE WAS FOUND! PLEASE INVESTIGATE!\e[0m"; echo -e "\e[0;31mWARNING: MALWARE WAS FOUND! PLEASE INVESTIGATE!\e[0m";
echo -e "\e[0;31m----------------------------------------------------------------\e[0m"; echo -e "\e[0;31m----------------------------------------------------------------\e[0m";
echo -e "\e[0;33mFalse positivies such as the following are probably OK\e[0m"; echo -e "\e[0;33mFalse positives such as the following are probably OK\e[0m";
echo -e "\e[0;33mPUAs: Ewind, Mobidash\e[0m"; echo -e "\e[0;33mPUAs: Ewind, Mobidash\e[0m";
echo -e "\e[0;31m----------------------------------------------------------------\e[0m"; echo -e "\e[0;31m----------------------------------------------------------------\e[0m";
sleep 60; sleep 60;

2
Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh
View File

@ -83,7 +83,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8966/3.15-^4.4/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9016/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9016/3.18/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/3.18/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0758/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0758/3.18/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1237/3.18/0002.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1237/3.18/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2053/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2053/3.18/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2069/3.18/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2069/3.18/0013.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2069/3.18/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2069/3.18/0014.patch

2
Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh
View File

@ -83,7 +83,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8966/3.15-^4.4/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9016/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9016/3.18/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/3.18/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0758/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0758/3.18/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1237/3.18/0002.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1237/3.18/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2053/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2053/3.18/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2069/3.18/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2069/3.18/0013.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2069/3.18/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2069/3.18/0014.patch

4
Scripts/LineageOS-15.1/Functions.sh
View File

@ -60,14 +60,12 @@ buildAll() {
buildDevice angler verity; buildDevice angler verity;
buildDevice Z00T; #broken - needs vendor patching buildDevice Z00T; #broken - needs vendor patching
buildDevice axon7; #broken - needs vendor patching buildDevice axon7; #broken - needs vendor patching
buildDevice us996;
buildDevice us997; buildDevice us997;
buildDevice flounder verity; buildDevice flounder verity;
buildDevice dragon verity; buildDevice dragon verity;
#The following are all superseded, and should only be enabled if the newer version is broken (not building/booting/etc.) #The following are all superseded, and should only be enabled if the newer version is broken (not building/booting/etc.)
buildDevice flo; buildDevice flo;
buildDevice h850; #broken
buildDevice fugu; buildDevice fugu;
if [ "$DOS_BUILDALL_SUPERSEDED" = true ]; then if [ "$DOS_BUILDALL_SUPERSEDED" = true ]; then
buildDevice mako; buildDevice mako;
@ -87,6 +85,8 @@ buildAll() {
buildDevice ether; buildDevice ether;
buildDevice kipper; buildDevice kipper;
buildDevice oneplus3; buildDevice oneplus3;
buildDevice us996;
buildDevice h850; #broken
buildDevice griffin; buildDevice griffin;
buildDevice marlin verity; buildDevice marlin verity;
buildDevice sailfish verity; buildDevice sailfish verity;

2
Scripts/LineageOS-16.0/Functions.sh
View File

@ -72,7 +72,7 @@ buildAll() {
buildDevice cheeseburger verity; #needs manual patching - vendor common makefile buildDevice cheeseburger verity; #needs manual patching - vendor common makefile
buildDevice dumpling verity; buildDevice dumpling verity;
buildDevice yellowstone; buildDevice yellowstone; #broken sepolicy?
if [ "$DOS_BUILDALL_SUPERSEDED" = true ]; then if [ "$DOS_BUILDALL_SUPERSEDED" = true ]; then
#SD410 #SD410
buildDevice crackling; buildDevice crackling;

12
Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh
View File

@ -70,10 +70,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19061/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/4.14/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/4.14/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/^5.3.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/^5.3.11/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.14/0009.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.14/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.14/0010.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.14/0010.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.14/0011.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.14/0011.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.14/0012.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.14/0012.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19448/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19448/4.14/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19462/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19462/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19602/^5.4.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19602/^5.4.2/0001.patch
@ -90,11 +90,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0012.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0013.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0014.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0015.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.14/0005.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.14/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.14/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.14/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3693/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3694/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3694/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8992/4.14/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8992/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/4.14/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10711/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10711/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10732/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10732/4.14/0005.patch

16
Scripts/LineageOS-17.1/Functions.sh
View File

@ -80,7 +80,7 @@ buildAll() {
#SD810 #SD810
buildDevice oneplus2; buildDevice oneplus2;
#SD820 #SD820
buildDevice h850; #needs manual patching + more - rm vendor/lge/v20-common/Android.bp buildDevice h850;
buildDevice us996; buildDevice us996;
buildDevice griffin; buildDevice griffin;
buildDevice oneplus3 verity; buildDevice oneplus3 verity;
@ -90,7 +90,7 @@ buildAll() {
buildDevice sailfish verity; buildDevice sailfish verity;
#SD835 #SD835
buildDevice cheryl; buildDevice cheryl;
buildDevice cheeseburger verity; #needs manual patching - vendor common makefile buildDevice cheeseburger verity; #needs manual patching - vendor common makefile + not booting
buildDevice dumpling verity; buildDevice dumpling verity;
buildDevice mata verity; buildDevice mata verity;
buildDevice taimen avb; buildDevice taimen avb;
@ -115,7 +115,7 @@ buildAll() {
#Exynos #Exynos
buildDevice starlte; buildDevice starlte;
#Tegra #Tegra
buildDevice yellowstone; buildDevice yellowstone; #broken
} }
export -f buildAll; export -f buildAll;
@ -148,9 +148,15 @@ enableDexPreOpt() {
cd "$DOS_BUILD_BASE$1"; cd "$DOS_BUILD_BASE$1";
if [ -f BoardConfig.mk ]; then if [ -f BoardConfig.mk ]; then
echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT := true" >> BoardConfig.mk;
echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false" >> BoardConfig.mk;
echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk; echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk;
echo "Enabled full dexpreopt for $1"; #m8: /system partition too small
if [ "$1" != "device/htc/m8" ]; then
echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false" >> BoardConfig.mk;
echo "Enabled full dexpreopt for $1";
else
echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk;
echo "Enabled core dexpreopt for $1";
fi;
fi; fi;
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
} }

3
Scripts/LineageOS-17.1/Patch.sh
View File

@ -112,6 +112,9 @@ enterAndClear "frameworks/opt/net/ims";
patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"; #Fix calling when IMS is removed patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"; #Fix calling when IMS is removed
fi fi
enterAndClear "hardware/qcom-caf/msm8996/audio";
patch -p1 < "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-8996.patch"; #audio_extn: Fix unused parameter warning in utils.c
enterAndClear "hardware/qcom-caf/msm8998/audio"; enterAndClear "hardware/qcom-caf/msm8998/audio";
patch -p1 < "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-8998.patch"; #audio_extn: Fix unused parameter warning in utils.c patch -p1 < "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-8998.patch"; #audio_extn: Fix unused parameter warning in utils.c