From 3ceff683a8282af442a221882c7d00fff5ef8f3e Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 21 Mar 2018 20:50:45 -0400 Subject: [PATCH] Rebase FDroidPriv patch and cleanup privacy guard changes --- ...lease_Key.patch => 0001-Release_Key.patch} | 14 +- .../0001-Privacy_Guard-More_Perms.patch | 141 ------------------ ...lease_Key.patch => 0001-Release_Key.patch} | 14 +- Scripts/LineageOS-14.1/Functions.sh | 3 + Scripts/LineageOS-14.1/Patch.sh | 3 +- Scripts/LineageOS-15.1/Patch.sh | 2 +- 6 files changed, 19 insertions(+), 158 deletions(-) rename Patches/LineageOS-14.1/android_packages_apps_FDroidPrivilegedExtension/{0002-Release_Key.patch => 0001-Release_Key.patch} (74%) delete mode 100644 Patches/LineageOS-14.1/android_packages_apps_Settings/0001-Privacy_Guard-More_Perms.patch rename Patches/LineageOS-15.1/android_packages_apps_FDroidPrivilegedExtension/{0002-Release_Key.patch => 0001-Release_Key.patch} (74%) diff --git a/Patches/LineageOS-14.1/android_packages_apps_FDroidPrivilegedExtension/0002-Release_Key.patch b/Patches/LineageOS-14.1/android_packages_apps_FDroidPrivilegedExtension/0001-Release_Key.patch similarity index 74% rename from Patches/LineageOS-14.1/android_packages_apps_FDroidPrivilegedExtension/0002-Release_Key.patch rename to Patches/LineageOS-14.1/android_packages_apps_FDroidPrivilegedExtension/0001-Release_Key.patch index d74cd8a7..7f7d3804 100644 --- a/Patches/LineageOS-14.1/android_packages_apps_FDroidPrivilegedExtension/0002-Release_Key.patch +++ b/Patches/LineageOS-14.1/android_packages_apps_FDroidPrivilegedExtension/0001-Release_Key.patch @@ -1,21 +1,21 @@ -From 77ca61398922d69a2b97dc3a0e4e149c40b5bbc1 Mon Sep 17 00:00:00 2001 +From 0494963c9882396a96a1796d3ef748771d6cb91c Mon Sep 17 00:00:00 2001 From: Tad -Date: Sun, 18 Dec 2016 19:01:10 -0500 -Subject: [PATCH] Change to release key +Date: Wed, 21 Mar 2018 19:20:02 -0400 +Subject: [PATCH] Switch to our release key --- app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java b/app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java -index f42bbd8..ee22bb7 100644 +index ef2087a..8cca796 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java -@@ -31,8 +31,8 @@ import java.util.HashSet; +@@ -34,8 +34,8 @@ import java.util.HashSet; public class ClientWhitelist { public static HashSet> whitelist = new HashSet<>(Arrays.asList( -- // certificate SHA-256 of https//f-droid.org/FDroid.apk +- // certificate SHA-256 of https//f-droid.org/F-Droid.apk - new Pair<>("org.fdroid.fdroid", "43238d512c1e5eb2d6569f4a3afbf5523418b82e0a3ed1552770abb9a9c9ccab") + //release-key + new Pair<>("org.fdroid.fdroid", "cb1ee2ec40d05ed678f42ae701cdfa29eea79d0e6d633276de230bf3494067c3") @@ -23,5 +23,5 @@ index f42bbd8..ee22bb7 100644 } -- -2.9.3 +2.16.2 diff --git a/Patches/LineageOS-14.1/android_packages_apps_Settings/0001-Privacy_Guard-More_Perms.patch b/Patches/LineageOS-14.1/android_packages_apps_Settings/0001-Privacy_Guard-More_Perms.patch deleted file mode 100644 index 8d8708ee..00000000 --- a/Patches/LineageOS-14.1/android_packages_apps_Settings/0001-Privacy_Guard-More_Perms.patch +++ /dev/null @@ -1,141 +0,0 @@ -From bc77347e083fec0197da88fd940d23896f2706aa Mon Sep 17 00:00:00 2001 -From: Tad -Date: Fri, 8 Dec 2017 03:07:24 -0500 -Subject: [PATCH] PrivacyGuard: Allow control over more permissions - -Change-Id: I46fae35ec2cf6fb560de89581d935cd023b25a86 ---- - .../android/settings/applications/AppOpsState.java | 60 +++++++++++++++------- - 1 file changed, 42 insertions(+), 18 deletions(-) - -diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java -index 6935d06931..0bcd690bcf 100644 ---- a/src/com/android/settings/applications/AppOpsState.java -+++ b/src/com/android/settings/applications/AppOpsState.java -@@ -113,11 +113,11 @@ public class AppOpsState { - AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION }, - new boolean[] { true, - true, -- false, -- false, -- false, -- false, -- false } -+ true, -+ true, -+ true, -+ true, -+ true } - ); - - public static final OpsTemplate PERSONAL_TEMPLATE = new OpsTemplate( -@@ -128,15 +128,27 @@ public class AppOpsState { - AppOpsManager.OP_READ_CALENDAR, - AppOpsManager.OP_WRITE_CALENDAR, - AppOpsManager.OP_READ_CLIPBOARD, -- AppOpsManager.OP_WRITE_CLIPBOARD }, -+ AppOpsManager.OP_WRITE_CLIPBOARD, -+ AppOpsManager.OP_GET_USAGE_STATS, -+ AppOpsManager.OP_BODY_SENSORS, -+ AppOpsManager.OP_GET_ACCOUNTS, -+ AppOpsManager.OP_USE_FINGERPRINT, -+ AppOpsManager.OP_ADD_VOICEMAIL, -+ AppOpsManager.OP_WRITE_WALLPAPER }, - new boolean[] { true, - true, - true, - true, - true, - true, -- false, -- false } -+ true, -+ true, -+ true, -+ true, -+ true, -+ true, -+ true, -+ true } - ); - - public static final OpsTemplate MESSAGING_TEMPLATE = new OpsTemplate( -@@ -148,8 +160,10 @@ public class AppOpsState { - AppOpsManager.OP_WRITE_SMS, - AppOpsManager.OP_SEND_SMS, - AppOpsManager.OP_READ_ICC_SMS, -- AppOpsManager.OP_WRITE_ICC_SMS }, -+ AppOpsManager.OP_WRITE_ICC_SMS, -+ AppOpsManager.OP_READ_CELL_BROADCASTS }, - new boolean[] { true, -+ true, - true, - true, - true, -@@ -175,7 +189,10 @@ public class AppOpsState { - AppOpsManager.OP_AUDIO_NOTIFICATION_VOLUME, - AppOpsManager.OP_AUDIO_BLUETOOTH_VOLUME, - AppOpsManager.OP_MUTE_MICROPHONE }, -- new boolean[] { false, -+ new boolean[] { true, -+ true, -+ true, -+ true, - true, - true, - false, -@@ -185,10 +202,7 @@ public class AppOpsState { - false, - false, - false, -- false, -- false, -- false, -- false } -+ true } - ); - - public static final OpsTemplate DEVICE_TEMPLATE = new OpsTemplate( -@@ -205,8 +219,15 @@ public class AppOpsState { - AppOpsManager.OP_CHANGE_WIFI_STATE, - AppOpsManager.OP_BLUETOOTH_CHANGE, - AppOpsManager.OP_NFC_CHANGE, -- AppOpsManager.OP_DATA_CONNECT_CHANGE }, -+ AppOpsManager.OP_DATA_CONNECT_CHANGE, -+ AppOpsManager.OP_PROCESS_OUTGOING_CALLS, -+ AppOpsManager.OP_USE_SIP, -+ AppOpsManager.OP_READ_PHONE_STATE, -+ AppOpsManager.OP_READ_EXTERNAL_STORAGE, -+ AppOpsManager.OP_WRITE_EXTERNAL_STORAGE }, - new boolean[] { false, -+ true, -+ true, - true, - true, - true, -@@ -214,8 +235,11 @@ public class AppOpsState { - true, - false, - false, -- false, -- false, -+ true, -+ true, -+ true, -+ true, -+ true, - true, - true, - true, -@@ -224,7 +248,7 @@ public class AppOpsState { - - public static final OpsTemplate RUN_IN_BACKGROUND_TEMPLATE = new OpsTemplate( - new int[] { AppOpsManager.OP_RUN_IN_BACKGROUND }, -- new boolean[] { false } -+ new boolean[] { true } - ); - - public static final OpsTemplate BOOTUP_TEMPLATE = new OpsTemplate( --- -2.15.1 - diff --git a/Patches/LineageOS-15.1/android_packages_apps_FDroidPrivilegedExtension/0002-Release_Key.patch b/Patches/LineageOS-15.1/android_packages_apps_FDroidPrivilegedExtension/0001-Release_Key.patch similarity index 74% rename from Patches/LineageOS-15.1/android_packages_apps_FDroidPrivilegedExtension/0002-Release_Key.patch rename to Patches/LineageOS-15.1/android_packages_apps_FDroidPrivilegedExtension/0001-Release_Key.patch index d74cd8a7..7f7d3804 100644 --- a/Patches/LineageOS-15.1/android_packages_apps_FDroidPrivilegedExtension/0002-Release_Key.patch +++ b/Patches/LineageOS-15.1/android_packages_apps_FDroidPrivilegedExtension/0001-Release_Key.patch @@ -1,21 +1,21 @@ -From 77ca61398922d69a2b97dc3a0e4e149c40b5bbc1 Mon Sep 17 00:00:00 2001 +From 0494963c9882396a96a1796d3ef748771d6cb91c Mon Sep 17 00:00:00 2001 From: Tad -Date: Sun, 18 Dec 2016 19:01:10 -0500 -Subject: [PATCH] Change to release key +Date: Wed, 21 Mar 2018 19:20:02 -0400 +Subject: [PATCH] Switch to our release key --- app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java b/app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java -index f42bbd8..ee22bb7 100644 +index ef2087a..8cca796 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java -@@ -31,8 +31,8 @@ import java.util.HashSet; +@@ -34,8 +34,8 @@ import java.util.HashSet; public class ClientWhitelist { public static HashSet> whitelist = new HashSet<>(Arrays.asList( -- // certificate SHA-256 of https//f-droid.org/FDroid.apk +- // certificate SHA-256 of https//f-droid.org/F-Droid.apk - new Pair<>("org.fdroid.fdroid", "43238d512c1e5eb2d6569f4a3afbf5523418b82e0a3ed1552770abb9a9c9ccab") + //release-key + new Pair<>("org.fdroid.fdroid", "cb1ee2ec40d05ed678f42ae701cdfa29eea79d0e6d633276de230bf3494067c3") @@ -23,5 +23,5 @@ index f42bbd8..ee22bb7 100644 } -- -2.9.3 +2.16.2 diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 14482fe8..07963cc1 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -85,6 +85,9 @@ buildAll() { export -f buildAll; patchWorkspace() { + source build/envsetup.sh; + repopick 201223; #Cherry picks + source $scripts/Patch.sh; source $scripts/Defaults.sh; source $scripts/Overclock.sh; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 6160417c..89e6a30b 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -116,7 +116,7 @@ sed -i 's|/$(fdroid_dir) \&\&| \&\&|' Android.mk; #One line wouldn't work... no #TODO: Change the package ID until https://gitlab.com/fdroid/fdroidclient/issues/843 is implemented enterAndClear "packages/apps/FDroidPrivilegedExtension" -patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0002-Release_Key.patch" #Change to release key +patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0001-Release_Key.patch" #Change to release key #release-keys: CB:1E:E2:EC:40:D0:5E:D6:78:F4:2A:E7:01:CD:FA:29:EE:A7:9D:0E:6D:63:32:76:DE:23:0B:F3:49:40:67:C3 #test-keys: C8:A2:E9:BC:CF:59:7C:2F:B6:DC:66:BE:E2:93:FC:13:F2:FC:47:EC:77:BC:6B:2B:0D:52:C1:1F:51:19:2A:B8 @@ -134,7 +134,6 @@ enterAndClear "packages/apps/Settings" git revert 2ebe6058c546194a301c1fd22963d6be4adbf961 sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 48;/' src/com/android/settings/ChooseLockPassword.java; #Increase max password length sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com.google.oQuae4av";/' src/com/android/settings/PrivacySettings.java; #MicroG doesn't support Backup, hide the options -patch -p1 < $patches"android_packages_apps_Settings/0001-Privacy_Guard-More_Perms.patch" #Allow more control over various permissions via Privacy Guard enterAndClear "packages/apps/SetupWizard" patch -p1 < $patches"android_packages_apps_SetupWizard/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 dbc4d59c..862137d3 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -107,7 +107,7 @@ sed -i 's|/$(fdroid_dir) \&\&| \&\&|' Android.mk; #One line wouldn't work... no #TODO: Change the package ID until https://gitlab.com/fdroid/fdroidclient/issues/843 is implemented enterAndClear "packages/apps/FDroidPrivilegedExtension" -patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0002-Release_Key.patch" #Change to release key +patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0001-Release_Key.patch" #Change to release key #release-keys: CB:1E:E2:EC:40:D0:5E:D6:78:F4:2A:E7:01:CD:FA:29:EE:A7:9D:0E:6D:63:32:76:DE:23:0B:F3:49:40:67:C3 #test-keys: C8:A2:E9:BC:CF:59:7C:2F:B6:DC:66:BE:E2:93:FC:13:F2:FC:47:EC:77:BC:6B:2B:0D:52:C1:1F:51:19:2A:B8