From f0ab546816fc477263d2c0ff2e3e26da5420b6d7 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 4 Apr 2018 07:52:11 -0400 Subject: [PATCH] Dramatically deduplicate scripts --- Scripts/{LineageOS-15.1 => Common}/Deblob.sh | 0 Scripts/Common/Functions.sh | 173 ++++++++ .../{LineageOS-14.1 => Common}/Patch_CVE.sh | 0 Scripts/LineageOS-14.1/00init.sh | 2 + Scripts/LineageOS-14.1/Deblob.sh | 389 ------------------ Scripts/LineageOS-14.1/Functions.sh | 180 +------- Scripts/LineageOS-15.1/00init.sh | 2 + Scripts/LineageOS-15.1/Functions.sh | 165 +------- Scripts/LineageOS-15.1/Patch_CVE.sh | 31 -- 9 files changed, 202 insertions(+), 740 deletions(-) rename Scripts/{LineageOS-15.1 => Common}/Deblob.sh (100%) create mode 100644 Scripts/Common/Functions.sh rename Scripts/{LineageOS-14.1 => Common}/Patch_CVE.sh (100%) delete mode 100755 Scripts/LineageOS-14.1/Deblob.sh delete mode 100644 Scripts/LineageOS-15.1/Patch_CVE.sh diff --git a/Scripts/LineageOS-15.1/Deblob.sh b/Scripts/Common/Deblob.sh similarity index 100% rename from Scripts/LineageOS-15.1/Deblob.sh rename to Scripts/Common/Deblob.sh diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh new file mode 100644 index 00000000..9e4f1c7c --- /dev/null +++ b/Scripts/Common/Functions.sh @@ -0,0 +1,173 @@ +#!/bin/bash +#DivestOS: A privacy oriented Android distribution +#Copyright (c) 2017-2018 Spot Communications, Inc. +# +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU General Public License as published by +#the Free Software Foundation, either version 3 of the License, or +#(at your option) any later version. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. +# +#You should have received a copy of the GNU General Public License +#along with this program. If not, see . + +startPatcher() { + #$cvePatcher must be set! + java -jar $cvePatcher patch $base $androidWorkspace"Patches/" $cveScripts $1; +} +export -f startPatcher; + +enter() { + echo "================================================================================================" + dir=$1; + cd $base$dir; + echo "[ENTERING] "$dir; +} +export -f enter; + +enterAndClear() { + enter $1; + gitReset; +} +export -f enterAndClear; + +gitReset() { + git add -A && git reset --hard; +} +export -f gitReset; + +disableDexPreOpt() { + cd $base$1; + if [ -f BoardConfig.mk ]; then + sed -i "s/WITH_DEXPREOPT := true/WITH_DEXPREOPT := false/" BoardConfig.mk; + echo "Disabled dexpreopt"; + fi; + cd $base; +} +export -f disableDexPreOpt; + +compressRamdisks() { + if [ -f BoardConfig.mk ]; then + echo "LZMA_RAMDISK_TARGETS := boot,recovery" >> BoardConfig.mk; + echo "Enabled ramdisk compression"; + fi; +} +export -f compressRamdisks; + +enhanceLocation() { + cd $base$1; + #Enable GLONASS + #sed -i 's/#A_GLONASS_POS_PROTOCOL_SELECT/A_GLONASS_POS_PROTOCOL_SELECT/' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; + #sed -i 's/A_GLONASS_POS_PROTOCOL_SELECT = 0.*/A_GLONASS_POS_PROTOCOL_SELECT = 15/' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; + #sed -i 's|A_GLONASS_POS_PROTOCOL_SELECT=0.*|A_GLONASS_POS_PROTOCOL_SELECT=15|' overlay/frameworks/base/core/res/res/values-*/*.xml &>/dev/null || true; + #Recommended reading: https://wwws.nightwatchcybersecurity.com/2016/12/05/cve-2016-5341/ + #XTRA: Only use specified URLs + sed -i 's|XTRA_SERVER_QUERY=1|XTRA_SERVER_QUERY=0|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; + sed -i 's|#XTRA_SERVER|XTRA_SERVER|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; + #XTRA: Enable HTTPS + sed -i 's|http://xtra|https://xtra|' overlay/frameworks/base/core/res/res/values-*/*.xml gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; + #XTRA: Use format version 3 if possible + if grep -sq "XTRA_VERSION_CHECK" gps.conf gps/gps.conf configs/gps.conf; then #Using hardware/qcom/gps OR precompiled blob OR device specific implementation + sed -i 's|XTRA_VERSION_CHECK=0|XTRA_VERSION_CHECK=1|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; + sed -i 's|xtra2.bin|xtra3grc.bin|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; + elif grep -sq "BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET := true" BoardConfig.mk boards/*gps.mk; then + if ! grep -sq "USE_DEVICE_SPECIFIC_LOC_API := true" BoardConfig.mk boards/*gps.mk; then + if ! grep -sq "libloc" *proprietary*.txt; then #Using hardware/qcom/gps + sed -i 's|xtra2.bin|xtra3grc.bin|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; + fi; + fi; + fi; + echo "Enhanced location services for $1"; + cd $base; +} +export -f enhanceLocation; + +enableZram() { + cd $base$1; + sed -i 's|#/dev/block/zram0|/dev/block/zram0|' fstab.* root/fstab.* rootdir/fstab.* rootdir/etc/fstab.* &>/dev/null || true; + echo "Enabled zram for $1"; + cd $base; +} +export -f enableZram; + +enableForcedEncryption() { + cd $base$1; + if [[ $1 != "device/lge/mako" ]]; then #Forced encryption seems to prevent some devices from booting + sed -i 's|encryptable=/|forceencrypt=/|' fstab.* root/fstab.* rootdir/fstab.* rootdir/etc/fstab.* &>/dev/null || true; + echo "Enabled forceencrypt for $1"; + fi; + cd $base; +} +export -f enableForcedEncryption; + +enableStrongEncryption() { + cd $base$1; + if [ -f BoardConfig.mk ]; then + echo "TARGET_WANTS_STRONG_ENCRYPTION := true" >> BoardConfig.mk; + echo "Enabled AES-256 encryption for $1"; + fi; + cd $base; +} +export -f enableStrongEncryption; + +getDefconfig() { + if ls arch/arm/configs/lineage*defconfig 1> /dev/null 2>&1; then + defconfigPath="arch/arm/configs/lineage*defconfig"; + elif ls arch/arm64/configs/lineage*defconfig 1> /dev/null 2>&1; then + defconfigPath="arch/arm64/configs/lineage*defconfig"; + else + defconfigPath="arch/arm/configs/*defconfig arch/arm64/configs/*defconfig"; + fi; + echo $defconfigPath; + #echo "Found defconfig at $defconfigPath" +} +export -f getDefconfig; + +editKernelLocalversion() { + defconfigPath=$(getDefconfig) + sed -i 's/CONFIG_LOCALVERSION=".*"/CONFIG_LOCALVERSION="'$1'"/' $defconfigPath &>/dev/null || true; +} +export -f editKernelLocalversion; + +hardenDefconfig() { + cd $base$1; + + #Attempts to enable/disable supported options to increase security + #See https://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project/Recommended_Settings + + defconfigPath=$(getDefconfig) + + #Enable supported options + #Disabled: CONFIG_DEBUG_SG (bootloops - https://patchwork.kernel.org/patch/8989981) + declare -a optionsYes=("CONFIG_ARM64_SW_TTBR0_PAN" "CONFIG_BUG" "CONFIG_BUG_ON_DATA_CORRUPTION" "CONFIG_CC_STACKPROTECTOR" "CONFIG_CC_STACKPROTECTOR_STRONG" "CONFIG_CPU_SW_DOMAIN_PAN" "CONFIG_DEBUG_CREDENTIALS" "CONFIG_DEBUG_KERNEL" "CONFIG_DEBUG_LIST" "CONFIG_DEBUG_NOTIFIERS" "CONFIG_DEBUG_RODATA" "CONFIG_DEBUG_WX" "CONFIG_FORTIFY_SOURCE" "CONFIG_GCC_PLUGIN_LATENT_ENTROPY" "CONFIG_GCC_PLUGIN_RANDSTRUCT" "CONFIG_GCC_PLUGINS" "CONFIG_GCC_PLUGIN_STRUCTLEAK" "CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL" "CONFIG_HARDENED_USERCOPY" "CONFIG_IO_STRICT_DEVMEM" "CONFIG_KAISER" "CONFIG_LEGACY_VSYSCALL_NONE" "CONFIG_PAGE_POISONING" "CONFIG_PAGE_POISONING_NO_SANITY" "CONFIG_PAGE_POISONING_ZERO" "CONFIG_PAGE_TABLE_ISOLATION" "CONFIG_PANIC_ON_OOPS" "CONFIG_RANDOMIZE_BASE" "CONFIG_REFCOUNT_FULL" "CONFIG_RETPOLINE" "CONFIG_SCHED_STACK_END_CHECK" "CONFIG_SECCOMP" "CONFIG_SECCOMP_FILTER" "CONFIG_SECURITY" "CONFIG_SECURITY_PERF_EVENTS_RESTRICT" "CONFIG_SECURITY_YAMA" "CONFIG_SECURITY_YAMA_STACKED" "CONFIG_SLAB_FREELIST_RANDOM" "CONFIG_SLAB_HARDENED" "CONFIG_SLUB_DEBUG" "CONFIG_STRICT_DEVMEM" "CONFIG_STRICT_KERNEL_RWX" "CONFIG_STRICT_MEMORY_RWX" "CONFIG_SYN_COOKIES" "CONFIG_UNMAP_KERNEL_AT_EL0" "CONFIG_VMAP_STACK") + for option in "${optionsYes[@]}" + do + 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; + fi; + fi; + done + #Disable supported options + #TODO: Disable earjack/uart debugger + 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") + for option in "${optionsNo[@]}" + do + sed -i 's/'$option'=y/# '$option' is not set/' $defconfigPath &>/dev/null || true; + done + #Extras + sed -i 's/CONFIG_DEFAULT_MMAP_MIN_ADDR=4096/CONFIG_DEFAULT_MMAP_MIN_ADDR=32768/' $defconfigPath &>/dev/null || true; + sed -i 's/CONFIG_LSM_MMAP_MIN_ADDR=4096/CONFIG_DEFAULT_MMAP_MIN_ADDR=32768/' $defconfigPath &>/dev/null || true; + + editKernelLocalversion "-dos"; + + echo "Hardened defconfig for $1"; + cd $base; +} +export -f hardenDefconfig; diff --git a/Scripts/LineageOS-14.1/Patch_CVE.sh b/Scripts/Common/Patch_CVE.sh similarity index 100% rename from Scripts/LineageOS-14.1/Patch_CVE.sh rename to Scripts/Common/Patch_CVE.sh diff --git a/Scripts/LineageOS-14.1/00init.sh b/Scripts/LineageOS-14.1/00init.sh index 8d65f673..2336704c 100644 --- a/Scripts/LineageOS-14.1/00init.sh +++ b/Scripts/LineageOS-14.1/00init.sh @@ -29,6 +29,7 @@ export cvePatchesLinux=$androidWorkspace"Patches/Linux/"; export cvePatchesAndroid=$androidWorkspace"Patches/Android/"; export dosWallpapers=$androidWorkspace"Patches/Wallpapers/"; +export scriptsCommon=$androidWorkspace"Scripts/Common/"; export scripts=$androidWorkspace"Scripts/LineageOS-14.1/"; export cveScripts=$scripts"CVE_Patchers/"; @@ -42,6 +43,7 @@ export JACK_SERVER_VM_ARGUMENTS="${ANDROID_JACK_VM_ARGS}" export GRADLE_OPTS=-Xmx2048m +source $scriptsCommon"/Functions.sh" source $scripts"/Functions.sh" unalias cp diff --git a/Scripts/LineageOS-14.1/Deblob.sh b/Scripts/LineageOS-14.1/Deblob.sh deleted file mode 100755 index 686a2dcd..00000000 --- a/Scripts/LineageOS-14.1/Deblob.sh +++ /dev/null @@ -1,389 +0,0 @@ -#!/bin/bash -#DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Spot Communications, Inc. -# -#This program is free software: you can redistribute it and/or modify -#it under the terms of the GNU General Public License as published by -#the Free Software Foundation, either version 3 of the License, or -#(at your option) any later version. -# -#This program is distributed in the hope that it will be useful, -#but WITHOUT ANY WARRANTY; without even the implied warranty of -#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -#GNU General Public License for more details. -# -#You should have received a copy of the GNU General Public License -#along with this program. If not, see . - -#Goal: Remove as many proprietary blobs without breaking core functionality -#Outcome: Increased battery/performance/privacy/security, Decreased ROM size -#TODO: Clean init*.rc files, Modularize, Remove more variants - -# -#Device Status (Tested under LineageOS 14.1) -# -#Functioning as Expected: bacon, clark, d852, mako, marlin, thor - -echo "Deblobbing..." - -# -#START OF BLOBS ARRAY -# - #WARNING: STRAY DELIMITERS WILL RESULT IN FILE DELETIONS - blobs=""; #Delimited using "|" - makes=""; - overlay=""; - kernels=""; #Delimited using " " - - #ACDB (Audio Configurations) [Qualcomm] XXX: Breaks audio output - #blobs=$blobs"acdb"; - - #ADSP/Hexagon (Hardware Audio Decoding) [Qualcomm] - #blobs=$blobs"adsprpcd|libadsprpc.so|libadsprpc.so|libfastcvadsp_stub.so|libfastcvopt.so|libadsp_fd_skel.so"; - - #Alipay (Payment Platform) [Alibaba] - blobs=$blobs"alipay.b00|alipay.b01|alipay.b02|alipay.b03|alipay.b04|alipay.b05|alipay.b06|alipay.mdt"; - - #aptX (Bluetooth Audio Compression Codec) [Qualcomm] - blobs=$blobs"|libaptX-1.0.0-rel-Android21-ARMv7A.so|libaptXHD-1.0.0-rel-Android21-ARMv7A.so|libaptXScheduler.so"; - - #ATFWD [Qualcomm] - blobs=$blobs"|ATFWD-daemon|atfwd.apk"; - - #AudioFX (Audio Effects) [Qualcomm] XXX: Breaks audio on some devices - #blobs=$blobs"|libqcbassboost.so|libqcreverb.so|libqcvirt.so"; - - #Camera - #Attempted, don't waste your time... - #FUN FACT: The Huawei Honor 5x ships with eight-hundred-and-thirty-five (*835*) proprietary camera blobs. - #blobs=$blobs"|"; - - #Clearkey (DRM) [Google] - blobs=$blobs"|libdrmclearkeyplugin.so"; - - #CMN (TrustZone?) [Qualcomm?] - #blobs=$blobs"|cmnlib.b00|cmnlib.b01|cmnlib.b02|cmnlib.b03|cmnlib.b04|cmnlib.b05|cmnlib.flist|cmnlib.mdt|cmnlib64.b00|cmnlib64.b01|cmnlib64.b02|cmnlib64.b03|cmnlib64.b04|cmnlib64.b05|cmnlib64.flist|cmnlib64.mdt"; - - #CNE (Automatic Cell/Wi-Fi Switching) [Qualcomm] - #blobs=$blobs"|libcneapiclient.so|libNimsWrap.so"; #XXX: Breaks radio - blobs=$blobs"|andsfCne.xml|ATT_profile1.xml|ATT_profile2.xml|ATT_profile3.xml|ATT_profile4.xml|ATT_profiles.xml|cnd|cneapiclient.jar|cneapiclient.xml|CNEService.apk|com.quicinc.cne.jar|com.quicinc.cne.xml|ConnectivityExt.jar|ConnectivityExt.xml|libcneconn.so|libcneqmiutils.so|libcne.so|libvendorconn.so|libwqe.so|profile1.xml|profile2.xml|profile3.xml|profile4.xml|profile5.xml|ROW_profile1.xml|ROW_profile2.xml|ROW_profile3.xml|ROW_profile4.xml|ROW_profile5.xml|ROW_profiles.xml|SwimConfig.xml|VZW_profile1.xml|VZW_profile2.xml|VZW_profile3.xml|VZW_profile4.xml|VZW_profile5.xml|VZW_profile6.xml|VZW_profiles.xml"; - makes=$makes"libcnefeatureconfig"; - - #Diagnostics [Qualcomm] - blobs=$blobs"|[/]diag[/]|diag_callback_client|diag_dci_sample|diag_klog|diag_mdlog|diag_mdlog-getlogs|diag_mdlog-wrap|diag[/]mdm|diag_qshrink4_daemon|diag_socket_log|diag_uart_log|drmdiagapp|ibdrmdiag.so|ssr_diag|test_diag"; - - #Dirac (Audio Effects) [Dirac] - blobs=$blobs"|diracmobile.config|libDiracAPI_SHARED.so|libdirac.so|libdirac-appi.so"; - - #Discretix (DRM/HDCP) [Discretix Technologies] - blobs=$blobs"|discretix|DxHDCP.cfg|libDxHdcp.so"; - blobs=$blobs"|dxhdcp2.b00|dxhdcp2.b01|dxhdcp2.b02|dxhdcp2.b03|dxhdcp2.mdt"; - blobs=$blobs"|dxcprm.b00|dxcprm.b01|dxcprm.b02|dxcprm.b03|dxcprm.mdt"; - - #Display Color Tuning [Qualcomm] - blobs=$blobs"|colorservice.apk|com.qti.snapdragon.sdk.display.jar|com.qti.snapdragon.sdk.display.xml|libdisp-aba.so|libmm-abl-oem.so|libmm-abl.so|libmm-als.so|libmm-color-convertor.so|libmm-disp-apis.so|libmm-qdcm.so|libsd_sdk_display.so|mm-pp-daemon|mm-pp-dpps|PPPreference.apk"; - - #DivX (DRM) [DivX] - blobs=$blobs"|libDivxDrm.so|libSHIMDivxDrm.so"; - - #DPM (Data Power Management) [Qualcomm] - blobs=$blobs"|com.qti.dpmframework.jar|com.qti.dpmframework.xml|dpmapi.jar|dpmapi.xml|dpm.conf|dpmd|dpmserviceapp.apk|libdpmctmgr.so|libdpmfdmgr.so|libdpmframework.so|libdpmnsrm.so|libdpmtcm.so|NsrmConfiguration.xml|tcmclient.jar"; - - #DRM - blobs=$blobs"|lib-sec-disp.so|libSecureUILib.so|libsecureui.so|libsecureuisvc_jni.so|libsecureui_svcsock.so"; - blobs=$blobs"|liboemcrypto.so|libtzdrmgenprov.so"; - blobs=$blobs"|libpvr.so|librmp.so|libsi.so|libSSEPKCS11.so"; - - #Face Unlock [Google] - blobs=$blobs"|libfacenet.so|libfilterpack_facedetect.so|libfrsdk.so"; - - #GPS [Qualcomm] - #blobs=$blobs"|flp.conf|flp.default.so|flp.msm8084.so|flp.msm8960.so|gpsd|gps.msm8084.so|gps.msm8960.so|libflp.so|libgps.utils.so|libloc_api_v02.so|libloc_core.so|libloc_ds_api.so|libloc_eng.so|libloc_ext.so"; - - #HDCP (DRM) - blobs=$blobs"|libmm-hdcpmgr.so"; - blobs=$blobs"|hdcp1.b00|hdcp1.b01|hdcp1.b02|hdcp1.b03|hdcp1.b04|hdcp1.b05|hdcp1.b06|hdcp1.mdt|tzhdcp.b00|tzhdcp.b01|tzhdcp.b02|tzhdcp.b03|tzhdcp.mdt"; - - #[HTC] - blobs=$blobs"|gptauuid.xml"; - blobs=$blobs"|htc_drmprov.b00|htc_drmprov.b01|htc_drmprov.b02|htc_drmprov.b03|htc_drmprov.b04|htc_drmprov.b05|htc_drmprov.b06|htc_drmprov.mdt|gpsample.mbn"; - - #I/O Prefetcher [Qualcomm] - blobs=$blobs"|libqc-opt.so"; - blobs=$blobs"|iop|libqti-iop-client.so|libqti-iop.so|QPerformance.jar"; - - #IMS (VoLTE/Wi-Fi Calling) [Qualcomm] - #blobs=$blobs"|ims.apk|ims.xml|libimsmedia_jni.so"; #IMS (Core) (To support carriers that have phased out 2G) - blobs=$blobs"|imscmlibrary.jar|imscmservice|imscm.xml|imsdatadaemon|imsqmidaemon|imssettings.apk|lib-imsdpl.so|lib-imscamera.so|libimscamera_jni.so|lib-imsqimf.so|lib-imsSDP.so|lib-imss.so|lib-imsvt.so|lib-imsxml.so"; #IMS - blobs=$blobs"|ims_rtp_daemon|lib-rtpcommon.so|lib-rtpcore.so|lib-rtpdaemoninterface.so|lib-rtpsl.so"; #RTP - blobs=$blobs"|lib-dplmedia.so|librcc.so|libvcel.so|libvoice-svc.so|qti_permissions.xml"; #Misc. - #blobs=$blobs"|volte_modem[/]"; - - #IPA (Internet Packet Accelerator) [Qualcomm] - #This is actually open source (excluding -diag) - #blobs=$blobs"|ipacm"; - blobs=$blobs"|ipacm-diag"; - #makes=$makes"|ipacm|IPACM_cfg.xml"; - #kernels=$kernels" drivers/platform/msm/ipa"; - - #Keystore/TrustZone (HW Crypto) [Qualcomm] - #blobs=$blobs"|qseecomd|keystore.qcom.so|libdrmdecrypt.so|libdrmfs.so|libdrmtime.so|libQSEEComAPI.so|librpmb.so|libssd.so"; - #blobs=$blobs"|keymaster.b00|keymaster.b01|keymaster.b02|keymaster.b03|keymaster.flist|keymaster.mdt"; - #blobs=$blobs"|tzapps.b00|tzapps.b01|tzapps.b02|tzapps.b03|tzapps.mdt"; - - #Location (gpsOne/gpsOneXTRA/IZat/Lumicast/QUIP) [Qualcomm] - blobs=$blobs"|cacert_location.pem|com.qti.location.sdk.jar|com.qti.location.sdk.xml|com.qualcomm.location.apk|com.qualcomm.location.xml|com.qualcomm.services.location.apk|gpsone_daemon|izat.conf|izat.xt.srv.jar|izat.xt.srv.xml|libalarmservice_jni.so|libasn1cper.so|libasn1crt.so|libasn1crtx.so|libdataitems.so|libdrplugin_client.so|libDRPlugin.so|libevent_observer.so|libgdtap.so|libgeofence.so|libizat_core.so|liblbs_core.so|liblocationservice_glue.so|liblocationservice.so|libloc_ext.so|libloc_xtra.so|liblowi_client.so|liblowi_wifihal_nl.so|liblowi_wifihal.so|libquipc_os_api.so|libquipc_ulp_adapter.so|libulp2.so|libxtadapter.so|libxt_native.so|libxtwifi_ulp_adaptor.so|libxtwifi_zpp_adaptor.so|location-mq|loc_launcher|lowi.conf|lowi-server|slim_ap_daemon|slim_daemon|xtra_root_cert.pem|xtra_t_app.apk|xtwifi.conf|xtwifi-client|xtwifi-inet-agent"; - overlay=$overlay"config_comboNetworkLocationProvider|config_enableFusedLocationOverlay|config_enableNetworkLocationOverlay|config_fusedLocationProviderPackageName|config_enableNetworkLocationOverlay|config_networkLocationProviderPackageName|com.qualcomm.location"; - - #Misc - blobs=$blobs"|libjni_latinime.so|libuiblur.so|libwifiscanner.so"; - - #[Motorola] - blobs=$blobs"|AppDirectedSMSProxy.apk|BuaContactAdapter.apk|batt_health|com.motorola.DirectedSMSProxy.xml|com.motorola.motosignature.jar|com.motorola.motosignature.xml|com.motorola.camera.xml|com.motorola.gallery.xml|com.motorola.msimsettings.xml|com.motorola.triggerenroll.xml|MotoDisplayFWProxy.apk|MotoSignatureApp.apk|TriggerEnroll.apk|TriggerTrainingService.apk"; - makes=$makes"|com.motorola.cameraone.xml"; - - #Performance [Qualcomm] - #blobs=$blobs"|msm_irqbalance"; - #Devices utilizing perfd won't hotplug cores without it - #Attempted to replace this with showp1984's msm_mpdecision, but the newer kernels simply don't have the mach_msm dependencies that are needed - #blobs=$blobs"|mpdecision|libqti-perfd-client.so|perfd|perf-profile0.conf|perf-profile1.conf|perf-profile2.conf|perf-profile3.conf|perf-profile4.conf|perf-profile5.conf"; - - #Playready (DRM) [Microsoft] - blobs=$blobs"|libtzplayready.so" - blobs=$blobs"|playread.b00|playread.b01|playread.b02|playread.b03|playread.mdt"; - - #Project Fi [Google] - blobs=$blobs"|Tycho.apk"; - - #Quickboot [Qualcomm] - blobs=$blobs"|QuickBoot.apk"; - - #QTI (Tethering Extensions) [Qualcomm] - blobs=$blobs"|libQtiTether.so|QtiTetherService.apk"; - - #RCS (Proprietary messaging protocol) - blobs=$blobs"|rcsimssettings.jar|rcsimssettings.xml|rcsservice.jar|rcsservice.xml|lib-imsrcscmclient.so|lib-ims-rcscmjni.so|lib-imsrcscmservice.so|lib-imsrcscm.so|lib-imsrcs.so|lib-rcsimssjni.so|lib-rcsjni.so"; #RCS - - #SecProtect [Qualcomm] - blobs=$blobs"|SecProtect.apk"; - - #SecureUI Frontends - blobs=$blobs"|libHealthAuthClient.so|libHealthAuthJNI.so|libSampleAuthJNI.so|libSampleAuthJNIv1.so|libSampleExtAuthJNI.so|libSecureExtAuthJNI.so|libSecureSampleAuthClient.so"; - - #SoundFX [Sony] - blobs=$blobs"|libsonypostprocbundle.so|libsonysweffect.so"; - - #[Sprint] - blobs=$blobs"|com.android.omadm.service.xml|ConnMO.apk|CQATest.apk|DCMO.apk|DiagMon.apk|DMConfigUpdate.apk|DMService.apk|GCS.apk|HiddenMenu.apk|libdmengine.so|libdmjavaplugin.so|LifetimeData.apk|SprintDM.apk|SprintHM.apk|whitelist_com.android.omadm.service.xml"; - - #Thermal Throttling [Qualcomm] - #blobs=$blobs"|libthermalclient.so|libthermalioctl.so|thermal-engine"; - - #Time Service [Qualcomm] - #Requires that https://github.com/LineageOS/android_hardware_sony_timekeep be included in repo manifest - #blobs=$blobs"|libtime_genoff.so"; #XXX: Breaks radio - #blobs=$blobs"|libTimeService.so|time_daemon|TimeService.apk"; - - #Venus (Hardware Video Decoding) [Qualcomm] - #blobs=$blobs"|venus.b00|venus.b01|venus.b02|venus.b03|venus.b04|venus.mbn|venus.mdt"; - - #[Verizon] - blobs=$blobs"|com.qualcomm.location.vzw_library.jar|com.qualcomm.location.vzw_library.xml|com.verizon.apn.xml|com.verizon.embms.xml|com.verizon.hardware.telephony.ehrpd.jar|com.verizon.hardware.telephony.ehrpd.xml|com.verizon.hardware.telephony.lte.jar|com.verizon.hardware.telephony.lte.xml|com.verizon.ims.jar|com.verizon.ims.xml|com.verizon.provider.xml|com.vzw.vzwapnlib.xml|qti-vzw-ims-internal.jar|qti-vzw-ims-internal.xml|VerizonUnifiedSettings.jar|VZWAPNLib.apk|VZWAPNService.apk|VZWAVS.apk|VzwLcSilent.apk|vzw_msdc_api.apk|VzwOmaTrigger.apk|vzw_sso_permissions.xml"; - - #Voice Recognition - blobs=$blobs"|aonvr1.bin|aonvr2.bin|audiomonitor|es305_fw.bin|HotwordEnrollment.apk|HotwordEnrollmentRT5677.apk|libadpcmdec.so|liblistenhardware.so|liblistenjni.so|liblisten.so|liblistensoundmodel.so|libqvop-service.so|librecoglib.so|libsmwrapper.so|libsupermodel.so|libtrainingcheck.so|qvop-daemon|sound_trigger.primary.msm8916.so|sound_trigger.primary.msm8996.so"; - - #Vulkan [Qualcomm] - #blobs=$blobs"|libllvm-qgl.so|vulkan.msm*.so"; - - #Wfd (Wireless Display) [Qualcomm] - blobs=$blobs"|libmmparser_lite.so|libmmrtpdecoder.so|libmmrtpencoder.so|libmmwfdinterface.so|libmmwfdsinkinterface.so|libmmwfdsrcinterface.so|libwfdavenhancements.so|libwfdcommonutils.so|libwfdhdcpcp.so|libwfdmmsink.so|libwfdmmsrc.so|libwfdmmutils.so|libwfdnative.so|libwfdrtsp.so|libwfdservice.so|libwfdsm.so|libwfduibcinterface.so|libwfduibcsinkinterface.so|libwfduibcsink.so|libwfduibcsrcinterface.so|libwfduibcsrc.so|WfdCommon.jar|wfdconfigsink.xml|wfdconfig.xml|wfdservice|WfdService.apk"; - - #Widevine (DRM) [Google] - blobs=$blobs"|com.google.widevine.software.drm.jar|com.google.widevine.software.drm.xml|libdrmclearkeyplugin.so|libdrmwvmplugin.so|libmarlincdmplugin.so|libwvdrmengine.so|libwvdrm_L1.so|libwvdrm_L3.so|libwvm.so|libWVphoneAPI.so|libWVStreamControlAPI_L1.so|libWVStreamControlAPI_L3.so"; - blobs=$blobs"|tzwidevine.b00|tzwidevine.b01|tzwidevine.b02|tzwidevine.b03|tzwidevine.mdt|tzwvcpybuf.b00|tzwvcpybuf.b01|tzwvcpybuf.b02|tzwvcpybuf.b03|tzwvcpybuf.flist|tzwvcpybuf.mdt|widevine.b00|widevine.b01|widevine.b02|widevine.b03|widevine.b04|widevine.b05|widevine.b06|widevine.mbn|widevine.mdt"; - makes=$makes"|libshim_wvm"; - - #WiPower (Wireless Charging) [Qualcomm] - blobs=$blobs"|a4wpservice.apk|com.quicinc.wbc.jar|com.quicinc.wbcserviceapp.apk|com.quicinc.wbcservice.jar|com.quicinc.wbcservice.xml|com.quicinc.wbc.xml|libwbc_jni.so|wbc_hal.default.so"; - makes=$makes"|android.wipower|android.wipower.xml|com.quicinc.wbcserviceapps|libwipower_jni|wipowerservice"; - - export blobs; - export makes; - export overlay; - export kernels; -# -#END OF BLOBS ARRAY -# - -# -#START OF FUNCTIONS -# -deblobDevice() { - devicePath=$1; - cd $base$devicePath; - if [ "${PWD##*/}" == "flo" ] || [ "${PWD##*/}" == "mako" ] || [ "${PWD##*/}" == "kona-common" ] || [ "${PWD##*/}" == "n5110" ] || [ "${PWD##*/}" == "smdk4412-common" ] || [ "${PWD##*/}" == "hdx-common" ] || [ "${PWD##*/}" == "thor" ] || [ "${PWD##*/}" == "flounder" ]; then #Some devices don't need/like TimeKeep - replaceTime="false"; - fi; - replaceTime="false"; #Temp disable replacement - if [ -f Android.mk ]; then - #Some devices store these in a dedicated firmware partition, others in /system/vendor/firmware, either way the following are just symlinks - #sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(CMN_SYMLINKS)//' Android.mk; #Remove CMN firmware - sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(DXHDCP2_SYMLINKS)//' Android.mk; #Remove Discretix firmware - #sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(IMS_SYMLINKS)//' Android.mk; #Remove IMS firmware - sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(PLAYREADY_SYMLINKS)//' Android.mk; #Remove Microsoft Playready firmware - sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(WIDEVINE_SYMLINKS)//' Android.mk; #Remove Google Widevine firmware - sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(WV_SYMLINKS)//' Android.mk; #Remove Google Widevine firmware - fi; - if [ -f BoardConfig.mk ]; then - if [ -z "$replaceTime" ]; then - sed -i 's/BOARD_USES_QC_TIME_SERVICES := true/BOARD_USES_QC_TIME_SERVICES := false/' BoardConfig.mk; #Switch to Sony TimeKeep - if ! grep -q "BOARD_USES_QC_TIME_SERVICES := false" BoardConfig.mk; then echo "BOARD_USES_QC_TIME_SERVICES := false" >> BoardConfig.mk; fi; #Switch to Sony TimeKeep - fi; - sed -i 's/BOARD_USES_QCNE := true/BOARD_USES_QCNE := false/' BoardConfig.mk; #Disable CNE - sed -i 's/BOARD_USES_WIPOWER := true/BOARD_USES_WIPOWER := false/' BoardConfig.mk; #Disable WiPower - fi; - if [ -f device.mk ]; then - awk -i inplace '!/'$makes'/' device.mk; #Remove all shim references from device makefile - if [ -z "$replaceTime" ]; then - #Switch to Sony TimeKeep - echo "PRODUCT_PACKAGES += \\" >> device.mk; - echo " timekeep \\" >> device.mk; - echo " TimeKeep" >> device.mk; - fi; - fi; - if [ -f "${PWD##*/}".mk ] && [ "${PWD##*/}".mk != "sepolicy" ]; then - awk -i inplace '!/'$makes'/' "${PWD##*/}".mk; #Remove all shim references from device makefile - if [ -z "$replaceTime" ]; then - #Switch to Sony TimeKeep - echo "PRODUCT_PACKAGES += \\" >> "${PWD##*/}".mk; - echo " timekeep \\" >> "${PWD##*/}".mk; - echo " TimeKeep" >> "${PWD##*/}".mk; - fi; - fi; - if [ -f system.prop ]; then - awk -i inplace '!/persist.loc.nlp_name/' system.prop; #Disable QC Location Provider - sed -i 's/drm.service.enabled=true/drm.service.enabled=false/' system.prop; - if ! grep -q "drm.service.enabled=false" system.prop; then echo "drm.service.enabled=false" >> system.prop; fi; #Disable DRM server - sed -i 's/persist.bt.enableAptXHD=true/persist.bt.enableAptXHD=false/' system.prop; #Disable aptX - sed -i 's/persist.cne.feature=./persist.cne.feature=0/' system.prop; #Disable CNE - sed -i 's/persist.dpm.feature=./persist.dpm.feature=0/' system.prop; #Disable DPM - sed -i 's/persist.gps.qc_nlp_in_use=./persist.gps.qc_nlp_in_use=0/' system.prop; #Disable QC Location Provider - sed -i 's/persist.sys.dpmd.nsrm=./persist.sys.dpmd.nsrm=0/' system.prop; #Disable DPM - sed -i 's/persist.rcs.supported=./persist.rcs.supported=0/' system.prop; #Disable RCS - sed -i 's/ro.bluetooth.emb_wp_mode=true/ro.bluetooth.emb_wp_mode=false/' system.prop; #Disable WiPower - sed -i 's/ro.bluetooth.wipower=true/ro.bluetooth.wipower=false/' system.prop; #Disable WiPower - #Disable IMS - #sed -i 's/persist.data.iwlan.enable=true/persist.data.iwlan.enable=false/' system.prop; - #sed -i 's/persist.ims.volte=true/persist.ims.volte=false/' system.prop; - #sed -i 's/persist.ims.vt=true/persist.ims.vt=false/' system.prop; - #sed -i 's/persist.radio.calls.on.ims=true/persist.radio.calls.on.ims=false/' system.prop; - #sed -i 's/persist.radio.hw_mbn_update=./persist.radio.hw_mbn_update=0/' system.prop; - #sed -i 's/persist.radio.jbims=./persist.radio.jbims=0/' system.prop; - #sed -i 's/persist.radio.sw_mbn_update=./persist.radio.sw_mbn_update=0/' system.prop; - #sed -i 's/persist.radio.sw_mbn_volte=./persist.radio.sw_mbn_volte=0/' system.prop; - #sed -i 's/persist.radio.VT_ENABLE=./persist.radio.VT_ENABLE=0/' system.prop; - #sed -i 's/persist.radio.VT_HYBRID_ENABLE=./persist.radio.VT_HYBRID_ENABLE=0/' system.prop; - #sed -i 's/persist.volte_enabled_by_hw=./persist.volte_enabled_by_hw=0/' system.prop; - fi; - if [ -f configs/qmi_config.xml ]; then - sed -i 's|name="dpm_enabled" type="int"> 1 <|name="dpm_enabled" type="int"> 0 <|' configs/qmi_config.xml; #Disable DPM - fi; - if [ -f init/init_*.cpp ]; then - sed -i 's/property_set("persist.rcs.supported", ".");/property_set("persist.rcs.supported", "0");/' init/init_*.cpp; #Disable RCS - #Disable IMS - #sed -i 's/property_set("persist.ims.volte", "true");/property_set("persist.ims.volte", "false");/' init/init_*.cpp; - #sed -i 's/property_set("persist.ims.vt", "true");/property_set("persist.ims.vt", "false");/' init/init_*.cpp; - #sed -i 's/property_set("persist.radio.calls.on.ims", "true");/property_set("persist.radio.calls.on.ims", "false");/' init/init_*.cpp; - #sed -i 's/property_set("persist.radio.jbims", ".");/property_set("persist.radio.jbims", "0");/' init/init_*.cpp; - #sed -i 's/property_set("persist.radio.VT_ENABLE", ".");/property_set("persist.radio.VT_ENABLE", "0");/' init/init_*.cpp; - #sed -i 's/property_set("persist.radio.VT_HYBRID_ENABLE", ".");/property_set("persist.radio.VT_HYBRID_ENABLE", "0");/' init/init_*.cpp; - fi; - if [ -f overlay/frameworks/base/core/res/res/values/config.xml ]; then - awk -i inplace '!/'$overlay'/' overlay/frameworks/base/core/res/res/values/config.xml; - #sed -i 's|true|false|' overlay/frameworks/base/core/res/res/values/config.xml; - sed -i 's|true|false|' overlay/frameworks/base/core/res/res/values/config.xml; #Disable UIBlur - #Disable IMS - #sed -i 's|true|false|' overlay/frameworks/base/core/res/res/values/config.xml; - #sed -i 's|true|false|' overlay/frameworks/base/core/res/res/values/config.xml; - #sed -i 's|true|false|' overlay/frameworks/base/core/res/res/values/config.xml; - #sed -i 's|true|false|' overlay/frameworks/base/core/res/res/values/config.xml; - #sed -i 's|true|false|' overlay/frameworks/base/core/res/res/values/config.xml; - fi; - if [ -d sepolicy ]; then - if [ -z "$replaceTime" ]; then - #Switch to Sony TimeKeep - echo "allow system_app time_data_file:dir { create_dir_perms search };" >> sepolicy/system_app.te; - echo "allow system_app time_data_file:file create_file_perms;" >> sepolicy/system_app.te; - fi; - fi; - if [ -z "$replaceTime" ]; then sed -i 's|service time_daemon /system/bin/time_daemon|service timekeep /system/bin/timekeep restore\n oneshot|' init.*.rc rootdir/init.*.rc rootdir/etc/init.*.rc &> /dev/null || true; fi; #Switch to Sony TimeKeep - rm -f board/qcom-cne.mk product/qcom-cne.mk; #Remove CNE - rm -f rootdir/etc/init.qti.ims.sh rootdir/init.qti.ims.sh init.qti.ims.sh; #Remove IMS startup script - rm -rf IMSEnabler; #Remove IMS compatibility module - #rm -rf data-ipa-cfg-mgr; #Remove IPA - rm -rf libshimwvm libshims/wvm_shim.cpp; #Remove Google Widevine compatibility module - rm -rf board/qcom-wipower.mk product/qcom-wipower.mk; #Remove WiPower makefiles - if [ -f setup-makefiles.sh ]; then - awk -i inplace '!/'$blobs'/' *proprietary*.txt; #Remove all blob references from blob manifest - bash -c "cd $base$devicePath && ./setup-makefiles.sh"; #Update the makefiles - fi; - cd $base; -} -export -f deblobDevice; - -deblobKernel() { - kernelPath=$1; - cd $base$kernelPath; - rm -rf $kernels; - cd $base; -} -export -f deblobKernel; - -deblobVendors() { - cd $base; - find vendor -regextype posix-extended -regex '.*('$blobs')' -type f -delete; #Delete all blobs -} -export -f deblobVendors; - -deblobVendor() { - makefile=$1; - cd $base; - awk -i inplace '!/'$blobs'/' $makefile; #Remove all blob references from makefile -} -export -f deblobVendor; -# -#END OF FUNCTIONS -# - - -# -#START OF DEBLOBBING -# -find device -maxdepth 2 -mindepth 2 -type d -exec bash -c 'deblobDevice "$0"' {} \; #Deblob all device directories -#find kernel -maxdepth 2 -mindepth 2 -type d -exec bash -c 'deblobKernel "$0"' {} \; #Deblob all kernel directories -find vendor -name "*vendor*.mk" -type f -exec bash -c 'deblobVendor "$0"' {} \; #Deblob all makefiles -deblobVendors; #Deblob entire vendor directory -rm -rf frameworks/av/drm/mediadrm/plugins/clearkey; #Remove Clearkey -rm -rf vendor/samsung/nodevice; -# -#END OF DEBLOBBING -# - -#setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong -cd device/asus/Z00T && ./setup-makefiles.sh && cd $base -cd device/lge/h850 && ./setup-makefiles.sh && cd $base - -#Fixes marlin building, really janky (recursive symlinks) and probably not the best place for it [LAOS SPECIFIC] -cd vendor/google/marlin/proprietary; -ln -s . vendor; -ln -s . lib/lib; -ln -s . lib64/lib64; -ln -s . app/app; -ln -s . bin/bin; -ln -s . etc/etc; -ln -s . framework/framework; -ln -s . priv-app/priv-app; -cd $base; - -echo "Deblobbing complete!" diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 004de139..004e6935 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -15,36 +15,11 @@ #You should have received a copy of the GNU General Public License #along with this program. If not, see . -startPatcher() { - #$cvePatcher must be set! - java -jar $cvePatcher patch $base $androidWorkspace"Patches/" $cveScripts $1; -} -export -f startPatcher; - patchAllKernels() { startPatcher "kernel_amazon_hdx-common kernel_asus_msm8916 kernel_fairphone_msm8974 kernel_google_marlin kernel_htc_msm8974 kernel_htc_msm8994 kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8992 kernel_lge_msm8996 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_nextbit_msm8992 kernel_oneplus_msm8974 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_smdk4412 kernel_samsung_universal8890"; } export -f patchAllKernels; -enter() { - echo "================================================================================================" - dir=$1; - cd $base$dir; - echo "[ENTERING] "$dir; -} -export -f enter; - -enterAndClear() { - enter $1; - gitReset; -} -export -f enterAndClear; - -gitReset() { - git add -A && git reset --hard; -} -export -f gitReset; - resetWorkspace() { repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/{FDroid,GmsCore} out && repo sync -j20 --force-sync; } @@ -94,9 +69,26 @@ patchWorkspace() { source $scripts/Optimize.sh; source $scripts/Rebrand.sh; source $scripts/Theme.sh; - source $scripts/Deblob.sh; - source $scripts/Patch_CVE.sh; + source $scriptsCommon/Deblob.sh; + source $scriptsCommon/Patch_CVE.sh; source build/envsetup.sh; + + #Deblobbing fixes + ##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong + cd device/asus/Z00T && ./setup-makefiles.sh && cd $base + cd device/lge/h850 && ./setup-makefiles.sh && cd $base + + ##Fixes marlin building, really janky (recursive symlinks) and probably not the best place for it [LAOS SPECIFIC] + cd vendor/google/marlin/proprietary; + ln -s . vendor; + ln -s . lib/lib; + ln -s . lib64/lib64; + ln -s . app/app; + ln -s . bin/bin; + ln -s . etc/etc; + ln -s . framework/framework; + ln -s . priv-app/priv-app; + cd $base; } export -f patchWorkspace; @@ -123,137 +115,3 @@ enableDexPreOptFull() { cd $base; } export -f enableDexPreOptFull; - -disableDexPreOpt() { - cd $base$1; - if [ -f BoardConfig.mk ]; then - sed -i "s/WITH_DEXPREOPT := true/WITH_DEXPREOPT := false/" BoardConfig.mk; - echo "Disabled dexpreopt"; - fi; - cd $base; -} -export -f disableDexPreOpt; - -compressRamdisks() { - if [ -f BoardConfig.mk ]; then - echo "LZMA_RAMDISK_TARGETS := boot,recovery" >> BoardConfig.mk; - echo "Enabled ramdisk compression"; - fi; -} -export -f compressRamdisks; - -enhanceLocation() { - cd $base$1; - #Enable GLONASS - #sed -i 's/#A_GLONASS_POS_PROTOCOL_SELECT/A_GLONASS_POS_PROTOCOL_SELECT/' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - #sed -i 's/A_GLONASS_POS_PROTOCOL_SELECT = 0.*/A_GLONASS_POS_PROTOCOL_SELECT = 15/' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - #sed -i 's|A_GLONASS_POS_PROTOCOL_SELECT=0.*|A_GLONASS_POS_PROTOCOL_SELECT=15|' overlay/frameworks/base/core/res/res/values-*/*.xml &>/dev/null || true; - #Recommended reading: https://wwws.nightwatchcybersecurity.com/2016/12/05/cve-2016-5341/ - #XTRA: Only use specified URLs - sed -i 's|XTRA_SERVER_QUERY=1|XTRA_SERVER_QUERY=0|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - sed -i 's|#XTRA_SERVER|XTRA_SERVER|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - #XTRA: Enable HTTPS - sed -i 's|http://xtra|https://xtra|' overlay/frameworks/base/core/res/res/values-*/*.xml gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - #XTRA: Use format version 3 if possible - if grep -sq "XTRA_VERSION_CHECK" gps.conf gps/gps.conf configs/gps.conf; then #Using hardware/qcom/gps OR precompiled blob OR device specific implementation - sed -i 's|XTRA_VERSION_CHECK=0|XTRA_VERSION_CHECK=1|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - sed -i 's|xtra2.bin|xtra3grc.bin|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - elif grep -sq "BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET := true" BoardConfig.mk boards/*gps.mk; then - if ! grep -sq "USE_DEVICE_SPECIFIC_LOC_API := true" BoardConfig.mk boards/*gps.mk; then - if ! grep -sq "libloc" *proprietary*.txt; then #Using hardware/qcom/gps - sed -i 's|xtra2.bin|xtra3grc.bin|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - fi; - fi; - fi; - echo "Enhanced location services for $1"; - cd $base; -} -export -f enhanceLocation; - -enableZram() { - cd $base$1; - sed -i 's|#/dev/block/zram0|/dev/block/zram0|' fstab.* root/fstab.* rootdir/fstab.* rootdir/etc/fstab.* &>/dev/null || true; - echo "Enabled zram for $1"; - cd $base; -} -export -f enableZram; - -enableForcedEncryption() { - cd $base$1; - if [[ $1 != "device/lge/mako" ]]; then #Forced encryption seems to prevent some devices from booting - sed -i 's|encryptable=/|forceencrypt=/|' fstab.* root/fstab.* rootdir/fstab.* rootdir/etc/fstab.* &>/dev/null || true; - echo "Enabled forceencrypt for $1"; - fi; - cd $base; -} -export -f enableForcedEncryption; - -enableStrongEncryption() { - cd $base$1; - if [ -f BoardConfig.mk ]; then - if [ $1 != "device/oneplus/bacon" ] && [ $1 != "device/lge/d852" ]; then #These test devices currently have encryption enabled, don't break them - echo "TARGET_WANTS_STRONG_ENCRYPTION := true" >> BoardConfig.mk; - echo "Enabled AES-256 encryption for $1"; - fi; - fi; - cd $base; -} -export -f enableStrongEncryption; - -getDefconfig() { - if ls arch/arm/configs/lineage*defconfig 1> /dev/null 2>&1; then - defconfigPath="arch/arm/configs/lineage*defconfig"; - elif ls arch/arm64/configs/lineage*defconfig 1> /dev/null 2>&1; then - defconfigPath="arch/arm64/configs/lineage*defconfig"; - else - defconfigPath="arch/arm/configs/*defconfig arch/arm64/configs/*defconfig"; - fi; - echo $defconfigPath; - #echo "Found defconfig at $defconfigPath" -} -export -f getDefconfig; - -editKernelLocalversion() { - defconfigPath=$(getDefconfig) - sed -i 's/CONFIG_LOCALVERSION=".*"/CONFIG_LOCALVERSION="'$1'"/' $defconfigPath &>/dev/null || true; -} -export -f editKernelLocalversion; - -hardenDefconfig() { - cd $base$1; - - #Attempts to enable/disable supported options to increase security - #See https://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project/Recommended_Settings - - defconfigPath=$(getDefconfig) - - #Enable supported options - #Disabled: CONFIG_DEBUG_SG (bootloops - https://patchwork.kernel.org/patch/8989981) - declare -a optionsYes=("CONFIG_ARM64_SW_TTBR0_PAN" "CONFIG_BUG" "CONFIG_BUG_ON_DATA_CORRUPTION" "CONFIG_CC_STACKPROTECTOR" "CONFIG_CC_STACKPROTECTOR_STRONG" "CONFIG_CPU_SW_DOMAIN_PAN" "CONFIG_DEBUG_CREDENTIALS" "CONFIG_DEBUG_KERNEL" "CONFIG_DEBUG_LIST" "CONFIG_DEBUG_NOTIFIERS" "CONFIG_DEBUG_RODATA" "CONFIG_DEBUG_WX" "CONFIG_FORTIFY_SOURCE" "CONFIG_GCC_PLUGIN_LATENT_ENTROPY" "CONFIG_GCC_PLUGIN_RANDSTRUCT" "CONFIG_GCC_PLUGINS" "CONFIG_GCC_PLUGIN_STRUCTLEAK" "CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL" "CONFIG_HARDENED_USERCOPY" "CONFIG_IO_STRICT_DEVMEM" "CONFIG_KAISER" "CONFIG_LEGACY_VSYSCALL_NONE" "CONFIG_PAGE_POISONING" "CONFIG_PAGE_POISONING_NO_SANITY" "CONFIG_PAGE_POISONING_ZERO" "CONFIG_PAGE_TABLE_ISOLATION" "CONFIG_PANIC_ON_OOPS" "CONFIG_RANDOMIZE_BASE" "CONFIG_REFCOUNT_FULL" "CONFIG_RETPOLINE" "CONFIG_SCHED_STACK_END_CHECK" "CONFIG_SECCOMP" "CONFIG_SECCOMP_FILTER" "CONFIG_SECURITY" "CONFIG_SECURITY_PERF_EVENTS_RESTRICT" "CONFIG_SECURITY_YAMA" "CONFIG_SECURITY_YAMA_STACKED" "CONFIG_SLAB_FREELIST_RANDOM" "CONFIG_SLAB_HARDENED" "CONFIG_SLUB_DEBUG" "CONFIG_STRICT_DEVMEM" "CONFIG_STRICT_KERNEL_RWX" "CONFIG_STRICT_MEMORY_RWX" "CONFIG_SYN_COOKIES" "CONFIG_UNMAP_KERNEL_AT_EL0" "CONFIG_VMAP_STACK") - for option in "${optionsYes[@]}" - do - 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; - fi; - fi; - done - #Disable supported options - #TODO: Disable earjack/uart debugger - 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") - for option in "${optionsNo[@]}" - do - sed -i 's/'$option'=y/# '$option' is not set/' $defconfigPath &>/dev/null || true; - done - #Extras - sed -i 's/CONFIG_DEFAULT_MMAP_MIN_ADDR=4096/CONFIG_DEFAULT_MMAP_MIN_ADDR=32768/' $defconfigPath &>/dev/null || true; - sed -i 's/CONFIG_LSM_MMAP_MIN_ADDR=4096/CONFIG_DEFAULT_MMAP_MIN_ADDR=32768/' $defconfigPath &>/dev/null || true; - - editKernelLocalversion "-dos"; - - echo "Hardened defconfig for $1"; - cd $base; -} -export -f hardenDefconfig; diff --git a/Scripts/LineageOS-15.1/00init.sh b/Scripts/LineageOS-15.1/00init.sh index e325fdd8..991fb27e 100644 --- a/Scripts/LineageOS-15.1/00init.sh +++ b/Scripts/LineageOS-15.1/00init.sh @@ -29,6 +29,7 @@ export cvePatchesLinux=$androidWorkspace"Patches/Linux/"; export cvePatchesAndroid=$androidWorkspace"Patches/Android/"; export dosWallpapers=$androidWorkspace"Patches/Wallpapers/"; +export scriptsCommon=$androidWorkspace"Scripts/Common/"; export scripts=$androidWorkspace"Scripts/LineageOS-15.1/"; export cveScripts=$scripts"CVE_Patchers/"; @@ -42,6 +43,7 @@ export JACK_SERVER_VM_ARGUMENTS="${ANDROID_JACK_VM_ARGS}" export GRADLE_OPTS=-Xmx2048m +source $scriptsCommon"/Functions.sh" source $scripts"/Functions.sh" unalias cp diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 8c9c6030..1a4bd193 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -15,36 +15,11 @@ #You should have received a copy of the GNU General Public License #along with this program. If not, see . -startPatcher() { - #$cvePatcher must be set! - java -jar $cvePatcher patch $base $androidWorkspace"Patches/" $cveScripts $1; -} -export -f startPatcher; - patchAllKernels() { startPatcher "kernel_fairphone_msm8974 kernel_google_marlin kernel_google_msm kernel_htc_flounder kernel_htc_msm8974 kernel_huawei_angler kernel_lge_bullhead kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8992 kernel_nextbit_msm8992 kernel_oppo_msm8974 kernel_samsung_msm8974"; } export -f patchAllKernels; -enter() { - echo "================================================================================================" - dir=$1; - cd $base$dir; - echo "[ENTERING] "$dir; -} -export -f enter; - -enterAndClear() { - enter $1; - gitReset; -} -export -f enterAndClear; - -gitReset() { - git add -A && git reset --hard; -} -export -f gitReset; - resetWorkspace() { repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/{FDroid,GmsCore} out && repo sync -j20 --force-sync; } @@ -88,9 +63,13 @@ patchWorkspace() { source $scripts/Overclock.sh; source $scripts/Optimize.sh; source $scripts/Rebrand.sh; - source $scripts/Deblob.sh; - source $scripts/Patch_CVE.sh; + source $scriptsCommon/Deblob.sh; + source $scriptsCommon/Patch_CVE.sh; source build/envsetup.sh; + + #Deblobbing fixes + ##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong + cd device/lge/h850 && ./setup-makefiles.sh && cd $base } export -f patchWorkspace; @@ -117,135 +96,3 @@ enableDexPreOptFull() { cd $base; } export -f enableDexPreOptFull; - -disableDexPreOpt() { - cd $base$1; - if [ -f BoardConfig.mk ]; then - sed -i "s/WITH_DEXPREOPT := true/WITH_DEXPREOPT := false/" BoardConfig.mk; - echo "Disabled dexpreopt"; - fi; - cd $base; -} -export -f disableDexPreOpt; - -compressRamdisks() { - if [ -f BoardConfig.mk ]; then - echo "LZMA_RAMDISK_TARGETS := boot,recovery" >> BoardConfig.mk; - echo "Enabled ramdisk compression"; - fi; -} -export -f compressRamdisks; - -enhanceLocation() { - cd $base$1; - #Enable GLONASS - #sed -i 's/#A_GLONASS_POS_PROTOCOL_SELECT/A_GLONASS_POS_PROTOCOL_SELECT/' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - #sed -i 's/A_GLONASS_POS_PROTOCOL_SELECT = 0.*/A_GLONASS_POS_PROTOCOL_SELECT = 15/' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - #sed -i 's|A_GLONASS_POS_PROTOCOL_SELECT=0.*|A_GLONASS_POS_PROTOCOL_SELECT=15|' overlay/frameworks/base/core/res/res/values-*/*.xml &>/dev/null || true; - #Recommended reading: https://wwws.nightwatchcybersecurity.com/2016/12/05/cve-2016-5341/ - #XTRA: Only use specified URLs - sed -i 's|XTRA_SERVER_QUERY=1|XTRA_SERVER_QUERY=0|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - sed -i 's|#XTRA_SERVER|XTRA_SERVER|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - #XTRA: Enable HTTPS - sed -i 's|http://xtra|https://xtra|' overlay/frameworks/base/core/res/res/values-*/*.xml gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - #XTRA: Use format version 3 if possible - if grep -sq "XTRA_VERSION_CHECK" gps.conf gps/gps.conf configs/gps.conf; then #Using hardware/qcom/gps OR precompiled blob OR device specific implementation - sed -i 's|XTRA_VERSION_CHECK=0|XTRA_VERSION_CHECK=1|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - sed -i 's|xtra2.bin|xtra3grc.bin|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - elif grep -sq "BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET := true" BoardConfig.mk boards/*gps.mk; then - if ! grep -sq "USE_DEVICE_SPECIFIC_LOC_API := true" BoardConfig.mk boards/*gps.mk; then - if ! grep -sq "libloc" *proprietary*.txt; then #Using hardware/qcom/gps - sed -i 's|xtra2.bin|xtra3grc.bin|' gps.conf gps/gps.conf configs/gps.conf &>/dev/null || true; - fi; - fi; - fi; - echo "Enhanced location services for $1"; - cd $base; -} -export -f enhanceLocation; - -enableZram() { - cd $base$1; - sed -i 's|#/dev/block/zram0|/dev/block/zram0|' fstab.* root/fstab.* rootdir/fstab.* rootdir/etc/fstab.* &>/dev/null || true; - echo "Enabled zram for $1"; - cd $base; -} -export -f enableZram; - -enableForcedEncryption() { - cd $base$1; - if [[ $1 != "device/lge/mako" ]]; then #Forced encryption seems to prevent some devices from booting - sed -i 's|encryptable=/|forceencrypt=/|' fstab.* root/fstab.* rootdir/fstab.* rootdir/etc/fstab.* &>/dev/null || true; - echo "Enabled forceencrypt for $1"; - fi; - cd $base; -} -export -f enableForcedEncryption; - -enableStrongEncryption() { - cd $base$1; - if [ -f BoardConfig.mk ]; then - echo "TARGET_WANTS_STRONG_ENCRYPTION := true" >> BoardConfig.mk; - echo "Enabled AES-256 encryption for $1"; - fi; - cd $base; -} -export -f enableStrongEncryption; - -getDefconfig() { - if ls arch/arm/configs/lineage*defconfig 1> /dev/null 2>&1; then - defconfigPath="arch/arm/configs/lineage*defconfig"; - elif ls arch/arm64/configs/lineage*defconfig 1> /dev/null 2>&1; then - defconfigPath="arch/arm64/configs/lineage*defconfig"; - else - defconfigPath="arch/arm/configs/*defconfig arch/arm64/configs/*defconfig"; - fi; - echo $defconfigPath; - #echo "Found defconfig at $defconfigPath" -} -export -f getDefconfig; - -editKernelLocalversion() { - defconfigPath=$(getDefconfig) - sed -i 's/CONFIG_LOCALVERSION=".*"/CONFIG_LOCALVERSION="'$1'"/' $defconfigPath &>/dev/null || true; -} -export -f editKernelLocalversion; - -hardenDefconfig() { - cd $base$1; - - #Attempts to enable/disable supported options to increase security - #See https://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project/Recommended_Settings - - defconfigPath=$(getDefconfig) - - #Enable supported options - #Disabled: CONFIG_DEBUG_SG (bootloops - https://patchwork.kernel.org/patch/8989981) - declare -a optionsYes=("CONFIG_ARM64_SW_TTBR0_PAN" "CONFIG_BUG" "CONFIG_BUG_ON_DATA_CORRUPTION" "CONFIG_CC_STACKPROTECTOR" "CONFIG_CC_STACKPROTECTOR_STRONG" "CONFIG_CPU_SW_DOMAIN_PAN" "CONFIG_DEBUG_CREDENTIALS" "CONFIG_DEBUG_KERNEL" "CONFIG_DEBUG_LIST" "CONFIG_DEBUG_NOTIFIERS" "CONFIG_DEBUG_RODATA" "CONFIG_DEBUG_WX" "CONFIG_FORTIFY_SOURCE" "CONFIG_GCC_PLUGIN_LATENT_ENTROPY" "CONFIG_GCC_PLUGIN_RANDSTRUCT" "CONFIG_GCC_PLUGINS" "CONFIG_GCC_PLUGIN_STRUCTLEAK" "CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL" "CONFIG_HARDENED_USERCOPY" "CONFIG_IO_STRICT_DEVMEM" "CONFIG_KAISER" "CONFIG_LEGACY_VSYSCALL_NONE" "CONFIG_PAGE_POISONING" "CONFIG_PAGE_POISONING_NO_SANITY" "CONFIG_PAGE_POISONING_ZERO" "CONFIG_PAGE_TABLE_ISOLATION" "CONFIG_PANIC_ON_OOPS" "CONFIG_RANDOMIZE_BASE" "CONFIG_REFCOUNT_FULL" "CONFIG_RETPOLINE" "CONFIG_SCHED_STACK_END_CHECK" "CONFIG_SECCOMP" "CONFIG_SECCOMP_FILTER" "CONFIG_SECURITY" "CONFIG_SECURITY_PERF_EVENTS_RESTRICT" "CONFIG_SECURITY_YAMA" "CONFIG_SECURITY_YAMA_STACKED" "CONFIG_SLAB_FREELIST_RANDOM" "CONFIG_SLAB_HARDENED" "CONFIG_SLUB_DEBUG" "CONFIG_STRICT_DEVMEM" "CONFIG_STRICT_KERNEL_RWX" "CONFIG_STRICT_MEMORY_RWX" "CONFIG_SYN_COOKIES" "CONFIG_UNMAP_KERNEL_AT_EL0" "CONFIG_VMAP_STACK") - for option in "${optionsYes[@]}" - do - 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; - fi; - fi; - done - #Disable supported options - #TODO: Disable earjack/uart debugger - 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") - for option in "${optionsNo[@]}" - do - sed -i 's/'$option'=y/# '$option' is not set/' $defconfigPath &>/dev/null || true; - done - #Extras - sed -i 's/CONFIG_DEFAULT_MMAP_MIN_ADDR=4096/CONFIG_DEFAULT_MMAP_MIN_ADDR=32768/' $defconfigPath &>/dev/null || true; - sed -i 's/CONFIG_LSM_MMAP_MIN_ADDR=4096/CONFIG_DEFAULT_MMAP_MIN_ADDR=32768/' $defconfigPath &>/dev/null || true; - - editKernelLocalversion "-dos"; - - echo "Hardened defconfig for $1"; - cd $base; -} -export -f hardenDefconfig; diff --git a/Scripts/LineageOS-15.1/Patch_CVE.sh b/Scripts/LineageOS-15.1/Patch_CVE.sh deleted file mode 100644 index 5dc32daa..00000000 --- a/Scripts/LineageOS-15.1/Patch_CVE.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -#DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017 Spot Communications, Inc. -# -#This program is free software: you can redistribute it and/or modify -#it under the terms of the GNU General Public License as published by -#the Free Software Foundation, either version 3 of the License, or -#(at your option) any later version. -# -#This program is distributed in the hope that it will be useful, -#but WITHOUT ANY WARRANTY; without even the implied warranty of -#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -#GNU General Public License for more details. -# -#You should have received a copy of the GNU General Public License -#along with this program. If not, see . - -#Attempts to patch kernels to be more secure - -#Is this the best way to do it? No. Is it the proper way to do it? No. Do I wish device maintainers would do it? Yes. Is it better then nothing? YES! - -echo "Patching CVEs..." - -cd $base -for patcher in $cveScripts/*.sh; do - echo "Running " $patcher; - source $patcher; -done; - -cd $base -echo "Patched CVEs!"