From cbe5dc9e9d7496e0d4dc768f7830b37071832110 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Wed, 20 Dec 2017 13:42:28 -0500
Subject: [PATCH] Add support for LG G2, G3, G4, G5 and update CVE patchers

---
 Manifests/Manifest_LAOS-14.1.xml              |  46 +++++++
 .../CVE_Patchers/android_kernel_lge_g3.sh     |  27 ++++
 .../android_kernel_lge_msm8974.sh             |  24 ++++
 .../android_kernel_lge_msm8992.sh             | 129 ++++++++++++++++++
 .../android_kernel_lge_msm8996.sh             | 102 ++++++++++++++
 .../android_kernel_motorola_msm8916.sh        |   8 --
 Scripts/LineageOS-14.1/Deblob.sh              |   1 +
 Scripts/LineageOS-14.1/Patch.sh               |   2 +-
 8 files changed, 330 insertions(+), 9 deletions(-)
 create mode 100644 Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh
 create mode 100644 Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh
 create mode 100644 Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh
 create mode 100644 Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh

diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index 9f7ee047..471721d2 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -69,6 +69,25 @@
 	<remove-project name="platform/prebuilts/go/darwin-x86" />
 	<remove-project name="platform/prebuilts/ninja/darwin-x86" />
 	<remove-project name="platform/prebuilts/python/darwin-x86/2.7.5" />
+	<!-- Untested -->
+	<remove-project name="LineageOS/android_external_bash" />
+	<remove-project name="LineageOS/android_external_fuse" />
+	<remove-project name="LineageOS/android_external_htop" />
+	<remove-project name="LineageOS/android_external_libncurses" />
+	<remove-project name="LineageOS/android_external_libtar" />
+	<remove-project name="LineageOS/android_external_libtruezip" />
+	<remove-project name="LineageOS/android_external_lzo" />
+	<remove-project name="LineageOS/android_external_nano" />
+	<remove-project name="LineageOS/android_external_ntfs-3g" />
+	<remove-project name="LineageOS/android_external_openssh" />
+	<remove-project name="LineageOS/android_external_p7zip" />
+	<remove-project name="LineageOS/android_external_pigz" />
+	<remove-project name="LineageOS/android_external_rsync" />
+	<remove-project name="LineageOS/android_external_unrar" />
+	<remove-project name="LineageOS/android_external_unzip" />
+	<remove-project name="LineageOS/android_external_vim" />
+	<remove-project name="LineageOS/android_external_yaffs2" />
+	<remove-project name="LineageOS/android_external_zip" />
 <!-- END OF UNNECESSARY REPO REMOVAL -->
 
 <!-- START OF ADDITIONAL REPOS -->
@@ -133,6 +152,28 @@
 	<project path="device/htc/hima-common" name="LineageOS/android_device_htc_hima-common" remote="github" />
 	<project path="kernel/htc/msm8994" name="LineageOS/android_kernel_htc_msm8994" remote="github" />
 
+	<!-- LG G2 (d802) -->
+	<project path="device/lge/g2-common" name="LineageOS/android_device_lge_g2-common" remote="github" />
+	<project path="device/lge/d802" name="LineageOS/android_device_lge_d802" remote="github" />
+	<project path="kernel/lge/msm8974" name="LineageOS/android_kernel_lge_msm8974" remote="github" />
+
+	<!-- LG G3 (d855) -->
+	<project path="device/lge/g3-common" name="LineageOS/android_device_lge_g3-common" remote="github" />
+	<project path="device/lge/d855" name="LineageOS/android_device_lge_d855" remote="github" />
+	<project path="kernel/lge/g3" name="LineageOS/android_kernel_lge_g3" remote="github" />
+
+	<!-- LG G4 (h815) -->
+	<project path="device/lge/g4-common" name="LineageOS/android_device_lge_g4-common" remote="github" />
+	<project path="device/lge/h815" name="LineageOS/android_device_lge_h815" remote="github" />
+	<project path="kernel/lge/msm8992" name="LineageOS/android_kernel_lge_msm8992" remote="github" />
+
+	<!-- LG G5 (h850) -->
+	<project path="device/lge/common" name="LineageOS/android_device_lge_common" remote="github" />
+	<project path="device/lge/g5-common" name="LineageOS/android_device_lge_g5-common" remote="github" />
+	<project path="device/lge/h850" name="LineageOS/android_device_lge_h850" remote="github" />
+	<project path="device/lge/msm8996-common" name="LineageOS/android_device_lge_msm8996-common" remote="github" />
+	<project path="kernel/lge/msm8996" name="LineageOS/android_kernel_lge_msm8996" remote="github" />
+
 	<!-- Moto G 3rd Gen (osprey) -->
 	<project path="device/motorola/msm8916-common" name="LineageOS/android_device_motorola_msm8916-common" remote="github" />
 	<project path="device/motorola/osprey" name="LineageOS/android_device_motorola_osprey" remote="github" />
@@ -218,6 +259,11 @@
 	<project path="hardware/samsung_slsi-cm/openmax" name="LineageOS/android_hardware_samsung_slsi-cm_openmax" remote="github" />
 	<project path="kernel/samsung/universal8890" name="LineageOS/android_kernel_samsung_universal8890" remote="github" />
 
+	<!-- NXP -->
+	<project path="vendor/nxp-nfc/opensource/frameworks" name="LineageOS/android_vendor_nxp-nfc_opensource_frameworks" remote="github" />
+	<project path="vendor/nxp-nfc/opensource/libnfc-nci" name="LineageOS/android_vendor_nxp-nfc_opensource_libnfc-nci" remote="github" />
+	<project path="vendor/nxp-nfc/opensource/Nfc" name="LineageOS/android_vendor_nxp-nfc_opensource_Nfc" remote="github" />
+
 	<!-- Proprietary Blobs -->
 	<project path="vendor/amazon" name="TheMuppets/proprietary_vendor_amazon" remote="github" />
 	<project path="vendor/asus" name="TheMuppets/proprietary_vendor_asus" remote="github" />
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh
new file mode 100644
index 00000000..bd29a02e
--- /dev/null
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+cd $base"kernel/lge/g3"
+git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2014-9781/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2015-6640/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-3857/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-3892/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-8406/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-9576/3.4/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0611/3.4/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.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-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-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-8246/3.4/0002.patch
+git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
+cd $base
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh
new file mode 100644
index 00000000..27009634
--- /dev/null
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+cd $base"kernel/lge/msm8974"
+git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2015-8939/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-0806/prima/0001.patch
+git apply $cvePatchesLinux/CVE-2016-0806/prima/0006.patch
+git apply $cvePatchesLinux/CVE-2016-0806/prima/0007.patch
+git apply $cvePatchesLinux/CVE-2016-0806/prima/0010.patch
+git apply $cvePatchesLinux/CVE-2016-6751/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-16525/^4.13/0002.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
+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-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-7487/ANY/0001.patch
+git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
+cd $base
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh
new file mode 100644
index 00000000..ad489d1d
--- /dev/null
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh
@@ -0,0 +1,129 @@
+#!/bin/bash
+cd $base"kernel/lge/msm8992"
+git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0004-No_dir-relax.patch
+git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0005.patch
+git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.10/0006.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/0001.patch
+git apply $cvePatchesLinux/CVE-2014-9781/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2015-5366/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2015-7515/^4.4/0002.patch
+git apply $cvePatchesLinux/CVE-2015-7550/^4.3/0001.patch
+git apply $cvePatchesLinux/CVE-2015-8967/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-10208/3.10-^3.16/0001.patch
+git apply $cvePatchesLinux/CVE-2016-2185/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-2186/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-2384/^4.5/0001.patch
+git apply $cvePatchesLinux/CVE-2016-2545/^4.4/0001.patch
+git apply $cvePatchesLinux/CVE-2016-2549/^4.4/0001.patch
+git apply $cvePatchesLinux/CVE-2016-3070/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-3138/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-3140/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-3689/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-3857/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-3951/ANY/0002.patch
+git apply $cvePatchesLinux/CVE-2016-5829/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-2016-6753/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-7117/^4.5/0002.patch
+git apply $cvePatchesLinux/CVE-2016-8404/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-8481/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-9576/3.10/0002.patch
+git apply $cvePatchesLinux/CVE-2016-9604/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-9754/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0403/3.0-^3.18/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0404/^3.18/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0537/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0648/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0710/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0746/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0748/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0751/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0861/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0862/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-1000365/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch
+git apply $cvePatchesLinux/CVE-2017-10663/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-10997/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-10998/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-10999/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-11019/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-11024/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-11025/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-11033/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-11046/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-11056/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-11059/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-11090/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-11092/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-11600/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch
+git apply $cvePatchesLinux/CVE-2017-15265/^4.14/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-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-2618/3.10/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-5970/^4.9/0001.patch
+git apply $cvePatchesLinux/CVE-2017-6074/^4.9/0001.patch
+git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch
+git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch
+git apply $cvePatchesLinux/CVE-2017-6951/^3.14/0001.patch
+git apply $cvePatchesLinux/CVE-2017-7308/ANY/0003.patch
+git apply $cvePatchesLinux/CVE-2017-7369/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-7373/3.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-7541/3.10/0002.patch
+git apply $cvePatchesLinux/CVE-2017-8245/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-8246/3.10/0003.patch
+git apply $cvePatchesLinux/CVE-2017-8247/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-8251/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-8260/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-8261/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-8262/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-8265/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-8280/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
+git apply $cvePatchesLinux/CVE-2017-9696/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-9702/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-9702/3.10/0002.patch
+git apply $cvePatchesLinux/CVE-2017-9720/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2017-9724/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-9725/3.10/0001.patch
+git apply $cvePatchesLinux/LVT-2017-0001/3.10/0003.patch
+git apply $cvePatchesLinux/LVT-2017-0002/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
+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
new file mode 100644
index 00000000..c39c966e
--- /dev/null
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh
@@ -0,0 +1,102 @@
+#!/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
+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/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/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-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-2549/^4.4/0001.patch
+git apply $cvePatchesLinux/CVE-2016-3136/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-3138/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2016-3140/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-6672/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-2016-7117/^4.5/0002.patch
+git apply $cvePatchesLinux/CVE-2016-8394/ANY/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-0610/ANY/0002.patch
+git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-0866/3.18/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-11031/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-12146/3.16+/0001.patch
+git apply $cvePatchesLinux/CVE-2017-15868/ANY/0001.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-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-7472/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.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
+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
+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 d8872397..890ff66d 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
@@ -45,17 +45,10 @@ 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-0861/3.10/0001.patch
-git apply $cvePatchesLinux/CVE-2017-0862/3.10/0001.patch
-git apply $cvePatchesLinux/CVE-2017-11016/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-11024/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2017-11033/3.10/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-11090/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-11600/3.10/0001.patch
-git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch
-git apply $cvePatchesLinux/CVE-2017-15265/^4.14/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
@@ -74,7 +67,6 @@ git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch
 git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch
 git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch
 git apply $cvePatchesLinux/CVE-2017-7541/3.10/0002.patch
-git apply $cvePatchesLinux/CVE-2017-9702/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
 cd $base
diff --git a/Scripts/LineageOS-14.1/Deblob.sh b/Scripts/LineageOS-14.1/Deblob.sh
index 00877a90..960a01c3 100755
--- a/Scripts/LineageOS-14.1/Deblob.sh
+++ b/Scripts/LineageOS-14.1/Deblob.sh
@@ -149,6 +149,7 @@ echo "Deblobbing..."
 	#blobs=$blobs"|mpdecision|libqti-perfd-client.so|perfd|perf-profile0.conf|perf-profile1.conf|perf-profile2.conf|perf-profile3.conf|perf-profile4.conf|perf-profile5.conf";
 
 	#Playready (DRM) [Microsoft]
+	blobs=$blobs"|libtzplayready.so"
 	blobs=$blobs"|playread.b00|playread.b01|playread.b02|playread.b03|playread.mdt";
 
 	#Project Fi [Google]
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index db644629..bd2ad1d7 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -22,7 +22,7 @@
 #source ../../Scripts/LineageOS-14.1/00init.sh && source $scripts/Patch.sh && source $scripts/Defaults.sh && source $scripts/Optimize.sh && source $scripts/Rebrand.sh && source $scripts/Theme.sh && source $scripts/Deblob.sh && source $scripts/Patch_CVE.sh && source build/envsetup.sh
 
 #Build!
-#brunch lineage_mako-user && export OTA_PACKAGE_SIGNING_KEY=../../Signing_Keys/releasekey && export SIGNING_KEY_DIR=../../Signing_Keys && brunch lineage_clark-user && brunch lineage_bacon-user && brunch lineage_thor-userdebug && brunch lineage_angler-user && brunch lineage_bullhead-user && brunch lineage_ether-user && brunch lineage_flounder-user && brunch lineage_flo-user && brunch lineage_FP2-user && brunch lineage_hammerhead-user && brunch lineage_himaul-user && brunch lineage_i9100-userdebug && brunch lineage_i9305-user && brunch lineage_jfltexx-user && brunch lineage_klte-user && brunch lineage_m8-user && brunch lineage_marlin-user && brunch lineage_n5110-user && brunch lineage_osprey-user && brunch lineage_sailfish-user && brunch lineage_shamu-user && brunch lineage_Z00T-user
+#brunch lineage_mako-user && export OTA_PACKAGE_SIGNING_KEY=../../Signing_Keys/releasekey && export SIGNING_KEY_DIR=../../Signing_Keys && brunch lineage_clark-user && brunch lineage_bacon-user && brunch lineage_thor-userdebug && brunch lineage_angler-user && brunch lineage_bullhead-user && brunch lineage_d802-user && brunch lineage_d855-user && brunch lineage_ether-user && brunch lineage_flounder-user && brunch lineage_flo-user && brunch lineage_FP2-user && brunch lineage_h815-user && brunch lineage_h850-user && brunch lineage_hammerhead-user && brunch lineage_himaul-user && brunch lineage_i9100-userdebug && brunch lineage_i9305-user && brunch lineage_jfltexx-user && brunch lineage_klte-user && brunch lineage_m8-user && brunch lineage_marlin-user && brunch lineage_n5110-user && brunch lineage_osprey-user && brunch lineage_sailfish-user && brunch lineage_shamu-user && brunch lineage_Z00T-user
 #XXX: Currently broken
 #	lineage_herolte-user - missing libprotobuf-cpp-full.so
 #TODO: Add victara, griffin, athene