Merge remote-tracking branch 'origin/master' into f28

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

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

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)

sources

@@ -1 +1 @@
-SHA512 (nfs-ganesha-4.0.tar.gz) = c6ec8146159500f03a4a8b1beb0e03ce79da33c67e8c077d1c7aea8be67d77690839bb7e10c88a9b8a3a8a9cca00ca10851f34f71c6f047956b24e7b7d9a7770
+SHA512 (nfs-ganesha-2.6.3.tar.gz) = 0689fbf9ce65919611927439260b0d6508973b50dbb497bb8d808d907558b7b7ea58ff8134e6edf6dd0c0b61cdbc7521adf5179e10b3d2880befc5d47ad0ecae