www-client/torbrowser: Tor Browser 8.0.2

see https://blog.torproject.org/new-release-tor-browser-802

Package-Manager: Portage-2.3.49, Repoman-2.3.10
RepoMan-Options: --ignore-arches

www-client/torbrowser/Manifest

 DIST firefox-60.0-patches-03.tar.xz 111764 BLAKE2B dd6fca1a7dad526cf1bdebb606773fab6bbb18e3cd601252f5b627e3d5ccb50a60bdc3ca228b1ed57d8b2334275fe5ef2669f8c98f8acf278effdb9dc7fc61df SHA512 24a09df0e785cd9ba71ae6baee33ef159c1fc3b580784f7d20a775dc846aaa51d660eca67e284960af72651d245236623a0736695c76be75a8b395e5b69ba1ce
-DIST tor-browser-60.2.0esr-8.0-1-build5.tar.gz 384227085 BLAKE2B fd8b9849427280f001615f648dcf78975c422cde0dcf01492fbf7a8a90a1708751fa39ef8ac628c4957f4fa28f8a7d7473af8ad1b93b91fed599623118c59e50 SHA512 bbcaa666c773d78a7d37286cd1f7539242c97e222ddb84624c3d55b5cf61d0fca49dce7b621b5546239a914a7682912b5154820e1fb41b468481dd99acf8ce16
-DIST tor-browser-linux32-8.0.1_en-US.tar.xz 76435584 BLAKE2B 38f4dad9fb6b1c547c538441526a6b508b0dcd0abc26e9c3928d79176c170ec8bb87be2d500e9d486dee30646ecaaa0e9eae59a7278d9f3052fcc33aff020952 SHA512 e8324dc407876cb58d16f221c83b9b20e3b6a7962ca8b03f8f15805cc5aadbc691be2f1a60a2cc2607f25160dfda2d7e2dd388551bb93e6c20ecfec46ff06035
-DIST tor-browser-linux64-8.0.1_en-US.tar.xz 74906040 BLAKE2B e8ecc703c7761731d8b34dfdc490dd083032cedf61e950b636de49a724e63682889f10745764e784e1ddbce704db9c1392a6521eb045366365e04974d9ae482e SHA512 24df502b4d23dfe73b69dff0a0544f177b58e76d16f6afa6eebe4d38cbe4329bc7868b6bbda43c4c6ba5f1c8f04d70903f2fc56d44474d0e6b7ad11c329d8e18
+DIST tor-browser-60.2.1esr-8.0-1-build1.tar.gz 384291832 BLAKE2B b2045beea557ef2112581bef1dde726bd84bd0244b40fe045a26d04730d53cb881891b229ff14b51459a913db6137ee319adc640ec97eec6981539f58345155f SHA512 c80596ab1b0fee6b9881ee5f3fbeec92b8033366c895d659b02cb0457194ae0ac3c427d0704a00b3447b92b7d1863064631b9189adfce824f51f98d4382c63f6
+DIST tor-browser-linux32-8.0.2_en-US.tar.xz 76445056 BLAKE2B a4ac9c78e638a589c324c9dc7e3be9c4b47574983289417d4d2fe5b360b4f60ab7b9753f6f32eed91aa9d277670089a2bfddb6f3c6a85b3be4f54ce63749a809 SHA512 326ee0a910862cbe5ecf519e0a5f49ecb6baac85f1e414e69d37a68a04013565a41c66dc71b2adb028d7c5a76978c639dbf25d98e24bf6fd7d146f1a4e9ef397
+DIST tor-browser-linux64-8.0.2_en-US.tar.xz 74913044 BLAKE2B bc87499a7556afa174493ac8659939bd2f8caf3a9d72689feda7b56a651c1ba185030d36435f8b065f9e11bc1fd132fb9f3e5a583606c785ba826a513a9c1a83 SHA512 6cccd91fe3137f0d5fd1c71c0857c7258415a2b078277fd90b5dcdd3cce8e8bcd536a1f3e5fb7f03119cac37d47e1e8f0e739566d5c8144306075ec46b260a18

www-client/torbrowser/files/firefox-60.0-blessings-TERM.patch

+https://github.com/erikrose/blessings/pull/137
+
+Fixes: https://bugs.gentoo.org/654316
+
+From 5fefc65c306cf9ec492e7b422d6bb4842385afbc Mon Sep 17 00:00:00 2001
+From: Jay Kamat <jaygkamat@gmail.com>
+Date: Fri, 24 Aug 2018 11:11:57 -0700
+Subject: [PATCH 1/2] Fix error when TERM is unset or improperly set
+
+---
+ blessings/__init__.py | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/blessings/__init__.py b/blessings/__init__.py
+index 98b75c3..3872b5f 100644
+--- a/third_party/python/blessings/blessings/__init__.py
++++ b/third_party/python/blessings/blessings/__init__.py
+@@ -94,8 +94,13 @@ def __init__(self, kind=None, stream=None, force_styling=False):
+             # init sequences to the stream if it has a file descriptor, and
+             # send them to stdout as a fallback, since they have to go
+             # somewhere.
+-            setupterm(kind or environ.get('TERM', 'unknown'),
+-                      self._init_descriptor)
++            try:
++                setupterm(kind or environ.get('TERM', 'dumb') or 'dumb',
++                          self._init_descriptor)
++            except:
++                # There was an error setting up the terminal, either curses is
++                # not supported or TERM is incorrectly set. Fall back to dumb.
++                self._does_styling = False
+ 
+         self.stream = stream
+ 
+
+From d885df78c6f931abf3259343aaaa897e16c8cba1 Mon Sep 17 00:00:00 2001
+From: Jay Kamat <jaygkamat@gmail.com>
+Date: Sat, 1 Sep 2018 13:20:32 -0700
+Subject: [PATCH 2/2] Explicitly catch curses.error
+
+---
+ blessings/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/blessings/__init__.py b/blessings/__init__.py
+index 3872b5f..fdceb09 100644
+--- a/third_party/python/blessings/blessings/__init__.py
++++ b/third_party/python/blessings/blessings/__init__.py
+@@ -97,7 +97,7 @@ def __init__(self, kind=None, stream=None, force_styling=False):
+             try:
+                 setupterm(kind or environ.get('TERM', 'dumb'),
+                           self._init_descriptor)
+-            except:
++            except curses.error:
+                 # There was an error setting up the terminal, either curses is
+                 # not supported or TERM is incorrectly set. Fall back to dumb.
+                 self._does_styling = False
+
+
+--- a/python/mach/mach/logging.py
++++ b/python/mach/mach/logging.py
+@@ -93,7 +93,7 @@
+ 
+     def set_terminal(self, terminal):
+         self.terminal = terminal
+-        self._sgr0 = blessings.tigetstr('sgr0') or '' if terminal and blessings else ''
++        self._sgr0 = terminal.normal if terminal and blessings else ''
+ 
+     def format(self, record):
+         f = record.msg.format(**record.params)
+ 

www-client/torbrowser/files/firefox-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch

+https://bugs.gentoo.org/667096
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1480554
+--- a/security/sandbox/linux/SandboxOpenedFiles.cpp
++++ b/security/sandbox/linux/SandboxOpenedFiles.cpp
+@@ -4,16 +4,17 @@
+  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+  * You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+ #include "SandboxOpenedFiles.h"
+ 
+ #include "mozilla/Move.h"
+ #include "SandboxLogging.h"
+ 
++#include <errno.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ 
+ namespace mozilla {
+ 
+ // The default move constructor almost works, but Atomic isn't
+ // move-constructable and the fd needs some special handling.
+ SandboxOpenedFile::SandboxOpenedFile(SandboxOpenedFile&& aMoved)
+
+
+
+

www-client/torbrowser/torbrowser-60.2.0_p801.ebuild → www-client/torbrowser/torbrowser-60.2.1_p802.ebuild

@@ -6,7 +6,7 @@ WANT_AUTOCONF="2.1"
 MOZ_ESR="1"
 
 PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads'
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
 
 MY_PN="firefox"
 if [[ ${MOZ_ESR} == 1 ]]; then
@@ -15,8 +15,8 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # see https://gitweb.torproject.org/builders/tor-browser-build.git/tree/projects/firefox/config?h=maint-8.0#n4
-TOR_PV="8.0.1"
-TOR_COMMIT="tor-browser-${MOZ_PV}-${TOR_PV%.*}-1-build5"
+TOR_PV="8.0.2"
+TOR_COMMIT="tor-browser-${MOZ_PV}-${TOR_PV%.*}-1-build1"
 
 # Patch version
 PATCH="${MY_PN}-60.0-patches-03"
@@ -101,7 +101,10 @@ src_prepare() {
 	# Apply gentoo firefox patches
 	rm "${WORKDIR}/firefox/2005_ffmpeg4.patch"
 	eapply "${WORKDIR}/firefox"
-	eapply "${FILESDIR}/bug_1461221.patch"
+
+	eapply "${FILESDIR}"/bug_1461221.patch
+	eapply "${FILESDIR}"/firefox-60.0-blessings-TERM.patch # 654316
+	eapply "${FILESDIR}"/firefox-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
 
 	# Revert "Change the default Firefox profile directory to be TBB-relative"
 	eapply "${FILESDIR}/${PN}-60.2.0-Change_the_default_Firefox_profile_directory.patch"
@@ -169,8 +172,20 @@ src_configure() {
 		mozconfig_use_enable hardened hardening
 	fi
 
+	# Disable built-in ccache support to avoid sandbox violation, #665420
+	# Use FEATURES=ccache instead!
+	mozconfig_annotate '' --without-ccache
+	sed -i -e 's/ccache_stats = None/return None/' \
+		python/mozbuild/mozbuild/controller/building.py || \
+		die "Failed to disable ccache stats call"
+
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
 
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
+		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
+	fi
+
 	# Use .mozconfig settings from torbrowser (setting this here since it gets overwritten by mozcoreconf-v6.eclass)
 	# see https://gitweb.torproject.org/tor-browser.git/tree/.mozconfig?h=tor-browser-60.2.0esr-8.0-1
 	echo "mk_add_options MOZ_APP_DISPLAYNAME=\"Tor Browser\"" >> "${S}"/.mozconfig
@@ -262,7 +277,7 @@ src_install() {
 
 	# see: https://gitweb.torproject.org/builders/tor-browser-build.git/tree/projects/tor-browser/RelativeLink/start-tor-browser?h=maint-8.0
 	# see: https://github.com/Whonix/anon-ws-disable-stacked-tor/blob/master/usr/lib/anon-ws-disable-stacked-tor/torbrowser.sh
-	rm "${D}/usr/bin/torbrowser" || die # symlink to /usr/lib64/torbrowser/torbrowser
+	rm "${ED%/}"/usr/bin/torbrowser || die # symlink to /usr/lib64/torbrowser/torbrowser
 	newbin - torbrowser <<-EOF
 		#!/bin/sh
 
@@ -285,6 +300,14 @@ src_install() {
 			|| die
 	fi
 
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	# torbrowser and torbrowser-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/torbrowser-bin || die
+	dosym torbrowser ${MOZILLA_FIVE_HOME}/torbrowser-bin
+
 	# Required in order to use plugins and even run torbrowser on hardened.
 	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{torbrowser,torbrowser-bin,plugin-container}
 
@@ -322,7 +345,7 @@ pkg_preinst() {
 pkg_postinst() {
 	gnome2_icon_cache_update
 
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then
 		elog "Apulse was detected at merge time on this system and so it will always be"
 		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
 		elog "media-sound/apulse."