From 25776910caefc393c5002fcda3a8c665a7394eb8 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 9 Jul 2018 08:16:36 -0400 Subject: [PATCH] Updates --- .../CVE_Patchers/android_kernel_google_marlin.sh | 4 +--- .../CVE_Patchers/android_kernel_huawei_angler.sh | 3 +-- .../CVE_Patchers/android_kernel_lge_bullhead.sh | 3 +-- Scripts/init.sh | 4 ++-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh index f461119b..b1a1ca92 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -100,8 +100,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7371/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7372/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9707/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3570/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch @@ -111,5 +109,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch -editKernelLocalversion "-dos.p111" +editKernelLocalversion "-dos.p109" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh index f521f9e8..b0a3f168 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh @@ -107,12 +107,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8280/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/^4.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/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-2016-2475/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-2017-15845/ANY/0001.patch -editKernelLocalversion "-dos.p114" +editKernelLocalversion "-dos.p113" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh index ff191886..bbafc403 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh @@ -98,10 +98,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/^4.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/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-2016-6693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch -editKernelLocalversion "-dos.p103" +editKernelLocalversion "-dos.p102" cd "$DOS_BUILD_BASE" diff --git a/Scripts/init.sh b/Scripts/init.sh index a26d3ead..fc470946 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -35,7 +35,7 @@ export DOS_MALWARE_SCAN_ENABLED=true; #Set true to perform a fast scan on patchW export DOS_MALWARE_SCAN_SETTING="quick"; #buildAll() scan speed. Options: quick, extra, slow, full export DOS_MICROG_INCLUDED="NLP"; #Determines inclusion of microG. Options: NONE, NLP, FULL export DOS_HOSTS_BLOCKING=true; #Switch to false to prevent inclusion of our HOSTS file -export DOS_HOSTS_BLOCKING_LIST="https://divestos.xyz/hosts-exp"; #Must be in the format "127.0.0.1 bad.domain.tld" +export DOS_HOSTS_BLOCKING_LIST="https://divestos.xyz/hosts"; #Must be in the format "127.0.0.1 bad.domain.tld" export DOS_OVERCLOCKS_ENABLED=true; #Switch to false to disable overclocks export DOS_STRONG_ENCRYPTION_ENABLED=false; #Switch to true to enable AES-256bit encryption XXX: THIS WILL **DESTROY** EXISTING INSTALLS! export DOS_NON_COMMERCIAL_USE_PATCHES=false; #Switch to false to prevent inclusion of non-commercial use patches @@ -78,7 +78,7 @@ fi; export DOS_TMP_DIR="/tmp/dos_tmp"; mkdir "$DOS_TMP_DIR"; -export DOS_HOSTS_FILE="$DOS_TMP_DIR/hosts-exp"; +export DOS_HOSTS_FILE="$DOS_TMP_DIR/hosts"; export DOS_PREBUILT_APPS=$DOS_WORKSPACE_ROOT"PrebuiltApps/"; export DOS_PATCHES_COMMON=$DOS_WORKSPACE_ROOT"Patches/Common/";