diff --git a/0003-nfs-ganesha_2803.patch b/0003-nfs-ganesha_2803.patch index e6577f4..5f393f5 100644 --- a/0003-nfs-ganesha_2803.patch +++ b/0003-nfs-ganesha_2803.patch @@ -1663,7 +1663,7 @@ diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/ganesha_mgr_utils.py ['Name', diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py --- nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py 2019-06-14 18:23:42.000000000 -0400 -+++ nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py 2019-06-28 18:19:39.000000000 -0400 ++++ nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py 2019-07-01 08:10:41.308197046 -0400 @@ -137,7 +137,11 @@ stats_state = self.exportmgrobj.get_dbus_method("GetFULLV4Stats", self.dbus_exportstats_name) @@ -1671,9 +1671,9 @@ diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py n - + # authentication + def auth_stats(self): -+ stats_state = self.exportmgrobj.get_dbus_method("GetAuthStats", -+ self.dbus_exportstats_name) -+ return DumpAuth(stats_state()) ++ stats_state = self.exportmgrobj.get_dbus_method("GetAuthStats", ++ self.dbus_exportstats_name) ++ return DumpAuth(stats_state()) class RetrieveClientStats(): def __init__(self): @@ -1698,7 +1698,7 @@ diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py n + self.success = stats[0] + self.status = stats[1] + if self.success: -+ self.timestamp = (stats[2][0], stats[2][1]) ++ self.timestamp = (stats[2][0], stats[2][1]) + self.gctotal = stats[3][0] + self.gclatency = stats[3][1] + self.gcmax = stats[3][2] @@ -1731,6 +1731,7 @@ diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py n class DumpFULLV3Stats(): def __init__(self, status): self.stats = status +Only in nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/Ganesha: glib_dbus_stats.py.orig diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/ganesha_mgr.py nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/ganesha_mgr.py --- nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/ganesha_mgr.py 2019-06-14 18:23:42.000000000 -0400 +++ nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/ganesha_mgr.py 2019-06-28 18:19:39.000000000 -0400 diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 90b721c..19b08d3 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -501,6 +501,7 @@ Development headers and auxiliary files for developing with %{name}. %setup -q -n %{name}-%{version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \