From f3b94fcd8385dfe2e322990da54bed7879a9200d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 15 2020 09:07:18 +0000
Subject: import pulseaudio-10.0-6.el7_9


---

diff --git a/SOURCES/0001-Permit-root-owned-home-directory.patch b/SOURCES/0001-Permit-root-owned-home-directory.patch
new file mode 100644
index 0000000..bd54680
--- /dev/null
+++ b/SOURCES/0001-Permit-root-owned-home-directory.patch
@@ -0,0 +1,35 @@
+From 97d0eda2562af07b7514de075ddf62f9dd678e51 Mon Sep 17 00:00:00 2001
+From: Nick Moriarty <nick.moriarty@york.ac.uk>
+Date: Fri, 26 Jul 2019 08:28:09 +0000
+Subject: [PATCH] Permit root-owned home directory
+
+On certain types of filesystem (especially NFS appliances which support
+multiple operating systems), the user's home directory may report as
+being owned by root rather than the user, yet still permit the user to
+create and modify files normally (which will be owned by them).
+
+Our users have home directories hosted on a NetApp storage appliance
+which uses mixed-mode ACLs but where the home directory is set up with
+NTFS ACLs at the top level.  This means they have the expected effective
+permissions, but the ownership reports as root.  This could also be the
+case if the filesystem were using NFS4 ACLs or similar.
+---
+ src/pulsecore/core-util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
+index d75f1d215..601b1d1df 100644
+--- a/src/pulsecore/core-util.c
++++ b/src/pulsecore/core-util.c
+@@ -1448,7 +1448,7 @@ static int check_ours(const char *p) {
+         return -errno;
+ 
+ #ifdef HAVE_GETUID
+-    if (st.st_uid != getuid())
++    if (st.st_uid != getuid() && st.st_uid != 0)
+         return -EACCES;
+ #endif
+ 
+-- 
+2.26.2
+
diff --git a/SPECS/pulseaudio.spec b/SPECS/pulseaudio.spec
index e7484ba..7c62121 100644
--- a/SPECS/pulseaudio.spec
+++ b/SPECS/pulseaudio.spec
@@ -25,7 +25,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release:        5%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release:        6%{?snap:.%{snap}git%{shortcommit}}%{?dist}
 License:        LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
 %if 0%{?gitrel}
@@ -59,6 +59,7 @@ Patch102: 0002-sink-source-update-the-default-sink-source-on-port-s.patch
 Patch103: 0003-improve-default-sink-source-handling.patch
 Patch104: 0004-core-device-port-check-availability-when-choosing-th.patch
 Patch105: add-dell-dock-conf.path
+Patch106: 0001-Permit-root-owned-home-directory.patch
 
 ## upstreamable patches
 
@@ -261,6 +262,7 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 %patch103 -p1 -b .103
 %patch104 -p1 -b .104
 %patch105 -p1 -b .105
+%patch106 -p1 -b .106
 
 sed -i.no_consolekit -e \
   's/^load-module module-console-kit/#load-module module-console-kit/' \
@@ -601,6 +603,10 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Fri Aug 21 2020 Wim Taymans <wtaymans@redhat.com> - 10.0-6
+- Allow root owned home directory.
+- Resolves: #1856308
+
 * Tue Jan 16 2018 Wim Taymans <wtaymans@redhat.com> - 10.0-5
 - Dist the new config file for Dell dock TB16
 - Resolves: #1457385