From fec8fecf5f1ead67aca13e42bc8fa1e612d2e01e Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 6 Apr 2018 13:38:55 -0400 Subject: [PATCH] 14.1: Drop marlin/sailfish --- Manifests/Manifest_LAOS-14.1.xml | 5 - .../android_kernel_google_marlin.sh | 220 ------------------ Scripts/LineageOS-14.1/Functions.sh | 16 +- .../android_kernel_huawei_angler.sh | 4 +- .../android_kernel_lge_bullhead.sh | 5 +- Scripts/LineageOS-15.1/Functions.sh | 6 +- 6 files changed, 6 insertions(+), 250 deletions(-) delete mode 100644 Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml index 7cd3ec63..023a27dd 100644 --- a/Manifests/Manifest_LAOS-14.1.xml +++ b/Manifests/Manifest_LAOS-14.1.xml @@ -124,11 +124,6 @@ - - - - - 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 deleted file mode 100644 index 6959c268..00000000 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh +++ /dev/null @@ -1,220 +0,0 @@ -#!/bin/bash -cd $base"kernel/google/marlin" -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 -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/0024.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/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/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 -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-2015-8966/3.15+/0001.patch -git apply $cvePatchesLinux/CVE-2015-9016/3.18/0002.patch -git apply $cvePatchesLinux/CVE-2016-10088/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-2187/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-2188/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-2188/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2016-2544/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-2549/^4.4/0001.patch -git apply $cvePatchesLinux/CVE-2016-2847/ANY/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-3140/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-3156/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-3672/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-3857/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-3865/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-3865/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2016-3906/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-5345/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-5854/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-5856/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-5857/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-5858/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-5867/3.18/0002.patch -git apply $cvePatchesLinux/CVE-2016-5870/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-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-7042/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-7117/^4.5/0002.patch -git apply $cvePatchesLinux/CVE-2016-8418/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-8483/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-9191/3.11-^4.8/0001.patch -git apply $cvePatchesLinux/CVE-2016-9604/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-GadgetFS/ANY/0003.patch -git apply $cvePatchesLinux/CVE-2016-GadgetFS/ANY/0006.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-0510/3.18/0003.patch -git apply $cvePatchesLinux/CVE-2017-0524/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-0537/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-0564/3.18/0004.patch -git apply $cvePatchesLinux/CVE-2017-0579/3.18/0001.patch -git apply $cvePatchesLinux/CVE-2017-0610/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2017-0622/3.18/0001.patch -git apply $cvePatchesLinux/CVE-2017-0627/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-0749/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-0794/3.18/0002.patch -git apply $cvePatchesLinux/CVE-2017-0866/3.18/0001.patch -git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-1000364/3.18/0008.patch -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-1000410/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-10998/3.18/0002.patch -git apply $cvePatchesLinux/CVE-2017-11001/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11002/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2017-11013/qcacld-2.0/0002.patch -git apply $cvePatchesLinux/CVE-2017-11014/qcacld-2.0/0002.patch -git apply $cvePatchesLinux/CVE-2017-11015/qcacld-2.0/0003.patch -git apply $cvePatchesLinux/CVE-2017-11015/qcacld-2.0/0004.patch -git apply $cvePatchesLinux/CVE-2017-11016/ANY/0001.patch -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/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-11034/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11044/3.18/0001.patch -git apply $cvePatchesLinux/CVE-2017-11045/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11046/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11047/3.18/0001.patch -git apply $cvePatchesLinux/CVE-2017-11048/3.18/0002.patch -git apply $cvePatchesLinux/CVE-2017-11049/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11059/3.18/0002.patch -git apply $cvePatchesLinux/CVE-2017-11067/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11091/3.18/0001.patch -git apply $cvePatchesLinux/CVE-2017-11093/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 -git apply $cvePatchesLinux/CVE-2017-13218/3.18/0005.patch -git apply $cvePatchesLinux/CVE-2017-13218/3.18/0006.patch -git apply $cvePatchesLinux/CVE-2017-13218/3.18/0011.patch -git apply $cvePatchesLinux/CVE-2017-13219/ANY/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-14873/3.18/0001.patch -git apply $cvePatchesLinux/CVE-2017-14877/3.18/0002.patch -git apply $cvePatchesLinux/CVE-2017-14884/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-14891/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-14892/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-14897/3.18/0002.patch -git apply $cvePatchesLinux/CVE-2017-15115/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch -git apply $cvePatchesLinux/CVE-2017-15649/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2017-15834/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-15847/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-15850/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-15858/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-15868/3.18/0003.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-16530/^4.13/0001.patch -git apply $cvePatchesLinux/CVE-2017-16531/^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-16538/^4.13/0001.patch -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-16646/ANY/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-16USB/ANY/0009.patch -git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-17762/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-17769/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-18150/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-2671/^4.10/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-5986/^4.9/0001.patch -git apply $cvePatchesLinux/CVE-2017-6001/^4.9/0002.patch -git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch -git apply $cvePatchesLinux/CVE-2017-6346/3.18/0001.patch -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-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/0004.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 -git apply $cvePatchesLinux/CVE-2017-8280/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-9075/^4.11/0001.patch -git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch -git apply $cvePatchesLinux/CVE-2017-9676/3.18/0002.patch -git apply $cvePatchesLinux/CVE-2017-9686/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-9687/3.18/0001.patch -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/3.18/0001.patch -git apply $cvePatchesLinux/CVE-2017-9707/ANY/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 -git apply $cvePatchesLinux/CVE-2017-9722/3.18/0001.patch -git apply $cvePatchesLinux/CVE-2018-3563/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2018-3599/ANY/0001.patch -git apply $cvePatchesLinux/Untracked/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch -git apply $cvePatchesLinux/Untracked/ANY/0003-tunnels-Don-t-apply-GRO-to-multiple-layers-of-encaps.patch -git apply $cvePatchesLinux/Untracked/ANY/0004-net-add-recursion-limit-to-GRO.patch -git apply $cvePatchesLinux/Untracked/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch -git apply $cvePatchesLinux/Untracked/ANY/0007-USB-usbip-fix-potential-out-of-bounds-write.patch -git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch -git apply $cvePatchesLinux/CVE-2016-5853/3.18/0002.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 -git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch -editKernelLocalversion "-dos.p216" -cd $base diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 23519cfc..d08b4fe8 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -16,7 +16,7 @@ #along with this program. If not, see . patchAllKernels() { - 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"; + startPatcher "kernel_amazon_hdx-common kernel_asus_msm8916 kernel_fairphone_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_samsung_jf kernel_samsung_msm8974 kernel_samsung_smdk4412 kernel_samsung_universal8890"; } export -f patchAllKernels; @@ -49,10 +49,8 @@ buildAll() { brunch lineage_i9305-user; brunch lineage_jfltexx-user; brunch lineage_klte-user; - brunch lineage_marlin-user; brunch lineage_n5110-user; brunch lineage_osprey-user; - brunch lineage_sailfish-user; brunch lineage_Z00T-user; } export -f buildAll; @@ -75,18 +73,6 @@ patchWorkspace() { ##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong cd device/asus/Z00T && ./setup-makefiles.sh && cd $base cd device/lge/h850 && ./setup-makefiles.sh && cd $base - - ##Fixes marlin building, really janky (recursive symlinks) and probably not the best place for it [LAOS SPECIFIC] - cd vendor/google/marlin/proprietary; - ln -s . vendor; - ln -s . lib/lib; - ln -s . lib64/lib64; - ln -s . app/app; - ln -s . bin/bin; - ln -s . etc/etc; - ln -s . framework/framework; - ln -s . priv-app/priv-app; - cd $base; } export -f patchWorkspace; diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh index bdacdbe4..9936d4a0 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh @@ -100,13 +100,11 @@ git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch git apply $cvePatchesLinux/CVE-2017-8269/3.10/0002.patch git apply $cvePatchesLinux/CVE-2017-8280/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch -git apply $cvePatchesLinux/CVE-2018-3563/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2018-5825/3.10/0001.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-2475/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-2017-15845/ANY/0001.patch -editKernelLocalversion "-dos.p108" +editKernelLocalversion "-dos.p106" cd $base diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh index 99901597..f65ffc76 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh @@ -90,13 +90,10 @@ git apply $cvePatchesLinux/CVE-2017-6951/^3.14/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.10/0003.patch -git apply $cvePatchesLinux/CVE-2017-8269/3.10/0002.patch git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch -git apply $cvePatchesLinux/CVE-2018-3563/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2018-5825/3.10/0001.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-6693/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch -editKernelLocalversion "-dos.p98" +editKernelLocalversion "-dos.p95" cd $base diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 174df483..d7e7b49f 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -45,16 +45,16 @@ buildAll() { brunch lineage_flounder-user; #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; + brunch lineage_marlin-user; brunch lineage_m8-user; - #brunch lineage_sailfish-user; + brunch lineage_sailfish-user; brunch lineage_shamu-user; } export -f buildAll; patchWorkspace() { source build/envsetup.sh; - repopick 205021 206123 211008 211049 209030; #Cherry picks + repopick 205021 206123 209030 211232 211095; #Cherry picks #repopick -t calendar-o; source $scripts/Patch.sh;