From 450361fc640751c2a33210a02ceff0874c9f449b Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Tue, 10 Mar 2020 18:18:58 +0100
Subject: update systemd & dbus dependencies

Update the outdated systemd and dbus dependencies which are now provided
as go modules.  This will further tighten our dependencies and releases
and pave the way for the upcoming auto-update feature.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
---
 vendor/github.com/godbus/dbus/conn_other.go | 93 -----------------------------
 1 file changed, 93 deletions(-)
 delete mode 100644 vendor/github.com/godbus/dbus/conn_other.go

(limited to 'vendor/github.com/godbus/dbus/conn_other.go')

diff --git a/vendor/github.com/godbus/dbus/conn_other.go b/vendor/github.com/godbus/dbus/conn_other.go
deleted file mode 100644
index 616dcf664..000000000
--- a/vendor/github.com/godbus/dbus/conn_other.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// +build !darwin
-
-package dbus
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"os/user"
-	"path"
-	"strings"
-)
-
-var execCommand = exec.Command
-
-func getSessionBusPlatformAddress() (string, error) {
-	cmd := execCommand("dbus-launch")
-	b, err := cmd.CombinedOutput()
-
-	if err != nil {
-		return "", err
-	}
-
-	i := bytes.IndexByte(b, '=')
-	j := bytes.IndexByte(b, '\n')
-
-	if i == -1 || j == -1 || i > j {
-		return "", errors.New("dbus: couldn't determine address of session bus")
-	}
-
-	env, addr := string(b[0:i]), string(b[i+1:j])
-	os.Setenv(env, addr)
-
-	return addr, nil
-}
-
-// tryDiscoverDbusSessionBusAddress tries to discover an existing dbus session
-// and return the value of its DBUS_SESSION_BUS_ADDRESS.
-// It tries different techniques employed by different operating systems,
-// returning the first valid address it finds, or an empty string.
-//
-// * /run/user/<uid>/bus           if this exists, it *is* the bus socket. present on
-//                                 Ubuntu 18.04
-// * /run/user/<uid>/dbus-session: if this exists, it can be parsed for the bus
-//                                 address. present on Ubuntu 16.04
-//
-// See https://dbus.freedesktop.org/doc/dbus-launch.1.html
-func tryDiscoverDbusSessionBusAddress() string {
-	if runtimeDirectory, err := getRuntimeDirectory(); err == nil {
-
-		if runUserBusFile := path.Join(runtimeDirectory, "bus"); fileExists(runUserBusFile) {
-			// if /run/user/<uid>/bus exists, that file itself
-			// *is* the unix socket, so return its path
-			return fmt.Sprintf("unix:path=%s", runUserBusFile)
-		}
-		if runUserSessionDbusFile := path.Join(runtimeDirectory, "dbus-session"); fileExists(runUserSessionDbusFile) {
-			// if /run/user/<uid>/dbus-session exists, it's a
-			// text file // containing the address of the socket, e.g.:
-			// DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-E1c73yNqrG
-
-			if f, err := ioutil.ReadFile(runUserSessionDbusFile); err == nil {
-				fileContent := string(f)
-
-				prefix := "DBUS_SESSION_BUS_ADDRESS="
-
-				if strings.HasPrefix(fileContent, prefix) {
-					address := strings.TrimRight(strings.TrimPrefix(fileContent, prefix), "\n\r")
-					return address
-				}
-			}
-		}
-	}
-	return ""
-}
-
-func getRuntimeDirectory() (string, error) {
-	if currentUser, err := user.Current(); err != nil {
-		return "", err
-	} else {
-		return fmt.Sprintf("/run/user/%s", currentUser.Uid), nil
-	}
-}
-
-func fileExists(filename string) bool {
-	if _, err := os.Stat(filename); !os.IsNotExist(err) {
-		return true
-	} else {
-		return false
-	}
-}
-- 
cgit v1.2.3-54-g00ecf