git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107635 from markuskowa/upd-ganesha

nfs-ganesha: 3.3 -> 3.4

commite8860f915923b9cf314e2ea88562fc86dc6d4b34 authormarkuskowa <markus.kowalewski@gmail.com> dateSat 26 Dec 2020, 17:05 (6 years ago) parent7bc8c1c61b4bf5
2 files changed+12−5
compare with master
unifiedsplit
pkgs/servers/nfs-ganesha/default.nix+2−2 pkgs/servers/nfs-ganesha/sysstatedir.patch+10−3
pkgs/servers/nfs-ganesha/default.nix+2−2
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "nfs-ganesha";
8− version = "3.3";
8+ version = "3.4";
99
1010 src = fetchFromGitHub {
1111 owner = "nfs-ganesha";
1212 repo = "nfs-ganesha";
1313 rev = "V${version}";
14− sha256 = "1w48rqrbqah0hnirvjdz8lyr9ah8b73j3cgsppb04gnrmpssgmb6";
14+ sha256 = "1qi617ppjjl38mqpbxiqhpxanq9qgqshb87cajs30rqkv9nj811k";
1515 };
1616
1717 patches = [ ./sysstatedir.patch ];
pkgs/servers/nfs-ganesha/sysstatedir.patch+10−3
@@ -1,15 +1,22 @@
11diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
2−index 51697310b..2b5f91075 100644
2+index 2a5795e9f..7314e0594 100644
33--- a/src/include/config-h.in.cmake
44+++ b/src/include/config-h.in.cmake
5−@@ -72,8 +72,8 @@
5+@@ -71,13 +71,13 @@
6+ #cmakedefine HAVE_URCU_REF_GET_UNLESS_ZERO 1
67 #define NFS_GANESHA 1
78
8− #define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf"
9+-#define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf"
910-#define GANESHA_PIDFILE_PATH "@SYSSTATEDIR@/run/ganesha.pid"
1011-#define NFS_V4_RECOV_ROOT "@SYSSTATEDIR@/lib/nfs/ganesha"
12++#define GANESHA_CONFIG_PATH "/etc/ganesha/ganesha.conf"
1113+#define GANESHA_PIDFILE_PATH "/run/ganesha.pid"
1214+#define NFS_V4_RECOV_ROOT "/var/lib/nfs/ganesha"
1315 /**
1416 * @brief Default value for krb5_param.ccache_dir
1517 */
18+-#define DEFAULT_NFS_CCACHE_DIR "@SYSSTATEDIR@/run/ganesha"
19++#define DEFAULT_NFS_CCACHE_DIR "/run/ganesha"
20+
21+ /* We're LGPL'd */
22+ #define _LGPL_SOURCE 1