From 5bc210f13564a7128d8e83f8e84e172e31bbb4e3 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 7 Jul 2023 13:33:11 -0400 Subject: [PATCH] Adjust microg config path /product can't be used for now https://github.com/microg/GmsCore/issues/1976 also move the wording around so it can be easier to remove later after a new release is tagged Signed-off-by: Tad --- .../Common/android_vendor_divested/strict_microG/Android.mk | 4 ++-- .../0014-signature_spoofing_toggle.patch | 4 ++-- .../0015-signature_spoofing_toggle.patch | 4 ++-- .../0016-signature_spoofing_toggle.patch | 4 ++-- .../0016-signature_spoofing_toggle.patch | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Patches/Common/android_vendor_divested/strict_microG/Android.mk b/Patches/Common/android_vendor_divested/strict_microG/Android.mk index 40e5ff2b..fcda406e 100644 --- a/Patches/Common/android_vendor_divested/strict_microG/Android.mk +++ b/Patches/Common/android_vendor_divested/strict_microG/Android.mk @@ -23,9 +23,9 @@ include $(CLEAR_VARS) LOCAL_MODULE := microg.xml LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC) +LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_PRODUCT_MODULE := true +LOCAL_PRODUCT_MODULE := false include $(BUILD_PREBUILT) diff --git a/Patches/LineageOS-17.1/android_packages_apps_Settings/0014-signature_spoofing_toggle.patch b/Patches/LineageOS-17.1/android_packages_apps_Settings/0014-signature_spoofing_toggle.patch index c85f1648..78bb0297 100644 --- a/Patches/LineageOS-17.1/android_packages_apps_Settings/0014-signature_spoofing_toggle.patch +++ b/Patches/LineageOS-17.1/android_packages_apps_Settings/0014-signature_spoofing_toggle.patch @@ -23,8 +23,8 @@ index a5aab8e5d0..eb346bd8eb 100644 Disable DNS content blocker Disables use of the included /etc/hosts database for data collection and malware blocking. -+ microG enablement (not recommended) -+ Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) microG can download/execute proprietary code from Google, 3) apps talking to microG do so using proprietary Google libraries. ++ microG enablement ++ Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) apps talking to microG do so using proprietary Google libraries, 3) microG can download/execute proprietary code from Google. + Privacy diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0015-signature_spoofing_toggle.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0015-signature_spoofing_toggle.patch index 9678c992..cebadc1d 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0015-signature_spoofing_toggle.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0015-signature_spoofing_toggle.patch @@ -23,8 +23,8 @@ index c597570f35..f04d49d6f1 100644 Disable DNS content blocker Disables use of the included /etc/hosts database for data collection and malware blocking. -+ microG enablement (not recommended) -+ Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) microG can download/execute proprietary code from Google, 3) apps talking to microG do so using proprietary Google libraries. ++ microG enablement ++ Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) apps talking to microG do so using proprietary Google libraries, 3) microG can download/execute proprietary code from Google. + Privacy diff --git a/Patches/LineageOS-19.1/android_packages_apps_Settings/0016-signature_spoofing_toggle.patch b/Patches/LineageOS-19.1/android_packages_apps_Settings/0016-signature_spoofing_toggle.patch index 4cff2a4f..d11053ca 100644 --- a/Patches/LineageOS-19.1/android_packages_apps_Settings/0016-signature_spoofing_toggle.patch +++ b/Patches/LineageOS-19.1/android_packages_apps_Settings/0016-signature_spoofing_toggle.patch @@ -23,8 +23,8 @@ index 1be8ea0677..24b8cbe581 100644 Disable DNS content blocker Disables use of the included /etc/hosts database for data collection and malware blocking. -+ microG enablement (not recommended) -+ Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) microG can download/execute proprietary code from Google, 3) apps talking to microG do so using proprietary Google libraries. ++ microG enablement ++ Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) apps talking to microG do so using proprietary Google libraries, 3) microG can download/execute proprietary code from Google. + Privacy diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0016-signature_spoofing_toggle.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0016-signature_spoofing_toggle.patch index fd2c9542..00e2a083 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0016-signature_spoofing_toggle.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_Settings/0016-signature_spoofing_toggle.patch @@ -16,15 +16,15 @@ Signed-off-by: Tad create mode 100644 src/com/android/settings/security/SigSpoofPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index 6e619cc2c4..8bc598e4bd 100644 +index 6e619cc2c4..15247c1c93 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -756,6 +756,9 @@ Disable DNS content blocker Disables use of the included /etc/hosts database for data collection and malware blocking. -+ microG enablement (not recommended) -+ Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) microG can download/execute proprietary code from Google, 3) apps talking to microG do so using proprietary Google libraries. ++ microG enablement ++ Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) apps talking to microG do so using proprietary Google libraries, 3) microG can download/execute proprietary code from Google. + Lock screen when trust is lost