From 06b81aea5db2559abd13520f7cb38d2ca14286dd Mon Sep 17 00:00:00 2001
From: Rex Hoffman <rex@e-hoffman.org>
Date: Sun, 24 Sep 2023 09:01:02 -0700
Subject: [PATCH] trying ci fix

---
 .github/workflows/dbus.xml                    | 31 +++++++++++++++++++
 .setupkeystore.sh                             |  6 ++--
 .../internal/kde/KWalletBackend.java          |  3 +-
 3 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/dbus.xml

diff --git a/.github/workflows/dbus.xml b/.github/workflows/dbus.xml
new file mode 100644
index 0000000..9b25cd7
--- /dev/null
+++ b/.github/workflows/dbus.xml
@@ -0,0 +1,31 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- Our well-known bus type, do not change this -->
+  <type>session</type>
+
+  <!-- Fork into daemon mode -->
+  <fork/>
+
+  <!-- We use system service launching using a helper -->
+  <standard_system_servicedirs/>
+
+  <!-- This is a setuid helper that is used to launch system services -->
+  <servicehelper>/lib/dbus-1/dbus-daemon-launch-helper</servicehelper>
+
+  <!-- Write a pid file -->
+  <pidfile>/var/run/dbus/pid</pidfile>
+
+  <!-- Enable logging to syslog -->
+  <syslog/>
+
+  <!-- Only allow socket-credentials-based authentication -->
+  <auth>EXTERNAL</auth>
+
+  <!-- Only listen on a local socket. (abstract=/path/to/socket 
+       means use abstract namespace, don't really create filesystem 
+       file; only Linux supports this. Use path=/whatever on other 
+       systems.) -->
+  <listen>unix:path=/tmp/test_system_bus_socket</listen>
+<busconfig>
diff --git a/.setupkeystore.sh b/.setupkeystore.sh
index 35ec5ba..e83edf6 100755
--- a/.setupkeystore.sh
+++ b/.setupkeystore.sh
@@ -3,8 +3,8 @@
 keyring="$1"
 
 set -x
-if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ] && [ "$keyring" == "gnome" ]; then 
-  export $(dbus-launch)
+if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ] && [ "$keyring" == "gnome" ]; then
+  export $(dbus-launch --config-file=${GITHUB_WORKSPACE}/.github/workflow/dbus.xml)
   eval "$(echo '\n' | gnome-keyring-daemon --unlock)"
   echo xxx@gmail.com | secret-tool store --label="main" email address
   PASS=$(secret-tool lookup email address)
@@ -25,7 +25,7 @@ if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ] && [ "$keyring" == "kde" ]; t
   cp $GITHUB_WORKSPACE/.setupkeystore/* ~/.local/share/kwalletd
   chmod 600 ~/.local/share/kwalletd/*
   dbus-uuidgen --ensure
-  export $(dbus-launch)
+  export $(dbus-launch --config-file=${GITHUB_WORKSPACE}/.github/workflow/dbus.xml)
   password=$(kwalletcli -f . -e address)
   echo Checking the secret can be retrieved.
   if  [ "$password" != "xxx@gmail.com" ]; then
diff --git a/java-keyring/src/main/java/com/github/javakeyring/internal/kde/KWalletBackend.java b/java-keyring/src/main/java/com/github/javakeyring/internal/kde/KWalletBackend.java
index c0ec770..31236a2 100644
--- a/java-keyring/src/main/java/com/github/javakeyring/internal/kde/KWalletBackend.java
+++ b/java-keyring/src/main/java/com/github/javakeyring/internal/kde/KWalletBackend.java
@@ -32,6 +32,7 @@
 
 import org.freedesktop.dbus.annotations.DBusInterfaceName;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
 import org.freedesktop.dbus.interfaces.DBusInterface;
 
 import java.io.IOException;
@@ -45,7 +46,7 @@ public class KWalletBackend implements KeyringBackend {
 
   public KWalletBackend() throws BackendNotSupportedException {
     try {
-      connection = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
+      connection = DBusConnectionBuilder.forSessionBus().build();
       wallet = connection.getRemoteObject("org.kde.kwalletd5", "/modules/kwalletd5", KWallet.class, true);
       wallet.localWallet(); //attempt connection to wallet
     } catch (Exception e) {