From 47ae3584a709d777a38950af5d748e3448caa98f Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 17 Jan 2018 17:06:40 -0500 Subject: [PATCH] Build fixes and update CVE patchers --- .../CVE_Patchers/android_kernel_lge_hammerhead.sh | 3 +-- .../CVE_Patchers/android_kernel_motorola_msm8916.sh | 5 +---- Scripts/LineageOS-14.1/Patch.sh | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh index e82a2294..e8bb9aa5 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -18,7 +18,6 @@ git apply $cvePatchesLinux/CVE-2017-11089/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-13215/ANY/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-16533/^4.13/0001.patch @@ -41,5 +40,5 @@ git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch git apply $cvePatchesLinux/CVE-2017-9684/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.p41" +editKernelLocalversion "-dos.p40" 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 ab5b9d69..0ee7afb5 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 @@ -47,8 +47,6 @@ git apply $cvePatchesLinux/CVE-2017-0648/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11473/ANY/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 git apply $cvePatchesLinux/CVE-2017-13218/3.10/0002.patch git apply $cvePatchesLinux/CVE-2017-13218/3.10/0003.patch @@ -62,7 +60,6 @@ git apply $cvePatchesLinux/CVE-2017-16538/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16643/3.5+/0001.patch git apply $cvePatchesLinux/CVE-2017-16645/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16650/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-16939/3.10/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 @@ -75,5 +72,5 @@ git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3- 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.p75" +editKernelLocalversion "-dos.p72" cd $base diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 218b117b..c3c7f3e7 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -124,6 +124,7 @@ patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0002-Releas enterAndClear "packages/apps/GmsCore" git submodule update --init --recursive +sed -i 's|build/outputs/apk/play-services-core-release-unsigned.apk|build/outputs/apk/release/play-services-core-release-unsigned.apk|' Android.mk; enterAndClear "packages/apps/GsfProxy" sed -i 's/ext.androidBuildVersionTools = "24.0.3"/ext.androidBuildVersionTools = "25.0.3"/' build.gradle; @@ -200,7 +201,6 @@ sed -i 's/shouldUseOptimizations(weight)/true/' cm/lib/main/java/org/cyanogenmod enterAndClear "device/motorola/clark" #enableDexPreOpt patch -p1 < $patches"android_device_motorola_clark/0001-Tri_State_Torch.patch" #Tri-state torch -awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfig.mk; #Soft bricks the radio when flashing via AOSP recovery enterAndClear "device/oneplus/bacon" enableDexPreOpt