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

14.1: Drop bacon and m8, 15.1: Many more fixes

Browse Source
This commit is contained in:
Tad 2018-04-04 21:24:08 -04:00
parent f0ab546816
commit b2d1b93dcb
12 changed files with 96 additions and 1447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Manifests/Manifest_LAOS-14.1.xml
View File

@ -129,12 +129,6 @@
<project path="device/google/sailfish" name="LineageOS/android_device_google_sailfish" remote="github" />
<project path="kernel/google/marlin" name="LineageOS/android_kernel_google_marlin" remote="github" />
<!-- HTC One (m8) -->
<project path="device/htc/m8" name="LineageOS/android_device_htc_m8" remote="github" />
<project path="device/htc/m8-common" name="LineageOS/android_device_htc_m8-common" remote="github" />
<project path="device/htc/msm8974-common" name="LineageOS/android_device_htc_msm8974-common" remote="github" />
<project path="kernel/htc/msm8974" name="LineageOS/android_kernel_htc_msm8974" remote="github" />
<!-- HTC One (m9) -->
<project path="device/htc/himaul" name="LineageOS/android_device_htc_himaul" remote="github" />
<project path="device/htc/hima-common" name="LineageOS/android_device_htc_hima-common" remote="github" />
@ -179,12 +173,6 @@
<project path="device/lge/hammerhead" name="LineageOS/android_device_lge_hammerhead" remote="github" />
<project path="kernel/lge/hammerhead" name="LineageOS/android_kernel_lge_hammerhead" remote="github" />
<!-- OnePlus One (bacon) -->
<project path="device/oppo/common" name="LineageOS/android_device_oppo_common" remote="github" />
<project path="device/oneplus/bacon" name="LineageOS/android_device_oneplus_bacon" remote="github" />
<project path="device/oppo/msm8974-common" name="LineageOS/android_device_oppo_msm8974-common" remote="github" />
<project path="kernel/oneplus/msm8974" name="LineageOS/android_kernel_oneplus_msm8974" remote="github" />
<!-- Samsung Common -->
<project path="device/samsung/qcom-common" name="LineageOS/android_device_samsung_qcom-common" remote="github" />
<project path="device/samsung/smdk4412-common" name="LineageOS/android_device_samsung_smdk4412-common" remote="github" />

1
Manifests/Manifest_LAOS-15.1.xml
View File

@ -31,7 +31,6 @@
<remove-project name="LineageOS/android_packages_apps_LockClock" />
<remove-project name="LineageOS/android_packages_apps_ManagedProvisioning" />
<remove-project name="LineageOS/android_packages_apps_OpenWeatherMapProvider" />
<remove-project name="LineageOS/android_packages_apps_Snap" />
<remove-project name="LineageOS/android_packages_apps_Stk" />
<remove-project name="LineageOS/android_packages_apps_Terminal" />
<remove-project name="LineageOS/android_packages_apps_TV" />

1369
Patches/LineageOS-14.1/android_kernel_oneplus_msm8974/0001-OverUnderClock-EXTREME.patch
View File

File diff suppressed because it is too large Load Diff

52
Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh
View File

@ -1,52 +0,0 @@
#!/bin/bash
cd $base"kernel/oneplus/msm8974"
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/ANY/0001.patch
git apply $cvePatchesLinux/0010-Accelerated_AES/3.4/0002.patch
git apply $cvePatchesLinux/CVE-2014-9781/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2014-9880/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-0801/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-2443/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6672/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-7117/^4.5/0002.patch
git apply $cvePatchesLinux/CVE-2016-8404/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0510/3.4/0001.patch
git apply $cvePatchesLinux/CVE-2017-0524/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0611/3.4/0001.patch
git apply $cvePatchesLinux/CVE-2017-0648/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0751/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch
git apply $cvePatchesLinux/CVE-2017-11000/ANY/0002.patch
git apply $cvePatchesLinux/CVE-2017-11019/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch
git apply $cvePatchesLinux/CVE-2017-13080/ANY/0002.patch
git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch
git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch
git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch
git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch
git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch
git apply $cvePatchesLinux/CVE-2017-16535/^4.13/0001.patch
git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch
git apply $cvePatchesLinux/CVE-2017-16650/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0005.patch
git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch
git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-7533/3.4/0001.patch
git apply $cvePatchesLinux/CVE-2017-8246/3.4/0002.patch
git apply $cvePatchesLinux/CVE-2017-8247/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
git apply $cvePatchesLinux/CVE-2017-9684/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-9706/ANY/0001.patch
git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
editKernelLocalversion "-dos.p48"
cd $base

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

@ -16,7 +16,7 @@
#along with this program. If not, see <https://www.gnu.org/licenses/>.
patchAllKernels() {
startPatcher "kernel_amazon_hdx-common kernel_asus_msm8916 kernel_fairphone_msm8974 kernel_google_marlin kernel_htc_msm8974 kernel_htc_msm8994 kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8992 kernel_lge_msm8996 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_nextbit_msm8992 kernel_oneplus_msm8974 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_smdk4412 kernel_samsung_universal8890";
startPatcher "kernel_amazon_hdx-common kernel_asus_msm8916 kernel_fairphone_msm8974 kernel_google_marlin kernel_htc_msm8994 kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8992 kernel_lge_msm8996 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_nextbit_msm8992 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_smdk4412 kernel_samsung_universal8890";
}
export -f patchAllKernels;
@ -34,7 +34,6 @@ buildAll() {
#Select devices are userdebug due to SELinux policy issues
#TODO: Add victara, griffin, athene, us997, us996, pme, t0lte, hlte
brunch lineage_d852-userdebug;
brunch lineage_bacon-user;
brunch lineage_thor-userdebug;
brunch lineage_mako-user;
brunch lineage_clark-user;
@ -50,7 +49,6 @@ buildAll() {
brunch lineage_i9305-user;
brunch lineage_jfltexx-user;
brunch lineage_klte-user;
brunch lineage_m8-user;
brunch lineage_marlin-user;
brunch lineage_n5110-user;
brunch lineage_osprey-user;

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

@ -71,8 +71,5 @@ patch -p1 < $patches"android_kernel_common_msm8992/0005-Overclock.patch"
patch -p1 < $patches"android_kernel_common_msm8992/0006-Overclock.patch"
patch -p1 < $patches"android_kernel_common_msm8992/0007-Overclock.patch"
enter "kernel/oneplus/msm8974"
patch -p1 < $patches"android_kernel_oneplus_msm8974/0001-OverUnderClock-EXTREME.patch" #300Mhz -> 268Mhz, 2.45Ghz -> 2.95Ghz =+2.02Ghz XXX: Not 100% stable under intense workloads
cd $base
echo "Overclocks applied!"

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

@ -29,7 +29,7 @@ git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0044.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0045.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0046.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0047.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0048.patch
#git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0048.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0049.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0050.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/ANY/0001.patch

0
Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh → Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh
View File

89
Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh Normal file
View File

@ -0,0 +1,89 @@
#!/bin/bash
cd $base"kernel/lge/msm8996"
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0019.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0020.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0022.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0023.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0025.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0026.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0027.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0028.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0029.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0030.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0031.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0032.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0033.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0034.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0035.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0036.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0037.patch
#git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0038.patch
#git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0039.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0040.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0041.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0042.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0043.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0045.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0046.patch
git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0050.patch
git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0011.patch
git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0012.patch
git apply $cvePatchesLinux/CVE-2014-9900/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2015-2041/^3.19/0002.patch
git apply $cvePatchesLinux/CVE-2015-7515/^4.4/0002.patch
git apply $cvePatchesLinux/CVE-2016-2188/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-2188/ANY/0002.patch
git apply $cvePatchesLinux/CVE-2016-2549/^4.4/0001.patch
git apply $cvePatchesLinux/CVE-2016-3136/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-3137/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-3138/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-3140/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-3857/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6672/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-8394/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-GadgetFS/ANY/0007.patch
git apply $cvePatchesLinux/CVE-2016-GadgetFS/ANY/0008.patch
git apply $cvePatchesLinux/CVE-2016-GadgetFS/ANY/0009.patch
git apply $cvePatchesLinux/CVE-2016-GadgetFS/ANY/0010.patch
git apply $cvePatchesLinux/CVE-2017-0610/ANY/0002.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11031/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2017-11045/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11075/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11093/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2017-13162/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2017-13245/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-14880/3.18/0002.patch
git apply $cvePatchesLinux/CVE-2017-14891/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-14892/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15826/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2017-15834/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15846/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15846/ANY/0002.patch
git apply $cvePatchesLinux/CVE-2017-15850/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-16650/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0005.patch
git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch
git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0009.patch
git apply $cvePatchesLinux/CVE-2017-17769/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-18061/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-18066/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch
git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch
git apply $cvePatchesLinux/CVE-2017-6001/^4.9/0002.patch
git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch
git apply $cvePatchesLinux/CVE-2018-3560/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3563/ANY/0002.patch
git apply $cvePatchesLinux/CVE-2018-3599/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-5825/3.18/0002.patch
git apply $cvePatchesLinux/LVT-2017-0001/3.18/0004.patch
git apply $cvePatchesLinux/LVT-2017-0002/3.18/0003.patch
git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
editKernelLocalversion "-dos.p85"
cd $base

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

@ -43,9 +43,9 @@ buildAll() {
brunch lineage_d855-userdebug;
brunch lineage_flo-user;
brunch lineage_flounder-user;
brunch lineage_h850-userdebug;
#brunch lineage_h850-userdebug; #prot_sect_kernel undefined
#brunch lineage_hammerhead-user; #find: `hardware/cyanogen/cmhw': No such file or directory
#brunch lineage_marlin-user; #include/linux/string.h:287:4: error: call to '__read_overflow2' declared with attribute error: detected read beyond size of object passed as 2nd parameter
#brunch lineage_marlin-user;
brunch lineage_m8-user;
#brunch lineage_sailfish-user;
brunch lineage_shamu-user;
@ -54,8 +54,7 @@ export -f buildAll;
patchWorkspace() {
source build/envsetup.sh;
repopick 205021 206123 211008 211049; #Cherry picks
repopick -t o_asb_4-2018;
repopick 205021 206123 211008 211049 209030; #Cherry picks
#repopick -t calendar-o;
source $scripts/Patch.sh;

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

@ -119,10 +119,10 @@ enterAndClear "packages/apps/GsfProxy"
sed -i 's/ext.androidBuildVersionTools = "24.0.3"/ext.androidBuildVersionTools = "25.0.3"/' build.gradle;
enterAndClear "packages/apps/LineageParts"
git revert 7ec4be432a9585833f48543a1fff859497e2b4ee #LOSCoins malware
rm -rf src/org/lineageos/lineageparts/lineagestats/ res/xml/anonymous_stats.xml res/xml/preview_data.xml #Nuke part of the analytics
sed -i 's|config_showWeatherMenu">true|config_showWeatherMenu">false|' res/values/config.xml; #Disable Weather
patch -p1 < $patches"android_packages_apps_LineageParts/0001-Remove_Analytics.patch" #Remove analytics
rm AndroidManifest.xml.orig res/values/*.xml.orig;
enterAndClear "packages/apps/Settings"
git revert a96df110e84123fe1273bff54feca3b4ca484dcd
@ -160,7 +160,6 @@ enterAndClear "system/vold"
patch -p1 < $patches"android_system_vold/0001-AES256.patch" #Add a variable for enabling AES-256 bit encryption
enterAndClear "vendor/lineage"
git revert c9c7968e597c105cb5ee69c4234d91070edd65fc #LOSCoins malware
rm -rf overlay/common/vendor/lineage-sdk/packages #Remove analytics
awk -i inplace '!/50-lineage.sh/' config/common.mk; #Make sure our hosts is always used
patch -p1 < $patches"android_vendor_lineage/0001-SCE.patch" #Include our extras such as MicroG and F-Droid

1
Scripts/LineageOS-15.1/Rebrand.sh
View File

@ -21,6 +21,7 @@ echo "Rebranding..."
enter "bootable/recovery"
sed -i 's|Android Recovery|DivestOS Recovery|' *_ui.cpp;
sed -i 's|LineageOS|DivestOS|' ui.cpp;
#TODO: Rebrand the rest of the recovery
enter "build/make"