From ebd992580c6789564883a6f862c8acbc4826f96b Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 5 Feb 2021 16:43:01 -0500 Subject: [PATCH] Update cherrypicks --- Scripts/LineageOS-14.1/Patch.sh | 3 --- Scripts/LineageOS-15.1/Functions.sh | 1 + Scripts/LineageOS-15.1/Patch.sh | 3 --- Scripts/LineageOS-16.0/Functions.sh | 1 + Scripts/LineageOS-16.0/Patch.sh | 3 --- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 4 +--- Scripts/LineageOS-17.1/Functions.sh | 1 + Scripts/LineageOS-17.1/Patch.sh | 4 +--- 8 files changed, 5 insertions(+), 15 deletions(-) diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 340cb552..0a006afc 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -76,9 +76,6 @@ enterAndClear "device/qcom/sepolicy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/248649.patch"; #msm_irqbalance: Allow read for stats and interrupts patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH -enterAndClear "external/chromium-webview"; -git fetch "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/71/302271/2 && git checkout FETCH_HEAD; #update webview - enterAndClear "external/sqlite"; patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (CopperheadOS-13.0) diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 3c95f32c..9c436caa 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -117,6 +117,7 @@ patchWorkspace() { source build/envsetup.sh; repopick -it tzdb2020f_O; + repopick -it tzdb2021a_O; repopick -it O_asb_2021-02; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index e69d64f1..0a5cc286 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -78,9 +78,6 @@ git revert --no-edit c9b0d95630b82cd0ad1a0fc633c6d59c2cb8aad7 37422f7df389f3ae5a enterAndClear "device/qcom/sepolicy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH -enterAndClear "external/chromium-webview"; -git fetch "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/71/302271/2 && git checkout FETCH_HEAD; #update webview - enterAndClear "external/okhttp"; git fetch "https://github.com/LineageOS/android_external_okhttp" refs/changes/47/303347/1 && git cherry-pick FETCH_HEAD; #O_asb_2021-02 diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index ccd14e37..8213e686 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -137,6 +137,7 @@ patchWorkspace() { repopick -i 232948; #wahoo: liblight: close fd #repopick -it pie-firewall; repopick -it tzdb2020f_P; + repopick -it tzdb2021a_P; repopick -it P_asb_2021-02; source "$DOS_SCRIPTS/Patch.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 29210fbf..6da478e3 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -77,9 +77,6 @@ enterAndClear "device/qcom/sepolicy-legacy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices -enterAndClear "external/chromium-webview"; -git fetch "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/71/302271/2 && git checkout FETCH_HEAD; #update webview - enterAndClear "external/okhttp"; git fetch "https://github.com/LineageOS/android_external_okhttp" refs/changes/26/303326/1 && git cherry-pick FETCH_HEAD; #P_asb_2021-02 diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh index 1afc6386..5c368aa5 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -98,7 +98,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.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-27825/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.4/0007.patch -editKernelLocalversion "-dos.p100" +editKernelLocalversion "-dos.p98" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 6803ccdd..ccefb134 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -134,6 +134,7 @@ patchWorkspace() { repopick -i 271361; #releasetools: python3 fix, 287339 (alt) #repopick -it ten-firewall; repopick -it tzdb2020f_Q; + repopick -it tzdb2021a_Q; repopick -it Q_asb_2021-02; source "$DOS_SCRIPTS/Patch.sh"; diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 9346db60..f06473de 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -75,9 +75,6 @@ enterAndClear "device/qcom/sepolicy-legacy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices -enterAndClear "external/chromium-webview"; -git fetch "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/71/302271/2 && git checkout FETCH_HEAD; #update webview - enterAndClear "external/libavc"; git fetch "https://github.com/LineageOS/android_external_libavc" refs/changes/75/303275/1 && git cherry-pick FETCH_HEAD; #Q_asb_2021-02 @@ -198,6 +195,7 @@ patch -p1 < "$DOS_PATCHES_COMMON/android_packages_inputmethods_LatinIME/0001-Voi enterAndClear "system/core"; if [ "$DOS_HOSTS_BLOCKING" = true ]; then cat "$DOS_HOSTS_FILE" >> rootdir/etc/hosts; fi; #Merge in our HOSTS file +git revert --no-edit 3032c7aa5ce90c0ae9c08fe271052c6e0304a1e7 01266f589e6deaef30b782531ae14435cdd2f18e; #insanity git revert --no-edit bd4142eab8b3cead0c25a2e660b4b048d1315d3c; #Always update recovery patch -p1 < "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts with nodev/noexec/nosuid + misc sysfs changes (GrapheneOS) if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES/android_system_core/0002-HM-Increase_vm_mmc.patch"; fi; #(GrapheneOS)