Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-25 07:29:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Small updates

Browse Source 
- Partial revert of 5106063c
- Cherry picks
- CVE patcher fixes
This commit is contained in:
Tad 2020-06-06 19:44:42 -04:00
parent 5797ea8fc4
commit 850c4ad88c
15 changed files with 7 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Manifests/Manifest_LAOS-14.1.xml
View File

@ -33,7 +33,6 @@
<remove-project name="LineageOS/android_packages_screensavers_Basic" />
<remove-project name="LineageOS/android_packages_screensavers_PhotoTable" />
<remove-project name="LineageOS/android_packages_screensavers_WebView" />
<!--<remove-project name="LineageOS/android_packages_services_Car" />-->
<remove-project name="LineageOS/android_packages_services_WeatherService" />
<remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_aarch64_aarch64-linux-android-4.9" />
<remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_arm_arm-linux-androideabi-4.9" />

16
Manifests/Manifest_LAOS-15.1.xml
View File

@ -2,7 +2,6 @@
<manifest>
<!-- START OF UNNECESSARY REPO REMOVAL -->
<remove-project name="device/generic/car" />
<remove-project name="device/generic/goldfish" />
<remove-project name="device/generic/goldfish-opengl" />
<remove-project name="device/generic/mini-emulator-arm64" />
@ -50,21 +49,6 @@
<remove-project name="LineageOS/slackbot" />
<remove-project name="LineageOS/www" />
<remove-project name="platform/external/replicaisland" />
<remove-project name="platform/packages/apps/Car/Dialer" />
<remove-project name="platform/packages/apps/Car/Hvac" />
<remove-project name="platform/packages/apps/Car/LatinIME" />
<remove-project name="platform/packages/apps/Car/LensPicker" />
<!--<remove-project name="platform/packages/apps/Car/libs" />-->
<remove-project name="platform/packages/apps/Car/LocalMediaPlayer" />
<remove-project name="platform/packages/apps/Car/Media" />
<remove-project name="platform/packages/apps/Car/Messenger" />
<remove-project name="platform/packages/apps/Car/Overview" />
<remove-project name="platform/packages/apps/Car/Radio" />
<remove-project name="platform/packages/apps/Car/Settings" />
<remove-project name="platform/packages/apps/Car/Stream" />
<remove-project name="platform/packages/apps/Car/SystemUpdater" />
<remove-project name="platform/packages/apps/Car/UserManagement" />
<!--<remove-project name="platform/packages/services/Car" />-->
<remove-project name="platform/prebuilts/clang/host/darwin-x86" />
<remove-project name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" />
<remove-project name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" />

17
Manifests/Manifest_LAOS-16.0.xml
View File

@ -2,7 +2,6 @@
<manifest>
<!-- START OF UNNECESSARY REPO REMOVAL -->
<remove-project name="device/generic/car" />
<remove-project name="device/generic/goldfish-opengl" />
<remove-project name="device/generic/mini-emulator-arm64" />
<remove-project name="device/generic/mini-emulator-armv7-a-neon" />
@ -52,25 +51,9 @@
<remove-project name="platform/external/tcpdump" />
<remove-project name="platform/external/wayland" />
<remove-project name="platform/external/wayland-protocols" />
<!--<remove-project name="platform/frameworks/opt/car/services" />-->
<remove-project name="platform/frameworks/opt/car/setupwizard" />
<remove-project name="platform/hardware/qcom/neuralnetworks/hvxservice" />
<remove-project name="platform/hardware/qcom/sdm710/vr" />
<remove-project name="platform/packages/apps/Car/Dialer" />
<remove-project name="platform/packages/apps/Car/Hvac" />
<remove-project name="platform/packages/apps/Car/LatinIME" />
<remove-project name="platform/packages/apps/Car/Launcher" />
<remove-project name="platform/packages/apps/Car/LensPicker" />
<!--<remove-project name="platform/packages/apps/Car/libs" />-->
<remove-project name="platform/packages/apps/Car/LocalMediaPlayer" />
<remove-project name="platform/packages/apps/Car/Media" />
<remove-project name="platform/packages/apps/Car/Messenger" />
<remove-project name="platform/packages/apps/Car/Overview" />
<remove-project name="platform/packages/apps/Car/Radio" />
<remove-project name="platform/packages/apps/Car/Settings" />
<remove-project name="platform/packages/apps/Car/Stream" />
<remove-project name="platform/packages/apps/Car/SystemUpdater" />
<!--<remove-project name="platform/packages/services/Car" />-->
<remove-project name="platform/prebuilts/clang/host/darwin-x86" />
<remove-project name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" />
<remove-project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" />

24
Manifests/Manifest_LAOS-17.1.xml
View File

@ -2,7 +2,6 @@
<manifest>
<!-- START OF UNNECESSARY REPO REMOVAL -->
<remove-project name="device/generic/car" />
<remove-project name="device/generic/goldfish-opengl" />
<remove-project name="device/generic/mini-emulator-arm64" />
<remove-project name="device/generic/mini-emulator-armv7-a-neon" />
@ -24,7 +23,6 @@
<remove-project name="LineageOS/android_external_vim" />
<remove-project name="LineageOS/android_hardware_qcom_vr" />
<remove-project name="LineageOS/android_packages_apps_Jelly" />
<remove-project name="LineageOS/android_packages_apps_ManagedProvisioning" />
<remove-project name="LineageOS/android_packages_apps_Stk" />
<remove-project name="LineageOS/android_packages_apps_StorageManager" />
<remove-project name="LineageOS/android_packages_apps_Terminal" />
@ -51,32 +49,10 @@
<remove-project name="platform/external/virglrenderer" />
<remove-project name="platform/external/wayland" />
<remove-project name="platform/external/wayland-protocols" />
<remove-project name="platform/frameworks/opt/car/services" />
<remove-project name="platform/frameworks/opt/car/setupwizard" />
<remove-project name="platform/hardware/qcom/neuralnetworks/hvxservice" />
<remove-project name="platform/hardware/qcom/sdm845/vr" />
<remove-project name="platform/hardware/qcom/sm8150/vr" />
<remove-project name="platform/packages/apps/Car/Cluster" />
<remove-project name="platform/packages/apps/Car/Dialer" />
<remove-project name="platform/packages/apps/Car/externallibs" />
<remove-project name="platform/packages/apps/Car/Hvac" />
<remove-project name="platform/packages/apps/Car/LatinIME" />
<remove-project name="platform/packages/apps/Car/Launcher" />
<remove-project name="platform/packages/apps/Car/LensPicker" />
<remove-project name="platform/packages/apps/Car/libs" />
<remove-project name="platform/packages/apps/Car/LinkViewer" />
<remove-project name="platform/packages/apps/Car/LocalMediaPlayer" />
<remove-project name="platform/packages/apps/Car/Media" />
<remove-project name="platform/packages/apps/Car/Messenger" />
<remove-project name="platform/packages/apps/Car/Notification" />
<remove-project name="platform/packages/apps/Car/Overview" />
<remove-project name="platform/packages/apps/Car/Radio" />
<remove-project name="platform/packages/apps/Car/Settings" />
<remove-project name="platform/packages/apps/Car/Stream" />
<remove-project name="platform/packages/apps/Car/SystemUpdater" />
<remove-project name="platform/packages/apps/Car/tests" />
<remove-project name="platform/packages/apps/SampleLocationAttribution" />
<remove-project name="platform/packages/services/Car" />
<remove-project name="platform/prebuilts/clang/host/darwin-x86" />
<remove-project name="platform/prebuilts/fuchsia_sdk" />
<remove-project name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" />

1
Scripts/Common/Fix_CVE_Patchers.sh
View File

@ -40,6 +40,7 @@ commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067/ANY/0001.patch
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";
commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima/0001.patch" "CVE-2017-11015/prima/0002.patch";
commentPatches android_kernel_google_msm-4.9.sh "CVE-2020-0067/ANY/0001.patch";
commentPatches android_kernel_google_wahoo.sh "CVE-2019-14047/ANY/0002.patch";
commentPatches android_kernel_htc_flounder.sh "CVE-2018-9514/ANY/0001.patch";
commentPatches android_kernel_htc_msm8994.sh "CVE-2016-8394/ANY/0001.patch" "CVE-2017-13166/3.10/0001.patch";
commentPatches android_kernel_lge_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2019-14070/ANY/0006.patch";

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

@ -119,9 +119,6 @@ patchWorkspace() {
repopick -it n_asb_09-2018-qcom;
repopick -it ibss-mode-nougat;
repopick -it n-netd;
repopick -it tzdb2020a_N;
repopick -it n-asb-2020-05;
repopick -i 275225; #update webview
repopick -it n-asb-2020-06;
export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails

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

@ -220,7 +220,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14038/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14055/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/^5.1.8/0001.patch

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

@ -105,7 +105,7 @@ 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;
source build/envsetup.sh;
repopick -i 275225; #update webview
repopick -it O_asb_2020-06;
export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails

2
Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh
View File

@ -118,7 +118,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14038/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14055/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/^5.1.8/0001.patch

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

@ -126,7 +126,6 @@ patchWorkspace() {
source build/envsetup.sh;
repopick -i 232948; #wahoo: liblight: close fd
repopick -i 275225; #update webview
source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS/Defaults.sh";

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

@ -72,9 +72,6 @@ patch -p1 < "$DOS_PATCHES_COMMON/android_build/0001-OTA_Keys.patch"; #add correc
awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' core/product.mk;
sed -i '74i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk;
enterAndClear "cts";
rm -rf tests/tests/car; #Remove Car related packages
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

2
Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh
View File

@ -85,7 +85,7 @@ 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/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/^5.3.11/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/^5.3.11/0001.patch

2
Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh
View File

@ -63,7 +63,7 @@ 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/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12614/^5.1.6/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14038/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19052/^5.3.11/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/^5.3.11/0001.patch

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

@ -104,7 +104,7 @@ 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;
source build/envsetup.sh;
repopick -i 275225; #update webview
repopick -it P_asb_2020-06;
source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS/Defaults.sh";

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

@ -66,9 +66,6 @@ patch -p1 < "$DOS_PATCHES_COMMON/android_build/0001-OTA_Keys.patch"; #add correc
awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' core/product.mk;
sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk;
enterAndClear "cts";
rm -rf tests/tests/car; #Remove Car related packages
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
@ -99,7 +96,6 @@ patch -p1 < "$DOS_PATCHES/android_frameworks_base/0009-SystemUI_No_Permission_Re
if [ "$DOS_GRAPHENE_EXEC" = true ]; then patch -p1 < "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning.patch"; fi; #add exec-based spawning support (GrapheneOS)
patch -p1 < "$DOS_PATCHES/android_frameworks_base/0003-SUPL_No_IMSI.patch"; #don't send IMSI to SUPL (MSe)
patch -p1 < "$DOS_PATCHES/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #enable fingerprint failed lockout after 5 attempts (GrapheneOS)
rm -rf packages/CarSystemUI; #Remove Car related packages
rm -rf packages/CompanionDeviceManager; #Used to support Android Wear (which hard depends on GMS)
rm -rf packages/OsuLogin; #Automatic Wi-Fi connection non-sense
rm -rf packages/PrintRecommendationService; #Creates popups to install proprietary print apps
@ -159,9 +155,6 @@ patch -p1 < "$DOS_PATCHES_COMMON/android_packages_inputmethods_LatinIME/0001-Voi
#patch -p1 < "$DOS_PATCHES/android_packages_services_Telephony/0001-PREREQ_Handle_All_Modes.patch"; #XXX 17REBASE
#patch -p1 < "$DOS_PATCHES/android_packages_services_Telephony/0002-More_Preferred_Network_Modes.patch"; #XXX 17REBASE
enterAndClear "platform_testing";
rm -rf libraries/car-helpers; #Remove Car related packages
enterAndClear "system/extras"
patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS)