From 8d70e4307348d4e2a669783e01c80ac0c74e5177 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Wed, 31 Oct 2018 20:54:23 +0100
Subject: [PATCH] CommonInstaller: update

---
 ChangeLog.md    | 11 +++++++++++
 CommonInstaller |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 75e212b..62d108d 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -11,6 +11,17 @@
   * improve microG DroidGuard Helper installation
   * fix swipe feature by providing SDK-specific libraries
 
+### General Changes
+
+* Full, microG packages
+  * split privapp-permissions-google.xml into
+     * privapp-permissions-microg.xml for microG GmsCore permissions
+     * privapp-permissions-phonesky.xml for Play Store permissions
+  * split microg-permissions.xml into
+     * microg-permissions.xml for microG GmsCore and uNlp permissions
+     * phonesky-permissions.xml for Play Store permissions
+  * add privapp-permissions-gsync.xml for BackupTransport permissions
+
 ### Updates
 
 * automatic
diff --git a/CommonInstaller b/CommonInstaller
index 3061e54..c333236 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -723,7 +723,7 @@ install_microg () {
 		fi
 
 		nanodroid_install_file etc/permissions/features.xml
-		nanodroid_install_file etc/permissions/privapp-permissions-google.xml
+		nanodroid_install_file etc/permissions/privapp-permissions-microg.xml
 		nanodroid_install_file etc/default-permissions/microg-permissions.xml
 		nanodroid_install_file etc/sysconfig/microg-a5k.xml
 
@@ -777,6 +777,9 @@ install_gsync () {
 			cp -r "${INSTALLER}/gsync/etc/default-permissions/" "${MODPATH}/system/etc/"
 			set_perm_data -r "${MODPATH}/system/etc/default-permissions/"
 
+			cp -r "${INSTALLER}/gsync/etc/permissions/" "${MODPATH}/system/etc/"
+			set_perm_data -r "${MODPATH}/system/etc/permissions/"
+
 			find "${INSTALLER}/gsync/etc/default-permissions/" -type f | \
 					sed -e "s,${INSTALLER}/gsync/etc,/system/etc,g" | \
 					installinfo_add
@@ -849,6 +852,9 @@ install_store () {
 			ui_print " << with Play Store"
 			NANODROID_APP_STORE="Phonesky"
 			NANODROID_REM_STORE="FakeStore"
+
+			nanodroid_install_file etc/permissions/privapp-permissions-phonesky.xml
+			nanodroid_install_file etc/default-permissions/phonesky-permissions.xml
 		;;
 
 		2 )