Content-Type: multipart/mixed;
 boundary=49d5134ff19db7e930f565c56b19e8cdb61ef6c2e32ef3b3340b66cb878d
Mime-Version: 1.0
Date: Wed, 08 Nov 2023 00:07:49 -0600
Message-Id: <CWT7EW1M207L.21UIKZ11LT0H@neon.tech>
Cc: "pgsql-hackers" <pgsql-hackers@postgresql.org>
Subject: Re: Fix use of openssl.path() if openssl isn't found
To: "Michael Paquier" <michael@paquier.xyz>
From: "Tristan Partin" <tristan@neon.tech>
References: <CWSX6P5OUUM5.N7B74KQ06ZP6@neon.tech>
 <ZUsiX0a8hIORUskh@paquier.xyz>
In-Reply-To: <ZUsiX0a8hIORUskh@paquier.xyz>
Archived-At: 
 <https://www.postgresql.org/message-id/CWT7EW1M207L.21UIKZ11LT0H%40neon.tech>
Precedence: bulk

--49d5134ff19db7e930f565c56b19e8cdb61ef6c2e32ef3b3340b66cb878d
Content-Type: multipart/alternative;
 boundary=146d0fcff2255edf4f18d3304ccb6f89d8db3afb861c7cb5b842dbdb333d

--146d0fcff2255edf4f18d3304ccb6f89d8db3afb861c7cb5b842dbdb333d
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Content-Type: text/plain; charset=UTF-8; format=Flowed

On Tue Nov 7, 2023 at 11:53 PM CST, Michael Paquier wrote:
> On Tue, Nov 07, 2023 at 04:06:56PM -0600, Tristan Partin wrote:
> > Found this issue during my Fedora 39 upgrade. Tested that uninstalling
> > openssl still allows the various ssl tests to run and succeed.
>
> Good catch.  You are right that this is inconsistent with what we
> expect in the test.
>
> > +openssl_path =3D ''
> > +if openssl.found()
> > +  openssl_path =3D openssl.path()
> > +endif
> > +
> >  tests +=3D {
> >    'name': 'ssl',
> >    'sd': meson.current_source_dir(),
> > @@ -7,7 +12,7 @@ tests +=3D {
> >    'tap': {
> >      'env': {
> >        'with_ssl': ssl_library,
> > -      'OPENSSL': openssl.path(),
> > +      'OPENSSL': openssl_path,
> >      },
> >      'tests': [
> >        't/001_ssltests.pl',
>
> Okay, that's a nit and it leads to the same result, but why not using
> the same one-liner style like all the other meson.build files that
> rely on optional commands?  See pg_verifybackup, pg_dump, etc.  That
> would be more consistent.

Because I forgot there were ternary statements in Meson :). Thanks for=20
the review. Here is v2.

--=20
Tristan Partin
Neon (https://neon.tech)

--146d0fcff2255edf4f18d3304ccb6f89d8db3afb861c7cb5b842dbdb333d--

--49d5134ff19db7e930f565c56b19e8cdb61ef6c2e32ef3b3340b66cb878d
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename=v2-0001-Fix-use-of-openssl.path-if-openssl-isn-t-found.patch
Content-Type: text/x-patch; charset=utf-8;
 name=v2-0001-Fix-use-of-openssl.path-if-openssl-isn-t-found.patch

RnJvbSA1ZmMwNDYwYjBiODViOGYwNDk3NjE4MmMwZjZlYzY1MGM0MGRmODMzIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBUcmlzdGFuIFBhcnRpbiA8dHJpc3RhbkBuZW9uLnRlY2g+CkRh
dGU6IFR1ZSwgNyBOb3YgMjAyMyAxNTo1OTowNCAtMDYwMApTdWJqZWN0OiBbUEFUQ0ggdjJdIEZp
eCB1c2Ugb2Ygb3BlbnNzbC5wYXRoKCkgaWYgb3BlbnNzbCBpc24ndCBmb3VuZAoKb3BlbnNzbCgx
KSBpcyBhbiBvcHRpb25hbCBkZXBlbmRlbmN5IG9mIHRoZSBQb3N0Z3JlcyBNZXNvbiBidWlsZCwg
YnV0CndhcyBpbmFkdmVydGFudGx5IHJlcXVpcmVkIHdoZW4gZGVmaW5pbmcgc29tZSBTU0wgdGVz
dHMuCi0tLQogc3JjL3Rlc3Qvc3NsL21lc29uLmJ1aWxkIHwgMiArLQogMSBmaWxlIGNoYW5nZWQs
IDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL3Rlc3Qvc3Ns
L21lc29uLmJ1aWxkIGIvc3JjL3Rlc3Qvc3NsL21lc29uLmJ1aWxkCmluZGV4IDRjZGE4MWYzYmMu
LmVkODNjNDM4ZWYgMTAwNjQ0Ci0tLSBhL3NyYy90ZXN0L3NzbC9tZXNvbi5idWlsZAorKysgYi9z
cmMvdGVzdC9zc2wvbWVzb24uYnVpbGQKQEAgLTcsNyArNyw3IEBAIHRlc3RzICs9IHsKICAgJ3Rh
cCc6IHsKICAgICAnZW52JzogewogICAgICAgJ3dpdGhfc3NsJzogc3NsX2xpYnJhcnksCi0gICAg
ICAnT1BFTlNTTCc6IG9wZW5zc2wucGF0aCgpLAorICAgICAgJ09QRU5TU0wnOiBvcGVuc3NsLmZv
dW5kKCkgPyBvcGVuc3NsLnBhdGggOiAnJywKICAgICB9LAogICAgICd0ZXN0cyc6IFsKICAgICAg
ICd0LzAwMV9zc2x0ZXN0cy5wbCcsCi0tIApUcmlzdGFuIFBhcnRpbgpOZW9uIChodHRwczovL25l
b24udGVjaCkKCg==
--49d5134ff19db7e930f565c56b19e8cdb61ef6c2e32ef3b3340b66cb878d--