CVS commit: pkgsrc/security/tor-browser

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jun  1 20:24:03 UTC 2019

Modified Files:
        pkgsrc/security/tor-browser: Makefile distinfo
        pkgsrc/security/tor-browser/patches: patch-aa
Added Files:
        pkgsrc/security/tor-browser/patches:
            patch-gfx_gl_GLContextProviderGLX.cpp

Log Message:
tor-browser: update to 8.5.60.7.0nb2.

Pick up two more NetBSD bugfixes from firefox60:
* use /dev/audio instead of /dev/sound
* use libGL.so instead of the versioned libGL.so.1, which does not exist
  on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/security/tor-browser/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/tor-browser/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/tor-browser/patches/patch-aa
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/security/tor-browser/patches/patch-gfx_gl_GLContextProviderGLX.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/tor-browser/Makefile
diff -u pkgsrc/security/tor-browser/Makefile:1.44 pkgsrc/security/tor-browser/Makefile:1.45
--- pkgsrc/security/tor-browser/Makefile:1.44   Wed May 29 12:33:29 2019
+++ pkgsrc/security/tor-browser/Makefile        Sat Jun  1 20:24:03 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2019/05/29 12:33:29 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2019/06/01 20:24:03 wiz Exp $
 
 DISTNAME=      src-firefox-tor-browser-60.7.0esr-8.5-1-build1
 PKGNAME=       tor-browser-8.5.60.7.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  https://dist.torproject.org/torbrowser/8.5/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/security/tor-browser/distinfo
diff -u pkgsrc/security/tor-browser/distinfo:1.10 pkgsrc/security/tor-browser/distinfo:1.11
--- pkgsrc/security/tor-browser/distinfo:1.10   Wed May 29 12:33:29 2019
+++ pkgsrc/security/tor-browser/distinfo        Sat Jun  1 20:24:03 2019
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.10 2019/05/29 12:33:29 wiz Exp $
+$NetBSD: distinfo,v 1.11 2019/06/01 20:24:03 wiz Exp $
 
 SHA1 (src-firefox-tor-browser-60.7.0esr-8.5-1-build1.tar.xz) = 2521274bb159d2ed3a955094d19330cdb13b3041
 RMD160 (src-firefox-tor-browser-60.7.0esr-8.5-1-build1.tar.xz) = 41e5674c7eca8ea14cc57be16ffeed97a2753c1b
 SHA512 (src-firefox-tor-browser-60.7.0esr-8.5-1-build1.tar.xz) = 5b58abffab98cc43de19d6fcc0416e195487ce39226c5dfedc6ddeb6194b2660bbd4bf895f690e277cfdb9205898b3ae8330c1557101a55efe4749ed85e8c23d
 Size (src-firefox-tor-browser-60.7.0esr-8.5-1-build1.tar.xz) = 279370536 bytes
 SHA1 (patch-.mozconfig) = 3377e91db2560d79503e9a9dd69011f5a84b6994
-SHA1 (patch-aa) = fdabcc9b055f6439fdbda9b38ab7cec08ff3e231
+SHA1 (patch-aa) = 17ea1093941cabc3dac1c653ba9edd92ec9877da
 SHA1 (patch-browser_app_profile_firefox.js) = 9a43095d94f83f315b9a3ce4a7b0a4301e9c40e6
 SHA1 (patch-build_moz.configure_old.configure) = 1df6867eaf73a350fbe8fcd5bd34e1fcab09d707
 SHA1 (patch-build_moz.configure_rust.configure) = 2818454ba4df3cbd85174edc4828206b3bf0a82b
 SHA1 (patch-dom_media_CubebUtils.cpp) = b9ef14e863f7eb5fb8e3caf3813dc28dea66ff7a
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = f1d0adae2873545818072adb4e8599267bc4e6c5
+SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 28c033037ac30636acdc7dd8f6637d5446ff25f7
 SHA1 (patch-gfx_webrender_src_query.rs) = 6434b0fc1d6441ddb555a2a3b199564b488ec336
 SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = 16e37fe54ba1d8d233f6b04dbd06e248305d7f6e
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 2f7fce38e1c68bb39e30f0fe4fa5c5e58809dcd0

Index: pkgsrc/security/tor-browser/patches/patch-aa
diff -u pkgsrc/security/tor-browser/patches/patch-aa:1.3 pkgsrc/security/tor-browser/patches/patch-aa:1.4
--- pkgsrc/security/tor-browser/patches/patch-aa:1.3    Mon Feb 25 15:32:24 2019
+++ pkgsrc/security/tor-browser/patches/patch-aa        Sat Jun  1 20:24:03 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2019/02/25 15:32:24 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2019/06/01 20:24:03 wiz Exp $
 
 * Disable libjpeg-turbo check
 * Add system libraries option
@@ -73,7 +73,7 @@ $NetBSD: patch-aa,v 1.3 2019/02/25 15:32
 +
 +    dnl Assume NetBSD implementation over SunAudio
 +    AC_CHECK_LIB(ossaudio, _oss_ioctl,
-+        [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound")
++        [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/audio")
 +         MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"])
 +fi
 +CFLAGS=$_SAVE_CFLAGS

Added files:

Index: pkgsrc/security/tor-browser/patches/patch-gfx_gl_GLContextProviderGLX.cpp
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-gfx_gl_GLContextProviderGLX.cpp:1.3
--- /dev/null   Sat Jun  1 20:24:03 2019
+++ pkgsrc/security/tor-browser/patches/patch-gfx_gl_GLContextProviderGLX.cpp   Sat Jun  1 20:24:03 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-gfx_gl_GLContextProviderGLX.cpp,v 1.3 2019/06/01 20:24:03 wiz Exp $
+
+NetBSD doesn't ship libGL.so.1 due to a major bump. Look for the unversioned
+name.
+
+--- gfx/gl/GLContextProviderGLX.cpp.orig       2019-05-14 19:13:16.000000000 +0000
++++ gfx/gl/GLContextProviderGLX.cpp
+@@ -80,7 +80,7 @@ bool GLXLibrary::EnsureInitialized() {
+     // implementation requires an executable stack, which causes mprotect calls,
+     // which trigger glibc bug
+     // http://sourceware.org/bugzilla/show_bug.cgi?id=12225
+-#ifdef __OpenBSD__
++#if defined(__OpenBSD__) || defined(__NetBSD__)
+     libGLfilename = "libGL.so";
+ #else
+     libGLfilename = "libGL.so.1";