From 5886e238babe8fd19428b4e05f89a371ed1ef4f6 Mon Sep 17 00:00:00 2001
From: Stacy Harper <contact@stacyharper.net>
Date: Tue, 25 May 2021 17:44:34 +0200
Subject: [PATCH] sxmo/sxmo-utils: Add back the system required configs (MR
 2197)

---
 sxmo/sxmo-utils/APKBUILD                      | 25 ++++++++++++++++---
 ...tfs-etc-NetworkManager-conf.d-00-sxmo.conf | 14 +++++++++++
 .../rootfs-etc-polkit-1-rules.d-00-sxmo.rules |  7 ++++++
 ....d-50-org.freedesktop.NetworkManager.rules |  5 ++++
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 sxmo/sxmo-utils/rootfs-etc-NetworkManager-conf.d-00-sxmo.conf
 create mode 100644 sxmo/sxmo-utils/rootfs-etc-polkit-1-rules.d-00-sxmo.rules
 create mode 100644 sxmo/sxmo-utils/rootfs-etc-polkit-1-rules.d-50-org.freedesktop.NetworkManager.rules

diff --git a/sxmo/sxmo-utils/APKBUILD b/sxmo/sxmo-utils/APKBUILD
index 99b160c52..aa7e7ba41 100644
--- a/sxmo/sxmo-utils/APKBUILD
+++ b/sxmo/sxmo-utils/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Miles Alan <m@milesalan.com>
 pkgname=sxmo-utils
 pkgver=1.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Utility scripts, programs, and configs that hold the Sxmo UI environment together"
 url="https://git.sr.ht/~mil/sxmo-utils"
 arch="all"
@@ -59,7 +59,12 @@ depends="
 
 options="!check" # has no tests
 subpackages="$pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~mil/sxmo-utils/archive/$pkgver.tar.gz"
+source="
+	$pkgname-$pkgver.tar.gz::https://git.sr.ht/~mil/sxmo-utils/archive/$pkgver.tar.gz
+	rootfs-etc-NetworkManager-conf.d-00-sxmo.conf
+	rootfs-etc-polkit-1-rules.d-00-sxmo.rules
+	rootfs-etc-polkit-1-rules.d-50-org.freedesktop.NetworkManager.rules
+	"
 
 package() {
 	mkdir -p "$pkgdir/etc/modules-load.d/"
@@ -68,6 +73,20 @@ package() {
 	printf %b "options snd slots=,snd-aloop" > "$pkgdir/etc/modprobe.d/sxmo.conf"
 
 	make  -C "$builddir" DESTDIR=$pkgdir install
+
+	install -Dm644 "$srcdir/rootfs-etc-NetworkManager-conf.d-00-sxmo.conf" \
+		"$pkgdir/etc/NetworkManager/conf.d/00-sxmo.conf"
+
+	install -Dm755 "$srcdir/rootfs-etc-polkit-1-rules.d-00-sxmo.rules" \
+		"$pkgdir/etc/polkit-1/rules.d/00-sxmo.rules"
+
+	install -Dm755 "$srcdir/rootfs-etc-polkit-1-rules.d-50-org.freedesktop.NetworkManager.rules" \
+		"$pkgdir/etc/polkit-1/rules.d/50-org.freedesktop.NetworkManager.rules"
 }
 
-sha512sums="b80ed389e29404421a829bba9b76814ee3afc3c11527d2f3e87f95eb83bbc498ead43e38c0d6164c4336c2d5633af569c43bcdb28c0f0d886e00ee506184b537  sxmo-utils-1.4.1.tar.gz"
+sha512sums="
+b80ed389e29404421a829bba9b76814ee3afc3c11527d2f3e87f95eb83bbc498ead43e38c0d6164c4336c2d5633af569c43bcdb28c0f0d886e00ee506184b537  sxmo-utils-1.4.1.tar.gz
+67a031f309a3232ac1e8abc3fedeaee912c035f9c81b4f709248895905a27ab5844ec92c65e55b79af3894450ba3883549d4004f11efebb47114d41f730e4a5f  rootfs-etc-NetworkManager-conf.d-00-sxmo.conf
+32532ad5071588b80f43d539b3bd140e3f5b4100fca244be2ade5b8c697c76043ce5278ae7bf14762106aed2c9690f34c14e73031e5d86c11cc042c8f7245421  rootfs-etc-polkit-1-rules.d-00-sxmo.rules
+7b34e861bc4ec57d970d2a7aacca36e3c3742a63ff995af1336f80b666e4a38c1035b35e129322e0d62dc75011bfaf495eb2bcae5392f2bf39f1d7b1400afcce  rootfs-etc-polkit-1-rules.d-50-org.freedesktop.NetworkManager.rules
+"
diff --git a/sxmo/sxmo-utils/rootfs-etc-NetworkManager-conf.d-00-sxmo.conf b/sxmo/sxmo-utils/rootfs-etc-NetworkManager-conf.d-00-sxmo.conf
new file mode 100644
index 000000000..264c97b5d
--- /dev/null
+++ b/sxmo/sxmo-utils/rootfs-etc-NetworkManager-conf.d-00-sxmo.conf
@@ -0,0 +1,14 @@
+[main]
+plugins+=ifupdown
+
+[ifupdown]
+managed=true
+
+[logging]
+level=INFO
+
+[device-mac-randomization]
+wifi.scan-rand-mac-address=no
+
+[keyfile]
+unmanaged-devices=interface-name:p2p0
diff --git a/sxmo/sxmo-utils/rootfs-etc-polkit-1-rules.d-00-sxmo.rules b/sxmo/sxmo-utils/rootfs-etc-polkit-1-rules.d-00-sxmo.rules
new file mode 100644
index 000000000..c1b52ddaa
--- /dev/null
+++ b/sxmo/sxmo-utils/rootfs-etc-polkit-1-rules.d-00-sxmo.rules
@@ -0,0 +1,7 @@
+polkit.addRule(function(action, subject) {
+  if (action.id.indexOf("org.freedesktop.ModemManager1.") == 0 &&
+      subject.isInGroup("plugdev")) {
+
+      return polkit.Result.YES;
+  }
+});
diff --git a/sxmo/sxmo-utils/rootfs-etc-polkit-1-rules.d-50-org.freedesktop.NetworkManager.rules b/sxmo/sxmo-utils/rootfs-etc-polkit-1-rules.d-50-org.freedesktop.NetworkManager.rules
new file mode 100644
index 000000000..8aaa868e4
--- /dev/null
+++ b/sxmo/sxmo-utils/rootfs-etc-polkit-1-rules.d-50-org.freedesktop.NetworkManager.rules
@@ -0,0 +1,5 @@
+polkit.addRule(function(action, subject) {
+    if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 && subject.isInGroup("netdev")) {
+        return polkit.Result.YES;
+    }
+});