From bd4cb22db1e6942078c6c1c41e68f62ff1208883 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 5 Jan 2021 12:22:42 -0500 Subject: [PATCH] ASB cherry picks --- Misc/aosp-cves/gen_cve_list-qc.sh | 2 ++ Misc/aosp-cves/gen_cve_list.sh | 4 ++++ Patches/Linux | 2 +- Scripts/LineageOS-16.0/Functions.sh | 1 + Scripts/LineageOS-16.0/Patch.sh | 3 +++ Scripts/LineageOS-17.1/Functions.sh | 1 + Scripts/LineageOS-17.1/Patch.sh | 6 ++++++ 7 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Misc/aosp-cves/gen_cve_list-qc.sh b/Misc/aosp-cves/gen_cve_list-qc.sh index 02b8827e..c509c2ad 100644 --- a/Misc/aosp-cves/gen_cve_list-qc.sh +++ b/Misc/aosp-cves/gen_cve_list-qc.sh @@ -1,3 +1,5 @@ +java -jar $DOS_BINARY_PATCHER scraper "https://www.qualcomm.com/company/product-security/bulletins/january-2021-bulletin" >> cve_list-qc.txt + java -jar $DOS_BINARY_PATCHER scraper "https://www.qualcomm.com/company/product-security/bulletins/december-2020-security-bulletin" >> cve_list-qc.txt java -jar $DOS_BINARY_PATCHER scraper "https://www.qualcomm.com/company/product-security/bulletins/november-2020-security-bulletin" >> cve_list-qc.txt java -jar $DOS_BINARY_PATCHER scraper "https://www.qualcomm.com/company/product-security/bulletins/october-2020-security-bulletin" >> cve_list-qc.txt diff --git a/Misc/aosp-cves/gen_cve_list.sh b/Misc/aosp-cves/gen_cve_list.sh index ddf0f524..f0417067 100644 --- a/Misc/aosp-cves/gen_cve_list.sh +++ b/Misc/aosp-cves/gen_cve_list.sh @@ -1,3 +1,7 @@ +java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/2021-01-01" >> cve_list.txt + +java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/pixel/2021-01-01" >> cve_list.txt + java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/2020-12-01" >> cve_list.txt java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/2020-11-01" >> cve_list.txt java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/2020-10-01" >> cve_list.txt diff --git a/Patches/Linux b/Patches/Linux index 4e7eb14b..7f7cae38 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 4e7eb14bbbb3db82360feac65fb932014866d7c7 +Subproject commit 7f7cae382405337ff94a887c4a0ce5a1e42c082f diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index bf8987a2..de694b5d 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -133,6 +133,7 @@ patchWorkspace() { repopick -i 232948; #wahoo: liblight: close fd #repopick -it pie-firewall; #repopick -it CVE-2019-2306_P; + repopick -it P_asb_2021-01; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 012b7bc3..43140bd7 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -109,6 +109,9 @@ sed -i '301i\ if(packageList.length() > 0) { packageList += ","; } packag if [ "$DOS_MICROG_INCLUDED" != "FULL" ]; then rm -rf packages/CompanionDeviceManager; fi; #Used to support Android Wear (which hard depends on GMS) rm -rf packages/PrintRecommendationService; #Creates popups to install proprietary print apps +enterAndClear "frameworks/minikin"; +git pull "https://github.com/LineageOS/android_frameworks_minikin" refs/changes/28/300228/1; #P_asb_2021-01 + if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then enterAndClear "frameworks/opt/net/ims"; patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"; #Fix calling when IMS is removed diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index da033dde..dc792951 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -129,6 +129,7 @@ patchWorkspace() { repopick -i 271361; #releasetools: python3 fix, 287339 (alt) #repopick -it ten-firewall; #repopick -it CVE-2019-2306; + repopick -it Q_asb_2021-01; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 82282eab..4b024083 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -108,6 +108,9 @@ if [ "$DOS_MICROG_INCLUDED" != "FULL" ]; then rm -rf packages/CompanionDeviceMan rm -rf packages/OsuLogin; #Automatic Wi-Fi connection non-sense rm -rf packages/PrintRecommendationService; #Creates popups to install proprietary print apps +enterAndClear "frameworks/minikin"; +git pull "https://github.com/LineageOS/android_frameworks_minikin" refs/changes/81/300181/1; #Q_asb_2021-01 + if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then enterAndClear "frameworks/opt/net/ims"; patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"; #Fix calling when IMS is removed @@ -176,6 +179,9 @@ if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES/android_sys enterAndClear "system/extras"; patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS) +enterAndClear "system/security"; +git pull "https://github.com/LineageOS/android_system_security" refs/changes/86/300186/1; #Q_asb_2021-01 + enterAndClear "system/sepolicy"; patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/29.0";