diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index a3907483..3b9ed581 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -327,7 +327,7 @@ hardenDefconfig() { done #Disable supported options declare -a optionsNo=("CONFIG_ACPI_CUSTOM_METHOD" "CONFIG_BINFMT_MISC" "CONFIG_COMPAT_BRK" "CONFIG_COMPAT_VDSO" "CONFIG_CP_ACCESS64" "CONFIG_DEVKMEM" "CONFIG_DEVMEM" "CONFIG_DEVPORT" "CONFIG_HIBERNATION" "CONFIG_INET_DIAG" "CONFIG_KEXEC" "CONFIG_LEGACY_PTYS" "CONFIG_MSM_BUSPM_DEV" "CONFIG_OABI_COMPAT" "CONFIG_PROC_KCORE" "CONFIG_PROC_VMCORE" "CONFIG_SECURITY_SELINUX_DISABLE" "CONFIG_SLAB_MERGE_DEFAULT" "CONFIG_WLAN_FEATURE_MEMDUMP" "CONFIG_EARJACK_DEBUGGER" "CONFIG_IOMMU_NON_SECURE"); - if [[ "$1" != *"kernel/htc/msm8994"* ]] && [[ "$1" != *"kernel/samsung/smdk4412"* ]]; then + if [[ "$1" != *"kernel/htc/msm8994"* ]] && [[ "$1" != *"kernel/samsung/smdk4412"* ]] && [[ "$1" != *"kernel/htc/flounder"* ]]; then optionsNo+=("CONFIG_DIAG_CHAR" "CONFIG_DIAG_OVER_USB" "CONFIG_USB_QCOM_DIAG_BRIDGE" "CONFIG_DIAGFWD_BRIDGE_CODE" "CONFIG_DIAG_SDIO_PIPE" "CONFIG_DIAG_HSIC_PIPE"); fi; if [ "$DOS_DEBLOBBER_REMOVE_IPA" = true ]; then optionsNo+=("CONFIG_IPA"); fi; diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh index e2451b2a..523a581a 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -52,7 +52,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11031/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11045/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11077/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13162/3.18/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13162/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.18/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15814/ANY/0001.patch diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index f6811449..3a0a3f06 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -54,7 +54,7 @@ buildAll() { brunch lineage_bacon-user; brunch lineage_angler-user; brunch lineage_bullhead-user; - #brunch lineage_clark-eng; #permissive and needs manual patching (fwb xml: fused: dangling tag) + #brunch lineage_clark-userdebug; #permissive and needs manual patching (fwb xml: fused: dangling tag) brunch lineage_d802-user; #brunch lineage_d855-user; #broken upstream - recovery updater brunch lineage_dragon-user; @@ -67,7 +67,7 @@ buildAll() { brunch lineage_h850-user; brunch lineage_hammerhead-user; #brunch lineage_jfltexx-user; #still in bringup - brunch lineage_klte-user; + brunch lineage_klte-user; #broken brunch lineage_m8-user; brunch lineage_marlin-user; brunch lineage_mata-user;