From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B8C8A138334 for ; Sun, 29 Sep 2019 02:56:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43C9CE0951; Sun, 29 Sep 2019 02:56:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C4A3E0951 for ; Sun, 29 Sep 2019 02:56:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3967534B6B9 for ; Sun, 29 Sep 2019 02:56:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5954A825 for ; Sun, 29 Sep 2019 02:56:44 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1569725773.bb1d232a1eeb428724c2c8e24335ecc17c4a69b7.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/neon/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/neon/neon-0.30.2.ebuild X-VCS-Directories: net-libs/neon/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: bb1d232a1eeb428724c2c8e24335ecc17c4a69b7 X-VCS-Branch: master Date: Sun, 29 Sep 2019 02:56:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c20d00f6-dd94-44c6-9dd4-10f384870131 X-Archives-Hash: ed85ad039729f199639b6117bac0456e commit: bb1d232a1eeb428724c2c8e24335ecc17c4a69b7 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sat Sep 28 02:29:13 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Sep 29 02:56:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb1d232a net-libs/neon: Fix building with dev-libs/libressl-3.0.0. Fixes: https://bugs.gentoo.org/691796 Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Mike Gilbert gentoo.org> net-libs/neon/neon-0.30.2.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild index 506f311c68b..eea871bc8d5 100644 --- a/net-libs/neon/neon-0.30.2.ebuild +++ b/net-libs/neon/neon-0.30.2.ebuild @@ -45,10 +45,12 @@ 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" - # 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" + if has_version "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" + fi eapply_user