diff --git a/Patches/Linux b/Patches/Linux index 08a9222a..e2ba58f4 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 08a9222af7dec29417a395f209e0f65ff106d22b +Subproject commit e2ba58f4cc36c9acec30decc511a7dbf7681d55f diff --git a/Scripts/LineageOS-14.1/00init.sh b/Scripts/LineageOS-14.1/00init.sh index a03ae5b5..3405eb99 100644 --- a/Scripts/LineageOS-14.1/00init.sh +++ b/Scripts/LineageOS-14.1/00init.sh @@ -17,7 +17,7 @@ #Sets settings used by all other scripts -export androidWorkspace="/mnt/Drive-1/Development/Other/Android_ROMs/"; +export androidWorkspace="/mnt/Drive-3/"; export base=$androidWorkspace"Build/LineageOS-14.1/"; export SIGNING_KEY_DIR=$androidWorkspace"Signing_Keys"; diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh index e48c3d09..51965ffa 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -1,7 +1,5 @@ #!/bin/bash cd $base"kernel/google/marlin" -git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/ANY/0001.patch -git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/ANY/0003.patch 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/0021.patch @@ -29,6 +27,8 @@ 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/0050.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/ANY/0001.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/ANY/0003.patch git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0011.patch git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0012.patch git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0013.patch @@ -103,7 +103,7 @@ git apply $cvePatchesLinux/CVE-2017-11019/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11025/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11028/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-11030/3.18/0002.patch -git apply $cvePatchesLinux/CVE-2017-11031/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2017-11031/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-11032/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11033/3.18/0003.patch git apply $cvePatchesLinux/CVE-2017-11044/3.18/0001.patch @@ -161,6 +161,7 @@ git apply $cvePatchesLinux/CVE-2017-7371/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-7372/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-7472/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-7533/3.18/0003.patch git apply $cvePatchesLinux/CVE-2017-7616/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-7618/^4.10/0002.patch git apply $cvePatchesLinux/CVE-2017-8247/ANY/0001.patch @@ -174,7 +175,7 @@ git apply $cvePatchesLinux/CVE-2017-9690/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-9696/3.18/0002.patch git apply $cvePatchesLinux/CVE-2017-9697/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-9698/3.18/0001.patch -git apply $cvePatchesLinux/CVE-2017-9700/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2017-9700/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-9716/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-9719/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-9720/3.18/0002.patch @@ -191,5 +192,5 @@ 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 git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch -editKernelLocalversion "-dos.p191" +editKernelLocalversion "-dos.p192" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh index 991b7232..86a2812d 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh @@ -41,7 +41,6 @@ git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-13168/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13216/3.10/0001.patch -git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch @@ -73,5 +72,5 @@ git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch git apply $cvePatchesLinux/CVE-2016-2475/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p73" +editKernelLocalversion "-dos.p72" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh index aab31337..cdd65fea 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -1,6 +1,5 @@ #!/bin/bash cd $base"kernel/lge/msm8996" -git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/ANY/0001.patch 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/0021.patch @@ -27,6 +26,7 @@ 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/0002-Copperhead-Kernel_Hardening/ANY/0001.patch git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0011.patch git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0012.patch git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0013.patch @@ -64,7 +64,7 @@ git apply $cvePatchesLinux/CVE-2017-1000364/3.18/0009.patch git apply $cvePatchesLinux/CVE-2017-1000364/3.18/0010.patch git apply $cvePatchesLinux/CVE-2017-1000365/3.18/0002.patch git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch -git apply $cvePatchesLinux/CVE-2017-11031/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2017-11031/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12146/3.16+/0001.patch git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch @@ -101,6 +101,7 @@ git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-6353/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-7472/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-7533/3.18/0003.patch git apply $cvePatchesLinux/CVE-2017-7616/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-7618/^4.10/0002.patch git apply $cvePatchesLinux/Untracked/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch @@ -113,5 +114,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.p113" +editKernelLocalversion "-dos.p114" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh index 9625598a..ab5b9d69 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh @@ -34,12 +34,9 @@ git apply $cvePatchesLinux/CVE-2016-3894/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-3902/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-5858/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-5858/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2016-5859/3.10/0001.patch -git apply $cvePatchesLinux/CVE-2016-5867/3.10/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-6694/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-6695/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-7117/^4.5/0002.patch git apply $cvePatchesLinux/CVE-2016-8481/ANY/0003.patch @@ -48,12 +45,8 @@ git apply $cvePatchesLinux/CVE-2017-0457/3.10/0002.patch git apply $cvePatchesLinux/CVE-2017-0524/ANY/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-11024/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11085/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11092/3.10/0002.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-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13216/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-13218/3.10/0001.patch @@ -79,9 +72,8 @@ git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-7541/3.10/0002.patch git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch -git apply $cvePatchesLinux/CVE-2016-5853/3.10/0001.patch git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p83" +editKernelLocalversion "-dos.p75" cd $base diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 6cc8a5e4..218b117b 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -137,6 +137,7 @@ enterAndClear "packages/apps/PackageInstaller" patch -p1 < $patches"android_packages_apps_PackageInstaller/64d8b44.diff" #Fix an issue with Permission Review enterAndClear "packages/apps/Settings" +git revert 2ebe6058c546194a301c1fd22963d6be4adbf961 sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 48;/' src/com/android/settings/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/0001-Privacy_Guard-More_Perms.patch" #Allow more control over various permissions via Privacy Guard @@ -205,7 +206,7 @@ enterAndClear "device/oneplus/bacon" enableDexPreOpt sed -i "s/TZ.BF.2.0-2.0.0134/TZ.BF.2.0-2.0.0134|TZ.BF.2.0-2.0.0137/" board-info.txt; #Suport new TZ firmware https://review.lineageos.org/#/c/178999/ -enterAndClear "kernel/lge/g3" +#enterAndClear "kernel/lge/g3" #sed -i 's/39 01 00 00 00 00 04 F2 01 00 40/39 01 00 00 00 00 04 F2 01 00 00/' arch/arm/boot/dts/msm8974pro-lge-common/msm8974pro-lge-panel.dtsi; #Oversharpening fix, Credit: @Skin1980 enterAndClear "device/lge/g4-common"