diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml index 0e5785cc..bb1670a2 100644 --- a/Manifests/Manifest_LAOS-14.1.xml +++ b/Manifests/Manifest_LAOS-14.1.xml @@ -146,11 +146,6 @@ - - - - - diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index b4dbadbd..9c799446 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -22,7 +22,7 @@ startPatcher() { export -f startPatcher; 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_msm8974 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_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"; } export -f patchAllKernels; @@ -63,7 +63,6 @@ buildAll() { brunch lineage_bacon-user; brunch lineage_thor-userdebug; brunch lineage_mako-user; - brunch lineage_d802-userdebug; brunch lineage_d855-userdebug; brunch lineage_ether-user; brunch lineage_FP2-user; diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh new file mode 100644 index 00000000..c4a5f2f6 --- /dev/null +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh @@ -0,0 +1,71 @@ +#!/bin/bash +cd $base"kernel/moto/shamu" +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0004-No_dir-relax.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0007.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0008.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0009.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0010.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0011.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0012.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0013.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0014.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0015.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0016.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0017.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0018.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/ANY/0003.patch +git apply $cvePatchesLinux/CVE-2015-1420/3.2-^3.19/0001.patch +git apply $cvePatchesLinux/CVE-2015-7515/^4.4/0002.patch +git apply $cvePatchesLinux/CVE-2015-8955/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2015-8967/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-0758/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-2475/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-3894/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-5870/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-6672/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-6695/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-8404/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-8464/3.10/0001.patch +git apply $cvePatchesLinux/CVE-2016-9576/3.10/0002.patch +git apply $cvePatchesLinux/CVE-2017-0404/^3.18/0001.patch +git apply $cvePatchesLinux/CVE-2017-0524/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-0537/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-0627/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-0824/ANY/0001.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-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-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-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/0003.patch +git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch +git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch +git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-8269/ANY/0001.patch +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.p67" +cd $base diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 07e1b17b..52a41eb0 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -22,7 +22,7 @@ startPatcher() { export -f startPatcher; patchAllKernels() { - startPatcher "kernel_fairphone_msm8974 kernel_google_marlin kernel_google_msm kernel_htc_flounder kernel_huawei_angler kernel_lge_bullhead kernel_lge_g3 kernel_lge_hammerhead kernel_lge_msm8974 kernel_nextbit_msm8992 kernel_oppo_msm8974 kernel_samsung_msm8974"; + startPatcher "kernel_fairphone_msm8974 kernel_google_marlin kernel_google_msm kernel_htc_flounder kernel_huawei_angler kernel_lge_bullhead kernel_lge_g3 kernel_lge_hammerhead kernel_lge_msm8974 kernel_moto_shamu kernel_nextbit_msm8992 kernel_oppo_msm8974 kernel_samsung_msm8974"; } export -f patchAllKernels; @@ -61,13 +61,11 @@ buildAll() { brunch lineage_angler-user; brunch lineage_bacon-user; brunch lineage_bullhead-user; - #brunch lineage_d802-userdebug; + brunch lineage_d802-userdebug; brunch lineage_d852-userdebug; - #brunch lineage_d855-userdebug; #device/lge/d855/recovery/recovery_updater.cpp:29:10: fatal error: 'updater/install.h' file not found - #brunch lineage_ether-user; + #brunch lineage_d855-userdebug; brunch lineage_flo-user; brunch lineage_flounder-user; - #brunch lineage_FP2-user; #brunch lineage_hammerhead-user; #find: `hardware/cyanogen/cmhw': No such file or directory #brunch lineage_marlin-user; #brunch lineage_sailfish-user; @@ -77,7 +75,7 @@ export -f buildAll; patchWorkspace() { source build/envsetup.sh; - repopick 204743 204744; #Cherry picks + repopick 204743 204744 205021; #Cherry picks source $scripts/Patch.sh; source $scripts/Defaults.sh;