From c012af895fda23d7f563ec208f4615e9fa216932 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Tue, 18 Sep 2018 20:55:45 -0400
Subject: [PATCH] Updates

---
 PrebuiltApps                                                 | 2 +-
 Scripts/LineageOS-14.1/Patch.sh                              | 2 +-
 .../LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh   | 5 +----
 Scripts/LineageOS-15.1/Patch.sh                              | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/PrebuiltApps b/PrebuiltApps
index a8a527e5..8a5f0b6e 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit a8a527e56318de2b51629abf493b343b3db6ed51
+Subproject commit 8a5f0b6e5cfd4540fae0976839975a0467ac09b1
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 7dd71ea1..e8027535 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -233,7 +233,7 @@ find "hardware/qcom/gps" -name "gps\.conf" -type f -exec bash -c 'hardenLocation
 find "device" -name "gps\.conf" -type f -exec bash -c 'hardenLocation "$0"' {} \;;
 find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableDexPreOpt "$0"' {} \;;
 find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'hardenUserdata "$0"' {} \;;
-#if [ "$STRONG_ENCRYPTION_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableStrongEncryption "$0"' {} \;; fi;
+#if [ "$DOS_STRONG_ENCRYPTION_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableStrongEncryption "$0"' {} \;; fi;
 find "kernel" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'hardenDefconfig "$0"' {} \;;
 cd "$DOS_BUILD_BASE";
 
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh
index 1ef71934..ed07a159 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh
@@ -15,13 +15,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/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/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p23"
+editKernelLocalversion "-dos.p20"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index a21ac2d8..36b09cea 100755
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -215,7 +215,7 @@ find "hardware/qcom/gps" -name "gps\.conf" -type f -exec bash -c 'hardenLocation
 find "device" -name "gps\.conf" -type f -exec bash -c 'hardenLocation "$0"' {} \;;
 find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableDexPreOpt "$0"' {} \;;
 find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'hardenUserdata "$0"' {} \;;
-#if [ "$STRONG_ENCRYPTION_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableStrongEncryption "$0"' {} \;; fi;
+#if [ "$DOS_STRONG_ENCRYPTION_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableStrongEncryption "$0"' {} \;; fi;
 find "kernel" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'hardenDefconfig "$0"' {} \;;
 cd "$DOS_BUILD_BASE";