From 2aa65e6b16088af002a19936b9fa432bea4319a7 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sun, 10 May 2020 22:26:44 -0400
Subject: [PATCH] Cherry picks

---
 Manifests/Manifest_LAOS-16.0.xml              |   4 -
 .../0001-audit2allow.patch                    | 193 ------------------
 .../privapp-permissions-qti.xml               |  61 ------
 Patches/Linux                                 |   2 +-
 PrebuiltApps                                  |   2 +-
 Scripts/LineageOS-11.0/Functions.sh           |   2 +-
 .../CVE_Patchers/android_kernel_asus_fugu.sh  |   3 +-
 .../android_kernel_asus_msm8916.sh            |   3 +-
 .../android_kernel_cyanogen_msm8916.sh        |   3 +-
 .../android_kernel_lge_msm8992.sh             |   3 +-
 .../android_kernel_motorola_msm8916.sh        |   3 +-
 .../android_kernel_motorola_msm8992.sh        |   3 +-
 .../android_kernel_nextbit_msm8992.sh         |   3 +-
 .../android_kernel_oneplus_msm8994.sh         |   3 +-
 Scripts/LineageOS-14.1/Functions.sh           |   3 +
 Scripts/LineageOS-14.1/Patch.sh               |   3 +
 .../CVE_Patchers/android_kernel_asus_fugu.sh  |   3 +-
 .../android_kernel_asus_msm8916.sh            |   3 +-
 .../android_kernel_cyanogen_msm8916.sh        |   3 +-
 .../CVE_Patchers/android_kernel_moto_shamu.sh |   3 +-
 .../android_kernel_nextbit_msm8992.sh         |   3 +-
 .../android_kernel_oneplus_msm8994.sh         |   3 +-
 Scripts/LineageOS-15.1/Functions.sh           |   5 +-
 Scripts/LineageOS-15.1/Patch.sh               |   3 +
 .../CVE_Patchers/android_kernel_asus_fugu.sh  |   3 +-
 .../android_kernel_cyanogen_msm8916.sh        |   3 +-
 .../CVE_Patchers/android_kernel_moto_shamu.sh |   3 +-
 .../android_kernel_motorola_msm8992.sh        | 182 -----------------
 .../android_kernel_nextbit_msm8992.sh         |   3 +-
 .../android_kernel_oneplus_msm8994.sh         |   3 +-
 Scripts/LineageOS-16.0/Functions.sh           |   9 +-
 Scripts/LineageOS-16.0/Patch.sh               |  14 --
 .../CVE_Patchers/android_kernel_moto_shamu.sh |   3 +-
 .../android_kernel_motorola_msm8974.sh        |   6 +-
 Scripts/LineageOS-17.1/Functions.sh           |   5 +-
 Scripts/init.sh                               |   2 +-
 36 files changed, 47 insertions(+), 509 deletions(-)
 delete mode 100644 Patches/LineageOS-16.0/android_device_motorola_clark/0001-audit2allow.patch
 delete mode 100644 Patches/LineageOS-16.0/android_device_motorola_clark/privapp-permissions-qti.xml
 delete mode 100644 Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8992.sh

diff --git a/Manifests/Manifest_LAOS-16.0.xml b/Manifests/Manifest_LAOS-16.0.xml
index 076ce579..8e779e96 100644
--- a/Manifests/Manifest_LAOS-16.0.xml
+++ b/Manifests/Manifest_LAOS-16.0.xml
@@ -148,10 +148,6 @@
 	<project path="device/motorola/victara" name="LineageOS/android_device_motorola_victara" remote="github" />
 	<project path="kernel/motorola/msm8974" name="LineageOS/android_kernel_motorola_msm8974" remote="github" />
 
-	<!-- Moto X Pure Edition (clark)
-	<project path="device/motorola/clark" name="randomblame/android_device_motorola_clark" remote="github" />
-	<project path="kernel/motorola/msm8992" name="randomblame/android_kernel_motorola_msm8992" remote="github" /> -->
-
 	<!-- Moto Z (griffin) -->
 	<project path="device/motorola/griffin" name="LineageOS/android_device_motorola_griffin" remote="github" />
 	<project path="kernel/motorola/msm8996" name="LineageOS/android_kernel_motorola_msm8996" remote="github" />
diff --git a/Patches/LineageOS-16.0/android_device_motorola_clark/0001-audit2allow.patch b/Patches/LineageOS-16.0/android_device_motorola_clark/0001-audit2allow.patch
deleted file mode 100644
index 4007e246..00000000
--- a/Patches/LineageOS-16.0/android_device_motorola_clark/0001-audit2allow.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From f882d4f46b119d05ed02bfb35d03507abe65df94 Mon Sep 17 00:00:00 2001
-From: Tad <tad@spotco.us>
-Date: Sat, 28 Sep 2019 10:57:48 -0400
-Subject: [PATCH] audit2allow sepolicy
-
-Change-Id: Ia1e82d78c0f6a59216ce62274ec678258a807ed7
----
- sepolicy/hal-nfc_default.te       |  2 ++
- sepolicy/hal_bluetooth_default.te |  1 +
- sepolicy/hal_keymaster_default.te |  1 +
- sepolicy/healthd.te               |  1 +
- sepolicy/init-power-sh.te         |  5 +++++
- sepolicy/init.te                  | 13 +++++++++++++
- sepolicy/mm-qcamerad.te           |  4 ++++
- sepolicy/qtelephony.te            |  2 ++
- sepolicy/rild.te                  |  4 ++++
- sepolicy/rmt_storage.te           |  1 +
- sepolicy/sensors.te               |  1 +
- sepolicy/servicemanager.te        |  3 +++
- sepolicy/system_app.te            |  3 +++
- sepolicy/system_server.te         |  3 +++
- sepolicy/toolbox.te               |  1 +
- sepolicy/ueventd.te               |  1 +
- 16 files changed, 46 insertions(+)
- create mode 100644 sepolicy/hal-nfc_default.te
- create mode 100644 sepolicy/hal_bluetooth_default.te
- create mode 100644 sepolicy/hal_keymaster_default.te
- create mode 100644 sepolicy/qtelephony.te
- create mode 100644 sepolicy/servicemanager.te
-
-diff --git a/sepolicy/hal-nfc_default.te b/sepolicy/hal-nfc_default.te
-new file mode 100644
-index 0000000..f4d0b78
---- /dev/null
-+++ b/sepolicy/hal-nfc_default.te
-@@ -0,0 +1,2 @@
-+allow hal_nfc_default nfc_data_file:dir { add_name write };
-+allow hal_nfc_default nfc_data_file:file { create open read write };
-diff --git a/sepolicy/hal_bluetooth_default.te b/sepolicy/hal_bluetooth_default.te
-new file mode 100644
-index 0000000..ec949d1
---- /dev/null
-+++ b/sepolicy/hal_bluetooth_default.te
-@@ -0,0 +1 @@
-+allow hal_bluetooth_default mnt_vendor_file:file { open read };
-diff --git a/sepolicy/hal_keymaster_default.te b/sepolicy/hal_keymaster_default.te
-new file mode 100644
-index 0000000..3aad282
---- /dev/null
-+++ b/sepolicy/hal_keymaster_default.te
-@@ -0,0 +1 @@
-+allow hal_keymaster_default unlabeled:file { getattr open read };
-diff --git a/sepolicy/healthd.te b/sepolicy/healthd.te
-index 114e7b7..74a252e 100644
---- a/sepolicy/healthd.te
-+++ b/sepolicy/healthd.te
-@@ -1,3 +1,4 @@
- allow healthd sysfs_thermal:dir search;
- allow healthd sysfs_thermal:file { open read };
- allow healthd device:dir r_dir_perms;
-+allow healthd sysfs:file { getattr open read };
-diff --git a/sepolicy/init-power-sh.te b/sepolicy/init-power-sh.te
-index c24dd3c..ba3cd05 100644
---- a/sepolicy/init-power-sh.te
-+++ b/sepolicy/init-power-sh.te
-@@ -31,3 +31,8 @@ allow init-power-sh rootfs:file { getattr open read };
- allow init-power-sh sysfs:dir { open read };
- allow init-power-sh sysfs:file getattr;
- allow init-power-sh sysfs:lnk_file getattr;
-+
-+allow init-power-sh file_contexts_file:file read;
-+allow init-power-sh sysfs_cpu_boost:dir search;
-+allow init-power-sh sysfs_cpu_boost:file { open write };
-+allow init-power-sh sysfs_net:dir search;
-diff --git a/sepolicy/init.te b/sepolicy/init.te
-index 5ea8334..8424ed2 100644
---- a/sepolicy/init.te
-+++ b/sepolicy/init.te
-@@ -14,3 +14,16 @@ allow init sysfs_lowmemorykiller:file getattr;
- allow init sysfs_light:file setattr;
- allow init sysfs_power:file setattr;
- allow init system_data_file:file { rename append };
-+allow init atfwd_service:service_manager find;
-+allow init debugfs_rmt:dir relabelfrom;
-+allow init debugfs_rmt:file relabelfrom;
-+allow init hal_drm_hwservice:hwservice_manager add;
-+allow init hal_light_hwservice:hwservice_manager add;
-+allow init hidl_base_hwservice:hwservice_manager add;
-+allow init mnt_vendor_file:dir mounton;
-+allow init qmuxd:unix_stream_socket connectto;
-+allow init qmuxd_socket:sock_file write;
-+allow init servicemanager:binder call;
-+allow init sysfs:file { open setattr write };
-+allow init sysfs_devices_system_cpu:file write;
-+allow init sysfs_graphics:file { open write };
-diff --git a/sepolicy/mm-qcamerad.te b/sepolicy/mm-qcamerad.te
-index 79059bb..990fb2c 100644
---- a/sepolicy/mm-qcamerad.te
-+++ b/sepolicy/mm-qcamerad.te
-@@ -3,3 +3,7 @@ allow mm-qcamerad init:unix_stream_socket connectto;
- allow mm-qcamerad persist_file:dir { getattr open read search  };
- allow mm-qcamerad persist_file:file { read open getattr };
- allow mm-qcamerad property_socket:sock_file write;
-+allow mm-qcamerad mnt_vendor_file:dir search;
-+allow mm-qcamerad mnt_vendor_file:file { getattr open read };
-+allow mm-qcamerad vendor_data_file:dir { add_name remove_name write };
-+allow mm-qcamerad vendor_data_file:sock_file { create unlink };
-diff --git a/sepolicy/qtelephony.te b/sepolicy/qtelephony.te
-new file mode 100644
-index 0000000..c9d5a74
---- /dev/null
-+++ b/sepolicy/qtelephony.te
-@@ -0,0 +1,2 @@
-+allow qtelephony atfwd_service:service_manager add;
-+allow qtelephony radio_service:service_manager find;
-diff --git a/sepolicy/rild.te b/sepolicy/rild.te
-index 732d94c..9970af5 100644
---- a/sepolicy/rild.te
-+++ b/sepolicy/rild.te
-@@ -10,3 +10,7 @@ allow rild rmt_storage_prop:file { getattr open read };
- allow rild sensors_device:chr_file { ioctl open read write };
- allow rild system_data_file:dir { write remove_name  add_name };
- allow rild system_data_file:sock_file { create setattr unlink };
-+allow rild proc:file read;
-+allow rild system_data_file:dir { open read };
-+allow rild system_file:file execute_no_trans;
-+allow rild unlabeled:dir getattr;
-diff --git a/sepolicy/rmt_storage.te b/sepolicy/rmt_storage.te
-index cf637ca..67cec68 100644
---- a/sepolicy/rmt_storage.te
-+++ b/sepolicy/rmt_storage.te
-@@ -10,3 +10,4 @@ allow rmt_storage fsg_file:file r_file_perms;
- allow rmt_storage init:unix_stream_socket connectto;
- allow rmt_storage property_socket:sock_file write;
- allow rmt_storage rmt_storage_prop:property_service set;
-+allow rmt_storage unlabeled:file { open read };
-diff --git a/sepolicy/sensors.te b/sepolicy/sensors.te
-index a07201b..196ed1a 100644
---- a/sepolicy/sensors.te
-+++ b/sepolicy/sensors.te
-@@ -1,3 +1,4 @@
- allow sensors init:unix_stream_socket connectto;
- allow sensors property_socket:sock_file write;
- allow sensors sensors_prop:property_service set;
-+allow sensors firmware_file:file { getattr open read };
-diff --git a/sepolicy/servicemanager.te b/sepolicy/servicemanager.te
-new file mode 100644
-index 0000000..8ef184e
---- /dev/null
-+++ b/sepolicy/servicemanager.te
-@@ -0,0 +1,3 @@
-+allow servicemanager init:dir search;
-+allow servicemanager init:file { open read };
-+allow servicemanager init:process getattr;
-diff --git a/sepolicy/system_app.te b/sepolicy/system_app.te
-index d0dbdfa..92d225c 100644
---- a/sepolicy/system_app.te
-+++ b/sepolicy/system_app.te
-@@ -1 +1,4 @@
- allow system_app sensors_device:chr_file { read write open ioctl };
-+allow system_app proc_pagetypeinfo:file { getattr open read };
-+allow system_app sysfs_zram:dir search;
-+allow system_app sysfs_zram:file { getattr open read };
-diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te
-index c082b93..8f81c08 100644
---- a/sepolicy/system_server.te
-+++ b/sepolicy/system_server.te
-@@ -5,3 +5,6 @@ allow system_server sysfs_dt2w:file rw_file_perms;
- allow system_server sysfs_light:file rw_file_perms;
- allow system_server sysfs_power:file rw_file_perms;
- allow system_server user_profile_data_file:dir r_dir_perms;
-+allow system_server block_device:blk_file { getattr ioctl open read write };
-+allow system_server init:binder call;
-+allow system_server sensors_device:chr_file ioctl;
-diff --git a/sepolicy/toolbox.te b/sepolicy/toolbox.te
-index 0e64d66..7c57640 100644
---- a/sepolicy/toolbox.te
-+++ b/sepolicy/toolbox.te
-@@ -3,3 +3,4 @@ allow toolbox hwrev_data_file:file { write unlink getattr setattr };
- allow toolbox init:fifo_file { write read getattr };
- allow toolbox self:capability chown;
- allow toolbox sysfs:file setattr;
-+allow toolbox sysfs:file { getattr open read };
-diff --git a/sepolicy/ueventd.te b/sepolicy/ueventd.te
-index d069fda..65a66b8 100644
---- a/sepolicy/ueventd.te
-+++ b/sepolicy/ueventd.te
-@@ -1 +1,2 @@
- allow ueventd radio_data_file:chr_file { create setattr };
-+allow ueventd unlabeled:file { getattr open read };
--- 
-2.21.0
-
diff --git a/Patches/LineageOS-16.0/android_device_motorola_clark/privapp-permissions-qti.xml b/Patches/LineageOS-16.0/android_device_motorola_clark/privapp-permissions-qti.xml
deleted file mode 100644
index 87d58fdf..00000000
--- a/Patches/LineageOS-16.0/android_device_motorola_clark/privapp-permissions-qti.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of The Linux Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
--->
-<!--
-This XML file declares which signature|privileged permissions should be
-granted to privileged applications on Qualcomm devices.
-It allows additional grants on top of privapp-permissions-platform.xml
--->
-<permissions>
-    <privapp-permissions package="com.quicinc.cne.CNEService">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.qti.dpmserviceapp">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.qualcomm.location">
-        <permission name="android.permission.CONTROL_LOCATION_UPDATES"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.qualcomm.location.XT">
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.qualcomm.qcrilmsgtunnel">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.qualcomm.atfwd">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-</permissions>
\ No newline at end of file
diff --git a/Patches/Linux b/Patches/Linux
index 12f80eb9..1c88b357 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit 12f80eb966709ad2bc0a10776e316beb229a999a
+Subproject commit 1c88b35767f3128092b2de8e807c2bcee55118ab
diff --git a/PrebuiltApps b/PrebuiltApps
index 3e85aa75..62085161 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit 3e85aa75a0285293c670a75796fcf470b558c691
+Subproject commit 62085161265662fb33321d69f55b31759044ab32
diff --git a/Scripts/LineageOS-11.0/Functions.sh b/Scripts/LineageOS-11.0/Functions.sh
index 31c7a8cd..ec3dd24b 100644
--- a/Scripts/LineageOS-11.0/Functions.sh
+++ b/Scripts/LineageOS-11.0/Functions.sh
@@ -57,7 +57,7 @@ patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/cm"; fi;
 	sed -i "s/'git', 'show', '-q'/'git', 'show'/" build/tools/repopick.py; #fix for old git versions
 	source build/envsetup.sh;
-	repopick -it asb-2018.09-cm11-qcom;
+	repopick -itf asb-2018.09-cm11-qcom;
 	repopick -i 230054 230392; #asb disclaimer
 	#repopick -it asb-2019.03-cm11;
 	#repopick -it asb-2019.04-cm11 -e 246293;
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh
index c25e1cef..345ed91e 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh
@@ -339,10 +339,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-#git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
-editKernelLocalversion "-dos.p344"
+editKernelLocalversion "-dos.p343"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh
index 795f2193..a10036ab 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh
@@ -192,11 +192,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p198"
+editKernelLocalversion "-dos.p197"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
index 630642f3..1ed45c49 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
@@ -210,11 +210,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p216"
+editKernelLocalversion "-dos.p215"
 cd "$DOS_BUILD_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
index 1134cdd8..8a306c23 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh
@@ -334,11 +334,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0001/3.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0002/3.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0004/3.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15845/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8281/3.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p340"
+editKernelLocalversion "-dos.p341"
 cd "$DOS_BUILD_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 1463e560..91a34259 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
@@ -233,11 +233,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p239"
+editKernelLocalversion "-dos.p238"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
index 992c4f2a..4a3cbe96 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
@@ -341,7 +341,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
@@ -349,5 +348,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15845/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8281/3.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p349"
+editKernelLocalversion "-dos.p348"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
index 7b458d28..49181533 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
@@ -201,10 +201,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p206"
+editKernelLocalversion "-dos.p205"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh
index 72d17cf6..838f2f58 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh
@@ -196,10 +196,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p201"
+editKernelLocalversion "-dos.p200"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index a9a66ed4..1c756a39 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -119,6 +119,9 @@ patchWorkspace() {
 	repopick -it n_asb_09-2018-qcom;
 	repopick -it ibss-mode-nougat;
 	repopick -it n-netd;
+	repopick -it tzdb2020a_N;
+	repopick -it n-asb-2020-05;
+	repopick -i 275225; #update webview
 
 	export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails
 
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index d6534b24..1aa281c7 100644
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -75,6 +75,9 @@ enterAndClear "device/qcom/sepolicy";
 patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/248649.patch"; #msm_irqbalance: Allow read for stats and interrupts
 patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH
 
+enterAndClear "external/libexif";
+git fetch "https://github.com/LineageOS/android_external_libexif" refs/changes/18/275018/1 && git cherry-pick FETCH_HEAD; #n-asb-2020-05
+
 enterAndClear "external/sqlite";
 patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (CopperheadOS-13.0)
 
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh
index 0cd06b48..51de1f7e 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh
@@ -317,9 +317,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-#git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
-editKernelLocalversion "-dos.p321"
+editKernelLocalversion "-dos.p320"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh
index 6e693a5c..11e3cda9 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh
@@ -189,11 +189,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p195"
+editKernelLocalversion "-dos.p194"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
index 1ac9f802..8798da2d 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
@@ -186,11 +186,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p192"
+editKernelLocalversion "-dos.p191"
 cd "$DOS_BUILD_BASE"
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
index c7c0c1ca..526359aa 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh
@@ -131,7 +131,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
@@ -139,5 +138,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p139"
+editKernelLocalversion "-dos.p138"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
index c76b392b..6a9f517d 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
@@ -201,10 +201,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p206"
+editKernelLocalversion "-dos.p205"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh
index 30ca4814..cac1d764 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh
@@ -174,10 +174,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p179"
+editKernelLocalversion "-dos.p178"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index e5f6cd95..e0462219 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -104,7 +104,10 @@ export -f buildAll;
 patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
 
-	#source build/envsetup.sh;
+	source build/envsetup.sh;
+	repopick -it tzdb2020a_O;
+	repopick -it O_asb_2020-05;
+	repopick -i 275225; #update webview
 
 	export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails
 
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index 01b01dca..6d226ac6 100644
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -78,6 +78,9 @@ git revert --no-edit c9b0d95630b82cd0ad1a0fc633c6d59c2cb8aad7 37422f7df389f3ae5a
 enterAndClear "device/qcom/sepolicy";
 patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH
 
+enterAndClear "external/libexif";
+git fetch "https://github.com/LineageOS/android_external_libexif" refs/changes/83/275083/1 && git cherry-pick FETCH_HEAD; #O_asb_2020-05
+
 enterAndClear "external/svox";
 git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles
 
diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh
index ace0c3c5..5537892f 100644
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh
@@ -316,9 +316,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-#git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
-editKernelLocalversion "-dos.p320"
+editKernelLocalversion "-dos.p319"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
index 455c24ee..39464bcb 100644
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
@@ -183,11 +183,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p189"
+editKernelLocalversion "-dos.p188"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh
index c7c0c1ca..526359aa 100644
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh
@@ -131,7 +131,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
@@ -139,5 +138,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p139"
+editKernelLocalversion "-dos.p138"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8992.sh
deleted file mode 100644
index 71c9f539..00000000
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8992.sh
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/bin/bash
-cd "$DOS_BUILD_BASE""kernel/motorola/msm8992"
-git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0004-No_dir-relax.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0013.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0014.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0015.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0016.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0017.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0018.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0012.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2898/^3.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4129/^3.10.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4129/^3.10.3/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9730/^3.18.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9904/^3.17/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1339/^4.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-5307/^4.2.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/^4.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5244/^4.6.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5828/^4.6.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8394/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0648/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0861/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0862/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000410/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11176/^4.11.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/^4.12.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11600/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13163/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13168/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.10/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.10/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13245/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13305/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13695/^4.12.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14489/^4.13.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15837/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16531/^4.13.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16533/^4.13.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16534/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16535/^4.13.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16537/^4.13.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/^4.13.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/^4.13.11/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.5-^4.13.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/^4.13.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16939/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/^4.14.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17558/^4.14.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17762/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/^4.14.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/^4.14.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18079/^4.12.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18153/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18203/^4.14.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18255/^4.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18306/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18360/^4.11.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18595/^4.14.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6345/^4.9.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.10/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8243/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8281/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8281/3.10/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8824/^4.14.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9711/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9723/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/^4.11.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/^3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/^4.16/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.10/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10881/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/^4.15.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11265/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11273/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11286/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11919/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11987/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12011/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13053/^4.17.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13913/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14634/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14734/^4.17.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/^4.18.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/^4.18.12/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18710/^4.19/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20511/^4.18.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20836/^4.20/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3585/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3597/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5332/^4.14.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5333/^4.14.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5750/^4.14.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5825/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5864/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5904/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5908/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7273/^4.15.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7492/^4.14.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7757/^4.15.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8781/^4.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9383/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9439/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9518/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10491/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10519/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11486/^5.0.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/^5.0.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/^5.1.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/^5.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15216/^5.0.14/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15807/^5.1.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/^5.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/^5.3.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2001/^3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2331/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p178"
-cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_nextbit_msm8992.sh
index 33f02ea8..f4bbffc3 100644
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_nextbit_msm8992.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_nextbit_msm8992.sh
@@ -199,10 +199,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p204"
+editKernelLocalversion "-dos.p203"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8994.sh
index 816db77c..20b34797 100644
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8994.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8994.sh
@@ -154,10 +154,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p159"
+editKernelLocalversion "-dos.p158"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index 7cbb55fe..7ff366cc 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -18,7 +18,7 @@
 #Last verified: 2018-04-27
 
 patchAllKernels() {
-	startPatcher "kernel_asus_fugu kernel_asus_msm8953 kernel_cyanogen_msm8916 kernel_cyanogen_msm8974 kernel_essential_msm8998 kernel_fairphone_msm8974 kernel_google_bonito kernel_google_crosshatch kernel_google_marlin kernel_google_msm kernel_google_wahoo kernel_htc_msm8974 kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8974 kernel_moto_shamu kernel_motorola_msm8974 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_smdk4412 kernel_yandex_sdm660 kernel_zuk_msm8996";
+	startPatcher "kernel_asus_fugu kernel_asus_msm8953 kernel_cyanogen_msm8916 kernel_cyanogen_msm8974 kernel_essential_msm8998 kernel_fairphone_msm8974 kernel_google_bonito kernel_google_crosshatch kernel_google_marlin kernel_google_msm kernel_google_wahoo kernel_htc_msm8974 kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8974 kernel_moto_shamu kernel_motorola_msm8974 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_smdk4412 kernel_yandex_sdm660 kernel_zuk_msm8996";
 }
 export -f patchAllKernels;
 
@@ -65,9 +65,7 @@ buildAll() {
 	buildDevice bacon;
 	buildDevice ham;
 	buildDevice klte;
-	buildDevice victara;
 	#SD808
-	#buildDeviceUserDebug clark; #permissive + needs manual patching - fwb xml: fused: dangling tag
 	buildDevice ether;
 	#SD810
 	buildDevice oneplus2;
@@ -108,6 +106,7 @@ buildAll() {
 		buildDevice d855;
 		buildDevice FP2;
 		buildDevice m8;
+		buildDevice victara;
 		#SD805
 		buildDevice shamu verity;
 		#SD820
@@ -125,7 +124,9 @@ export -f buildAll;
 patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
 
-	#source build/envsetup.sh;
+	source build/envsetup.sh;
+	repopick -i 232948; #wahoo: liblight: close fd
+	repopick -i 275225; #update webview
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS/Defaults.sh";
diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh
index 40adc192..ef17f67f 100644
--- a/Scripts/LineageOS-16.0/Patch.sh
+++ b/Scripts/LineageOS-16.0/Patch.sh
@@ -231,20 +231,6 @@ echo "pmf=0" >> wifi/wpa_supplicant_overlay.conf; #Wi-Fi chipset doesn't support
 #enterAndClear "device/moto/shamu";
 #git revert --no-edit 05fb49518049440f90423341ff25d4f75f10bc0c; #restore releasetools #TODO
 
-#enterAndClear "device/motorola/clark";
-#git revert --no-edit fc6cf83; #disable nfc for now
-#awk -i inplace '!/nfc/' device.mk;
-#awk -i inplace '!/Nfc/' device.mk;
-#awk -i inplace '!/Tag/' device.mk;
-#patch -p1 < "$DOS_PATCHES/android_device_motorola_clark/0001-audit2allow.patch"; #audit2allow sepolicy
-#mkdir permissions;
-#cp "$DOS_PATCHES/android_device_motorola_clark/privapp-permissions-qti.xml" permissions/; #Fix privapp permissions, Credit: @Fabiett83
-#echo "PRODUCT_COPY_FILES += device/motorola/clark/permissions/privapp-permissions-qti.xml:system/etc/permissions/privapp-permissions-qti.xml" >> device.mk;
-#sed -i 's/androidboot.selinux=permissive//' BoardConfig.mk; #enforce sepolicy
-#rm configs/Android.mk; #fix compile
-#rm setup-makefiles.sh; #broken, deblobber will still function
-#XXX: remove atfwd and cne from vendor makefiles
-
 enterAndClear "device/oneplus/oneplus2";
 sed -i 's|etc/permissions/qti_libpermissions.xml|vendor/etc/permissions/qti_libpermissions.xml|' proprietary-files.txt;
 
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh
index c7c0c1ca..526359aa 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh
@@ -131,7 +131,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
@@ -139,5 +138,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p139"
+editKernelLocalversion "-dos.p138"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh
index cd2f0ef5..5a2a4760 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh
@@ -101,10 +101,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10902/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch
@@ -158,5 +154,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/^3.6/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-editKernelLocalversion "-dos.p158"
+editKernelLocalversion "-dos.p154"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index a317ccc2..0919d4f1 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -66,7 +66,7 @@ buildAll() {
 	buildDevice d855;
 	buildDevice FP2;
 	buildDevice m8;
-	buildDevice victara; #no compile
+	buildDevice victara;
 	#SD805
 	buildDevice shamu verity;
 	#SD820
@@ -86,7 +86,8 @@ export -f buildAll;
 patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
 
-	#source build/envsetup.sh;
+	source build/envsetup.sh;
+	repopick -i 275225; #update webview
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS/Defaults.sh";
diff --git a/Scripts/init.sh b/Scripts/init.sh
index 54117e7e..a8c1db93 100644
--- a/Scripts/init.sh
+++ b/Scripts/init.sh
@@ -41,7 +41,7 @@ export DOS_DEBLOBBER_REMOVE_AUDIOFX=true; #Set true to remove AudioFX
 export DOS_DEBLOBBER_REMOVE_GRAPHICS=false; #Set true to remove all graphics blobs and use SwiftShader CPU renderer #TODO: Needs work
 export DOS_DEBLOBBER_REMOVE_RENDERSCRIPT=false; #Set true to remove RenderScript blobs
 export DOS_DEBLOBBER_REMOVE_FP=false; #Set true to remove all fingerprint reader blobs
-export DOS_DEBLOBBER_REMOVE_IMS=true; #Set true to remove all IMS blobs XXX: Will break compat with select carriers
+export DOS_DEBLOBBER_REMOVE_IMS=false; #Set true to remove all IMS blobs XXX: Will break compat with select carriers
 export DOS_DEBLOBBER_REMOVE_IPA=false; #Set true to remove all IPA blobs
 export DOS_DEBLOBBER_REMOVE_IR=false; #Set true to remove all IR blobs
 export DOS_DEBLOBBER_REPLACE_TIME=false; #Set true to replace Qualcomm Time Services with the open source Sony TimeKeep reimplementation #TODO: Needs work