Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/neon/
Date: Mon, 25 Feb 2019 21:25:14
Message-Id: 1551129895.e0556ce3cbc530d36ba9548aedcac376d545b970.floppym@gentoo
1 commit: e0556ce3cbc530d36ba9548aedcac376d545b970
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Sat Feb 23 05:03:10 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 25 21:24:55 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0556ce3
7
8 net-libs/neon: Fix building with USE="-gnutls pkcs11 ssl" and >=dev-libs/openssl-1.1.
9
10 Fixes: https://bugs.gentoo.org/674554
11 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
12 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
13
14 net-libs/neon/neon-0.30.2.ebuild | 5 ++++-
15 1 file changed, 4 insertions(+), 1 deletion(-)
16
17 diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
18 index e7b2bb04dd1..cad03d94e6d 100644
19 --- a/net-libs/neon/neon-0.30.2.ebuild
20 +++ b/net-libs/neon/neon-0.30.2.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2018 Gentoo Foundation
23 +# Copyright 2001-2019 Arfrever Frehtes Taifersar Arahesis and others
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI="6"
27 @@ -42,6 +42,9 @@ src_prepare() {
28 # Use CHOST-prefixed version of xml2-config for cross-compilation.
29 sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed"
30
31 + # Fix compatibility with OpenSSL >=1.1.
32 + sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
33 +
34 # Use OpenSSL <1.1 compatibility code with LibreSSL.
35 # Functions EVP_PKEY_up_ref(), EVP_PKEY_get0_RSA(), RSA_meth_get0_app_data(), RSA_meth_new(), RSA_meth_free(),
36 # RSA_meth_set_priv_enc(), RSA_meth_set0_app_data() are not implemented in LibreSSL 2.5.1.