File: 06-hardcode-ssl-path.diff

package info (click to toggle)
glusterfs 11.2-1
  • links: PTS
  • area: main
  • in suites: forky, sid
  • size: 28,240 kB
  • sloc: ansic: 471,238; sh: 45,610; python: 16,893; perl: 3,328; makefile: 2,014; yacc: 487; ruby: 171; lisp: 124; xml: 75; lex: 61
file content (21 lines) | stat: -rw-r--r-- 1,120 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
# On Debian like systems the output of openssl version -d is /usr/lib/ssl,
# where are symlinks in it to the correct directories in /etc/ssl.
# But glusterfs hardcodes the certificate files to be placed directly in
# /usr/lib/ssl, without the correct subdirectories. So that it is possible
# again to store the certificate data in /etc/ssl/ we hardcode the path now.
# A better solution would be to configure the paths in the volfiles, but that
# is not possible, yet.
# Closes: #1056193

diff -Naur glusterfs-11.1.orig/configure.ac glusterfs-11.1/configure.ac
--- glusterfs-11.1.orig/configure.ac	2023-11-06 16:24:25.401026631 +0100
+++ glusterfs-11.1/configure.ac	2023-12-12 11:59:20.278889134 +0100
@@ -803,7 +803,7 @@
 
 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|')
+SSL_CERT_PATH=/etc/ssl
 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.])