From 3f70428b1c546bcf0cf5aa6bf3cdcb346c823119 Mon Sep 17 00:00:00 2001 From: Tyler Langlois Date: Thu, 6 Apr 2023 22:13:32 -0600 Subject: [PATCH] glusterfs: 10.1 -> 10.3 --- pkgs/tools/filesystems/glusterfs/default.nix | 4 ++-- pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index a1d09df7e609..ccaabf5f2841 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -55,13 +55,13 @@ let ]; in stdenv.mkDerivation rec { pname = "glusterfs"; - version = "10.1"; + version = "10.3"; src = fetchFromGitHub { owner = "gluster"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vVFC2kQNneaOwrezPehOX32dpJb88ZhGHBApEXc9MOg="; + sha256 = "sha256-2+zdEbvXwfjAyeWpy0TAWRE0kvqSUqebmRyuhdfzYd0="; }; inherit buildInputs propagatedBuildInputs; diff --git a/pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch b/pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch index 5964e14787e7..71b632e12eae 100644 --- a/pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch +++ b/pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch @@ -7,7 +7,7 @@ index fb8db11e9e..4c40683057 100644 dnl Find out OpenSSL trusted certificates path AC_MSG_CHECKING([for OpenSSL trusted certificates path]) -SSL_CERT_PATH=$(openssl version -d | sed -e 's|OPENSSLDIR: "\(.*\)".*|\1|') --if test -d $SSL_CERT_PATH 1>/dev/null 2>&1; then +-if test -d "${SSL_CERT_PATH}" 1>/dev/null 2>&1; then - AC_MSG_RESULT([$SSL_CERT_PATH]) - AC_DEFINE_UNQUOTED(SSL_CERT_PATH, ["$SSL_CERT_PATH"], [Path to OpenSSL trusted certificates.]) - AC_SUBST(SSL_CERT_PATH)