diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2019-05-05 03:45:17 +0200 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2019-05-05 15:04:00 -0400 |
| commit | 4817be8b81641fdc439e4c847d16dad216357cbd (patch) | |
| tree | 1769b7d18c31f6f9eeeda825acad3d61b5e7d3a2 /net-libs/neon | |
| parent | dev-db/sqlite: Delete old versions (<3.27.2). (diff) | |
| download | gentoo-4817be8b81641fdc439e4c847d16dad216357cbd.tar.gz gentoo-4817be8b81641fdc439e4c847d16dad216357cbd.tar.bz2 gentoo-4817be8b81641fdc439e4c847d16dad216357cbd.zip | |
net-libs/neon: Fix building with >=dev-libs/libressl-2.7.
Fixes: https://bugs.gentoo.org/658210
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-libs/neon')
| -rw-r--r-- | net-libs/neon/neon-0.30.2.ebuild | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild index cad03d94e6d9..cead548a3b2e 100644 --- a/net-libs/neon/neon-0.30.2.ebuild +++ b/net-libs/neon/neon-0.30.2.ebuild @@ -45,10 +45,10 @@ src_prepare() { # Fix compatibility with OpenSSL >=1.1. sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed" - # Use OpenSSL <1.1 compatibility code with LibreSSL. - # Functions EVP_PKEY_up_ref(), EVP_PKEY_get0_RSA(), RSA_meth_get0_app_data(), RSA_meth_new(), RSA_meth_free(), - # RSA_meth_set_priv_enc(), RSA_meth_set0_app_data() are not implemented in LibreSSL 2.5.1. - sed -e "s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c src/ne_pkcs11.c || die "sed failed" + # Support LibreSSL. + # Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.1. + sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed" + sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n meth->app_data = app_data;\n return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed" eapply_user |