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 D21D91382C5 for ; Mon, 11 Jan 2021 16:06:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DE13E09E2; Mon, 11 Jan 2021 16:06:45 +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 DF90CE09DB for ; Mon, 11 Jan 2021 16:06:44 +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 D1CFB341031 for ; Mon, 11 Jan 2021 16:06:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56BF53A6 for ; Mon, 11 Jan 2021 16:06:42 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1610381191.be4a30e09ac98d66661074a4d4a88b92c6268be8.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/zoom/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/zoom/zoom-5.4.53391.1108-r1.ebuild X-VCS-Directories: net-im/zoom/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: be4a30e09ac98d66661074a4d4a88b92c6268be8 X-VCS-Branch: master Date: Mon, 11 Jan 2021 16:06:42 +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: be2b02f1-55e6-470b-86c8-7a77de3d1132 X-Archives-Hash: 9f6bde64b22859c3848f38200e0fcc44 commit: be4a30e09ac98d66661074a4d4a88b92c6268be8 Author: Ulrich Müller gentoo org> AuthorDate: Mon Jan 11 15:56:07 2021 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Jan 11 16:06:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be4a30e0 net-im/zoom: Backport ebuild changes to x86 version Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Ulrich Müller gentoo.org> net-im/zoom/zoom-5.4.53391.1108-r1.ebuild | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild b/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild index 3d3b63c3854..07911c9877c 100644 --- a/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild +++ b/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -48,7 +48,8 @@ RDEPEND="!games-engines/zoom pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib )" -BDEPEND="dev-util/bbe" +BDEPEND="dev-util/bbe + bundled-libjpeg-turbo? ( dev-util/patchelf )" QA_PREBUILT="opt/zoom/*" @@ -67,6 +68,11 @@ src_prepare() { bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die mv zoom.tmp zoom || die fi + + if use bundled-libjpeg-turbo; then + # Remove insecure RPATH from bundled lib + patchelf --remove-rpath libturbojpeg.so || die + fi } src_install() { @@ -101,14 +107,6 @@ pkg_postinst() { ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1 done readme.gentoo_print_elog - - if use bundled-libjpeg-turbo; then - ewarn "If the \"bundled-libjpeg-turbo\" flag is enabled, you may see a" - ewarn "QA notice about insecure RPATHs in the libturbojpeg.so library" - ewarn "bundled with the upstream package. Please report this problem" - ewarn "directly to Zoom upstream. Do *not* file a Gentoo bug for it." - ewarn "See https://bugs.gentoo.org/715106 for further details." - fi } pkg_postrm() {