commit 34398778bc25fcffae10c4ba1c3ce74dc140c0ae Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Tue Dec 26 11:44:18 2017 +0100
- updated to 3.12.4 (latest LTM version) - updated noquiet,interpreters patches - removed obsolete link patch glusterfs-link.patch | 12 ----- glusterfs-noquiet.patch | 8 ++-- glusterfs.spec | 54 +++++++++++----------- interpreters.patch | 116 +++++++++++++++++++++++++++++++----------------- 4 files changed, 106 insertions(+), 84 deletions(-) --- diff --git a/glusterfs.spec b/glusterfs.spec index 86127e2..f815f68 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -1,5 +1,4 @@ # TODO: -# - package ganesha specific files? (no ganesha in PLD yet) # - 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 @@ -11,22 +10,22 @@ # Conditional build: %bcond_without ibverbs # ib-verbs transport %bcond_without systemtap # systemtap/dtrace support +%bcond_without system_fuse # system fusermount # 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.10.4 +Version: 3.12.4 Release: 1 License: LGPL v3+ or GPL v2 (libraries), GPL v3+ (programs) Group: Applications/System -Source0: https://download.gluster.org/pub/gluster/glusterfs/3.10/LATEST/glusterfs-%{version}.tar.gz -# Source0-md5: 4e1771c08523a3ab32356e4899b088f5 +Source0: https://download.gluster.org/pub/gluster/glusterfs/3.12/LATEST/glusterfs-%{version}.tar.gz +# Source0-md5: 722c1acdf0b72e0f1507fa462e7cda65 Source1: glusterfsd.init -Patch0: %{name}-link.patch -Patch1: %{name}-noquiet.patch -Patch2: %{name}-python.patch -Patch3: systemd.patch -Patch4: interpreters.patch +Patch0: %{name}-noquiet.patch +Patch1: %{name}-python.patch +Patch2: systemd.patch +Patch3: interpreters.patch URL: https://www.gluster.org/ BuildRequires: acl-devel BuildRequires: autoconf >= 2.50 @@ -36,9 +35,7 @@ BuildRequires: bison # for bd-xlator BuildRequires: device-mapper-devel >= 2.02.79 BuildRequires: flex -BuildRequires: glib2-devel >= 2.0 BuildRequires: libaio-devel -BuildRequires: libfuse-devel >= 2.6 %{?with_ibverbs:BuildRequires: libibverbs-devel >= 1.0.4} %{?with_ibverbs:BuildRequires: librdmacm-devel >= 1.0.15} BuildRequires: libtool @@ -182,7 +179,7 @@ Summary: GlusterFS Client Summary(pl.UTF-8): Klient GlusterFS Group: Applications/System Requires: %{name}-common = %{version}-%{release} -Requires: libfuse >= 2.6 +%{?with_system_fuse:Requires: libfuse >= 2.6} %description client This package provides the FUSE based GlusterFS client. @@ -265,7 +262,6 @@ Plik składni Vima do edycji konfiguracji GlusterFS-a. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %build %{__libtoolize} @@ -274,8 +270,8 @@ Plik składni Vima do edycji konfiguracji GlusterFS-a. %{__autoheader} %{__automake} %configure \ + %{?with_system_fuse:--disable-fusermount} \ --disable-silent-rules \ - --enable-fusermount \ %{!?with_ibverbs:--disable-ibverbs} \ --enable-systemtap%{!?with_systemtap:=no} \ --with-initdir=/etc/rc.d/init.d \ @@ -357,17 +353,12 @@ fi %files common %defattr(644,root,root,755) %doc ChangeLog NEWS README.md THANKS -%dir %{_sysconfdir}/%{name} %attr(755,root,root) %{_bindir}/glusterfind %attr(755,root,root) %{_sbindir}/glfsheal # NOTE: glusterfs is link to glusterfsd and is needed by client mount %attr(755,root,root) %{_sbindir}/glusterfs %attr(755,root,root) %{_sbindir}/glusterfsd - -#%attr(755,root,root) %{_libdir}/ganesha/create-export-ganesha.sh -#%attr(755,root,root) %{_libdir}/ganesha/dbus-send.sh -#%attr(755,root,root) %{_libdir}/ganesha/ganesha-ha.sh -#%attr(755,root,root) %{_libdir}/ganesha/generate-epoch.py +%dir %{_sysconfdir}/%{name} %dir %{_libdir}/glusterfs @@ -396,8 +387,8 @@ fi %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* %dir %{_libdir}/glusterfs/%{version}/xlator/protocol @@ -486,20 +477,28 @@ 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-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 %attr(754,root,root) /etc/rc.d/init.d/glusterfsd %attr(755,root,root) %{_sbindir}/conf.py %attr(755,root,root) %{_sbindir}/gcron.py %attr(755,root,root) %{_sbindir}/gf_attach +%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 %{systemdunitdir}/glusterd.service +%{systemdunitdir}/glusterfssharedstorage.service %{systemdtmpfilesdir}/gluster.conf +%{_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/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/virt %dir %{_var}/lib/glusterd/hooks %dir %{_var}/lib/glusterd/hooks/1 @@ -508,9 +507,14 @@ fi %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 +%dir %{_var}/lib/glusterd/hooks/1/create +%dir %{_var}/lib/glusterd/hooks/1/create/post +%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/create/post/S10selinux-label-brick.sh %dir %{_var}/lib/glusterd/hooks/1/delete %dir %{_var}/lib/glusterd/hooks/1/delete/post %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/delete/post/S57glusterfind-delete-post +%dir %{_var}/lib/glusterd/hooks/1/delete/pre +%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/delete/pre/S10selinux-del-fcontext.sh %dir %{_var}/lib/glusterd/hooks/1/set %dir %{_var}/lib/glusterd/hooks/1/set/post %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/set/post/S30samba-set.sh @@ -519,7 +523,6 @@ fi %dir %{_var}/lib/glusterd/hooks/1/start/post %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/start/post/S29CTDBsetup.sh %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/start/post/S30samba-start.sh -%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/start/post/S31ganesha-start.sh %dir %{_var}/lib/glusterd/hooks/1/stop %dir %{_var}/lib/glusterd/hooks/1/stop/pre %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh @@ -528,7 +531,7 @@ fi %files client %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/fusermount-glusterfs +%{!?with_system_fuse:%attr(755,root,root) %{_bindir}/fusermount-glusterfs} %attr(755,root,root) /sbin/mount.glusterfs %attr(755,root,root) %{_sbindir}/gluster %{_mandir}/man8/gluster.8* @@ -539,9 +542,6 @@ fi %dir %{_prefix}/lib/ocf/resource.d/glusterfs %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/glusterfs/glusterd %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/glusterfs/volume -#%{_prefix}/lib/ocf/resource.d/heartbeat/ganesha_grace -#%{_prefix}/lib/ocf/resource.d/heartbeat/ganesha_mon -#%{_prefix}/lib/ocf/resource.d/heartbeat/ganesha_nfsd %files events %defattr(644,root,root,755) diff --git a/glusterfs-link.patch b/glusterfs-link.patch deleted file mode 100644 index 82cf917..0000000 --- a/glusterfs-link.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- glusterfs-3.7.5/rpc/rpc-lib/src/Makefile.am.orig 2015-10-07 15:18:14.993228975 +0200 -+++ glusterfs-3.7.5/rpc/rpc-lib/src/Makefile.am 2015-10-09 18:28:49.261547744 +0200 -@@ -4,7 +4,8 @@ - rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c \ - rpc-drc.c $(CONTRIBDIR)/sunrpc/xdr_sizeof.c rpc-clnt-ping.c - --libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -+libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(top_builddir)/rpc/xdr/src/libgfxdr.la -+ - libgfrpc_la_LDFLAGS = -version-info $(LIBGFRPC_LT_VERSION) $(GF_LDFLAGS) - - noinst_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h \ diff --git a/glusterfs-noquiet.patch b/glusterfs-noquiet.patch index b313ee3..470b2cf 100644 --- a/glusterfs-noquiet.patch +++ b/glusterfs-noquiet.patch @@ -1,6 +1,6 @@ ---- glusterfs-3.4.0/configure.ac.orig 2013-07-12 19:43:26.000000000 +0200 -+++ glusterfs-3.4.0/configure.ac 2013-07-23 17:07:15.203576003 +0200 -@@ -12,18 +12,6 @@ +--- 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 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) @@ -16,6 +16,6 @@ - AM_LIBTOOLFLAGS="--quiet"; -fi - - AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_HEADERS([config.h site.h]) AC_CONFIG_FILES([Makefile diff --git a/interpreters.patch b/interpreters.patch index 314311e..b9e1430 100644 --- a/interpreters.patch +++ b/interpreters.patch @@ -1,12 +1,3 @@ -diff -dur glusterfs-3.8.11.orig/extras/ganesha/scripts/generate-epoch.py glusterfs-3.8.11/extras/ganesha/scripts/generate-epoch.py ---- glusterfs-3.8.11.orig/extras/ganesha/scripts/generate-epoch.py 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/extras/ganesha/scripts/generate-epoch.py 2017-04-21 14:55:35.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - # - # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> - # This file is part of GlusterFS. 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 @@ -78,75 +69,118 @@ diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/brickfind.py glusterfs-3.8 # -*- coding: utf-8 -*- # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/> -diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/changelogdata.py glusterfs-3.8.11/tools/glusterfind/src/changelogdata.py ---- glusterfs-3.8.11.orig/tools/glusterfind/src/changelogdata.py 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/tools/glusterfind/src/changelogdata.py 2017-04-21 14:55:35.000000000 +0200 +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. <http://www.redhat.com/> -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 +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. <http://www.redhat.com/> -diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/conf.py glusterfs-3.8.11/tools/glusterfind/src/conf.py ---- glusterfs-3.8.11.orig/tools/glusterfind/src/conf.py 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/tools/glusterfind/src/conf.py 2017-04-21 14:55:35.000000000 +0200 +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. <http://www.redhat.com/> -diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/__init__.py glusterfs-3.8.11/tools/glusterfind/src/__init__.py ---- glusterfs-3.8.11.orig/tools/glusterfind/src/__init__.py 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/tools/glusterfind/src/__init__.py 2017-04-21 14:55:35.000000000 +0200 +--- 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. <http://www.redhat.com> + # 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. <http://www.redhat.com> + # 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. <http://www.redhat.com> + # 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. <http://www.redhat.com> +--- 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 - # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/> -diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/libgfchangelog.py glusterfs-3.8.11/tools/glusterfind/src/libgfchangelog.py ---- glusterfs-3.8.11.orig/tools/glusterfind/src/libgfchangelog.py 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/tools/glusterfind/src/libgfchangelog.py 2017-04-21 14:55:35.000000000 +0200 +--- 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) 2015 Red Hat, Inc. <http://www.redhat.com/> -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 + # + # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> +--- 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) 2015 Red Hat, Inc. <http://www.redhat.com/> -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 + # + # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> +--- 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) 2015 Red Hat, Inc. <http://www.redhat.com/> -diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/utils.py glusterfs-3.8.11/tools/glusterfind/src/utils.py ---- glusterfs-3.8.11.orig/tools/glusterfind/src/utils.py 2017-04-11 10:33:35.000000000 +0200 -+++ glusterfs-3.8.11/tools/glusterfind/src/utils.py 2017-04-21 14:55:35.000000000 +0200 + # + # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> +--- 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. <http://www.redhat.com> +--- 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. <http://www.redhat.com> +--- 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 - # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/> + import os + from optparse import OptionParser ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/glusterfs.git/commitdiff/34398778bc25fcffae10c4ba1c3ce74dc140c0ae _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit