From f3a04d8178abea59a309bc430d83a7001dbc16b0 Mon Sep 17 00:00:00 2001
From: Recolic <git@me.recolic.net>
Date: Tue, 6 Jun 2023 14:11:26 -0700
Subject: [PATCH] upgrade identity broker
---
README.md | 22 +++++++++----------
l1-quickinstall.sh | 2 +-
.../PKGBUILD | 20 ++++++++---------
.../x.install | 4 ++--
4 files changed, 24 insertions(+), 24 deletions(-)
rename {msft-identity-broker => microsoft-identity-broker}/PKGBUILD (54%)
rename {msft-identity-broker => microsoft-identity-broker}/x.install (77%)
diff --git a/README.md b/README.md
index f8cc116..d1e841b 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ After installing level-2, you can actually enroll the machine and get a certific
## Install Level-1
-1. Install `libsdbus-c++0 msalsdk-dbusclient msft-identity-broker` packages in this repo. Note that they depends on `jre11-openjdk`.
+1. Install `libsdbus-c++0 msalsdk-dbusclient microsoft-identity-broker` packages in this repo. Note that they depends on `jre11-openjdk`.
2. Install `microsoft-edge-stable-bin` from AUR.
3. `[Temporary Fix]` Downgrade `tpm2-tss` to `3.2.0-1`, and add it to `IgnorePkg` in `/etc/pacman.conf`.
@@ -30,12 +30,12 @@ It's suggested to keep the Ubuntu VM powered-on forever, to keep the certificate
Copy the following files from enrolled Level-2 machine to unenrolled Level-1 machine:
```
-/var/lib/msft-identity-device-broker/1000.db
+/var/lib/microsoft-identity-device-broker/1000.db
/etc/machine-id
/etc/os-release # Note: this is a symbol-link in ubuntu
-/home/YourName/.config/msft-identity-broker/account-data.db
-/home/YourName/.config/msft-identity-broker/broker-data.db
-/home/YourName/.config/msft-identity-broker/cookies.db
+/home/YourName/.config/microsoft-identity-broker/account-data.db
+/home/YourName/.config/microsoft-identity-broker/broker-data.db
+/home/YourName/.config/microsoft-identity-broker/cookies.db
/home/YourName/.local/share/keyrings/login.keyring
```
@@ -51,8 +51,8 @@ You are all set!
If your edge browser is not allowing you to login, check the following logs:
-1. Any error message in `journalctl --user -u msft-identity-broker.service`?
-2. Any error message in `sudo journalctl -u msft-identity-device-broker.service`?
+1. Any error message in `journalctl --user -u microsoft-identity-broker.service`?
+2. Any error message in `sudo journalctl -u microsoft-identity-device-broker.service`?
3. Run `seahorse` and is there Intune entries in your `login` keyring? Is it `set as default`?
4. Run `ldd /usr/lib/libmsal_dbus_client.so`. Is there undefined reference?
@@ -60,11 +60,11 @@ If your edge browser is not allowing you to login, check the following logs:
#### ArchLinux side
-- msft-identity-broker.service: Failed at step STATE_DIRECTORY spawning /opt/msft/identitybroker/bin/msft-identity-broker: Operation not permitted
+- microsoft-identity-broker.service: Failed at step STATE_DIRECTORY spawning /opt/microsoft/identitybroker/bin/microsoft-identity-broker: Operation not permitted
-This is a permission issue. Please run `chmod 777 -R /opt/msft` as root, **and** run `chown -R YourName /home/YourName/.config`, and restart the service.
+This is a permission issue. Please run `chmod 777 -R /opt/microsoft` as root, **and** run `chown -R YourName /home/YourName/.config`, and restart the service.
-- msft-identity-broker.service: Failed to set up special execution directory in /home/YourName/.config: Operation not permitted
+- microsoft-identity-broker.service: Failed to set up special execution directory in /home/YourName/.config: Operation not permitted
This is also a permission issue while overwritting user config with root account manually. Please run `chown -R YourName /home/YourName/.config` and restart the service.
@@ -84,7 +84,7 @@ Sign out and sign in again.
- Cannot find directory `.../msft-identity-broker/...`
-This directory was renamed from `msft-identity-broker` to `microsoft-identity-broker` in latest intune. Remember to rename it while copy files around.
+This directory was renamed from `msft-identity-broker` to `microsoft-identity-broker` in latest intune. Either upgrade your identity broker, or rename things manually (might be error-prone).
#### Ubuntu side (officially supported)
diff --git a/l1-quickinstall.sh b/l1-quickinstall.sh
index bca2ca4..a233af6 100755
--- a/l1-quickinstall.sh
+++ b/l1-quickinstall.sh
@@ -7,6 +7,6 @@ function i () {
sudo pacman -Sy --noconfirm jre11-openjdk
( i libsdbus-c++0 )
-( i msft-identity-broker )
+( i microsoft-identity-broker )
( i msalsdk-dbusclient )
diff --git a/msft-identity-broker/PKGBUILD b/microsoft-identity-broker/PKGBUILD
similarity index 54%
rename from msft-identity-broker/PKGBUILD
rename to microsoft-identity-broker/PKGBUILD
index 81c3569..f1461fc 100644
--- a/msft-identity-broker/PKGBUILD
+++ b/microsoft-identity-broker/PKGBUILD
@@ -1,29 +1,29 @@
# Maintainer: Recolic K <root@recolic.net>
-pkgname=msft-identity-broker
-pkgver=1.0.6
+pkgname=microsoft-identity-broker
+pkgver=1.5.1
pkgrel=1
-pkgdesc="msft-identity-broker"
-url="https://packages.microsoft.com/ubuntu/20.04/prod/pool/main/m/msft-identity-broker"
+pkgdesc="microsoft-identity-broker"
+url="https://packages.microsoft.com/ubuntu/20.04/prod/pool/main/m/microsoft-identity-broker"
license=("GPL2")
arch=("x86_64")
depends=("dbus" "gnome-keyring" "systemd" "jre11-openjdk")
makedepends=()
-conflicts=()
-replaces=()
+conflicts=("msft-identity-broker")
+replaces=("msft-identity-broker")
backup=()
source=("source.deb::$url/${pkgname}_${pkgver}_amd64.deb")
validpgpkeys=("")
-sha256sums=("5523be2d7b0a502b34268f94b1c95d4a892500b1ab69a1ab0e9c9cafb7c62bbb")
+sha256sums=("2438b186365c527f546c59e0e3a5c660c431739a12026ad89c2e0acad56ce443")
install=x.install
package() {
cd "$srcdir"
ar x source.deb
tar xvzf data.tar.gz
- echo "Patching... (Hardcode archlinux java11 JAVA_HOME into xxx.service)"
- echo 'Environment="JAVA_HOME=/usr/lib/jvm/java-11-openjdk"' >> "$srcdir/usr/lib/systemd/system/msft-identity-device-broker.service"
- echo 'Environment="JAVA_HOME=/usr/lib/jvm/java-11-openjdk"' >> "$srcdir/usr/lib/systemd/user/msft-identity-broker.service"
+ echo ">>> Patching... (Hardcode archlinux java11 JAVA_HOME into xxx.service)"
+ echo 'Environment="JAVA_HOME=/usr/lib/jvm/java-11-openjdk"' >> "$srcdir/usr/lib/systemd/system/microsoft-identity-device-broker.service"
+ echo 'Environment="JAVA_HOME=/usr/lib/jvm/java-11-openjdk"' >> "$srcdir/usr/lib/systemd/user/microsoft-identity-broker.service"
cp -r "$srcdir/usr" "$srcdir/opt" "$pkgdir/"
}
diff --git a/msft-identity-broker/x.install b/microsoft-identity-broker/x.install
similarity index 77%
rename from msft-identity-broker/x.install
rename to microsoft-identity-broker/x.install
index e0fb3b1..e83f727 100644
--- a/msft-identity-broker/x.install
+++ b/microsoft-identity-broker/x.install
@@ -3,7 +3,7 @@ post_install() {
# I don't know why they are doing this. just leave them there.
if [ -d /run/systemd/system ]; then
systemctl --system daemon-reload || true
- # systemctl restart msft-identity-device-broker.service || true
+ # systemctl restart microsoft-identity-device-broker.service || true
fi
}
@@ -13,7 +13,7 @@ post_upgrade() {
pre_remove() {
if [ -d /run/systemd/system ]; then
- systemctl stop msft-identity-device-broker.service || true
+ systemctl stop microsoft-identity-device-broker.service || true
fi
}
--
GitLab