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 05AE3138334 for ; Thu, 4 Apr 2019 00:10:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 004E4E0958; Thu, 4 Apr 2019 00:10:19 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 C7AB0E0958 for ; Thu, 4 Apr 2019 00:10:17 +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 0F602335D27 for ; Thu, 4 Apr 2019 00:10:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9547576 for ; Thu, 4 Apr 2019 00:09:59 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1554336584.8d445166aaaa9c00abbdc582b73a3e4664ece5ad.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch dev-libs/libzip/libzip-1.5.2-r1.ebuild X-VCS-Directories: dev-libs/libzip/ dev-libs/libzip/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8d445166aaaa9c00abbdc582b73a3e4664ece5ad X-VCS-Branch: master Date: Thu, 4 Apr 2019 00:09:59 +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: 24604a4f-30c7-475f-a7b8-9538ca6a5cdd X-Archives-Hash: c256604e3cd81d922eaf27494422a5e1 commit: 8d445166aaaa9c00abbdc582b73a3e4664ece5ad Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 4 00:09:05 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 4 00:09:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d445166 dev-libs/libzip: Fix USE mbedtls Closes: https://bugs.gentoo.org/680820 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch | 23 +++++++++++++++++++++++ dev-libs/libzip/libzip-1.5.2-r1.ebuild | 2 ++ 2 files changed, 25 insertions(+) diff --git a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch new file mode 100644 index 00000000000..564cc9b79f1 --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch @@ -0,0 +1,23 @@ +From e34b2ed6116ba5e6d3c25cd504d91bb680db92e8 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner +Date: Tue, 2 Apr 2019 15:26:06 +0200 +Subject: [PATCH] mbedtls: link against the correct library + +Inspired by https://github.com/nih-at/libzip/pull/88 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3f252b3f7..f8eb16eeb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,7 +42,7 @@ ELSE() + ENDIF() + IF(ENABLE_MBEDTLS) + FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h) +- FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedtls) ++ FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto) + ELSE() + SET(MBEDTLS_LIBRARIES FALSE) + ENDIF() diff --git a/dev-libs/libzip/libzip-1.5.2-r1.ebuild b/dev-libs/libzip/libzip-1.5.2-r1.ebuild index 795775cb0b0..814a668c430 100644 --- a/dev-libs/libzip/libzip-1.5.2-r1.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r1.ebuild @@ -30,6 +30,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-mbedtls.patch" ) # bug 680820 + pkg_setup() { # Upstream doesn't support building dynamic & static # simultaneously: https://github.com/nih-at/libzip/issues/76