nixpkgs/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch
Niklas Hambüchen 8f4084004e
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 https://github.com/NixOS/nixpkgs/pull/29062
2017-09-30 14:24:44 +02:00

27 lines
876 B
Diff

From f523afac49e24ecc0fa4ad85195135689cf445f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
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: Id2362c20f34346c37acfb9eb1ad105d0b7b8b60f
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index f87d8a454..b4d3f5d10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1118,7 +1118,7 @@ if test "x$exec_prefix" = xNONE; then
exec_prefix="$(eval echo $prefix)"
fi
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
--
2.12.0