glusterfs package update

Signed-off-by: basebuilder_pel7x64builder0 <basebuilder@powerel.org>

SOURCES/0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch

@@ -0,0 +1,38 @@
+From a0a0afc59bb1d2deddfdb776bc9e49e02f58ce32 Mon Sep 17 00:00:00 2001
+From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
+Date: Tue, 24 Jul 2018 14:40:51 -0400
+Subject: [PATCH] georep: fix hard-coded paths in gsyncd.conf.in
+
+Why anyone puts a hard-coded path like /usr/local/sbin in a
+config file is beyond me.
+
+I wonder how many more are lurking in our sources
+
+Change-Id: I6523894416cc06236ea1f99529efd36e957bd98e
+updates: bz#1193929
+Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
+---
+ geo-replication/gsyncd.conf.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/geo-replication/gsyncd.conf.in b/geo-replication/gsyncd.conf.in
+index 0a842cf2b..bd04400ff 100644
+--- a/geo-replication/gsyncd.conf.in
++++ b/geo-replication/gsyncd.conf.in
+@@ -138,11 +138,11 @@ value =
+ help=If SSH keys are not secured with gsyncd prefix then use this configuration to set the actual path of gsyncd(Usually /usr/libexec/glusterfs/gsyncd)
+ 
+ [gluster-command-dir]
+-value=/usr/local/sbin/
++value=@SBIN_DIR@
+ help=Directory where Gluster binaries exist on master
+ 
+ [slave-gluster-command-dir]
+-value=/usr/local/sbin/
++value=@SBIN_DIR@
+ help=Directory where Gluster binaries exist on slave
+ 
+ [gluster-params]
+-- 
+2.17.1
+

SOURCES/glusterd.sysconfig

@@ -0,0 +1,6 @@
+# Change the glusterd service defaults here.
+# See "glusterd --help" outpout for defaults and possible values.
+
+#GLUSTERD_LOGFILE="/var/log/gluster/gluster.log"
+#GLUSTERD_LOGLEVEL="NORMAL"
+

SOURCES/glusterfsd.init

@@ -0,0 +1,107 @@
+#!/bin/sh
+#
+# glusterfsd   Startup script for the glusterfs server
+#
+# chkconfig:   - 20 80
+# description: Clustered file-system server
+
+### BEGIN INIT INFO
+# Provides: glusterfsd
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Should-Start: 
+# Should-Stop: 
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: glusterfs server
+# Description:       Clustered file-system server
+### END INIT INFO
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+exec="/usr/sbin/glusterfsd"
+prog="glusterfsd"
+
+# Set defaults, then source config for eventual overrides
+GLUSTERFSD_NOFILE="65536"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
+
+start() {
+    [ -x $exec ] || exit 5
+    [ $GLUSTERFSD_CONFIG -a -f $GLUSTERFSD_CONFIG ] || exit 6
+    ulimit -n $GLUSTERFSD_NOFILE
+    echo -n $"Starting $prog: "
+    daemon $exec${GLUSTERFSD_CONFIG+" -f $GLUSTERFSD_CONFIG"}${GLUSTERFSD_LOGFILE+" -l $GLUSTERFSD_LOGFILE"}${GLUSTERFSD_LOGLEVEL+" -L $GLUSTERFSD_LOGLEVEL"} -p /var/run/glusterfsd.pid
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
+}
+
+stop() {
+    echo -n $"Stopping $prog: "
+    killproc $prog
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart() {
+    stop
+    start
+}
+
+reload() {
+    restart
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    status $prog
+}
+
+rh_status_q() {
+    rh_status &>/dev/null
+}
+
+
+case "$1" in
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
+esac
+exit $?
+

SOURCES/glusterfsd.service

@@ -0,0 +1,16 @@
+[Unit]
+Description=GlusterFS brick processes (stopping only)
+After=network.target glusterd.service
+
+[Service]
+Type=oneshot
+# glusterd starts the glusterfsd processed on-demand
+# /bin/true will mark this service as started, RemainAfterExit keeps it active
+ExecStart=/bin/true
+RemainAfterExit=yes
+# if there are no glusterfsd processes, a stop/reload should not give an error
+ExecStop=/bin/sh -c "/bin/killall --wait glusterfsd || /bin/true"
+ExecReload=/bin/sh -c "/bin/killall -HUP glusterfsd || /bin/true"
+
+[Install]
+WantedBy=multi-user.target

SOURCES/glusterfsd.sysconfig

@@ -0,0 +1,6 @@
+# Change the glusterfsd service defaults here.
+# See "glusterfsd --help" outpout for defaults and possible values.
+
+#GLUSTERFSD_CONFIG="/etc/glusterfs/glusterfsd.vol"
+#GLUSTERFSD_LOGFILE="/var/log/glusterfs/glusterfs.log"
+#GLUSTERFSD_LOGLEVEL="NORMAL"

SOURCES/python.patch

@@ -0,0 +1,32 @@
+--- glusterfs-4.1.1/xlators/features/utime/src/utime-gen-fops-c.py.orig	2018-07-11 09:40:35.166390285 -0400
++++ glusterfs-4.1.1/xlators/features/utime/src/utime-gen-fops-c.py	2018-07-11 09:41:00.743390285 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ 
+ import os
+ import sys
+--- glusterfs-4.1.1/xlators/features/utime/src/utime-gen-fops-h.py.orig	2018-07-11 09:40:49.035390285 -0400
++++ glusterfs-4.1.1/xlators/features/utime/src/utime-gen-fops-h.py	2018-07-11 09:41:06.015390285 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ 
+ import os
+ import sys
+--- glusterfs-4.1.1/xlators/features/cloudsync/src/cloudsync-fops-c.py.orig	2018-07-11 09:41:30.646390285 -0400
++++ glusterfs-4.1.1/xlators/features/cloudsync/src/cloudsync-fops-c.py	2018-07-11 09:41:53.033390285 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ 
+ from __future__ import print_function
+ import os
+--- glusterfs-4.1.1/xlators/features/cloudsync/src/cloudsync-fops-h.py.orig	2018-07-11 09:41:38.198390285 -0400
++++ glusterfs-4.1.1/xlators/features/cloudsync/src/cloudsync-fops-h.py	2018-07-11 09:41:55.423390285 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ 
+ from __future__ import print_function
+ import os

SOURCES/rhel5-load-fuse-modules

@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# fusermount-glusterfs requires the /dev/fuse character device. The fuse module
+# provides this and is loaded on demand in newer Linux distributions.
+#
+
+[ -c /dev/fuse ] || /sbin/modprobe fuse