nfs-ganesha 2.7.6

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
nfs-ganesha 2.7.6 GA
2019-07-23 13:21:29 -04:00 · 2019-07-16 14:26:13 -04:00 · 2019-07-02 16:46:43 -04:00 · 2019-06-05 18:06:56 -04:00
5 changed files with 141 additions and 441 deletions
--- a/0001-config_samples-log_rotate.patch
+++ b/0001-config_samples-log_rotate.patch
@ -1,16 +0,0 @@
--- nfs-ganesha-3.5/src/config_samples/logrotate_ganesha.orig	2021-06-11 11:05:49.699522427 -0400
-+++ nfs-ganesha-3.5/src/config_samples/logrotate_ganesha	2021-06-11 11:06:18.362010100 -0400
-@@ -1,4 +1,5 @@
- /var/log/ganesha/ganesha.log {
-+    su ganesha ganesha
-     weekly
-     rotate 52
-     copytruncate
--- nfs-ganesha-3.5/src/config_samples/logrotate_fsal_gluster.orig	2021-06-11 11:05:59.857340860 -0400
-+++ nfs-ganesha-3.5/src/config_samples/logrotate_fsal_gluster	2021-06-11 11:06:22.785931021 -0400
-@@ -1,4 +1,5 @@
- /var/log/ganesha/ganesha-gfapi.log {
-+    su ganesha ganesha
-     weekly
-     rotate 52
-     copytruncate
--- a/0001_src_scripts_ganeshactl_CMakeLists.txt.patch
+++ b/0001_src_scripts_ganeshactl_CMakeLists.txt.patch
@ -0,0 +1,10 @@
+--- nfs-ganesha-2.7.4/src/scripts/ganeshactl/CMakeLists.txt.orig	2019-06-05 17:58:40.943933814 -0400
+++ nfs-ganesha-2.7.4/src/scripts/ganeshactl/CMakeLists.txt	2019-06-05 17:59:26.653933814 -0400
+@@ -1,6 +1,6 @@
+ # Building and packaging DBUS scripts for ganesha
+ 
+-find_program(PYTHON NAMES "python" "python3")
+find_program(PYTHON NAMES "python2")
+ 
+ # PyQT based class modules
+ set(GANESHA_BASE_SRCS
--- a/0002-CMakeLists.txt.patch
+++ b/0002-CMakeLists.txt.patch
@ -1,78 +0,0 @@
--- nfs-ganesha-4-rc3/src/CMakeLists.txt.orig	2021-11-08 18:24:19.024041776 -0500
-+++ nfs-ganesha-4-rc3/src/CMakeLists.txt	2021-11-09 13:54:02.553226811 -0500
-@@ -558,11 +558,11 @@
- 
- gopt_test(USE_ADMIN_TOOLS)
- if (USE_ADMIN_TOOLS)
-  find_package (Python COMPONENTS Interpreter Development)
-  if (NOT Python_Interpreter_FOUND)
-+  find_package(PythonInterp ${USE_ADMIN_TOOLS_REQUIRED})
-+  if (NOT PYTHONINTERP_FOUND)
-     message(WARNING "Cannot find python. Disablin admin tools")
-     set(USE_ADMIN_TOOLS OFF)
-  endif (NOT Python_Interpreter_FOUND)
-+  endif (NOT PYTHONINTERP_FOUND)
- endif (USE_ADMIN_TOOLS)
- 
- gopt_test(USE_GUI_ADMIN_TOOLS)
--- nfs-ganesha-4-rc4/src/scripts/ganeshactl/CMakeLists.txt.orig	2021-11-17 09:22:20.860134361 -0500
-+++ nfs-ganesha-4-rc4/src/scripts/ganeshactl/CMakeLists.txt	2021-11-17 09:41:47.651949504 -0500
-@@ -44,7 +44,7 @@
-   Ganesha/QtUI/ui_log_dialog.ui
-   )
- 
-if(Python_FOUND)
-+if(PYTHONINTERP_FOUND)
-   set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
-   set(SETUP_PY    "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
-   set(OUTPUT      "${CMAKE_CURRENT_BINARY_DIR}/build/ganeshactl_timestamp")
-@@ -118,7 +118,7 @@
- 
-   add_custom_command(
-     OUTPUT ${OUTPUT}
-    COMMAND ${Python_EXECUTABLE} "${SETUP_PY}"  build
-+    COMMAND ${PYTHON_EXECUTABLE} "${SETUP_PY}"  build
-     COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
-     DEPENDS ${GANESHA_SRCS} ${UI_PY_FILES} ${SCRIPTS}
-     )
-@@ -127,9 +127,9 @@
- 
-   install(
-     CODE
-    "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${Python_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
-+    "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
-     )
-endif(Python_FOUND)
-+endif(PYTHONINTERP_FOUND)
- 
- # Man page
- set(man8_file ganesha_conf.man)
--- nfs-ganesha-4-rc4/src/scripts/gpfs-epoch/CMakeLists.txt.orig	2021-11-17 09:22:55.938555754 -0500
-+++ nfs-ganesha-4-rc4/src/scripts/gpfs-epoch/CMakeLists.txt	2021-11-17 09:41:32.836208727 -0500
-@@ -1,6 +1,6 @@
- 
- if(USE_FSAL_GPFS)
-  if(Python_FOUND)
-+  if(PYTHONINTERP_FOUND)
-     set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
-     set(SETUP_PY    "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
-     set(OUTPUT      "${CMAKE_CURRENT_BINARY_DIR}/build/gpfs_epoch_timestamp")
-@@ -38,7 +38,7 @@
-     add_custom_command(
-       OUTPUT ${OUTPUT}
-       COMMAND ${CMAKE_COMMAND} -E touch __init__.py
-      COMMAND ${Python_EXECUTABLE} "${SETUP_PY}"  build
-+      COMMAND ${PYTHON_EXECUTABLE} "${SETUP_PY}"  build
-       COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
-       DEPENDS ${GPFS_EPOCH_SRCS} ${SCRIPTS}
-       )
-@@ -47,7 +47,7 @@
- 
-     install(
-       CODE
-      "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${Python_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} --install-scripts=\$ENV{DESTDIR}${LIBEXECDIR}/ganesha)"
-+      "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} --install-scripts=\$ENV{DESTDIR}${LIBEXECDIR}/ganesha)"
-       )
-  endif(Python_FOUND)
-+  endif(PYTHONINTERP_FOUND)
- endif(USE_FSAL_GPFS)
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@ -1,6 +1,18 @@

 %global _hardened_build 1

+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
+%global with_nfsidmap 1
+%else
+%global with_nfsidmap 0
+%endif
+
+%if ( 0%{?fedora} >= 18 || 0%{?rhel} >= 7 )
+%global with_systemd 1
+%else
+%global with_systemd 0
+%endif
+
 %if ( 0%{?suse_version} )
 BuildRequires: distribution-release
 %if ( ! 0%{?is_opensuse} )
@ -10,6 +22,9 @@ Requires: sles-release >= 12
 BuildRequires: openSUSE-release
 Requires: openSUSE-release
 %endif
+
+%global with_systemd 1
+%global with_nfsidmap 1
 %endif

 # Conditionally enable some FSALs, disable others.
@ -28,7 +43,7 @@ Requires: openSUSE-release
 %bcond_without nullfs
 %global use_fsal_null %{on_off_switch nullfs}

-%bcond_without mem
+%bcond_with mem
 %global use_fsal_mem %{on_off_switch mem}

 %bcond_without gpfs
@ -42,7 +57,7 @@ Requires: openSUSE-release

 %ifnarch i686 armv7hl
 %bcond_without ceph
-%else
+#else
 %bcond_with ceph
 %endif
 %global use_fsal_ceph %{on_off_switch ceph}
@ -57,15 +72,12 @@ Requires: openSUSE-release
 %bcond_without gluster
 %global use_fsal_gluster %{on_off_switch gluster}

-%bcond_with kvsfs
-%global use_fsal_kvsfs %{on_off_switch kvsfs}
+%bcond_with panfs
+%global use_fsal_panfs %{on_off_switch panfs}

 %bcond_with rdma
 %global use_rdma %{on_off_switch rdma}

-%bcond_with 9P
-%global use_9P %{on_off_switch 9P}
-
 %bcond_with jemalloc

 %bcond_with lttng
@ -111,37 +123,29 @@ Requires: openSUSE-release
 %endif

 %global dev_version %{lua: s = string.gsub('@GANESHA_EXTRA_VERSION@', '^%-', ''); s2 = string.gsub(s, '%-', '.'); print((s2 ~= nil and s2 ~= '') and s2 or "0.1") }
-#%%global dev rc6
+#%%global	dev rc5
+#%%global	dash_dev_version 2.6-rc5

 Name:		nfs-ganesha
-Version:	4.0
-Release:	9%{?dev:%{dev}}%{?dist}
+Version:	2.7.6
+Release:	2%{?dev:%{dev}}%{?dist}
 Summary:	NFS-Ganesha is a NFS Server running in user space
 License:	LGPLv3+
 Url:		https://github.com/nfs-ganesha/nfs-ganesha/wiki

-Source0:	https://github.com/%{name}/%{name}/archive/V%{version}%{?dev:-%{dev}}/%{name}-%{version}%{?dev:%{dev}}.tar.gz
-Patch0001:	0001-config_samples-log_rotate.patch
-Patch0002:	0002-CMakeLists.txt.patch
+Source0:	https://github.com/%{name}/%{name}/archive/V%{version}/%{name}-%{version}.tar.gz
+Patch1:		0001_src_scripts_ganeshactl_CMakeLists.txt.patch

 BuildRequires:	cmake
-BuildRequires:	make
-%ifarch x86_64 aarch64
-BuildRequires:	mold
-%endif
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	pkgconfig
-BuildRequires:	userspace-rcu-devel
 BuildRequires:	krb5-devel
-%if %{with rados_recov} || %{with rados_urls}
-BuildRequires: librados-devel >= 0.61
-%endif
 %if ( 0%{?suse_version} >= 1330 )
-BuildRequires:	libnsl-devel
+BuildRequires:  libnsl-devel
 %else
 %if ( 0%{?fedora} >= 28 || 0%{?rhel} >= 8 )
-BuildRequires:	libnsl2-devel
+BuildRequires:  libnsl2-devel
 %endif
 %endif
 %if ( 0%{?suse_version} )
@ -160,7 +164,7 @@ BuildRequires: libwbclient-devel
 %endif
 BuildRequires:	gcc-c++
 %if ( %{with_system_ntirpc} )
-BuildRequires:	libntirpc-devel >= 4.0
+BuildRequires:	libntirpc-devel = 1.7.4
 %else
 Requires: libntirpc = @NTIRPC_VERSION_EMBED@
 %endif
@ -170,8 +174,6 @@ Requires: libntirpc = @NTIRPC_VERSION_EMBED@
 Requires:	policycoreutils-python
 %endif
 %if ( 0%{?fedora} )
-# The nfs-ganesha.service unit requires dbus-send
-Requires:	dbus-tools
 # this should effectively be a no-op, as all Fedora installs should have it
 # with selinux.
 Requires:	policycoreutils-python-utils
@ -188,11 +190,15 @@ Requires:	portmap
 %endif
 %endif

+%if %{with_nfsidmap}
 %if ( 0%{?suse_version} )
 BuildRequires:	nfsidmap-devel
 %else
 BuildRequires:	libnfsidmap-devel
 %endif
+%else
+BuildRequires:	nfs-utils-lib-devel
+%endif

 %if %{with rdma}
 BuildRequires:	libmooshika-devel >= 0.6-0
@ -200,24 +206,23 @@ BuildRequires:	libmooshika-devel >= 0.6-0
 %if %{with jemalloc}
 BuildRequires:	jemalloc-devel
 %endif
+%if %{with_systemd}
 BuildRequires: systemd
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
-%if %{with man_page}
-%if ( 0%{?rhel} && 0%{?rhel} < 8 )
-BuildRequires: python-sphinx
 %else
-%if ( 0%{?suse_version} )
-BuildRequires: python3-Sphinx
-%else
-BuildRequires: python3-sphinx
+BuildRequires:	initscripts
 %endif
+%if %{with man_page}
+%if ( 0%{?fedora} >= 28 || 0%{?rhel} >= 8 )
+BuildRequires: python3-sphinx
+%else
+BuildRequires: python-sphinx
 %endif
 %endif
 Requires(post): psmisc
-Requires(pre): /usr/sbin/useradd
-Requires(pre): /usr/sbin/groupadd
+Requires(pre): shadow-utils

 %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 Requires: nfs-ganesha-selinux = %{version}-%{release}
@ -230,14 +235,12 @@ nfs-ganesha : NFS-GANESHA is a NFS Server running in user space.
 It comes with various back-end modules (called FSALs) provided as
 shared objects to support different file systems and name-spaces.

-%if %{with 9P}
 %package mount-9P
 Summary: a 9p mount helper

 %description mount-9P
 This package contains the mount.9P script that clients can use
 to simplify mounting to NFS-GANESHA. This is a 9p mount helper.
-%endif

 %package vfs
 Summary: The NFS-GANESHA VFS FSAL
@ -249,50 +252,36 @@ Requires: nfs-ganesha = %{version}-%{release}
 This package contains a FSAL shared object to
 be used with NFS-Ganesha to support VFS based filesystems

-%package proxy-v4
-Summary: The NFS-GANESHA PROXY_V4 FSAL
+%package proxy
+Summary: The NFS-GANESHA PROXY FSAL
 BuildRequires: libattr-devel
 Requires: nfs-ganesha = %{version}-%{release}

-%description proxy-v4
+%description proxy
 This package contains a FSAL shared object to
-be used with NFS-Ganesha to support PROXY_V4 based filesystems
-
-%package proxy-v3
-Summary: The NFS-GANESHA PROXY_V3 FSAL
-BuildRequires: libattr-devel
-Requires: nfs-ganesha = %{version}-%{release}
-
-%description proxy-v3
-This package contains a FSAL shared object to
-be used with NFS-Ganesha to support PROXY_V3 based filesystems
+be used with NFS-Ganesha to support PROXY based filesystems

 %if %{with utils}
 %package utils
 Summary: The NFS-GANESHA util scripts
-%if ( 0%{?rhel} && 0%{?rhel} < 8 )
-Requires:	dbus-python, pygobject2, pyparsing
-BuildRequires:	python-devel
-%else
-Requires:	python3-gobject, python3-pyparsing
-BuildRequires:	python3-devel
 %if ( 0%{?suse_version} )
-Requires:	dbus-1-python
+Requires:	dbus-1-python, python-gobject2 python-pyparsing
 %else
-Requires:	python3-dbus
+Requires:	python2-dbus, pygobject2, python2-pyparsing
 %endif
-%endif
-
 %if %{with gui_utils}
 %if ( 0%{?suse_version} )
-BuildRequires:	python-qt5-devel
+BuildRequires:	python-qt4-devel
 %else
-%if ( 0%{?fedora} >= 31 || 0%{?rhel} >= 8 )
-BuildRequires:	python3-qt5-devel
-%else
-BuildRequires:	PyQt4-devel
+BuildRequires:	python3-PyQt4-devel
 %endif
 %endif
+%if ( 0%{?suse_version} )
+BuildRequires:	python2-devel
+Requires: nfs-ganesha = %{version}-%{release}, python
+%else
+BuildRequires:	python2-devel
+Requires: nfs-ganesha = %{version}-%{release}, python2
 %endif

 %description utils
@ -314,24 +303,12 @@ to the ganesha.nfsd server, it makes it possible to trace using LTTng.
 %if %{with rados_recov}
 %package rados-grace
 Summary: The NFS-GANESHA command for managing the RADOS grace database
+BuildRequires: librados-devel >= 12.2.0
 Requires: nfs-ganesha = %{version}-%{release}

 %description rados-grace
 This package contains the ganesha-rados-grace tool for interacting with the
-database used by the rados_cluster recovery backend and the
-libganesha_rados_grace shared library for using RADOS storage for
-recovery state.
-%endif
-
-%if %{with rados_urls}
-%package rados-urls
-Summary: The NFS-GANESHA library for use with RADOS URLs
-Group: Applications/System
-Requires: nfs-ganesha = %{version}-%{release}
-
-%description rados-urls
-This package contains the libganesha_rados_urls library used for
-handling RADOS URL configurations.
+database used by the rados_cluster recovery backend.
 %endif

 # Option packages start here. use "rpmbuild --with gpfs" (or equivalent)
@ -376,7 +353,6 @@ be used with NFS-Ganesha to support GPFS backend
 Summary: The NFS-GANESHA CephFS FSAL
 Requires:	nfs-ganesha = %{version}-%{release}
 BuildRequires:	libcephfs2-devel >= 12.2.0
-BuildRequires:	libacl-devel

 %description ceph
 This package contains a FSAL shared object to
@ -421,17 +397,15 @@ This package contains a FSAL shared object to
 be used with NFS-Ganesha to support LUSTRE based filesystems
 %endif

-# KVSFS
-%if %{with kvsfs}
-%package kvsfs
-Summary: The NFS-GANESHA KVSFS FSAL
+# PANFS
+%if %{with panfs}
+%package panfs
+Summary: The NFS-GANESHA PANFS FSAL
 Requires:	nfs-ganesha = %{version}-%{release}
-Requires:	libkvsns >= 1.2.0
-BuildRequires:	libkvsns-devel >= 1.2.0

-%description kvsfs
+%description panfs
 This package contains a FSAL shared object to
-be used with NFS-Ganesha to support KVSFS/libkvsns
+be used with NFS-Ganesha to support PANFS
 %endif

 # GLUSTER
@ -439,7 +413,7 @@ be used with NFS-Ganesha to support KVSFS/libkvsns
 %package gluster
 Summary: The NFS-GANESHA GLUSTER FSAL
 Requires:	nfs-ganesha = %{version}-%{release}
-BuildRequires:	glusterfs-api-devel >= 7.0
+BuildRequires:	glusterfs-api-devel >= 3.12.3
 BuildRequires:	libattr-devel, libacl-devel

 %description gluster
@ -451,9 +425,9 @@ be used with NFS-Ganesha to support Gluster
 %if ( 0%{?fedora} >= 29 || 0%{?rhel} >= 8 )
 %package selinux
 Summary: The NFS-GANESHA SELINUX targeted policy
-BuildArch:	noarch
-Requires:	nfs-ganesha = %{version}-%{release}
-BuildRequires:	selinux-policy-devel
+BuildArch:     noarch
+Requires:      nfs-ganesha = %{version}-%{release}
+BuildRequires:        selinux-policy-devel
 %{?selinux_requires}

 %description selinux
@ -512,15 +486,12 @@ Development headers and auxiliary files for developing with %{name}.
 %endif

 %prep
-%setup -q
-%patch0001 -p1
-%patch0002 -p1
+%setup -q -n %{name}-%{version}
+%patch1 -p1

 %build
-export VERBOSE=1
-cd src && %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
+cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
 	-DBUILD_CONFIG=rpmbuild				\
-	-DCMAKE_COLOR_MAKEFILE:BOOL=OFF			\
 	-DUSE_FSAL_NULL=%{use_fsal_null}		\
 	-DUSE_FSAL_MEM=%{use_fsal_mem}			\
 	-DUSE_FSAL_XFS=%{use_fsal_xfs}			\
@ -528,7 +499,7 @@ cd src && %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
 	-DUSE_FSAL_CEPH=%{use_fsal_ceph}		\
 	-DUSE_FSAL_RGW=%{use_fsal_rgw}			\
 	-DUSE_FSAL_GPFS=%{use_fsal_gpfs}		\
-	-DUSE_FSAL_KVSFS=%{use_fsal_kvsfs}		\
+	-DUSE_FSAL_PANFS=%{use_fsal_panfs}		\
 	-DUSE_FSAL_GLUSTER=%{use_fsal_gluster}		\
 	-DUSE_SYSTEM_NTIRPC=%{use_system_ntirpc}	\
 	-DUSE_9P_RDMA=%{use_rdma}			\
@ -538,24 +509,19 @@ cd src && %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
 	-DUSE_RADOS_RECOV=%{use_rados_recov}		\
 	-DRADOS_URLS=%{use_rados_urls}			\
 	-DUSE_FSAL_VFS=ON				\
-	-DUSE_FSAL_PROXY_V4=ON				\
-	-DUSE_FSAL_PROXY_V3=ON				\
+	-DUSE_FSAL_PROXY=ON				\
 	-DUSE_DBUS=ON					\
-	-DUSE_9P=%{use_9P}				\
+	-DUSE_9P=ON					\
 	-DDISTNAME_HAS_GIT_DATA=OFF			\
 	-DUSE_MAN_PAGE=%{use_man_page}			\
 	-DRPCBIND=%{use_rpcbind}			\
 	-D_MSPAC_SUPPORT=%{use_mspac_support}		\
 	-DSANITIZE_ADDRESS=%{use_sanitize_address}	\
-%ifarch x86_64 aarch64
-       -DCMAKE_LINKER=%{_bindir}/ld.mold                \
-%endif
 %if %{with jemalloc}
 	-DALLOCATOR=jemalloc
 %endif

-export GCC_COLORS=
-%cmake_build
+make %{?_smp_mflags} || make %{?_smp_mflags} || make

 %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 make -C selinux -f /usr/share/selinux/devel/Makefile ganesha.pp
@ -576,29 +542,28 @@ cd src
 install -m 644 config_samples/logrotate_ganesha	%{buildroot}%{_sysconfdir}/logrotate.d/ganesha
 install -m 644 scripts/ganeshactl/org.ganesha.nfsd.conf	%{buildroot}%{_sysconfdir}/dbus-1/system.d
 install -m 755 scripts/nfs-ganesha-config.sh	%{buildroot}%{_libexecdir}/ganesha
-%if %{with 9P}
 install -m 755 tools/mount.9P	%{buildroot}%{_sbindir}/mount.9P
-%endif
 install -m 644 config_samples/vfs.conf %{buildroot}%{_sysconfdir}/ganesha
 %if %{with rgw}
 install -m 644 config_samples/rgw.conf %{buildroot}%{_sysconfdir}/ganesha
 %endif

+%if %{with_systemd}
 mkdir -p %{buildroot}%{_unitdir}
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 8 )
-mkdir -p %{buildroot}%{_sysconfdir}/systemd/system/nfs-ganesha-lock.service.d
-%endif
-
 install -m 644 scripts/systemd/nfs-ganesha.service.el7	%{buildroot}%{_unitdir}/nfs-ganesha.service
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 8 )
-install -m 644 scripts/systemd/nfs-ganesha-lock.service.el8    %{buildroot}%{_unitdir}/nfs-ganesha-lock.service
-install -m 644 scripts/systemd/rpc-statd.conf.el8      %{buildroot}%{_sysconfdir}/systemd/system/nfs-ganesha-lock.service.d/rpc-statd.conf
-%else
 install -m 644 scripts/systemd/nfs-ganesha-lock.service.el7	%{buildroot}%{_unitdir}/nfs-ganesha-lock.service
-%endif
 install -m 644 scripts/systemd/nfs-ganesha-config.service	%{buildroot}%{_unitdir}/nfs-ganesha-config.service
 install -m 644 scripts/systemd/sysconfig/nfs-ganesha	%{buildroot}%{_sysconfdir}/sysconfig/ganesha
+%if 0%{?_tmpfilesdir:1}
+mkdir -p %{buildroot}%{_tmpfilesdir}
+install -m 644 scripts/systemd/tmpfiles.d/ganesha.conf	%{buildroot}%{_tmpfilesdir}
+%endif
 mkdir -p %{buildroot}%{_localstatedir}/log/ganesha
+%else
+mkdir -p %{buildroot}%{_sysconfdir}/init.d
+install -m 755 scripts/init.d/nfs-ganesha.el6		%{buildroot}%{_sysconfdir}/init.d/nfs-ganesha
+install -m 644 scripts/init.d/sysconfig/ganesha		%{buildroot}%{_sysconfdir}/sysconfig/ganesha
+%endif

 %if %{with lustre}
 install -m 644 config_samples/lustre.conf %{buildroot}%{_sysconfdir}/ganesha
@ -612,6 +577,10 @@ install -m 644 config_samples/xfs.conf %{buildroot}%{_sysconfdir}/ganesha
 install -m 644 config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha
 %endif

+%if %{with rados_recov}
+install -m 755 tools/ganesha-rados-grace       %{buildroot}%{_bindir}/ganesha-rados-grace
+%endif
+
 %if %{with rgw}
 install -m 644 config_samples/rgw.conf %{buildroot}%{_sysconfdir}/ganesha
 install -m 644 config_samples/rgw_bucket.conf %{buildroot}%{_sysconfdir}/ganesha
@ -622,22 +591,19 @@ install -m 644 config_samples/logrotate_fsal_gluster %{buildroot}%{_sysconfdir}/
 %endif

 %if %{with gpfs}
+install -m 755 scripts/gpfs-epoch %{buildroot}%{_libexecdir}/ganesha
 install -m 644 config_samples/gpfs.conf	%{buildroot}%{_sysconfdir}/ganesha
 install -m 644 config_samples/gpfs.ganesha.nfsd.conf %{buildroot}%{_sysconfdir}/ganesha
 install -m 644 config_samples/gpfs.ganesha.main.conf %{buildroot}%{_sysconfdir}/ganesha
 install -m 644 config_samples/gpfs.ganesha.log.conf %{buildroot}%{_sysconfdir}/ganesha
 install -m 644 config_samples/gpfs.ganesha.exports.conf	%{buildroot}%{_sysconfdir}/ganesha
+%if ! %{with_systemd}
+mkdir -p %{buildroot}%{_sysconfdir}/init.d
+install -m 755 scripts/init.d/nfs-ganesha.gpfs		%{buildroot}%{_sysconfdir}/init.d/nfs-ganesha-gpfs
+%endif
 %endif

-# setuptools >= 60 changes the environment to use its bundled copy of distutils
-# by default, not the Python-bundled one. To run the Python's standard library
-# distutils, the environment variable must be set.
-# Although technically setuptools is not needed for the cmake scripts, if it's
-# pulled by another package, it changes the environment and consequently,
-# the build fails. This was reported in:
-# https://github.com/pypa/setuptools/issues/3143
-export SETUPTOOLS_USE_DISTUTILS=stdlib
-%cmake_install
+make DESTDIR=%{buildroot} install

 %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 install -d %{buildroot}%{_selinux_store_path}/packages
@ -646,14 +612,6 @@ install -p -m 644 selinux/ganesha.if %{buildroot}%{_selinux_store_path}/devel/in
 install -m 0644 selinux/ganesha.pp.bz2 %{buildroot}%{_selinux_store_path}/packages
 %endif

-%if ( 0%{?rhel} && 0%{?rhel} < 8 )
-rm -f %{buildroot}/%{python_sitelib}/gpfs*
-rm -f %{buildroot}/%{python_sitelib}/__init__.*
-%else
-rm -f %{buildroot}/%{python3_sitelib}/gpfs*
-rm -f %{buildroot}/%{python3_sitelib}/__init__.*
-%endif
-
 %post
 %if ( 0%{?suse_version} )
 %service_add_post nfs-ganesha.service nfs-ganesha-lock.service nfs-ganesha-config.service
@ -666,10 +624,12 @@ semanage fcontext -a -t ganesha_var_log_t %{_localstatedir}/log/ganesha/ganesha-
 %endif
 restorecon %{_localstatedir}/log/ganesha
 %endif
+%if %{with_systemd}
 %systemd_post nfs-ganesha.service
 %systemd_post nfs-ganesha-lock.service
 %systemd_post nfs-ganesha-config.service
 %endif
+%endif
 killall -SIGHUP dbus-daemon >/dev/null 2>&1 || :

 %pre
@ -681,37 +641,46 @@ exit 0
 %if ( 0%{?suse_version} )
 %service_del_preun nfs-ganesha-lock.service
 %else
+%if %{with_systemd}
 %systemd_preun nfs-ganesha-lock.service
 %endif
+%endif

 %postun
 %if ( 0%{?suse_version} )
 %service_del_postun nfs-ganesha-lock.service
 %debug_package
 %else
+%if %{with_systemd}
 %systemd_postun_with_restart nfs-ganesha-lock.service
 %endif
+%endif

 %files
 %license src/LICENSE.txt
 %{_bindir}/ganesha.nfsd
-%{_libdir}/libganesha_nfsd.so*
 %config %{_sysconfdir}/dbus-1/system.d/org.ganesha.nfsd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/ganesha
 %config(noreplace) %{_sysconfdir}/logrotate.d/ganesha
 %dir %{_sysconfdir}/ganesha/
 %config(noreplace) %{_sysconfdir}/ganesha/ganesha.conf
+%dir %{_defaultdocdir}/ganesha/
+%{_defaultdocdir}/ganesha/*
 %doc src/ChangeLog
 %dir %{_rundir}/ganesha
 %dir %{_libexecdir}/ganesha/
 %{_libexecdir}/ganesha/nfs-ganesha-config.sh
-%dir %attr(0755,ganesha,ganesha) %{_localstatedir}/log/ganesha
+%dir %attr(0775,ganesha,ganesha) %{_localstatedir}/log/ganesha

+%if %{with_systemd}
 %{_unitdir}/nfs-ganesha.service
 %{_unitdir}/nfs-ganesha-lock.service
 %{_unitdir}/nfs-ganesha-config.service
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 8 )
-%{_sysconfdir}/systemd/system/nfs-ganesha-lock.service.d/rpc-statd.conf
+%if 0%{?_tmpfilesdir:1}
+%{_tmpfilesdir}/ganesha.conf
+%endif
+%else
+%{_sysconfdir}/init.d/nfs-ganesha
 %endif

 %if %{with man_page}
@ -725,25 +694,17 @@ exit 0
 %if %{with rados_recov}
 %files rados-grace
 %{_bindir}/ganesha-rados-grace
-%{_libdir}/libganesha_rados_recov.so*
 %if %{with man_page}
 %{_mandir}/*/ganesha-rados-grace.8.gz
 %{_mandir}/*/ganesha-rados-cluster-design.8.gz
 %endif
 %endif

-%if %{with rados_urls}
-%files rados-urls
-%{_libdir}/libganesha_rados_urls.so*
-%endif
-
-%if %{with 9P}
 %files mount-9P
 %{_sbindir}/mount.9P
 %if %{with man_page}
 %{_mandir}/*/ganesha-9p-config.8.gz
 %endif
-%endif

 %files vfs
 %{_libdir}/ganesha/libfsalvfs*
@ -752,16 +713,10 @@ exit 0
 %{_mandir}/*/ganesha-vfs-config.8.gz
 %endif

-%files proxy-v4
-%{_libdir}/ganesha/libfsalproxy_v4*
+%files proxy
+%{_libdir}/ganesha/libfsalproxy*
 %if %{with man_page}
-%{_mandir}/*/ganesha-proxy-v4-config.8.gz
-%endif
-
-%files proxy-v3
-%{_libdir}/ganesha/libfsalproxy_v3*
-%if %{with man_page}
-%{_mandir}/*/ganesha-proxy-v3-config.8.gz
+%{_mandir}/*/ganesha-proxy-config.8.gz
 %endif

 # Optional packages
@ -792,8 +747,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/ganesha/gpfs.ganesha.main.conf
 %config(noreplace) %{_sysconfdir}/ganesha/gpfs.ganesha.log.conf
 %config(noreplace) %{_sysconfdir}/ganesha/gpfs.ganesha.exports.conf
-%if %{with utils}
 %{_libexecdir}/ganesha/gpfs-epoch
+%if ! %{with_systemd}
+%{_sysconfdir}/init.d/nfs-ganesha-gpfs
 %endif
 %if %{with man_page}
 %{_mandir}/*/ganesha-gpfs-config.8.gz
@ -846,7 +802,7 @@ exit 0
 %if ! %{with system_ntirpc}
 %files -n libntirpc
 %{_libdir}/libntirpc.so.@NTIRPC_VERSION_EMBED@
-%{_libdir}/libntirpc.so.4.0
+%{_libdir}/libntirpc.so.1.6
 %{_libdir}/libntirpc.so
 %{!?_licensedir:%global license %%doc}
 %license libntirpc/COPYING
@ -857,9 +813,9 @@ exit 0
 %{_includedir}/ntirpc/*
 %endif

-%if %{with kvsfs}
-%files kvsfs
-%{_libdir}/ganesha/libfsalkvsfs*
+%if %{with panfs}
+%files panfs
+%{_libdir}/ganesha/libfsalpanfs*
 %endif

 %if %{with lttng}
@ -869,12 +825,12 @@ exit 0

 %if %{with utils}
 %files utils
-%if ( 0%{?rhel} && 0%{?rhel} < 8 )
-%{python_sitelib}/Ganesha/*
-%{python_sitelib}/ganeshactl-*-info
+%if ( 0%{?suse_version} )
+%{python2_sitelib}/Ganesha/*
+%{python2_sitelib}/ganeshactl-*-info
 %else
-%{python3_sitelib}/Ganesha/*
-%{python3_sitelib}/ganeshactl-*-info
+%{python2_sitelib}/Ganesha/*
+%{python2_sitelib}/ganeshactl-*-info
 %endif
 %if %{with gui_utils}
 %{_bindir}/ganesha-admin
@ -882,13 +838,8 @@ exit 0
 %{_bindir}/manage_exports
 %{_bindir}/manage_logger
 %{_bindir}/ganeshactl
-%if %{with 9P}
 %{_bindir}/client_stats_9pOps
 %{_bindir}/export_stats_9pOps
-%else
-%exclude %{_bindir}/client_stats_9pOps
-%exclude %{_bindir}/export_stats_9pOps
-%endif
 %endif
 %{_bindir}/fake_recall
 %{_bindir}/get_clientids
@ -901,184 +852,17 @@ exit 0
 %endif

 %changelog
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+* Tue Jul 23 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.7.6-2
+- nfs-ganesha 2.7.6

-* Tue Jul 19 2022 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-8
- Rebuilt for pyparsing-3.0.9, ceph w/ fmt-9
+* Tue Jul 16 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.7.6-1
+- nfs-ganesha 2.7.6 GA

-* Tue Jul 19 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.0-7
- Rebuilt for pyparsing-3.0.9
+* Tue Jul 2 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.7.5-1
+- nfs-ganesha 2.7.5 GA

-* Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 4.0-6
- Rebuilt for Python 3.11
-
-* Fri Mar 04 2022 Karolina Surma <ksurma@redhat.com> - 4.0-5
- Don't BR setuptools, use Python's bundled distutils
- Fix build with cmake 3.23.0rc2
- Related: rhbz#2059201, rhbz#2059188, rhbz#2057738
-
-* Fri Jan 28 2022 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-4
- NFS-Ganesha 4.1, w/ modern linker (mold), this time for real
-
-* Wed Jan 26 2022 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-3
- NFS-Ganesha 4.0, w/ modern linker (mold)
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Dec 21 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-1
- NFS-Ganesha 4.0 GA
-
-* Fri Dec 17 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-0.4rc6
- NFS-Ganesha 4.0 RC6
-
-* Wed Nov 17 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-0.3rc4
- NFS-Ganesha 4.0 RC4, w/ utils and gui_utils (python)
-
-* Wed Nov 17 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-0.2rc4
- NFS-Ganesha 4.0 RC4
-
-* Mon Nov 8 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-0.1rc3
- NFS-Ganesha 4.0 RC3
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jul 16 2021 Lars Kellogg-Stedman <lars at redhat.com> - 3.5-8
- Add dependency on dbus-tools
-
- Rebuilt for userspace-rcu-0.13 again
-* Tue Jun 22 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.5-7
- Rebuilt for userspace-rcu-0.13 again
-
-* Wed Jun 16 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.5-6
- Rebuilt for libntirpc-3.5
- plus https://src.fedoraproject.org/rpms/nfs-ganesha/pull-request/2
-
-* Tue Jun 8 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.5-5
- Rebuilt for userspace-rcu-0.13
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.5-4
- Rebuilt for Python 3.10
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.5-3
- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Tue Feb 9 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.5-2
- NFS-Ganesha 3.5, rebuild with ceph-16
-
-* Thu Jan 28 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.5-1
- NFS-Ganesha 3.5 GA
- fix for compiling with Ceph-16 (pacific)
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Dec 23 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.4-1
- NFS-Ganesha 3.4 GA
-
-* Thu Nov 5 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-8
- BuildRequires: make
-
-* Tue Sep 8 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-7
- selinux
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 20 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-6
- use %%cmake_build and %%cmake_install
-
-* Mon Jul 20 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-5
- use %%make_install
-
-* Mon Jul 13 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-4
- rpc-statd.conf.el8
-
-* Tue Jun 23 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com>
- explicit BuildRequires: python3-setuptools
-
-* Thu Jun 18 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-3
- rhbz#1848208
-
-* Mon Jun 8 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-1
- NFS-Ganesha 3.3 GA
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.2-6
- Rebuilt for Python 3.9
-
-* Mon Mar 23 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2-5
- NFS-Ganesha 3.2, NFSv4-compound-op-fails SEGV
-
-* Thu Feb 20 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2-4
- NFS-Ganesha 3.2, /var/log/ganesha, rhbz#1805493
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jan 23 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2-2
- NFS-Ganesha 3.2, gcc-10
-
-* Sun Dec 22 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2-1
- NFS-Ganesha 3.2 GA
- 3.1 was not built
-
-* Mon Nov 11 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.0-1
- NFS-Ganesha 3.0 GA
-
-* Wed Nov 6 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.0-0.3rc5
- nfs-ganesha 3.0 RC5, rebuild w/ libntirpc-3.0 GA
-
-* Tue Nov 5 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.0-0.2rc5
- nfs-ganesha 3.0 RC5, enable fsal_mem (again)
-
-* Sun Nov 3 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.0-0.1rc5
- nfs-ganesha 3.0 RC5
-
-* Wed Sep 25 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.2-4
- PyQt4 -> PyQt5
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.8.2-3
- Rebuilt for Python 3.8
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.8.2-2
- Rebuilt for Python 3.8
-
-* Wed Aug 14 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.2-1
- nfs-ganesha 2.8.2 (f32/rawhide)
-
-* Wed Aug 14 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.2-4
- nfs-ganesha 2.8.2, #1741023
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 23 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.2-2
- nfs-ganesha 2.8.2 GA
-
-* Tue Jul 2 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.1-1
- nfs-ganesha 2.8.1 GA
-
-* Mon Jul 1 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.0-4
- nfs-ganesha 2.8.0, 2.8.0.3
-
-* Sun Jun 16 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.0-3
- nfs-ganesha 2.8.0, 2.8.0.2
-
-* Tue Jun 11 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.0-2
- nfs-ganesha 2.8.0, 2.8.0.1
-
-* Fri May 31 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.0-1
- nfs-ganesha 2.8.0 GA
-
-* Fri May 31 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.0-0.2rc1
- nfs-ganesha 2.8.0 RC1, utils and gui_utils enabled
-
-* Thu May 30 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.0-0.1rc1
- nfs-ganesha 2.8.0 RC1, utils and gui_utils disabled until the python
-  byte_compile problems can be resolved
+* Wed Jun 5 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.7.4-1
+- nfs-ganesha 2.7.4 GA

 * Fri May 17 2019 Miro Hrončok <mhroncok@redhat.com> - 2.7.3-4
 - Avoid unversioned Python requires
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (nfs-ganesha-4.0.tar.gz) = c6ec8146159500f03a4a8b1beb0e03ce79da33c67e8c077d1c7aea8be67d77690839bb7e10c88a9b8a3a8a9cca00ca10851f34f71c6f047956b24e7b7d9a7770
+SHA512 (nfs-ganesha-2.7.6.tar.gz) = 09aaed0116638f801f18cc8de75d1a0e45bb27916d09fee1fe7d152db559a6176d94f4e4b127d35a39e77923ac38d6d5090b69b0a7d8c71708eca2b81dca0a68
Author	SHA1	Message	Date
Kaleb S. KEITHLEY	a9a86d8554	nfs-ganesha 2.7.6 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>	2019-07-23 13:21:29 -04:00
Kaleb S. KEITHLEY	b32e11bb66	nfs-ganesha 2.7.6 GA Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>	2019-07-16 14:26:13 -04:00
Kaleb S. KEITHLEY	419a86e1df	nfs-ganesha 2.7.5 GA Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>	2019-07-02 16:46:43 -04:00
Kaleb S. KEITHLEY	d717b7c667	nfs-ganesha 2.7.4 GA Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>	2019-06-05 18:06:56 -04:00