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 1D6301382C5 for ; Fri, 20 Apr 2018 16:24:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 543E0E0946; Fri, 20 Apr 2018 16:24:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 15E08E0946 for ; Fri, 20 Apr 2018 16:24:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 77AA3335C77 for ; Fri, 20 Apr 2018 16:24:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16C0C257 for ; Fri, 20 Apr 2018 16:24:39 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1524241468.c3de07e5236962952d47815e6ab96c46cd38dfd0.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/gsoap/, net-libs/gsoap/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch net-libs/gsoap/gsoap-2.8.51.ebuild X-VCS-Directories: net-libs/gsoap/ net-libs/gsoap/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: c3de07e5236962952d47815e6ab96c46cd38dfd0 X-VCS-Branch: master Date: Fri, 20 Apr 2018 16:24:39 +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-Archives-Salt: ac17cf7c-2c7c-46f9-854a-70ad7257d56f X-Archives-Hash: a9967449e256b81b9a7b792410b5144f commit: c3de07e5236962952d47815e6ab96c46cd38dfd0 Author: Aaron Bauman gentoo org> AuthorDate: Fri Apr 20 16:24:17 2018 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Fri Apr 20 16:24:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3de07e5 net-libs/gsoap: compatibility patch for LibreSSL This patch fixes building with dev-libs/libressl-2.6.4. This patch will not be needed once dev-libs/libressl-2.7.x goes stable. Additionally, fix slot/subslot modifier to ensure rebuilds are trigged for API changes. Closes: https://bugs.gentoo.org/617264 Package-Manager: Portage-2.3.31, Repoman-2.3.9 .../gsoap-2.8.51-libressl-2.6-compatibility.patch | 38 ++++++++++++++++++++++ net-libs/gsoap/gsoap-2.8.51.ebuild | 7 ++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch b/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch new file mode 100644 index 00000000000..8f13a39d32c --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch @@ -0,0 +1,38 @@ +--- a/gsoap/plugin/smdevp.c 2018-04-20 15:45:25.112658174 +0000 ++++ b/gsoap/plugin/smdevp.c 2018-04-20 15:47:58.826360980 +0000 +@@ -479,7 +479,7 @@ + /* allocate and init the OpenSSL HMAC or EVP_MD context */ + if ((alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) + { +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + data->ctx = (void*)SOAP_MALLOC(soap, sizeof(HMAC_CTX)); + if (data->ctx) + HMAC_CTX_init((HMAC_CTX*)data->ctx); +@@ -489,7 +489,7 @@ + } + else + { +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + data->ctx = (void*)SOAP_MALLOC(soap, sizeof(EVP_MD_CTX)); + if (data->ctx) + EVP_MD_CTX_init((EVP_MD_CTX*)data->ctx); +@@ -642,7 +642,7 @@ + *len = (int)n; + } + /* cleanup */ +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) + HMAC_CTX_cleanup((HMAC_CTX*)data->ctx); + else +@@ -687,7 +687,7 @@ + } + if (data->ctx) + { +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) + HMAC_CTX_cleanup((HMAC_CTX*)data->ctx); + else diff --git a/net-libs/gsoap/gsoap-2.8.51.ebuild b/net-libs/gsoap/gsoap-2.8.51.ebuild index 345507edae7..5dd67d3686f 100644 --- a/net-libs/gsoap/gsoap-2.8.51.ebuild +++ b/net-libs/gsoap/gsoap-2.8.51.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,7 @@ RDEPEND=" gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) + libressl? ( dev-libs/libressl:0= ) ) " DEPEND="${RDEPEND} @@ -41,6 +41,9 @@ src_prepare() { # enable shared libs https://bugs.gentoo.org/583398 eapply "${FILESDIR}/${PN}-2.7.40-shared_libs.patch" + # fix building with libressl-2.6.x. This will not be needed when 2.7.x goes stable + eapply "${FILESDIR}/${PN}-2.8.51-libressl-2.6-compatibility.patch" + eautoreconf }