net-libs/neon: Fix building with USE="-gnutls pkcs11 ssl" and >=dev-libs/openssl...
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Sat, 23 Feb 2019 05:03:10 +0000 (06:03 +0100)
committerMike Gilbert <floppym@gentoo.org>
Mon, 25 Feb 2019 21:24:55 +0000 (16:24 -0500)
Fixes: https://bugs.gentoo.org/674554
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
net-libs/neon/neon-0.30.2.ebuild

index e7b2bb04dd15d4033c91f779868a3efda502c70a..cad03d94e6d96216dfff4158b23bb29e46270449 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2001-2019 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -42,6 +42,9 @@ src_prepare() {
        # Use CHOST-prefixed version of xml2-config for cross-compilation.
        sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed"
 
+       # 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.