From c37e8974ac8506bfa6a59445f9e25996e13c82c2 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Wed, 3 May 2017 22:31:57 +0200
Subject: [PATCH 411/426] packaging: /var/run/gluster owner
 gluster:gluster(0775) for statedumps

gfapi has the ability to take statedumps. However, if the application
using gfapi isn't running with root privs the statedump file can't be
written to the default location, i.e. /var/run/gluster.

Cherry picked from commit 0e50c4b3ea734456c14e2d7a578463999bd332c3:
> Change-Id: I97d8919ef8b8cd4775e1a206f939a2bf0046786d
> BUG: 1445569
> Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
> Reviewed-on: https://review.gluster.org/17122
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Niels de Vos <ndevos@redhat.com>

Change-Id: I97d8919ef8b8cd4775e1a206f939a2bf0046786d
BUG: 1445570
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/105119
Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
 extras/run-gluster.tmpfiles.in |  2 +-
 glusterfs.spec.in              | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/extras/run-gluster.tmpfiles.in b/extras/run-gluster.tmpfiles.in
index 49a2662..329f2dd 100644
--- a/extras/run-gluster.tmpfiles.in
+++ b/extras/run-gluster.tmpfiles.in
@@ -1,2 +1,2 @@
 # hardcoding /run for now, should be detected while building from source?
-d /run/gluster 0755 root root -
+d /run/gluster 0775 gluster gluster -
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index da334d5..c83f897 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -208,6 +208,7 @@ Source0:          @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
 
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+Requires(pre):    shadow-utils
 %if ( 0%{?rhel} && 0%{?rhel} <= 5 )
 BuildRequires:    python-simplejson
 %endif
@@ -924,6 +925,15 @@ fi
 %endif
 
 ##-----------------------------------------------------------------------------
+## All %%pre should be placed here and keep them sorted
+##
+%pre
+getent group gluster > /dev/null || groupadd -r gluster
+getent passwd gluster > /dev/null || useradd -r -g gluster -d /var/run/gluster -s /sbin/nologin -c "GlusterFS daemons" gluster
+exit 0
+
+
+##-----------------------------------------------------------------------------
 ## All %%preun should be placed here and keep them sorted
 ##
 %if ( 0%{?_build_server} )
@@ -1130,7 +1140,7 @@ exit 0
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/write-behind.so
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/nl-cache.so
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so
-%dir %{_localstatedir}/run/gluster
+%dir %attr(0775,gluster,gluster) %{_localstatedir}/run/gluster
 %if 0%{?_tmpfilesdir:1}
 %{_tmpfilesdir}/gluster.conf
 %endif
@@ -2051,6 +2061,9 @@ end
 %endif
 
 %changelog
+* Wed May 3 2017 Niels de Vos <ndevos@redhat.com>
+- /var/run/gluster owner gluster:gluster(0775) for qemu(gfapi) statedumps (#1445570)
+
 * Wed Feb 1 2017 Poornima G <pgurusid@redhat.com>
 - Install /var/lib/glusterd/groups/metadata-cache by default
 
-- 
1.8.3.1