From 44a192b7a4b0e3ff6cd3abf4ac13ffcc942738af Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 26 Aug 2018 20:32:19 -0400 Subject: [PATCH] Various fixes --- Scripts/Common/Deblob.sh | 5 ++--- Scripts/Common/Functions.sh | 8 ++++---- .../CVE_Patchers/android_kernel_motorola_msm8974.sh | 2 +- .../CVE_Patchers/android_kernel_motorola_msm8974.sh | 2 +- Scripts/init.sh | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 040f4ddf..16731e15 100755 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -53,9 +53,8 @@ echo "Deblobbing..." blobs=$blobs"|.*aptX.*"; #AT Command Handling/Forwarding (See: https://atcommands.org) - blobs=$blobs"|bin[/]atd|ATFWD-daemon|atfwd.apk|port-bridge|drexe|log_serial_arm|at_distributor|connfwexe"; - #blobs=$blobs"libqmi.so|wankit|nvm_server|mmgr"; - sepolicy=$sepolicy" atfwd.te port-bridge.te"; + blobs=$blobs"|bin[/]atd|ATFWD-daemon|atfwd.apk|drexe|log_serial_arm|at_distributor|connfwexe"; + sepolicy=$sepolicy" atfwd.te"; #AudioFX (Audio Effects) [Qualcomm] if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index b942ed38..d5e0cb74 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -301,8 +301,8 @@ hardenDefconfig() { sed -i 's/# '"$option"' is not set/'"$option"'=y/' $defconfigPath &>/dev/null || true; #Some defconfigs are very minimal/not-autogenerated, so lets add the rest. Obviously most won't have any affect as they aren't supported. if [[ "$defconfigPath" == *"lineage"* ]]; then - if ! grep -q "$option""=y" $defconfigPath; then - echo "$option""=y" | tee -a $defconfigPath > /dev/null; + if ! grep -q "$option=y" $defconfigPath; then + echo "$option=y" | tee -a $defconfigPath > /dev/null; fi; fi; done @@ -314,8 +314,8 @@ hardenDefconfig() { sed -i 's/'"$option"'=y/# '"$option"' is not set/' $defconfigPath &>/dev/null || true; #Some defconfigs are very minimal/not-autogenerated, so lets add the rest. Obviously most won't have any affect as they aren't supported. if [[ "$defconfigPath" == *"lineage"* ]]; then - if ! grep -q "$option""=n" $defconfigPath; then - echo "$option""=n" | tee -a $defconfigPath > /dev/null; + if ! grep -q "$option=n" $defconfigPath; then + echo "$option=n" | tee -a $defconfigPath > /dev/null; fi; fi; done diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index ce513e37..b18c0cde 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -10,7 +10,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3153/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1593/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3865/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5696/3.4/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5696/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8406/ANY/0001.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index ce513e37..b18c0cde 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -10,7 +10,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3153/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1593/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3865/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5696/3.4/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5696/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8406/ANY/0001.patch diff --git a/Scripts/init.sh b/Scripts/init.sh index 5c324e83..948fbd17 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -27,7 +27,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 export DOS_DEBLOBBER_REMOVE_FP=false; #Set true to remove all fingerprint reader blobs export DOS_DEBLOBBER_REMOVE_IMS=false; #Set true to remove all IMS blobs -export DOS_DEBLOBBER_REMOVE_IPA=true; #Set true to remove all IPA blobs +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 export DOS_DEFAULT_DNS_PRESET="Cloudflare"; #Sets default DNS. Options: Cloudflare, OpenNIC, DNSWATCH, Google, OpenDNS, Quad9, Quad9U, Verisign