Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

0002-CMakeLists.txt.patch

@@ -0,0 +1,78 @@
+--- 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)

nfs-ganesha.spec

@@ -57,8 +57,8 @@ Requires: openSUSE-release
 %bcond_without gluster
 %global use_fsal_gluster %{on_off_switch gluster}
 
-%bcond_with panfs
-%global use_fsal_panfs %{on_off_switch panfs}
+%bcond_with kvsfs
+%global use_fsal_kvsfs %{on_off_switch kvsfs}
 
 %bcond_with rdma
 %global use_rdma %{on_off_switch rdma}
@@ -111,20 +111,24 @@ 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 rc5
+#%%global dev rc6
 
 Name:		nfs-ganesha
-Version:	3.5
-Release:	6%{?dev:%{dev}}%{?dist}
+Version:	4.0
+Release:	9%{?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
+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
 
 BuildRequires:	cmake
 BuildRequires:	make
+%ifarch x86_64 aarch64
+BuildRequires:	mold
+%endif
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	pkgconfig
@@ -134,10 +138,10 @@ BuildRequires:	krb5-devel
 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} )
@@ -156,7 +160,7 @@ BuildRequires: libwbclient-devel
 %endif
 BuildRequires:	gcc-c++
 %if ( %{with_system_ntirpc} )
-BuildRequires:	libntirpc-devel >= 3.4
+BuildRequires:	libntirpc-devel >= 4.0
 %else
 Requires: libntirpc = @NTIRPC_VERSION_EMBED@
 %endif
@@ -166,6 +170,8 @@ 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
@@ -243,14 +249,23 @@ 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
-Summary: The NFS-GANESHA PROXY FSAL
+%package proxy-v4
+Summary: The NFS-GANESHA PROXY_V4 FSAL
 BuildRequires: libattr-devel
 Requires: nfs-ganesha = %{version}-%{release}
 
-%description proxy
+%description proxy-v4
 This package contains a FSAL shared object to
-be used with NFS-Ganesha to support PROXY based filesystems
+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
 
 %if %{with utils}
 %package utils
@@ -261,7 +276,6 @@ BuildRequires:	python-devel
 %else
 Requires:	python3-gobject, python3-pyparsing
 BuildRequires:	python3-devel
-BuildRequires:	python3-setuptools
 %if ( 0%{?suse_version} )
 Requires:	dbus-1-python
 %else
@@ -407,15 +421,17 @@ This package contains a FSAL shared object to
 be used with NFS-Ganesha to support LUSTRE based filesystems
 %endif
 
-# PANFS
-%if %{with panfs}
-%package panfs
-Summary: The NFS-GANESHA PANFS FSAL
+# KVSFS
+%if %{with kvsfs}
+%package kvsfs
+Summary: The NFS-GANESHA KVSFS FSAL
 Requires:	nfs-ganesha = %{version}-%{release}
+Requires:	libkvsns >= 1.2.0
+BuildRequires:	libkvsns-devel >= 1.2.0
 
-%description panfs
+%description kvsfs
 This package contains a FSAL shared object to
-be used with NFS-Ganesha to support PANFS
+be used with NFS-Ganesha to support KVSFS/libkvsns
 %endif
 
 # GLUSTER
@@ -435,9 +451,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
@@ -496,11 +512,13 @@ Development headers and auxiliary files for developing with %{name}.
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}%{?dev:-%{dev}}
+%setup -q
 %patch0001 -p1
+%patch0002 -p1
 
 %build
-cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
+export VERBOSE=1
+cd src && %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
 	-DBUILD_CONFIG=rpmbuild				\
 	-DCMAKE_COLOR_MAKEFILE:BOOL=OFF			\
 	-DUSE_FSAL_NULL=%{use_fsal_null}		\
@@ -510,7 +528,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_PANFS=%{use_fsal_panfs}		\
+	-DUSE_FSAL_KVSFS=%{use_fsal_kvsfs}		\
 	-DUSE_FSAL_GLUSTER=%{use_fsal_gluster}		\
 	-DUSE_SYSTEM_NTIRPC=%{use_system_ntirpc}	\
 	-DUSE_9P_RDMA=%{use_rdma}			\
@@ -520,7 +538,8 @@ 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=ON				\
+	-DUSE_FSAL_PROXY_V4=ON				\
+	-DUSE_FSAL_PROXY_V3=ON				\
 	-DUSE_DBUS=ON					\
 	-DUSE_9P=%{use_9P}				\
 	-DDISTNAME_HAS_GIT_DATA=OFF			\
@@ -528,11 +547,13 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
 	-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 VERBOSE=1
 export GCC_COLORS=
 %cmake_build
 
@@ -608,6 +629,14 @@ install -m 644 config_samples/gpfs.ganesha.log.conf %{buildroot}%{_sysconfdir}/g
 install -m 644 config_samples/gpfs.ganesha.exports.conf	%{buildroot}%{_sysconfdir}/ganesha
 %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
 
 %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
@@ -723,10 +752,16 @@ exit 0
 %{_mandir}/*/ganesha-vfs-config.8.gz
 %endif
 
-%files proxy
-%{_libdir}/ganesha/libfsalproxy*
+%files proxy-v4
+%{_libdir}/ganesha/libfsalproxy_v4*
 %if %{with man_page}
-%{_mandir}/*/ganesha-proxy-config.8.gz
+%{_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
 %endif
 
 # Optional packages
@@ -757,7 +792,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
+%endif
 %if %{with man_page}
 %{_mandir}/*/ganesha-gpfs-config.8.gz
 %endif
@@ -809,7 +846,7 @@ exit 0
 %if ! %{with system_ntirpc}
 %files -n libntirpc
 %{_libdir}/libntirpc.so.@NTIRPC_VERSION_EMBED@
-%{_libdir}/libntirpc.so.1.6
+%{_libdir}/libntirpc.so.4.0
 %{_libdir}/libntirpc.so
 %{!?_licensedir:%global license %%doc}
 %license libntirpc/COPYING
@@ -820,9 +857,9 @@ exit 0
 %{_includedir}/ntirpc/*
 %endif
 
-%if %{with panfs}
-%files panfs
-%{_libdir}/ganesha/libfsalpanfs*
+%if %{with kvsfs}
+%files kvsfs
+%{_libdir}/ganesha/libfsalkvsfs*
 %endif
 
 %if %{with lttng}
@@ -864,7 +901,58 @@ exit 0
 %endif
 
 %changelog
-* Wed June 16 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.5-6
+* 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 19 2022 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-8
+- Rebuilt for pyparsing-3.0.9, ceph w/ fmt-9
+
+* Tue Jul 19 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.0-7
+- Rebuilt for pyparsing-3.0.9
+
+* 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
 
@@ -901,10 +989,10 @@ exit 0
 - 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
+- use %%cmake_build and %%cmake_install
 
 * Mon Jul 20 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-5
-- use %make_install
+- use %%make_install
 
 * Mon Jul 13 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-4
 - rpc-statd.conf.el8

sources

@@ -1 +1 @@
-SHA512 (nfs-ganesha-3.5.tar.gz) = c2a2a6d9993a7c96771d74f61465bc56a9b6ef45be10abaa351ace8f3fcb045a4f799d92292f8228bae0ac52961c0081f4fc5d852f795c7617f235ddf57bc22c
+SHA512 (nfs-ganesha-4.0.tar.gz) = c6ec8146159500f03a4a8b1beb0e03ce79da33c67e8c077d1c7aea8be67d77690839bb7e10c88a9b8a3a8a9cca00ca10851f34f71c6f047956b24e7b7d9a7770