Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update cherry picks

Browse Source
This commit is contained in:
Tad 2020-04-28 19:23:49 -04:00
parent 9fcb91793e
commit c1e0503390
7 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PrebuiltApps

@ -1 +1 @@
Subproject commit a4383f52794d12e4e23f98916e45f13a591def50 Subproject commit 3e85aa75a0285293c670a75796fcf470b558c691

2
Scripts/LineageOS-11.0/Patch.sh
View File

@ -118,7 +118,7 @@ echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our cus
enter "vendor/divested"; enter "vendor/divested";
if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += GmsCore GsfProxy FakeStore" >> packages.mk; fi; if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += GmsCore GsfProxy FakeStore" >> packages.mk; fi;
if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += $DOS_HOSTS_BLOCKING_APP" >> packages.mk; fi; if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += $DOS_HOSTS_BLOCKING_APP" >> packages.mk; fi;
sed -i 's/FairEmail/K9Mail/' packages.mk; #FairEmail requires 5.0+ awk -i inplace '!/FairEmail/' packages.mk; #FairEmail requires 5.0+
# #
#END OF ROM CHANGES #END OF ROM CHANGES
# #

3
Scripts/LineageOS-14.1/Functions.sh
View File

@ -119,9 +119,6 @@ patchWorkspace() {
repopick -it n_asb_09-2018-qcom; repopick -it n_asb_09-2018-qcom;
repopick -it ibss-mode-nougat; repopick -it ibss-mode-nougat;
repopick -it n-netd; repopick -it n-netd;
repopick -i 268803 268804; #sqlite vulns
repopick -it n-asb-2020-04;
repopick 271078; #update webview
export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails

4
Scripts/LineageOS-14.1/Patch.sh
View File

@ -75,10 +75,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/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 patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH
enterAndClear "external/ppp";
git fetch "https://github.com/LineageOS/android_external_ppp" refs/changes/64/270364/1 && git cherry-pick FETCH_HEAD; #CVE-2020-8597_cm-14.1
git fetch "https://github.com/LineageOS/android_external_ppp" refs/changes/65/270365/1 && git cherry-pick FETCH_HEAD;
enterAndClear "external/sqlite"; enterAndClear "external/sqlite";
patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (CopperheadOS-13.0) patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (CopperheadOS-13.0)

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

@ -104,8 +104,7 @@ export -f buildAll;
patchWorkspace() { patchWorkspace() {
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
source build/envsetup.sh; #source build/envsetup.sh;
repopick 271078; #update webview
export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails

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

@ -84,7 +84,6 @@ buildAll() {
#SD835 #SD835
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 mata verity;
buildDevice taimen avb; buildDevice taimen avb;
buildDevice walleye avb; buildDevice walleye avb;
#SD845 #SD845
@ -117,6 +116,7 @@ buildAll() {
buildDevice sailfish verity; buildDevice sailfish verity;
#SD835 #SD835
buildDevice cheryl; buildDevice cheryl;
buildDevice mata verity;
fi; fi;
} }
export -f buildAll; export -f buildAll;
@ -124,8 +124,7 @@ export -f buildAll;
patchWorkspace() { patchWorkspace() {
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
source build/envsetup.sh; #source build/envsetup.sh;
repopick 271078; #update webview
source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS/Defaults.sh"; source "$DOS_SCRIPTS/Defaults.sh";

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

@ -87,7 +87,8 @@ patchWorkspace() {
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
source build/envsetup.sh; source build/envsetup.sh;
repopick 271078; #update webview repopick 274320; #CarrierDefaultapp: Fix WebView vulnerability by disallowing file access
repopick 274321; #MediaProvider: Less spam
source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS/Defaults.sh"; source "$DOS_SCRIPTS/Defaults.sh";