pg.ddx.io pgsql-hackers@postgresql.org mailing list archive
help / color / mirror / Atom feed From: Tristan Partin <tristan@neon.tech>
To: pgsql-hackers <pgsql-hackers@postgresql.org>
Subject: Fix use of openssl.path() if openssl isn't found
Date: Tue, 07 Nov 2023 16:06:56 -0600
Message-ID: <CWSX6P5OUUM5.N7B74KQ06ZP6@neon.tech> (raw )
Found this issue during my Fedora 39 upgrade. Tested that uninstalling
openssl still allows the various ssl tests to run and succeed.
--
Tristan Partin
Neon (https://neon.tech )
Attachments:
v1-0001-Fix-use-of-openssl.path-if-openssl-isn-t-found.patch (text/x-patch, 1.1K) download
From d684d6fc1546335804d2ed82ff909991965a61a8 Mon Sep 17 00:00:00 2001
From: Tristan Partin <tristan@neon.tech>
Date: Tue, 7 Nov 2023 15:59:04 -0600
Subject: [PATCH v1] Fix use of openssl.path() if openssl isn't found
openssl(1) is an optional dependency of the Postgres Meson build, but
was inadvertantly required when defining some SSL tests.
---
src/test/ssl/meson.build | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/test/ssl/meson.build b/src/test/ssl/meson.build
index 4cda81f3bc..c3ffcaa032 100644
--- a/src/test/ssl/meson.build
+++ b/src/test/ssl/meson.build
@@ -1,5 +1,10 @@
# Copyright (c) 2022-2023, PostgreSQL Global Development Group
+openssl_path = ''
+if openssl.found()
+ openssl_path = openssl.path()
+endif
+
tests += {
'name': 'ssl',
'sd': meson.current_source_dir(),
@@ -7,7 +12,7 @@ tests += {
'tap': {
'env': {
'with_ssl': ssl_library,
- 'OPENSSL': openssl.path(),
+ 'OPENSSL': openssl_path,
},
'tests': [
't/001_ssltests.pl',
--
Tristan Partin
Neon (https://neon.tech)
view thread (5+ messages) latest in thread
Message-ID: <CWSX6P5OUUM5.N7B74KQ06ZP6@neon.tech>
Permalink: ../CWSX6P5OUUM5.N7B74KQ06ZP6@neon.tech/
Also on: postgresql.org/message-id/CWSX6P5OUUM5.N7B74KQ06ZP6@neon.tech
copy link · copy postgr.es · copy git am
reply Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-hackers@postgresql.org
Cc: tristan@neon.tech
Subject: Re: Fix use of openssl.path() if openssl isn't found
In-Reply-To: <CWSX6P5OUUM5.N7B74KQ06ZP6@neon.tech>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox