glusterfs: 3.10.2 -> 3.12.1

Changes: * The patch `glusterfs-fix-unsubstituted-autoconf-macros` was deleted because the issue was fixed upstream: https://bugzilla.redhat.com/show_bug.cgi?id=1450588 * The `glusterd-ganesha.c` part of `glusterfs-use-PATH-instead-of-hardcodes` was detleted because `glusterd-ganesha.c` was removed upstream without replacement that has the relevant hardcoded paths. Closes #29062
NixOS · Sep 30, 2017 · 8f40840 · 8f40840
1 parent 74db6fa
commit 8f40840
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 270 deletions.
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -15,10 +15,10 @@ let
     #       The command
     #         find /nix/store/...-glusterfs-.../ -name '*.py' -executable
     #       can help with finding new Python scripts.
-    version = "3.10.2";
+    version = "3.12.1";
     name="${baseName}-${version}";
     url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
-    sha256 = "09hpvw42sc77nc3bfv7395wjn7fxvp0n8qnmrlyxq83hf0w81gfs";
+    sha256 = "14l6p2zyjsrnjvf0lipq32p517zk813nqv06pjq6kcqkmy038wdv";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl ncurses readline
@@ -71,7 +71,6 @@ rec {
 
   patches = [
     ./glusterfs-use-PATH-instead-of-hardcodes.patch
-    ./glusterfs-fix-unsubstituted-autoconf-macros.patch
     ./glusterfs-python-remove-find_library.patch
     # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1489610 is fixed
     ./glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch

diff --git a/...s/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch b/...s/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch
@@ -1,27 +1,27 @@
-From 965eb1e08e10ff82bb91d485dc24672acc7c72cf Mon Sep 17 00:00:00 2001
+From f523afac49e24ecc0fa4ad85195135689cf445f0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
-Date: Fri, 8 Sep 2017 00:51:53 +0200
+Date: Wed, 27 Sep 2017 21:36:41 +0200
 Subject: [PATCH] Fix "glusterfind saves var data under $prefix instead of
  localstatedir". Fixes #1489610
 
-Change-Id: I6d71297fb7a5a9d12cc3726b4a4ad94efcd644f9
+Change-Id: Id2362c20f34346c37acfb9eb1ad105d0b7b8b60f
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 0c3a38689..d508fda71 100644
+index f87d8a454..b4d3f5d10 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1057,7 +1057,7 @@ if test "x$prefix" = xNONE; then
- 	prefix=$ac_default_prefix
+@@ -1118,7 +1118,7 @@ if test "x$exec_prefix" = xNONE; then
+ 	exec_prefix="$(eval echo $prefix)"
  fi
- GLUSTERFS_LIBEXECDIR="$(eval echo $prefix)/libexec/glusterfs"
+ GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs"
 -GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd"
 +GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/var/lib/misc/glusterfsd"
  prefix=$old_prefix
+ exec_prefix=$old_exec_prefix
 
- ### Dirty hacky stuff to make LOCALSTATEDIR work
 -- 
 2.12.0
 
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch
@@ -41,29 +41,6 @@ index e9f80fe81..6380dd867 100644
                                 progname, strerror (errno));
  #endif /* GF_LINUX_HOST_OS */
                  exit (1);
-diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
-index da1fee066..dcb9e5725 100644
---- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
-+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
-@@ -122,15 +122,15 @@ manage_service (char *action)
-         int     i               = 0;
-         int     ret             = 0;
-         struct service_command sc_list[] = {
--                { .binary  = "/bin/systemctl",
-+                { .binary  = "systemctl",
-                   .service = "nfs-ganesha",
-                   .action  = sc_systemctl_action
-                 },
--                { .binary  = "/sbin/invoke-rc.d",
-+                { .binary  = "invoke-rc.d",
-                   .service = "nfs-ganesha",
-                   .action  = sc_service_action
-                 },
--                { .binary  = "/sbin/service",
-+                { .binary  = "service",
-                   .service = "nfs-ganesha",
-                   .action  = sc_service_action
-                 },
 diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c
 index 0e6629cf0..fcb4738b7 100644
 --- a/xlators/mgmt/glusterd/src/glusterd-quota.c