alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nfs-ganesha: 3.3 -> 3.4

Browse source
This commit is contained in:
Markus Kowalewski 2020-12-26 14:22:38 +01:00
parent 1e40e796af
commit 61b4bf53f0
No known key found for this signature in database
GPG key ID: D865C8A91D7025EB
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/nfs-ganesha/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nfs-ganesha"; pname = "nfs-ganesha";
version = "3.3"; version = "3.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nfs-ganesha"; owner = "nfs-ganesha";
repo = "nfs-ganesha"; repo = "nfs-ganesha";
rev = "V${version}"; rev = "V${version}";
sha256 = "1w48rqrbqah0hnirvjdz8lyr9ah8b73j3cgsppb04gnrmpssgmb6"; sha256 = "1qi617ppjjl38mqpbxiqhpxanq9qgqshb87cajs30rqkv9nj811k";
}; };
patches = [ ./sysstatedir.patch ]; patches = [ ./sysstatedir.patch ];

13
pkgs/servers/nfs-ganesha/sysstatedir.patch
View file

@ -1,15 +1,22 @@
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 51697310b..2b5f91075 100644 index 2a5795e9f..7314e0594 100644
--- a/src/include/config-h.in.cmake --- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake +++ b/src/include/config-h.in.cmake
@@ -72,8 +72,8 @@ @@ -71,13 +71,13 @@
#cmakedefine HAVE_URCU_REF_GET_UNLESS_ZERO 1
#define NFS_GANESHA 1 #define NFS_GANESHA 1
#define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf" -#define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf"
-#define GANESHA_PIDFILE_PATH "@SYSSTATEDIR@/run/ganesha.pid" -#define GANESHA_PIDFILE_PATH "@SYSSTATEDIR@/run/ganesha.pid"
-#define NFS_V4_RECOV_ROOT "@SYSSTATEDIR@/lib/nfs/ganesha" -#define NFS_V4_RECOV_ROOT "@SYSSTATEDIR@/lib/nfs/ganesha"
+#define GANESHA_CONFIG_PATH "/etc/ganesha/ganesha.conf"
+#define GANESHA_PIDFILE_PATH "/run/ganesha.pid" +#define GANESHA_PIDFILE_PATH "/run/ganesha.pid"
+#define NFS_V4_RECOV_ROOT "/var/lib/nfs/ganesha" +#define NFS_V4_RECOV_ROOT "/var/lib/nfs/ganesha"
/** /**
* @brief Default value for krb5_param.ccache_dir * @brief Default value for krb5_param.ccache_dir
*/ */
-#define DEFAULT_NFS_CCACHE_DIR "@SYSSTATEDIR@/run/ganesha"
+#define DEFAULT_NFS_CCACHE_DIR "/run/ganesha"
/* We're LGPL'd */
#define _LGPL_SOURCE 1