From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1084173-garchives=archives.gentoo.org@lists.gentoo.org>
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 8E6B0138334
for <garchives@archives.gentoo.org>; Thu, 18 Apr 2019 13:08:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 45C8EE09C1;
Thu, 18 Apr 2019 13:08:10 +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 036A0E09C1
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Apr 2019 13:08:09 +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 1C32B34148E
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Apr 2019 13:08:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C328580
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Apr 2019 13:08:06 +0000 (UTC)
From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" <anarchy@gentoo.org>
Message-ID: <1555592877.f96d4ac794cdc1a5cf6a20ef57c22e6e9234beaf.anarchy@gentoo>
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/torbrowser/
X-VCS-Repository: proj/mozilla
X-VCS-Files: www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r1.ebuild
X-VCS-Directories: www-client/torbrowser/
X-VCS-Committer: anarchy
X-VCS-Committer-Name: Jory Pratt
X-VCS-Revision: f96d4ac794cdc1a5cf6a20ef57c22e6e9234beaf
X-VCS-Branch: master
Date: Thu, 18 Apr 2019 13:08:06 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ef5775a3-1641-45dd-be72-e263ad5710bd
X-Archives-Hash: c842cfb820d592a9e3b1e81e0d4fda5e
commit: f96d4ac794cdc1a5cf6a20ef57c22e6e9234beaf
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 13:07:57 2019 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 13:07:57 2019 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=f96d4ac7
www-client/torbrowser: use system nss/nspr misc other cleanup
Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r1.ebuild | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r1.ebuild b/www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r1.ebuild
index 0690db2..bfe9bcb 100644
--- a/www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r1.ebuild
+++ b/www-client/torbrowser/torbrowser-60.6.1.8.0.8.1.1-r1.ebuild
@@ -57,6 +57,8 @@ RESTRICT="primaryuri"
ASM_DEPEND=">=dev-lang/yasm-1.1"
RDEPEND="
+ >=dev-libs/nss-3.36.7
+ >=dev-libs/nspr-4.19
>=net-vpn/tor-0.3.3.9
system-icu? ( >=dev-libs/icu-60.2 )
jack? ( virtual/jack )
@@ -236,11 +238,6 @@ src_configure() {
mozconfig_annotate 'torbrowser' --with-tor-browser-version="${TOR_PV}"
mozconfig_annotate 'torbrowser' --disable-tor-browser-update
- # torbrowser uses a patched nss library
- # see https://gitweb.torproject.org/tor-browser.git/log/security/nss?h=tor-browser-60.2.0esr-8.0-1-build1
- mozconfig_annotate 'torbrowser' --without-system-nspr
- mozconfig_annotate 'torbrowser' --without-system-nss
-
echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
echo "mk_add_options XARGS="${EPREFIX}"/usr/bin/xargs" >> "${S}"/.mozconfig
@@ -262,7 +259,6 @@ src_compile() {
src_install() {
cd "${BUILD_OBJ_DIR}" || die
- export LD_LIBRARY_PATH="${BUILD_OBJ_DIR}/dist/bin"
# Pax mark xpcshell for hardened support, only used for startupcache creation.
pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
@@ -319,11 +315,6 @@ src_install() {
dodoc "${FILESDIR}/99torbrowser.example"
dodoc "${WORKDIR}/tor-browser_en-US/Browser/TorBrowser/Docs/ChangeLog.txt"
-
- # Profile without the tor-launcher extension
- # see: https://trac.torproject.org/projects/tor/ticket/10160
- rm "${MOZILLA_FIVE_HOME}/defaults/profile/extensions/tor-launcher@torproject.org.xpi" || die \
- "Failed to remove torlauncher extension"
}
pkg_preinst() {