diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2019-12-06 16:00:36 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2019-12-06 16:00:36 +0000 |
| commit | 6a9a1171e6954e63ac9c00ef913b4f7167b1947d (patch) | |
| tree | 4c1b71283a6d7be3a4c96658744cf9b75f566bdd /databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc | |
| parent | MOVED: Pet MOVEDlint (diff) | |
databases/percona57-{server,client} update to 5.7.27-30 release
percona57-client:
- Install compat pkgconfig symlink as well as it done for libs
(many packages still search for mysqlclient.pc only)
percona57-server:
- Proper use system lz4/zstd libs for rocksdb engine
- Declare system libevent to use instead of bundled one
- Stop pollute libdata/pkgconfig dir with unneeded .pc file
- Unbreak build with DEFAULT_VERSIONS+=ssl=libressl
PR: 239347
Submitted by: fluffy [cleanups], Igor Zabelin [update]
Approved by: maintainer (timeout, >3 months)
Diffstat (limited to 'databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc')
| -rw-r--r-- | databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc b/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc new file mode 100644 index 000000000000..56a64a6300a5 --- /dev/null +++ b/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc @@ -0,0 +1,21 @@ +--- mysys_ssl/my_crypt.cc.orig 2019-05-16 05:06:00 UTC ++++ mysys_ssl/my_crypt.cc +@@ -30,7 +30,7 @@ + #include <boost/move/unique_ptr.hpp> + #include <boost/core/noncopyable.hpp> + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf) + #define RAND_OpenSSL() RAND_SSLeay() + #endif +@@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX() + MyEncryptionCTX::~MyEncryptionCTX() + { + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL) + EVP_CIPHER_CTX_cleanup(ctx); + delete ctx; + ERR_remove_thread_state(0); |