From 318988345b8fa374f8dea772e1f7d2f611ec6c45 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 13 Jan 2021 06:29:29 -0500 Subject: [PATCH] Drop WireGuard kernel module support It was never used or enabled. Silly me didn't acknowledge that it requires root for any app to use. The app itself will still be included in the PrebuiltApps submodule for anyone who needs. --- Scripts/LineageOS-14.1/Patch.sh | 7 ------- Scripts/LineageOS-15.1/Patch.sh | 7 ------- Scripts/LineageOS-16.0/Patch.sh | 7 ------- Scripts/LineageOS-17.1/Patch.sh | 7 ------- Scripts/init.sh | 1 - 5 files changed, 29 deletions(-) diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 0d4b0e1a..2daf934d 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -151,13 +151,6 @@ git apply "$DOS_PATCHES_COMMON/android_hardware_qcom_display/CVE-2019-2306-msm89 enterAndClear "hardware/qcom/gps"; git apply "$DOS_PATCHES/android_hardware_qcom_gps/0001-rollover.patch"; #fix week rollover -if enter "kernel/wireguard"; then -if [ "$DOS_WIREGUARD_INCLUDED" = false ]; then rm Android.mk; fi; -#Remove system information from HTTP requests -awk -i inplace '!/USER_AGENT=/' fetch.sh; -sed -i '3iUSER_AGENT="WireGuard-AndroidROMBuild/0.23' fetch.sh; -fi; - enterAndClear "packages/apps/CMParts"; rm -rf src/org/cyanogenmod/cmparts/cmstats/ res/xml/anonymous_stats.xml res/xml/preview_data.xml; #Nuke part of CMStats patch -p1 < "$DOS_PATCHES/android_packages_apps_CMParts/0001-Remove_Analytics.patch"; #Remove the rest of CMStats diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 5b1bb6c2..2497c1d8 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -149,13 +149,6 @@ git apply "$DOS_PATCHES_COMMON/android_hardware_qcom_display/CVE-2019-2306-msm89 enterAndClear "hardware/qcom/gps"; git apply "$DOS_PATCHES_COMMON/android_hardware_qcom_gps/0001-rollover.patch"; #fix week rollover -if enter "kernel/wireguard"; then -if [ "$DOS_WIREGUARD_INCLUDED" = false ]; then rm Android.mk; fi; -#Remove system information from HTTP requests -awk -i inplace '!/USER_AGENT=/' fetch.sh; -sed -i '3iUSER_AGENT="WireGuard-AndroidROMBuild/0.3"' fetch.sh; -fi; - enterAndClear "lineage-sdk"; awk -i inplace '!/WeatherManagerServiceBroker/' lineage/res/res/values/config.xml; #Disable Weather if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/LineageAudioService/' lineage/res/res/values/config.xml; fi; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 15418822..97055627 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -149,13 +149,6 @@ git apply "$DOS_PATCHES_COMMON/android_hardware_qcom_display/CVE-2019-2306-msm89 enterAndClear "hardware/qcom/display-caf/msm8998"; git apply "$DOS_PATCHES_COMMON/android_hardware_qcom_display/CVE-2019-2306-msm8998.patch"; -if enter "kernel/wireguard"; then -if [ "$DOS_WIREGUARD_INCLUDED" = false ]; then rm Android.mk; fi; -#Remove system information from HTTP requests -awk -i inplace '!/USER_AGENT=/' fetch.sh; -sed -i '3iUSER_AGENT="WireGuard-AndroidROMBuild/0.3"' fetch.sh; -fi; - enterAndClear "lineage-sdk"; awk -i inplace '!/LineageWeatherManagerService/' lineage/res/res/values/config.xml; #Disable Weather if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/LineageAudioService/' lineage/res/res/values/config.xml; fi; diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index cd3bdaba..0a3ff348 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -145,13 +145,6 @@ patch -p1 < "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-8996.patch"; # enterAndClear "hardware/qcom-caf/msm8998/audio"; patch -p1 < "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-8998.patch"; #audio_extn: Fix unused parameter warning in utils.c -if enter "kernel/wireguard"; then -if [ "$DOS_WIREGUARD_INCLUDED" = false ]; then rm Android.mk; fi; -#Remove system information from HTTP requests -awk -i inplace '!/USER_AGENT=/' fetch.sh; -sed -i '3iUSER_AGENT="WireGuard-AndroidROMBuild/0.3"' fetch.sh; -fi; - enterAndClear "libcore"; if [ "$DOS_GRAPHENE_EXEC" = true ]; then patch -p1 < "$DOS_PATCHES/android_libcore/0001-Exec_Preload.patch"; fi; #add exec-based spawning support (GrapheneOS) if [ "$DOS_GRAPHENE_EXEC" = true ]; then patch -p1 < "$DOS_PATCHES/android_libcore/0002-Exec_Based_Spawning.patch"; fi; #add exec-based spawning support (GrapheneOS) diff --git a/Scripts/init.sh b/Scripts/init.sh index 7358b8e5..75f307c1 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -62,7 +62,6 @@ export DOS_NON_COMMERCIAL_USE_PATCHES=false; #Set true to allow inclusion of non export DOS_OPTIMIZE_IMAGES=false; #Set true to apply lossless optimizations to image resources export DOS_OVERCLOCKS_ENABLED=false; #Set true to enable overclocks #XXX: Most devices have their processors directly under their RAM, heatsinking is mostly into the ground plane, potentially inflicting damage to RAM and the processor itself export DOS_STRONG_ENCRYPTION_ENABLED=false; #Set true to enable AES 256-bit FDE encryption on 14.1+15.1 XXX: THIS WILL **DESTROY** EXISTING INSTALLS! -export DOS_WIREGUARD_INCLUDED=false; #Set true to enable WireGuard kernel module inclusion for devices with kernel 3.10+ #Servers export DOS_DEFAULT_DNS_PRESET="Cloudflare-BL"; #Sets default DNS. Options: See changeDefaultDNS() in Scripts/Common/Functions.sh