15.1: Updates & Fixes

This commit is contained in:
Tad 2018-04-19 21:26:11 -04:00
parent 4b04593376
commit a45a9be0e9
7 changed files with 161 additions and 33 deletions

View file

@ -24,7 +24,6 @@ git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/3.18/0043.patch
git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/3.18/0045.patch
git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/3.18/0046.patch
git apply $cvePatchesLinux/0007-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
@ -49,25 +48,14 @@ 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
@ -83,5 +71,5 @@ 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.p83"
editKernelLocalversion "-dos.p71"
cd $base

View file

@ -42,7 +42,6 @@ git apply $cvePatchesLinux/CVE-2017-11024/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11600/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-13245/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-14877/3.10/0001.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-16537/^4.13/0001.patch
@ -64,5 +63,5 @@ git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2016-2475/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
editKernelLocalversion "-dos.p64"
editKernelLocalversion "-dos.p63"
cd $base

View file

@ -59,6 +59,7 @@ patchWorkspace() {
repopick 209188; #g3-common cherry picks
repopick 211404 211405 211406 211407 211408 211409; #d852 cherry picks
repopick 205021; #d855 cherry picks
repopick -t trust_interface;
#repopick -t calendar-o;
source $scripts/Patch.sh;

View file

@ -128,7 +128,6 @@ enterAndClear "packages/apps/Settings"
git revert a96df110e84123fe1273bff54feca3b4ca484dcd #don't hide oem unlock
sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 48;/' src/com/android/settings/password/ChooseLockPassword.java; #Increase max password length
sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com.google.oQuae4av";/' src/com/android/settings/PrivacySettings.java; #MicroG doesn't support Backup, hide the options
patch -p1 < $patches"android_packages_apps_Settings/0002-Remove_Analytics.patch" #Remove analytics
enterAndClear "packages/apps/SetupWizard"
patch -p1 < $patches"android_packages_apps_SetupWizard/0001-Remove_Analytics.patch" #Remove analytics