Unverified Commit dec41d49 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #225105 from tylerjl/gluster-10.3 

glusterfs: 10.1 -> 10.3
parents 9695631f 3f70428b

pkgs/tools/filesystems/glusterfs/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch

+1 −1
Original line number Diff line number Diff line
@@ -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)