diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index ad10588d..628f78e0 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -92,6 +92,7 @@ echo "Deblobbing..." #Dirac (Audio Codec + Effects) [Dirac] blobs=$blobs"|libDiracAPI_SHARED.so|.*dirac.*"; + blobs=$blobs"|diracmobile.config"; #Discretix (DRM/HDCP) [Discretix Technologies] blobs=$blobs"|DxDrmServerIpc|discretix"; @@ -227,7 +228,8 @@ echo "Deblobbing..." blobs=$blobs"|dolby_vision.cfg"; #I/O Prefetcher [Qualcomm] - blobs=$blobs"|libqc-opt.so|libqti-iop.*.so"; + #blobs=$blobs"|libqc-opt.so"; #Can break camera in some cases + blobs=$blobs"|libqti-iop.*.so"; blobs=$blobs"|bin[/]iop"; blobs=$blobs"|QPerformance.jar"; blobs=$blobs"|vendor.qti.hardware.iop.*"; diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index ab78a301..55e57846 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -85,13 +85,16 @@ scanForMalware() { scanQueue="$DOS_BUILD_BASE"; fi; fi; - du -hsc "$scanQueue"; - /usr/bin/clamscan --recursive --detect-pua --infected "$excludes" "$scanQueue"; + du -hsc $scanQueue; + /usr/bin/clamscan --recursive --detect-pua --infected $excludes $scanQueue; clamscanExit="$?"; if [ "$clamscanExit" -eq "1" ]; then echo -e "\e[0;31m----------------------------------------------------------------\e[0m"; echo -e "\e[0;31mWARNING: MALWARE WAS FOUND! PLEASE INVESTIGATE!\e[0m"; echo -e "\e[0;31m----------------------------------------------------------------\e[0m"; + echo -e "\e[0;33mFalse positivies such as the following are probably OK\e[0m"; + echo -e "\e[0;33mPUAs: Ewind, Mobidash\e[0m"; + echo -e "\e[0;31m----------------------------------------------------------------\e[0m"; sleep 60; fi; if [ "$clamscanExit" -eq "0" ]; then diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 0ceb33ad..40577102 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -230,12 +230,14 @@ awk -i inplace '!/additional_system_update/' overlay/packages/apps/Settings/res/ enableLowRam "device/samsung/tuna"; enterAndClear "device/samsung/tuna"; rm setup-makefiles.sh; #broken, deblobber will still function +sed -i 's|vendor/maguro/|vendor/|' libgps-shim/gps.c; #fix dlopen not found #See: https://review.lineageos.org/q/topic:%22tuna-sepolicies patch -p1 < "$DOS_PATCHES/android_device_samsung_tuna/0001-fix_denial.patch"; patch -p1 < "$DOS_PATCHES/android_device_samsung_tuna/0002-fix_denial.patch"; patch -p1 < "$DOS_PATCHES/android_device_samsung_tuna/0003-fix_denial.patch"; patch -p1 < "$DOS_PATCHES/android_device_samsung_tuna/0004-fix_denial.patch"; patch -p1 < "$DOS_PATCHES/android_device_samsung_tuna/0005-fix_denial.patch"; +echo "allow system_server system_file:file execmod;" >> sepolicy/system_server.te; #fix gps load enter "vendor/google"; echo "" > atv/atv-common.mk; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 63a31b97..942d9843 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -171,6 +171,7 @@ echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our cus enter "vendor/divested"; if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += GmsCore GsfProxy FakeStore" >> packages.mk; fi; if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += $DOS_HOSTS_BLOCKING_APP" >> packages.mk; fi; +echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All of our kernels have deny USB patch added # #END OF ROM CHANGES # diff --git a/Scripts/init.sh b/Scripts/init.sh index d4da997e..c5a52bd9 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -27,7 +27,7 @@ export DOS_BUILDALL_SUPERSEDED=false; #Set true to build superseded devices when export DOS_DEBLOBBER_REMOVE_ACCESSORIES=true; #Set false to allow use of external accessories 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 #TODO: Needs work -export DOS_DEBLOBBER_REMOVE_RENDERSCRIPT=true; #Set true to remove RenderScript blobs +export DOS_DEBLOBBER_REMOVE_RENDERSCRIPT=false; #Set true to remove RenderScript blobs 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 XXX: Will break compat with select carriers export DOS_DEBLOBBER_REMOVE_IPA=false; #Set true to remove all IPA blobs