From: Marcin Krol Date: Sun, 18 Aug 2019 14:45:47 +0000 (+0200) Subject: - merged 6.1 from PLD X-Git-Url: https://git.tld-linux.org/?p=packages%2Fglusterfs.git;a=commitdiff_plain;h=54495140abb6d0f3021018b923258a9500dd0c91 - merged 6.1 from PLD --- diff --git a/glusterfs-noquiet.patch b/glusterfs-noquiet.patch index 470b2cf..fad9364 100644 --- a/glusterfs-noquiet.patch +++ b/glusterfs-noquiet.patch @@ -1,20 +1,12 @@ ---- glusterfs-3.12.4/configure.ac.orig 2017-12-25 23:08:22.278402857 +0100 -+++ glusterfs-3.12.4/configure.ac 2017-12-25 23:12:01.968400346 +0100 -@@ -21,18 +21,6 @@ +--- glusterfs-6.1/configure.ac.orig 2019-04-27 16:24:14.967624948 +0200 ++++ glusterfs-6.1/configure.ac 2019-04-27 16:27:45.566484037 +0200 +@@ -21,10 +21,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) -if make --help 2>&1 | grep -q no-print-directory; then - AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory"; -fi -- --if make --help 2>&1 | grep -q quiet; then -- AM_MAKEFLAGS="$AM_MAKEFLAGS --quiet" --fi -- --if libtool --help 2>&1 | grep -q quiet; then -- AM_LIBTOOLFLAGS="--quiet"; --fi - AC_CONFIG_HEADERS([config.h site.h]) diff --git a/glusterfs-python.patch b/glusterfs-python.patch deleted file mode 100644 index a3fbb33..0000000 --- a/glusterfs-python.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glusterfs-3.10.1/configure.ac.orig 2017-04-16 17:57:27.942310649 +0200 -+++ glusterfs-3.10.1/configure.ac 2017-04-16 18:03:50.218972950 +0200 -@@ -521,7 +521,7 @@ - PYTHONDEV_CPPFLAGS=`echo ${PYTHONDEV_CPPFLAGS} | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[[0-9]]//g'` - - dnl Find python libs at user configured libdir and also "lib" under prefix -- PYTHONDEV_LDFLAGS="${PYTHON_LIBS} -L`${PYTHON}-config --prefix`/lib -L`${PYTHON}-config --prefix`/$libdir `${PYTHON}-config --ldflags`" -+ PYTHONDEV_LDFLAGS="${PYTHON_LIBS} `${PYTHON}-config --ldflags`" - - BUILD_PYTHON_SITE_PACKAGES=${pythondir} - BUILD_PYTHON_INC=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_inc())" 2>/dev/null` diff --git a/glusterfs.spec b/glusterfs.spec index 514bdd3..9ab640e 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -1,4 +1,5 @@ # TODO: +# - python3 module # - Find pidfiles killproc --pidfile ${PIDFILE} -TERM instead of kill -TERM ${PID} # - Check transport-ibverbs package and ibverbs bcond # - Add passing options from /etc/sysconfig/glusterfsd to glusterfsd @@ -15,35 +16,36 @@ Summary: Clustered File Storage that can scale to peta bytes Summary(pl.UTF-8): Klastrowy system przechowywania plików skalujący się do petabajtów Name: glusterfs -Version: 3.12.9 -Release: 3 +Version: 6.1 +Release: 1 License: LGPL v3+ or GPL v2 (libraries), GPL v3+ (programs) Group: Applications/System -Source0: https://download.gluster.org/pub/gluster/glusterfs/3.12/%{version}/glusterfs-%{version}.tar.gz -# Source0-md5: 18f639e98e4c130365b48576cbf01aae +Source0: https://download.gluster.org/pub/gluster/glusterfs/6/%{version}/glusterfs-%{version}.tar.gz +# Source0-md5: 18967c357204d4cbdd9c1731508862c6 Source1: glusterfsd.init Patch0: %{name}-noquiet.patch -Patch1: %{name}-python.patch -Patch3: interpreters.patch URL: https://www.gluster.org/ BuildRequires: acl-devel BuildRequires: autoconf >= 2.50 BuildRequires: automake BuildRequires: bison #BuildRequires: cmocka-devel >= 1.0.1 for unittest +BuildRequires: curl-devel # for bd-xlator BuildRequires: device-mapper-devel >= 2.02.79 BuildRequires: flex BuildRequires: libaio-devel %{?with_ibverbs:BuildRequires: libibverbs-devel >= 1.0.4} %{?with_ibverbs:BuildRequires: librdmacm-devel >= 1.0.15} +BuildRequires: libselinux-devel +BuildRequires: libtirpc-devel BuildRequires: libtool BuildRequires: libuuid-devel BuildRequires: libxml2-devel >= 1:2.6.19 BuildRequires: openssl-devel BuildRequires: pkgconfig -BuildRequires: python >= 1:2.4 -BuildRequires: python-devel >= 1:2.4 +BuildRequires: python >= 1:2.6 +BuildRequires: python-devel >= 1:2.6 BuildRequires: readline-devel BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.228 @@ -229,6 +231,27 @@ GlusterFS support for geo-replication. %description geo-replication -l pl.UTF-8 Obsługa geo-replikacji dla GlusterFS-a. +%package thin-arbiter +Summary: GlusterFS thin-arbiter module +Summary(pl.UTF-8): Moduł thin-arbiter dla GlusterFS-a +Group: Applications/File +Requires: %{name}-server = %{version}-%{release} + +%description thin-arbiter +This package provides a tie-breaker functionality to GlusterFS +replicate volume. It includes translators required to provide the +functionality, and also few other scripts required for getting the +setup done. + +This package provides the glusterfs thin-arbiter translator. + +%description thin-arbiter -l pl.UTF-8 +Ten pakiet dodaje funkcję dogrywki do replikacji wolumenów GlusterFS. +Zawiera moduły tłumaczące wymagane do zapewniania tej funkcji oraz +kilka skryptów wymaganych do konfiguracji. + +Ten pakiet zawiera moduł tłumaczący thin-arbiter. + %package -n emacs-glusterfs-mode Summary: Emacs mode to edit GlusterFS configuration Summary(pl.UTF-8): Tryb Emacsa do edycji konfiguracji GlusterFS-a @@ -258,8 +281,6 @@ Plik składni Vima do edycji konfiguracji GlusterFS-a. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch3 -p1 %build %{__libtoolize} @@ -268,8 +289,10 @@ Plik składni Vima do edycji konfiguracji GlusterFS-a. %{__autoheader} %{__automake} %configure \ + PYTHON=%{__python} \ %{?with_system_fuse:--disable-fusermount} \ --disable-silent-rules \ + --enable-gnfs \ %{!?with_ibverbs:--disable-ibverbs} \ --enable-systemtap%{!?with_systemtap:=no} \ --with-initdir=/etc/rc.d/init.d @@ -294,7 +317,6 @@ install -d $RPM_BUILD_ROOT%{_datadir}/{emacs/site-lisp,vim/syntax} %{__rm} $RPM_BUILD_ROOT%{_libdir}/glusterfs/%{version}/*/*.la %{__rm} $RPM_BUILD_ROOT%{_libdir}/glusterfs/%{version}/*/*/*.la -%{__rm} $RPM_BUILD_ROOT%{_libdir}/glusterfs/%{version}/*/*/*/*.la %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/glusterfs/benchmarking %{__rm} $RPM_BUILD_ROOT%{_libexecdir}/glusterfs/python/syncdaemon/README.md @@ -345,6 +367,9 @@ fi %attr(755,root,root) %{_libdir}/glusterfs/%{version}/auth/addr.so %attr(755,root,root) %{_libdir}/glusterfs/%{version}/auth/login.so +%dir %{_libdir}/glusterfs/%{version}/cloudsync-plugins +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/cloudsync-plugins/cloudsyncs3.so + %dir %{_libdir}/glusterfs/%{version}/rpc-transport %attr(755,root,root) %{_libdir}/glusterfs/%{version}/rpc-transport/socket.so @@ -354,32 +379,27 @@ fi %attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/cluster/*.so %dir %{_libdir}/glusterfs/%{version}/xlator/debug %attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/debug/*.so -%dir %{_libdir}/glusterfs/%{version}/xlator/encryption -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/encryption/*.so* %dir %{_libdir}/glusterfs/%{version}/xlator/features -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/features/*.so* -%dir %{_libdir}/glusterfs/%{version}/xlator/features/glupy -%{_libdir}/glusterfs/%{version}/xlator/features/glupy/*.py* +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/features/*.so +%exclude %{_libdir}/glusterfs/%{version}/xlator/features/thin-arbiter.so %dir %{_libdir}/glusterfs/%{version}/xlator/mgmt %attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/mgmt/glusterd.so %dir %{_libdir}/glusterfs/%{version}/xlator/mount %attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/mount/api.so %attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/mount/fuse.so -#%dir %{_libdir}/glusterfs/%{version}/xlator/nfs -#%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/nfs/server.so +%dir %{_libdir}/glusterfs/%{version}/xlator/nfs +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/nfs/server.so %dir %{_libdir}/glusterfs/%{version}/xlator/performance -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/performance/*.so* +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/performance/*.so +%dir %{_libdir}/glusterfs/%{version}/xlator/playground +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/playground/template.so %dir %{_libdir}/glusterfs/%{version}/xlator/protocol -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/protocol/*.so +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/protocol/client.so +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/protocol/server.so %dir %{_libdir}/glusterfs/%{version}/xlator/storage -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/storage/*.so +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/storage/posix.so %dir %{_libdir}/glusterfs/%{version}/xlator/system %attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/system/posix-acl.so -%dir %{_libdir}/glusterfs/%{version}/xlator/testing -%dir %{_libdir}/glusterfs/%{version}/xlator/testing/features -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/testing/features/*.so -%dir %{_libdir}/glusterfs/%{version}/xlator/testing/performance -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/testing/performance/*.so %if "%{_libexecdir}" != "%{_libdir}" %dir %{_libexecdir}/glusterfs @@ -394,6 +414,7 @@ fi %{_libexecdir}/glusterfs/glusterfind/__init__.py* %{_libexecdir}/glusterfs/glusterfind/changelogdata.py* %{_libexecdir}/glusterfs/glusterfind/conf.py* +%{_libexecdir}/glusterfs/glusterfind/gfind_py2py3.py* %{_libexecdir}/glusterfs/glusterfind/libgfchangelog.py* %{_libexecdir}/glusterfs/glusterfind/main.py* %{_libexecdir}/glusterfs/glusterfind/utils.py* @@ -403,6 +424,8 @@ fi %dir %{_datadir}/glusterfs %dir %{_datadir}/glusterfs/scripts +#%attr(755,root,root) %{_datadir}/glusterfs/scripts/control-cpu-load.sh +#%attr(755,root,root) %{_datadir}/glusterfs/scripts/control-mem.sh %attr(755,root,root) %{_datadir}/glusterfs/scripts/post-upgrade-script-for-quota.sh %attr(755,root,root) %{_datadir}/glusterfs/scripts/pre-upgrade-script-for-quota.sh %attr(755,root,root) %{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh @@ -417,8 +440,6 @@ fi %attr(755,root,root) %ghost %{_libdir}/libgfapi.so.0 %attr(755,root,root) %{_libdir}/libgfchangelog.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgfchangelog.so.0 -%attr(755,root,root) %{_libdir}/libgfdb.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgfdb.so.0 %attr(755,root,root) %{_libdir}/libgfrpc.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgfrpc.so.0 %attr(755,root,root) %{_libdir}/libgfxdr.so.*.*.* @@ -430,33 +451,28 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libgfapi.so %attr(755,root,root) %{_libdir}/libgfchangelog.so -%attr(755,root,root) %{_libdir}/libgfdb.so %attr(755,root,root) %{_libdir}/libgfrpc.so %attr(755,root,root) %{_libdir}/libgfxdr.so %attr(755,root,root) %{_libdir}/libglusterfs.so %{_libdir}/libgfapi.la %{_libdir}/libgfchangelog.la -%{_libdir}/libgfdb.la %{_libdir}/libgfrpc.la %{_libdir}/libgfxdr.la %{_libdir}/libglusterfs.la %dir %{_includedir}/glusterfs %{_includedir}/glusterfs/api %{_includedir}/glusterfs/gfchangelog -%{_includedir}/glusterfs/gfdb %{_includedir}/glusterfs/rpc %{_includedir}/glusterfs/server %{_includedir}/glusterfs/*.h %{_pkgconfigdir}/glusterfs-api.pc %{_pkgconfigdir}/libgfchangelog.pc -%{_pkgconfigdir}/libgfdb.pc %files -n python-gluster %defattr(644,root,root,755) %dir %{py_sitescriptdir}/gluster %{py_sitescriptdir}/gluster/*.py[co] %{py_sitescriptdir}/gluster/cliutils -%{py_sitescriptdir}/gluster/glupy # created only when using py_build/py_install in xlators/features/glupy/src #%{py_sitescriptdir}/glusterfs_glupy-%{version}-py*.egg-info @@ -469,9 +485,12 @@ fi %files server %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/glusterfsd.vol +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/group-db-workload +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/group-distributed-virt %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/group-gluster-block %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/group-metadata-cache %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/group-nl-cache +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/group-samba %attr(754,root,root) /etc/rc.d/init.d/glusterfsd %attr(755,root,root) %{_sbindir}/conf.py %attr(755,root,root) %{_sbindir}/gcron.py @@ -479,19 +498,24 @@ fi %attr(755,root,root) %{_sbindir}/gluster-setgfid2path %attr(755,root,root) %{_sbindir}/glusterd %attr(755,root,root) %{_sbindir}/snap_scheduler.py +#%attr(755,root,root) %{_libexecdir}/glusterfs/mount-shared-storage.sh %{_mandir}/man8/gluster-setgfid2path.8* %{_mandir}/man8/glusterd.8* %dir %{_var}/lib/glusterd %dir %{_var}/lib/glusterd/groups +%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/db-workload +%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/distributed-virt %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/gluster-block %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/metadata-cache %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/nl-cache +%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/samba %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/virt %dir %{_var}/lib/glusterd/hooks %dir %{_var}/lib/glusterd/hooks/1 %dir %{_var}/lib/glusterd/hooks/1/add-brick %dir %{_var}/lib/glusterd/hooks/1/add-brick/post +%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/add-brick/post/S13create-subdir-mounts.sh %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh %dir %{_var}/lib/glusterd/hooks/1/add-brick/pre %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh @@ -536,19 +560,20 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/glusterfs/eventsconfig.json %attr(755,root,root) %{_sbindir}/gluster-eventsapi %attr(755,root,root) %{_sbindir}/glustereventsd -%dir %{_libexecdir}/glusterfs/events -%attr(755,root,root) %{_libexecdir}/glusterfs/events/glustereventsd.py -%{_libexecdir}/glusterfs/events/__init__.py* -%{_libexecdir}/glusterfs/events/eventsapiconf.py* -%{_libexecdir}/glusterfs/events/eventtypes.py* -%{_libexecdir}/glusterfs/events/gf_event.py* -%{_libexecdir}/glusterfs/events/handlers.py* -%{_libexecdir}/glusterfs/events/utils.py* +%dir %{_libexecdir}/glusterfs/gfevents +%attr(755,root,root) %{_libexecdir}/glusterfs/gfevents/glustereventsd.py +%{_libexecdir}/glusterfs/gfevents/__init__.py* +%{_libexecdir}/glusterfs/gfevents/eventsapiconf.py* +%{_libexecdir}/glusterfs/gfevents/eventtypes.py* +%{_libexecdir}/glusterfs/gfevents/gf_event.py* +%{_libexecdir}/glusterfs/gfevents/handlers.py* +%{_libexecdir}/glusterfs/gfevents/utils.py* %{_libexecdir}/glusterfs/peer_eventsapi.py* %{_datadir}/glusterfs/scripts/eventsdash.py %files geo-replication %defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/gsyncd.conf %attr(755,root,root) %{_sbindir}/gfind_missing_files %attr(755,root,root) %{_sbindir}/gluster-georep-sshkey %attr(755,root,root) %{_sbindir}/gluster-mountbroker @@ -574,6 +599,12 @@ fi %dir %{_var}/lib/glusterd/hooks/1/gsync-create/post %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/gsync-create/post/S56glusterd-geo-rep-create-post.sh +%files thin-arbiter +%defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/thin-arbiter.vol +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/features/thin-arbiter.so +%attr(755,root,root) %{_datadir}/glusterfs/scripts/setup-thin-arbiter.sh + %files -n emacs-glusterfs-mode %defattr(644,root,root,755) %{_datadir}/emacs/site-lisp/glusterfs-mode.el diff --git a/interpreters.patch b/interpreters.patch deleted file mode 100644 index b9e1430..0000000 --- a/interpreters.patch +++ /dev/null @@ -1,186 +0,0 @@ -diff -dur glusterfs-3.8.11.orig/extras/geo-rep/schedule_georep.py.in glusterfs-3.8.11/extras/geo-rep/schedule_georep.py.in ---- glusterfs-3.8.11.orig/extras/geo-rep/schedule_georep.py.in 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/extras/geo-rep/schedule_georep.py.in 2017-04-21 14:55:35.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - """ - Schedule Geo-replication - ------------------------ -diff -dur glusterfs-3.8.11.orig/extras/snap_scheduler/gcron.py glusterfs-3.8.11/extras/snap_scheduler/gcron.py ---- glusterfs-3.8.11.orig/extras/snap_scheduler/gcron.py 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/extras/snap_scheduler/gcron.py 2017-04-21 14:55:35.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # - # Copyright (c) 2015 Red Hat, Inc. - # This file is part of GlusterFS. -diff -dur glusterfs-3.8.11.orig/extras/snap_scheduler/snap_scheduler.py glusterfs-3.8.11/extras/snap_scheduler/snap_scheduler.py ---- glusterfs-3.8.11.orig/extras/snap_scheduler/snap_scheduler.py 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/extras/snap_scheduler/snap_scheduler.py 2017-04-21 14:55:35.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # - # Copyright (c) 2015 Red Hat, Inc. - # This file is part of GlusterFS. ---- glusterfs-3.10.1/extras/stop-all-gluster-processes.sh.orig 2017-04-27 22:09:07.287953034 +0200 -+++ glusterfs-3.10.1/extras/stop-all-gluster-processes.sh 2017-04-27 22:10:38.047952000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/bin/bash - # - # Kill all the processes/services except glusterd - # -diff -dur glusterfs-3.8.11.orig/geo-replication/src/peer_mountbroker.in glusterfs-3.8.11/geo-replication/src/peer_mountbroker.in ---- glusterfs-3.8.11.orig/geo-replication/src/peer_mountbroker.in 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/geo-replication/src/peer_mountbroker.in 2017-04-21 14:55:35.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - import os - from argparse import ArgumentParser, RawDescriptionHelpFormatter - import json -diff -dur glusterfs-3.8.11.orig/tools/gfind_missing_files/gfid_to_path.py glusterfs-3.8.11/tools/gfind_missing_files/gfid_to_path.py ---- glusterfs-3.8.11.orig/tools/gfind_missing_files/gfid_to_path.py 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/tools/gfind_missing_files/gfid_to_path.py 2017-04-21 14:55:35.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - - # Copyright (c) 2015 Red Hat, Inc. - # This file is part of GlusterFS. -diff -dur glusterfs-3.8.11.orig/tools/glusterfind/glusterfind.in glusterfs-3.8.11/tools/glusterfind/glusterfind.in ---- glusterfs-3.8.11.orig/tools/glusterfind/glusterfind.in 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/tools/glusterfind/glusterfind.in 2017-04-21 14:55:35.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - - # Copyright (c) 2015 Red Hat, Inc. - # This file is part of GlusterFS. -diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/brickfind.py glusterfs-3.8.11/tools/glusterfind/src/brickfind.py ---- glusterfs-3.8.11.orig/tools/glusterfind/src/brickfind.py 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/tools/glusterfind/src/brickfind.py 2017-04-21 14:55:35.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - # Copyright (c) 2015 Red Hat, Inc. -diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/changelog.py glusterfs-3.8.11/tools/glusterfind/src/changelog.py ---- glusterfs-3.8.11.orig/tools/glusterfind/src/changelog.py 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/tools/glusterfind/src/changelog.py 2017-04-21 14:55:35.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - # Copyright (c) 2015 Red Hat, Inc. -diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/main.py glusterfs-3.8.11/tools/glusterfind/src/main.py ---- glusterfs-3.8.11.orig/tools/glusterfind/src/main.py 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/tools/glusterfind/src/main.py 2017-04-21 14:55:35.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - # Copyright (c) 2015 Red Hat, Inc. -diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/nodeagent.py glusterfs-3.8.11/tools/glusterfind/src/nodeagent.py ---- glusterfs-3.8.11.orig/tools/glusterfind/src/nodeagent.py 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/tools/glusterfind/src/nodeagent.py 2017-04-21 14:55:35.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - # Copyright (c) 2015 Red Hat, Inc. ---- glusterfs-3.12.4/geo-replication/syncdaemon/gsyncd.py.orig 2017-12-14 11:22:31.448031474 +0100 -+++ glusterfs-3.12.4/geo-replication/syncdaemon/gsyncd.py 2017-12-26 11:05:36.587911481 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # - # Copyright (c) 2011-2014 Red Hat, Inc. - # This file is part of GlusterFS. ---- glusterfs-3.12.4/geo-replication/syncdaemon/changelogagent.py.orig 2017-12-14 11:22:31.448031474 +0100 -+++ glusterfs-3.12.4/geo-replication/syncdaemon/changelogagent.py 2017-12-26 11:05:48.794578005 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # - # Copyright (c) 2011-2014 Red Hat, Inc. - # This file is part of GlusterFS. ---- glusterfs-3.12.4/geo-replication/syncdaemon/gsyncdstatus.py.orig 2017-12-14 11:22:31.448031474 +0100 -+++ glusterfs-3.12.4/geo-replication/syncdaemon/gsyncdstatus.py 2017-12-26 11:06:04.354577832 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # - # Copyright (c) 2011-2014 Red Hat, Inc. - # This file is part of GlusterFS. ---- glusterfs-3.12.4/geo-replication/src/peer_georep-sshkey.py.in.orig 2017-12-14 11:22:31.446031470 +0100 -+++ glusterfs-3.12.4/geo-replication/src/peer_georep-sshkey.py.in 2017-12-26 11:06:26.764577588 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - # - # Copyright (c) 2016 Red Hat, Inc. ---- glusterfs-3.12.4/geo-replication/src/peer_mountbroker.py.in.orig 2017-12-14 11:22:31.447031472 +0100 -+++ glusterfs-3.12.4/geo-replication/src/peer_mountbroker.py.in 2017-12-26 11:06:40.887910749 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - import os - from errno import EEXIST, ENOENT - ---- glusterfs-3.12.4/events/eventskeygen.py.orig 2017-12-14 11:22:31.433031442 +0100 -+++ glusterfs-3.12.4/events/eventskeygen.py 2017-12-26 11:07:24.924576912 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - # - # Copyright (c) 2016 Red Hat, Inc. ---- glusterfs-3.12.4/events/tools/eventsdash.py.orig 2017-12-14 11:22:31.434031444 +0100 -+++ glusterfs-3.12.4/events/tools/eventsdash.py 2017-12-26 11:07:47.844576651 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - # - # Copyright (c) 2016 Red Hat, Inc. ---- glusterfs-3.12.4/events/src/glustereventsd.py.orig 2017-12-14 11:22:31.433031442 +0100 -+++ glusterfs-3.12.4/events/src/glustereventsd.py 2017-12-26 11:08:06.877909766 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - # - # Copyright (c) 2016 Red Hat, Inc. ---- glusterfs-3.12.4/events/src/peer_eventsapi.py.orig 2017-12-14 11:22:31.434031444 +0100 -+++ glusterfs-3.12.4/events/src/peer_eventsapi.py 2017-12-26 11:08:18.717909931 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - # - # Copyright (c) 2016 Red Hat, Inc. ---- glusterfs-3.12.4/events/src/gf_event.py.orig 2017-12-14 11:22:31.433031442 +0100 -+++ glusterfs-3.12.4/events/src/gf_event.py 2017-12-26 11:08:29.301242844 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - # - # Copyright (c) 2016 Red Hat, Inc. ---- glusterfs-3.12.4/extras/hook-scripts/S40ufo-stop.py.orig 2017-12-14 11:22:31.440031457 +0100 -+++ glusterfs-3.12.4/extras/hook-scripts/S40ufo-stop.py 2017-12-26 11:08:45.694575988 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - - import os - from optparse import OptionParser