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

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
Rebuilt for pyparsing-3.0.9, ceph w/ fmt-9
2022-07-22 00:32:36 +00:00 · 2022-07-19 09:59:38 -04:00 · 2022-07-19 11:12:47 +02:00 · 2022-06-15 18:15:36 +02:00 · 2022-03-04 11:20:47 +01:00 · 2022-03-04 11:18:12 +01:00
19 changed files with 1258 additions and 733 deletions
--- a/0001-config_samples-log_rotate.patch
+++ b/0001-config_samples-log_rotate.patch
@ -0,0 +1,16 @@
+--- 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/0002-CMakeLists.txt.patch
+++ b/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)
--- a/nfs-ganesha-2.0.0-dirent.patch
+++ b/nfs-ganesha-2.0.0-dirent.patch
@ -1,91 +0,0 @@
--- nfs-ganesha-2.0.0/src/CMakeLists.txt.orig	2014-05-20 13:58:50.685211144 -0400
-+++ nfs-ganesha-2.0.0/src/CMakeLists.txt	2014-05-20 14:00:24.825924703 -0400
-@@ -125,6 +125,7 @@
- 
- if (LINUX)
-     set(PLATFORM "LINUX")
-+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE")
-     set(OS_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include/os/linux")
-     find_library(LIBDL dl)  # module loader
- endif(LINUX)
--- nfs-ganesha-2.0.0/src/os/linux/subr.c.orig	2014-05-20 14:02:56.340987294 -0400
-+++ nfs-ganesha-2.0.0/src/os/linux/subr.c	2014-05-20 14:03:41.196565516 -0400
-@@ -34,6 +34,7 @@
- #include <sys/syscall.h>
- #include "os/subr.h"
- 
-+#ifdef NOT_TRUE
- /* not defined in linux headers so we do it here
-  */
- struct linux_dirent {
-@@ -50,6 +51,7 @@
- 	   // offset is (d_reclen - 1))
- 	 */
- };
-+#endif
- 
- /**
-  * @brief Read system directory entries into the buffer
-@@ -63,7 +65,7 @@
- {
- 	int retval = 0;
- 
-	retval = syscall(SYS_getdents, fd, buf, bcount);
-+	retval = syscall(SYS_getdents64, fd, buf, bcount);
- 	if (retval >= 0)
- 		*basepp += retval;
- 	return retval;
-@@ -82,7 +84,7 @@
- 
- bool to_vfs_dirent(char *buf, int bpos, struct vfs_dirent *vd, off_t base)
- {
-	struct linux_dirent *dp = (struct linux_dirent *)(buf + bpos);
-+	struct dirent64 *dp = (struct dirent64 *)(buf + bpos);
- 	char type;
- 
- 	vd->vd_ino = dp->d_ino;
--- nfs-ganesha-2.0.0/src/FSAL/FSAL_GPFS/handle.c.orig	2014-05-20 14:30:03.880250822 -0400
-+++ nfs-ganesha-2.0.0/src/FSAL/FSAL_GPFS/handle.c	2014-05-20 14:31:41.470619655 -0400
-@@ -438,6 +438,7 @@
- 	return status;
- }
- 
-+#ifdef NOT_TRUE
- /* not defined in linux headers so we do it here
-  */
- 
-@@ -455,6 +456,7 @@
- 	   // offset is (d_reclen - 1))
- 	 */
- };
-+#endif
- 
- #define BUF_SIZE 1024
- /**
-@@ -480,7 +482,7 @@
- 	fsal_status_t status;
- 	off_t seekloc = 0;
- 	int bpos, cnt, nread;
-	struct linux_dirent *dentry;
-+	struct dirent64 *dentry;
- 	char buf[BUF_SIZE];
- 
- 	if (whence != NULL)
-@@ -502,7 +504,7 @@
- 	}
- 	cnt = 0;
- 	do {
-		nread = syscall(SYS_getdents, dirfd, buf, BUF_SIZE);
-+		nread = syscall(SYS_getdents64, dirfd, buf, BUF_SIZE);
- 		if (nread < 0) {
- 			retval = errno;
- 			fsal_error = posix2fsal_error(retval);
-@@ -511,7 +513,7 @@
- 		if (nread == 0)
- 			break;
- 		for (bpos = 0; bpos < nread;) {
-			dentry = (struct linux_dirent *)(buf + bpos);
-+			dentry = (struct dirent64 *)(buf + bpos);
- 			if (strcmp(dentry->d_name, ".") == 0
- 			    || strcmp(dentry->d_name, "..") == 0)
- 				goto skip;	/* must skip '.' and '..' */
--- a/nfs-ganesha-2.0.0-fsal_ceph.patch
+++ b/nfs-ganesha-2.0.0-fsal_ceph.patch
@ -1,18 +0,0 @@
--- nfs-ganesha-2.0.0/src/FSAL/FSAL_CEPH/handle.c.orig	2014-06-02 01:49:21.711983531 -0400
-+++ nfs-ganesha-2.0.0/src/FSAL/FSAL_CEPH/handle.c	2014-06-02 01:50:57.119983531 -0400
-@@ -374,12 +374,13 @@
- 	/* The private 'full' directory handle */
- 	struct handle *link = container_of(link_pub, struct handle, handle);
- 	/* Pointer to the Ceph link content */
-	char *content = NULL;
-+	char content[4096] = {0,};
- 
- 	/* Content points into a static buffer in the Ceph client's
- 	   cache, so we don't have to free it. */
- 
-	rc = ceph_ll_readlink(export->cmount, link->i, &content, 0, 0);
-+	rc = ceph_ll_readlink(export->cmount, link->i,
-+                              content, sizeof content, 0, 0);
- 
- 	if (rc < 0)
- 		return ceph2fsal_error(rc);
--- a/nfs-ganesha-2.0.0-lustre-strict.patch
+++ b/nfs-ganesha-2.0.0-lustre-strict.patch
@ -1,12 +0,0 @@
-diff -up nfs-ganesha-2.0.0/src/FSAL/FSAL_LUSTRE/fsal_handle.h.lustre-strict nfs-ganesha-2.0.0/src/FSAL/FSAL_LUSTRE/fsal_handle.h
--- nfs-ganesha-2.0.0/src/FSAL/FSAL_LUSTRE/fsal_handle.h.lustre-strict	2013-12-10 16:01:48.823633927 -0800
-+++ nfs-ganesha-2.0.0/src/FSAL/FSAL_LUSTRE/fsal_handle.h	2013-12-10 16:02:38.036661006 -0800
-@@ -109,7 +109,7 @@ static inline int lustre_name_to_handle_
- 					   struct lustre_file_handle
- 					   *out_handle, int flags)
- {
-	char path[MAXPATHLEN];
-+	char path[MAXPATHLEN + 2];
- 
- 	if (!mntpath || !at_handle || !name || !out_handle)
- 		return -1;
--- a/nfs-ganesha-2.0.0-no-strict-aliasing.patch
+++ b/nfs-ganesha-2.0.0-no-strict-aliasing.patch
@ -1,12 +0,0 @@
-*** nfs-ganesha-2.0.0/src/CMakeLists.txt.orig	2013-12-11 12:46:24.587001058 -0500
--- nfs-ganesha-2.0.0/src/CMakeLists.txt	2013-12-11 12:47:27.314999423 -0500
-***************
-*** 34,39 ****
--- 34,40 ----
-  
-  # find out which platform we are building on
-  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-strict-aliasing")
-    set(LINUX ON)
-    set(UNIX ON)
-    # Now detects the Linux's distro
--- a/nfs-ganesha-2.0.0rc5.patch
+++ b/nfs-ganesha-2.0.0rc5.patch
@ -1,26 +0,0 @@
--- nfs-ganesha-pre-2.0-RC3/src/os/linux/subr.c.orig	2013-11-04 13:17:41.284000000 -0500
-+++ nfs-ganesha-pre-2.0-RC3/src/os/linux/subr.c	2013-11-04 13:31:05.496000000 -0500
-@@ -127,7 +127,6 @@
- {
- 	uid_t orig_uid = setfsuid(uid);
- 	if (uid != setfsuid(uid)) {
-		setfsuid(orig_uid);
- 		LogCrit(COMPONENT_FSAL, "Could not set user identity");
- 	}
- 	return orig_uid;
-@@ -137,7 +136,6 @@
- {
- 	gid_t orig_gid = setfsgid(gid);
- 	if (gid != setfsgid(gid)) {
-		setfsgid(orig_gid);
- 		LogCrit(COMPONENT_FSAL, "Could not set group identity");
- 	}
- 	return orig_gid;
--- nfs-ganesha-pre-2.0-RC3/src/tools/ganestat.pl.orig	2013-11-04 16:46:40.414916999 -0500
-+++ nfs-ganesha-pre-2.0-RC3/src/tools/ganestat.pl	2013-11-04 16:47:09.108916999 -0500
-@@ -1,4 +1,4 @@
-#!/bin/env perl
-+#!/usr/bin/perl
- #
- ################## Doxygen header ##################
- #*
--- a/nfs-ganesha-2.1.0-cache_inode.patch
+++ b/nfs-ganesha-2.1.0-cache_inode.patch
@ -1,19 +0,0 @@
-*** nfs-ganesha-2.1.0/src/include/cache_inode.h.orig	2015-02-12 11:12:22.218718318 -0500
--- nfs-ganesha-2.1.0/src/include/cache_inode.h	2015-02-12 11:12:37.967718318 -0500
-***************
-*** 879,885 ****
-  cache_inode_status_t cache_inode_invalidate(cache_entry_t *entry,
-  					    uint32_t flags);
-  
-! inline int cache_inode_set_time_current(struct timespec *time);
-  
-  void cache_inode_destroyer(void);
-  
--- 879,885 ----
-  cache_inode_status_t cache_inode_invalidate(cache_entry_t *entry,
-  					    uint32_t flags);
-  
-! int cache_inode_set_time_current(struct timespec *time);
-  
-  void cache_inode_destroyer(void);
-  
--- a/nfs-ganesha-2.1.0-cache_inode_getattr.patch
+++ b/nfs-ganesha-2.1.0-cache_inode_getattr.patch
@ -1,19 +0,0 @@
-*** nfs-ganesha-2.1.0/src/cache_inode/cache_inode_getattr.c.orig	2014-06-27 10:06:09.273133273 -0400
--- nfs-ganesha-2.1.0/src/cache_inode/cache_inode_getattr.c	2014-06-27 10:06:45.677133273 -0400
-***************
-*** 71,77 ****
-  		    cache_inode_getattr_cb_t cb)
-  {
-  	cache_inode_status_t status;
-! 	struct gsh_export *junction_export;
-  	cache_entry_t *junction_entry;
-  	uint64_t mounted_on_fileid;
-  
--- 71,77 ----
-  		    cache_inode_getattr_cb_t cb)
-  {
-  	cache_inode_status_t status;
-! 	struct gsh_export *junction_export = NULL;
-  	cache_entry_t *junction_entry;
-  	uint64_t mounted_on_fileid;
-  
--- a/nfs-ganesha-2.1.0-commonlib.patch
+++ b/nfs-ganesha-2.1.0-commonlib.patch
@ -1,19 +0,0 @@
-*** nfs-ganesha-2.1.0/src/FSAL/commonlib.c.orig	2014-06-27 14:08:23.118133273 -0400
--- nfs-ganesha-2.1.0/src/FSAL/commonlib.c	2014-06-27 14:09:12.677133273 -0400
-***************
-*** 752,758 ****
-  int change_fsid_type(struct fsal_filesystem *fs,
-  		     enum fsid_type fsid_type)
-  {
-! 	uint64_t major, minor;
-  	bool valid = false;
-  
-  	if (fs->fsid_type == fsid_type)
--- 752,758 ----
-  int change_fsid_type(struct fsal_filesystem *fs,
-  		     enum fsid_type fsid_type)
-  {
-! 	uint64_t major = 0, minor = 0;
-  	bool valid = false;
-  
-  	if (fs->fsid_type == fsid_type)
--- a/nfs-ganesha-2.1.0-config-h.in.cmake.patch
+++ b/nfs-ganesha-2.1.0-config-h.in.cmake.patch
@ -1,19 +0,0 @@
-*** nfs-ganesha-2.1.0/src/include/config-h.in.cmake.orig	2014-06-27 11:38:56.845133273 -0400
--- nfs-ganesha-2.1.0/src/include/config-h.in.cmake	2014-06-27 11:39:09.294133273 -0400
-***************
-*** 14,20 ****
-  #define _GIT_HEAD_COMMIT "@_GIT_HEAD_COMMIT@"
-  #define _GIT_DESCRIBE "@_GIT_DESCRIBE@"
-  #define BUILD_HOST "@BUILD_HOST_NAME@"
-! #define FSAL_MODULE_LOC "@MODULES_PATH@/@FSAL_DESTINATION@"
-  /* Build controls */
-  
-  #cmakedefine _MSPAC_SUPPORT 1
--- 14,20 ----
-  #define _GIT_HEAD_COMMIT "@_GIT_HEAD_COMMIT@"
-  #define _GIT_DESCRIBE "@_GIT_DESCRIBE@"
-  #define BUILD_HOST "@BUILD_HOST_NAME@"
-! #define FSAL_MODULE_LOC "/usr/@FSAL_DESTINATION@"
-  /* Build controls */
-  
-  #cmakedefine _MSPAC_SUPPORT 1
--- a/nfs-ganesha-2.1.0-config_parsing.patch
+++ b/nfs-ganesha-2.1.0-config_parsing.patch
@ -1,44 +0,0 @@
-*** nfs-ganesha-2.1.0/src/config_parsing/config_parsing.c.orig	2014-06-27 07:42:33.850133273 -0400
--- nfs-ganesha-2.1.0/src/config_parsing/config_parsing.c	2014-06-27 09:59:59.758133273 -0400
-***************
-*** 1567,1573 ****
-  	struct config_node *sub_node;
-  	struct config_node *top;
-  	struct expr_parse *expr, *expr_head;
-! 	struct config_node_list *list = NULL, *list_tail;
-  	char *ep;
-  	int rc = EINVAL;
-  	bool found = false;
--- 1567,1573 ----
-  	struct config_node *sub_node;
-  	struct config_node *top;
-  	struct expr_parse *expr, *expr_head;
-! 	struct config_node_list *list = NULL, *list_tail = NULL;
-  	char *ep;
-  	int rc = EINVAL;
-  	bool found = false;
-***************
-*** 1599,1607 ****
-  			list->tree_node = sub_node;
-  			if (*node_list == NULL)
-  				*node_list = list;
-! 			else
-  				list_tail->next = list;
-! 			list_tail = list;
-  			found = true;
-  		}
-  	}
--- 1599,1611 ----
-  			list->tree_node = sub_node;
-  			if (*node_list == NULL)
-  				*node_list = list;
-! 			else if (list_tail != NULL)
-  				list_tail->next = list;
-!                         else {
-!                                 for (list_tail = (*node_list)->next;
-!                                      list_tail->next != NULL; )
-!                                      list_tail = list_tail->next;
-!                         }
-  			found = true;
-  		}
-  	}
--- a/nfs-ganesha-2.1.0-nfs4_op_secinfo.patch
+++ b/nfs-ganesha-2.1.0-nfs4_op_secinfo.patch
@ -1,19 +0,0 @@
-*** nfs-ganesha-2.1.0/src/Protocols/NFS/nfs4_op_secinfo.c.orig	2014-06-30 07:54:56.787133273 -0400
--- nfs-ganesha-2.1.0/src/Protocols/NFS/nfs4_op_secinfo.c	2014-06-30 07:55:58.190133273 -0400
-***************
-*** 65,71 ****
-  	cache_entry_t *entry_src = NULL;
-  	sec_oid4 v5oid = { krb5oid.length, (char *)krb5oid.elements };
-  	int num_entry = 0;
-! 	struct export_perms save_export_perms;
-  	struct gsh_export *saved_gsh_export = NULL;
-  
-  	resp->resop = NFS4_OP_SECINFO;
--- 65,71 ----
-  	cache_entry_t *entry_src = NULL;
-  	sec_oid4 v5oid = { krb5oid.length, (char *)krb5oid.elements };
-  	int num_entry = 0;
-! 	struct export_perms save_export_perms = {0,};
-  	struct gsh_export *saved_gsh_export = NULL;
-  
-  	resp->resop = NFS4_OP_SECINFO;
--- a/nfs-ganesha-2.1.0-nfs4_pseudo.patch
+++ b/nfs-ganesha-2.1.0-nfs4_pseudo.patch
@ -1,23 +0,0 @@
-*** nfs-ganesha-2.1.0/src/Protocols/NFS/nfs4_pseudo.c.orig	2014-06-27 10:14:43.556133273 -0400
--- nfs-ganesha-2.1.0/src/Protocols/NFS/nfs4_pseudo.c	2014-06-27 10:17:10.928133273 -0400
-***************
-*** 385,393 ****
-  	/* Now we need to process the rest of the path, creating directories
-  	 * if necessary.
-  	 */
-! 	for (tok = strtok_r(rest, "/", &saveptr);
-! 	     tok;
-! 	     tok = strtok_r(NULL, "/", &saveptr)) {
-  		rc = make_pseudofs_node(tok, &state);
-  		if (!rc) {
-  			/* Release reference on mount point inode
--- 385,393 ----
-  	/* Now we need to process the rest of the path, creating directories
-  	 * if necessary.
-  	 */
-!         saveptr = NULL;
-! 	tok = strtok_r(rest, "/", &saveptr);
-! 	for (; tok; tok = strtok_r(NULL, "/", &saveptr)) {
-  		rc = make_pseudofs_node(tok, &state);
-  		if (!rc) {
-  			/* Release reference on mount point inode
--- a/nfs-ganesha-2.1.0-state_lock.patch
+++ b/nfs-ganesha-2.1.0-state_lock.patch
@ -1,21 +0,0 @@
-*** nfs-ganesha-2.1.0/src/SAL/state_lock.c.orig	2015-02-12 11:44:24.233718318 -0500
--- nfs-ganesha-2.1.0/src/SAL/state_lock.c	2015-02-12 11:45:06.679718318 -0500
-***************
-*** 611,618 ****
-   *
-   * @return New entry or NULL.
-   */
-! inline state_lock_entry_t *state_lock_entry_t_dup(state_lock_entry_t *
-! 						  orig_entry)
-  {
-  	return create_state_lock_entry(orig_entry->sle_entry,
-  				       orig_entry->sle_export,
--- 611,618 ----
-   *
-   * @return New entry or NULL.
-   */
-! static inline state_lock_entry_t *state_lock_entry_t_dup(state_lock_entry_t *
-! 							 orig_entry)
-  {
-  	return create_state_lock_entry(orig_entry->sle_entry,
-  				       orig_entry->sle_export,
--- a/nfs-ganesha-2.1.0-support-CMakeLists.txt.patch
+++ b/nfs-ganesha-2.1.0-support-CMakeLists.txt.patch
@ -1,19 +0,0 @@
-*** nfs-ganesha-2.1.0/src/support/CMakeLists.txt.orig	2014-07-01 11:06:16.219133273 -0400
--- nfs-ganesha-2.1.0/src/support/CMakeLists.txt	2014-07-01 11:05:03.312133273 -0400
-***************
-*** 33,39 ****
-       uid2grp_cache.c
-  )
-  
-! add_library( uid2grp ${uid2grp_SRCS} )
-  
-  ########### next target ###############
-  
--- 33,39 ----
-       uid2grp_cache.c
-  )
-  
-! add_library( uid2grp STATIC ${uid2grp_SRCS} )
-  
-  ########### next target ###############
-  
--- a/nfs-ganesha-2.2.0-CMakeLists.txt.patch
+++ b/nfs-ganesha-2.2.0-CMakeLists.txt.patch
@ -1,72 +0,0 @@
--- nfs-ganesha-2.2-rc6/src/CMakeLists.txt.orig	2015-04-01 15:33:18.887000000 -0400
-+++ nfs-ganesha-2.2-rc6/src/CMakeLists.txt	2015-04-02 12:16:44.245000000 -0400
-@@ -716,12 +716,15 @@
-    set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/portability_cmake_2.8  /usr/share/cmake/Modules ${CMAKE_MODULE_PATH})
- endif( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8" )
- 
-+find_library(LIBNTIRPC ntirpc)  # extended Pthreads functions
-+set(LIBTIRPC_INCLUDE_DIR "/usr/include/ntirpc")
-+
- include_directories(
-   "${PROJECT_BINARY_DIR}/include"
-  "${PROJECT_SOURCE_DIR}/libntirpc/ntirpc/"
-   "${PROJECT_SOURCE_DIR}/include"
-   "${OS_INCLUDE_DIR}"
-   "${KRB5_INCLUDE_DIRS}"
-+  "${LIBTIRPC_INCLUDE_DIR}"
- )
- 
- # Fixup loose bits of autotools legacy
-@@ -732,14 +735,13 @@
-   set(_USE_CB_SIMULATOR ON)
- endif(USE_CB_SIMULATOR)
- 
-
- #callers add:
- #  target_link_libraries(your_library ${LIBTIRPC_LIBRARIES})
-set(LIBTIRPC_INCLUDE_DIR
-  "${PROJECT_BINARY_DIR}/libtirpc/ntirpc"
-  "${PROJECT_BINARY_DIR}/libtirpc/ntirpc/rpc"
-)
-set(LIBTIRPC_LIBRARIES "${PROJECT_BINARY_DIR}/libntirpc/src/libntirpc.a")
-+#set(LIBTIRPC_INCLUDE_DIR
-+#  "${PROJECT_BINARY_DIR}/libtirpc/ntirpc"
-+#  "${PROJECT_BINARY_DIR}/libtirpc/ntirpc/rpc"
-+#)
-+#set(LIBTIRPC_LIBRARIES "${PROJECT_BINARY_DIR}/libntirpc/src/libntirpc.a")
- 
- # Find misc system libs
- find_library(LIBRT rt)  # extended Pthreads functions
-@@ -867,6 +869,7 @@
-   ${KRB5_LIBRARIES}
-   ${CMAKE_THREAD_LIBS_INIT}
-   ${LIBRT}
-+  ${LIBNTIRPC}
- )
- 
- # Config file; make sure it doesn't clobber an existing one
-@@ -877,16 +880,6 @@
- # pre-create PREFIX/var/run/ganesha
- install(DIRECTORY DESTINATION ${SYSSTATEDIR}/run/ganesha)
- 
-IF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/CMakeLists.txt )
-message( FATAL_ERROR
-"No CMakeLists.txt found in libntirpc
-This probably means that the directory was not properly populated.
-Please run the following command to do that and use cmake again:
-    git submodule update --init
-Alternatively, if you are not using git, get the current version at
-    https://github.com/nfs-ganesha/ntirpc" )
-ENDIF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/CMakeLists.txt )
-
- add_subdirectory(log)
- add_subdirectory(config_parsing)
- add_subdirectory(cidr)
-@@ -896,7 +889,6 @@
- add_subdirectory(NodeList)
- add_subdirectory(cache_inode)
- add_subdirectory(SAL)
-add_subdirectory(libntirpc)
- add_subdirectory(RPCAL)
- add_subdirectory(Protocols)
- add_subdirectory(support)
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
--- a/2
+++ b/2
@ -1 +1 @@
-e2d8e66ab4f78e3ecf1582cfa26c7d37  nfs-ganesha-2.2.0.tar.gz
+SHA512 (nfs-ganesha-4.0.tar.gz) = c6ec8146159500f03a4a8b1beb0e03ce79da33c67e8c077d1c7aea8be67d77690839bb7e10c88a9b8a3a8a9cca00ca10851f34f71c6f047956b24e7b7d9a7770