From 8661d3feab49c4c2c258ec9d2a334652f79fe325 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Thu, 11 Mar 2021 09:03:28 -0800
Subject: [PATCH] pulseaudio: use default dbus policy file

---
 .../pulseaudio/config/pulseaudio-system.conf  | 33 -------------------
 packages/audio/pulseaudio/package.mk          |  3 +-
 2 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 packages/audio/pulseaudio/config/pulseaudio-system.conf

diff --git a/packages/audio/pulseaudio/config/pulseaudio-system.conf b/packages/audio/pulseaudio/config/pulseaudio-system.conf
deleted file mode 100644
index c92fc53010..0000000000
--- a/packages/audio/pulseaudio/config/pulseaudio-system.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?><!--*-nxml-*-->
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<!--
-This file is part of PulseAudio.
-
-PulseAudio is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of the
-License, or (at your option) any later version.
-
-PulseAudio is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
-Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
--->
-
-<busconfig>
-
-  <!-- System-wide PulseAudio runs as 'root' user. This fragment is
-       not necessary for user PulseAudio instances. -->
-
-  <policy user="root">
-    <allow own="org.pulseaudio.Server"/>
-    <allow send_destination="org.pulseaudio.Server"/>
-    <allow receive_sender="org.pulseaudio.Server"/>
-  </policy>
-
-</busconfig>
diff --git a/packages/audio/pulseaudio/package.mk b/packages/audio/pulseaudio/package.mk
index 007839628e..7835401ed8 100644
--- a/packages/audio/pulseaudio/package.mk
+++ b/packages/audio/pulseaudio/package.mk
@@ -80,7 +80,8 @@ post_makeinstall_target() {
   safe_remove ${INSTALL}/usr/share/bash-completion
 
   cp ${PKG_DIR}/config/system.pa ${INSTALL}/etc/pulse/
-  cp ${PKG_DIR}/config/pulseaudio-system.conf ${INSTALL}/etc/dbus-1/system.d/
+
+  sed 's/user="pulse"/user="root"/' -i ${INSTALL}/etc/dbus-1/system.d/pulseaudio-system.conf
 
   mkdir -p ${INSTALL}/usr/config
     cp -PR ${PKG_DIR}/config/pulse-daemon.conf.d ${INSTALL}/usr/config