head	1.9;
access;
symbols
	pkgsrc-2024Q2:1.8.0.28
	pkgsrc-2024Q2-base:1.8
	pkgsrc-2024Q1:1.8.0.26
	pkgsrc-2024Q1-base:1.8
	pkgsrc-2023Q4:1.8.0.24
	pkgsrc-2023Q4-base:1.8
	pkgsrc-2023Q3:1.8.0.22
	pkgsrc-2023Q3-base:1.8
	pkgsrc-2023Q2:1.8.0.20
	pkgsrc-2023Q2-base:1.8
	pkgsrc-2023Q1:1.8.0.18
	pkgsrc-2023Q1-base:1.8
	pkgsrc-2022Q4:1.8.0.16
	pkgsrc-2022Q4-base:1.8
	pkgsrc-2022Q3:1.8.0.14
	pkgsrc-2022Q3-base:1.8
	pkgsrc-2022Q2:1.8.0.12
	pkgsrc-2022Q2-base:1.8
	pkgsrc-2022Q1:1.8.0.10
	pkgsrc-2022Q1-base:1.8
	pkgsrc-2021Q4:1.8.0.8
	pkgsrc-2021Q4-base:1.8
	pkgsrc-2021Q3:1.8.0.6
	pkgsrc-2021Q3-base:1.8
	pkgsrc-2021Q2:1.8.0.4
	pkgsrc-2021Q2-base:1.8
	pkgsrc-2021Q1:1.8.0.2
	pkgsrc-2021Q1-base:1.8
	pkgsrc-2020Q4:1.7.0.2
	pkgsrc-2020Q4-base:1.7
	pkgsrc-2020Q3:1.6.0.6
	pkgsrc-2020Q3-base:1.6
	pkgsrc-2020Q2:1.6.0.4
	pkgsrc-2020Q2-base:1.6
	pkgsrc-2020Q1:1.6.0.2
	pkgsrc-2020Q1-base:1.6
	pkgsrc-2019Q4:1.5.0.8
	pkgsrc-2019Q4-base:1.5
	pkgsrc-2019Q3:1.5.0.4
	pkgsrc-2019Q3-base:1.5
	pkgsrc-2019Q2:1.5.0.2
	pkgsrc-2019Q2-base:1.5
	pkgsrc-2019Q1:1.3.0.2
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.2.0.18
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.16
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.14
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.12
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.10
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.8
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.4
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.2
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.1.0.8
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.6
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.4
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.2
	pkgsrc-2016Q1-base:1.1;
locks; strict;
comment	@# @;


1.9
date	2024.08.04.09.48.59;	author nia;	state dead;
branches;
next	1.8;
commitid	QUF0ANVviXJplukF;

1.8
date	2021.03.09.13.31.48;	author wiz;	state Exp;
branches;
next	1.7;
commitid	B5Oatsoa7Yr8zDKC;

1.7
date	2020.10.07.11.10.34;	author wiz;	state Exp;
branches;
next	1.6;
commitid	F03i79vbPUBBHXqC;

1.6
date	2020.03.13.17.59.27;	author wiz;	state Exp;
branches
	1.6.6.1;
next	1.5;
commitid	ExZMuSCgafMeEg0C;

1.5
date	2019.06.14.17.22.21;	author nia;	state Exp;
branches;
next	1.4;
commitid	kY7KbYrCKEGJdbrB;

1.4
date	2019.06.01.20.24.03;	author wiz;	state Exp;
branches;
next	1.3;
commitid	qnhAgVSkS0nODwpB;

1.3
date	2019.02.25.15.32.24;	author wiz;	state Exp;
branches;
next	1.2;
commitid	s4OVmwbTk8HL6adB;

1.2
date	2017.01.22.12.27.21;	author ryoon;	state Exp;
branches;
next	1.1;
commitid	5VJ6CZyEDNPmEXCz;

1.1
date	2016.02.14.07.30.54;	author ryoon;	state Exp;
branches;
next	;
commitid	sEk8ICglPZQf2RUy;

1.6.6.1
date	2020.10.23.17.27.12;	author bsiegert;	state Exp;
branches;
next	;
commitid	sQOyQfnlFM71h3tC;


desc
@@


1.9
log
@Remove unmaintained tor-browser packages

Have not built anywhere for some time and pose an active security
threat to potential users, who are better off using a regular
browser with tor.
@
text
@$NetBSD: patch-aa,v 1.8 2021/03/09 13:31:48 wiz Exp $

* Add Sun audio support
* Include include/nss/nss for workaround for neqo-crypto 0.1.6 of firefox-72.0

--- old-configure.in.orig	Tue Jan  7 17:23:36 2020
+++ old-configure.in	Fri Jan 17 16:03:40 2020
@@@@ -1960,6 +1960,19 @@@@
 AC_DEFINE(MOZ_WEBM_ENCODER)
 AC_SUBST(MOZ_WEBM_ENCODER)
 
+dnl ==================================
+dnl = Check sunaudio availability
+dnl ==================================
+
+dnl If using Solaris or NetBSD, ensure that sunaudio is available
+case "$OS_TARGET" in
+SunOS|NetBSD)
+    MOZ_SUNAUDIO=1
+    ;;
+esac
+
+AC_SUBST(MOZ_SUNAUDIO)
+
 dnl ========================================================
 dnl NegotiateAuth
 dnl ========================================================
@


1.8
log
@*: remove unneeded patch after nss header install location change
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.7 2020/10/07 11:10:34 wiz Exp $
@


1.7
log
@tor-browser: update to 10.0.

Tor Browser 10.0 -- September 22 2020
 * Windows + OS X + Linux
   * Update Firefox to 78.3.0esr
   * Update Tor to 0.4.4.5
   * Update Tor Launcher to 0.2.25
     * Bug 32174: Replace XUL <textbox> with <html:input>
     * Bug 33890: Rename XUL files to XHTML
     * Bug 33862: Fix usages of createTransport API
     * Bug 33906: Fix Tor-Launcher issues for Firefox 75
     * Bug 33998: Use CSS grid instead of XUL grid
     * Bug 34164: Tor Launcher deadlocks during startup (Firefox 77)
     * Bug 34206: Tor Launcher button labels are missing (Firefox 76)
     * Bug 40002: After rebasing to 80.0b2 moat is broken [tor-launcher]
     * Translations update
   * Update NoScript to 11.0.44
     * Bug 40093: Youtube videos on safer produce an error [tor-browser]
   * Translations update
   * Bug 10394: Let Tor Browser update HTTPS Everywhere
   * Bug 11154: Disable TLS 1.0 (and 1.1) by default
   * Bug 16931: Sanitize the add-on blocklist update URL
   * Bug 17374: Disable 1024-DH Encryption by default
   * Bug 21601: Remove unused media.webaudio.enabled pref
   * Bug 30682: Disable Intermediate CA Preloading
   * Bug 30812: Exempt about: pages from Resist Fingerprinting
   * Bug 31918+33533+40024+40037: Rebase Tor Browser esr68 patches for ESR 78 [tor-browser]
   * Bug 32612: Update MAR_CHANNEL_ID for the alpha
   * Bug 32886: Separate treatment of @@media interaction features for desktop and android
   * Bug 33534: Review FF release notes from FF69 to latest (FF78)
   * Bug 33697: Use old search config based on list.json
   * Bug 33721: PDF Viewer is not working in the safest security level
   * Bug 33734: Set MOZ_NORMANDY to False
   * Bug 33737: Fix aboutDialog.js error for Firefox nightlies
   * Bug 33848: Disable Enhanced Tracking Protection
   * Bug 33851: Patch out Parental Controls detection and logging
   * Bug 33852: Clean up about:logins to not mention Sync
   * Bug 33856: Set browser.privatebrowsing.forceMediaMemoryCache to True
   * Bug 33862: Fix usages of createTransport API
   * Bug 33867: Disable password manager and password generation
   * Bug 33890: Rename XUL files to XHTML
   * Bug 33892: Add brandProductName to brand.dtd and brand.properties
   * Bug 33962: Uplift patch for bug 5741 (dns leak protection)
   * Bug 34125: API change in protocolProxyService.registerChannelFilter
   * Bug 40001: Generate tor-browser-brand.ftl when importing translations [torbutton]
   * Bug 40002: Remove about:pioneer [tor-browser]
   * Bug 40002: Fix generateNSGetFactory being moved to ComponentUtils [torbutton]
   * Bug 40003: Adapt code for L10nRegistry API changes [torbutton]
   * Bug 40005: Initialize the identity UI before setting up the circuit display [torbutton]
   * Bug 40006: Fix new identity for 81 [torbutton]
   * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton]
   * Bug 40008: Style fixes for 78 [torbutton]
   * Bug 40016: Update Snowflake to discover NAT type [tor-browser-build]
   * Bug 40017: Audit Firefox 68-78 diff for proxy issues [tor-browser]
   * Bug 40022: Update new icons in Tor Browser branding [tor-browser]
   * Bug 40025: Revert add-on permissions due to Mozilla's 1560059 [tor-browser]
   * Bug 40036: Remove product version/update channel from #13379 patch [tor-browser]
   * Bug 40038: Review RemoteSettings for ESR 78 [tor-browser]
   * Bug 40048: Disable various ESR78 features via prefs [tor-browser]
   * Bug 40059: Verify our external helper patch is still working [tor-browser]
   * Bug 40066: Update existing prefs for ESR 78 [tor-browser]
   * Bug 40066: Remove default bridge 37.218.240.34 [tor-browser-build]
   * Bug 40073: Disable remote Public Suffix List fetching [tor-browser]
   * Bug 40073: Repack omni.ja to include builtin HTTPS Everywhere [tor-browser-build]
   * Bug 40078: Backport patches for bug 1651680 for now [tor-browser]
   * Bug 40082: Let JavaScript on safest setting handled by NoScript again [tor-browser]
   * Bug 40088: Moat "Submit" button does not work
   * Bug 40090: Disable v3 add-on blocklist for now [tor-browser]
   * Bug 40091: Load HTTPS Everywhere as a builtin addon [tor-browser]
   * Bug 40102: Fix UI bugs in Tor Browser 10.0 alpha [tor-browser]
   * Bug 40106: Cannot install addons in full screen mode [tor-browser]
   * Bug 40109: Playing video breaks after reloading pages [tor-browser]
   * Bug 40119: Enable v3 extension blocklisting again [tor-browser]
 * Windows
   * Bug 33855: Don't use site's icon as window icon in Windows in private mode
   * Bug 40061: Omit the Windows default browser agent from the build [tor-browser]
 * OS X
   * Bug 32252: Tor Browser does not display correctly in VMWare Fusion on macOS (mojave)
 * Build System
   * Windows + OS X + Linux
     * Bump Go to 1.14.7
     * Bug 31845: Bump GCC version to 9.3.0
     * Bug 34011: Bump clang to 9.0.1
     * Bug 34014: Enable sqlite3 support in Python
     * Bug 34390: Don't copy DBM libraries anymore
     * Bug 34391: Remove unused --enable-signmar option
     * Bug 40004: Adapt Rust project for Firefox 78 ESR [tor-browser-build]
     * Bug 40005: Adapt Node project for Firefox 78 ESR [tor-browser-build]
     * Bug 40006: Adapt cbindgen for Firefox 78 ESR [tor-browser-build]
     * Bug 40037: Move projects over to clang-source [tor-browser-build]
     * Bug 40026: Fix full .mar creation for esr78 [tor-browser-build]
     * Bug 40027: Fix incremental .mar creation for esr78 [tor-browser-build]
     * Bug 40028: Do not reference unset env variables [tor-browser-build]
     * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build]
     * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build]
     * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build]
     * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja [tor-browser-build]
   * Windows
     * Bug 34230: Update Windows toolchain for Firefox 78 ESR
     * Bug 40015: Use only 64bit fxc2 [tor-browser-build]
     * Bug 40017: Enable stripping again on Windows [tor-browser-build]
     * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build]
     * Bug 40061: Omit the Windows default browser agent from the build [tor-browser]
     * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build]
     * Bug 40077: Don't pass --no-insert-timestamp when building Firefox [tor-browser-build]
     * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore [tor-browser-build]
   * OS X
     * Bug 34229: Update macOS toolchain for Firefox 78 ESR
     * Bug 40003: Update cctools version for Firefox 78 ESR [tor-browser-build]
     * Bug 40018: Add libtapi project for cctools [tor-browser-build]
     * Bug 40019: Ship our own runtime library for macOS [tor-browser-build]
   * Linux
     * Bug 34359: Adapt abicheck.cc to deal with newer GCC version
     * Bug 34386: Fix up clang compilation on Linux
     * Bug 40053: Also create the langpacks tarball for non-release builds [tor-browser-build]

Tor Browser 10.0a7 -- September 14 2020
 * Windows + OS X + Linux
   * Update Tor Launcher to 0.2.24
   * Update NoScript to 11.0.43
   * Translations update
   * Bug 10394: Let Tor Browser update HTTPS Everywhere
   * Bug 32017: Use ExtensionStorageIDB again
   * Bug 40006: Fix new identity for 81 [torbutton]
   * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton]
   * Bug 40008: Style fixes for 78 [torbutton]
   * Bug 40066: Remove default bridge 37.218.240.34 [tor-browser-build]
   * Bug 40073: Repack omni.ja to include builtin HTTPS Everywhere [tor-browser-build]
   * Bug 40091: Load HTTPS Everywhere as a builtin addon [tor-browser]
   * Bug 40102: Fix UI bugs in Tor Browser 10.0 alpha [tor-browser]
   * Bug 40109: Playing video breaks after reloading pages [tor-browser]
   * Big 40119: Enable v3 extension blocklisting again [tor-browser]
 * Build System
   * Windows + OS X + Linux
     * Bump Go to 1.14.7
     * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build]
     * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build]
     * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build]
     * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja [tor-browser-build]
   * Windows
     * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build]
     * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build]
     * Bug 40077: Don't pass --no-insert-timestamp when building Firefox [tor-browser-build]
     * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore [tor-browser-build]

Tor Browser 10.0a6 -- August 26 2020
 * All Platforms
   * Update HTTPS Everywhere to 2020.08.13
 * Windows + OS X + Linux
   * Update Firefox to 78.2.0esr
   * Update Tor Launcher to 0.2.23
     * Bug 40002: After rebasing to 80.0b2 moat is broken [tor-launcher]
     * Translations update
   * Update NoScript to 11.0.39
   * Bug 21601: Remove unused media.webaudio.enabled pref
   * Bug 40002: Remove about:pioneer [tor-browser]
   * Bug 40082: Let JavaScript on safest setting handled by NoScript again [tor-browser]
   * Bug 40088: Moat "Submit" button does not work
   * Bug 40090: Disable v3 add-on blocklist for now [tor-browser]
 * OS X
   * Bug 40015: Tor Browser broken on MacOS 11 Big Sur
 * Android
   * Update Firefox to 68.12.0esr
   * Update NoScript to 11.0.38
   * Update Tor to 0.4.4.4-rc
 * Build System
   * Windows + OS X + Linux
     * Bump Go to 1.13.15
   * Linux
     * Bug 40053: Also create the langpacks tarball for non-release builds [tor-browser-build]
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1 2020/07/30 08:09:28 nia Exp $
a27 9
@@@@ -2744,7 +2757,7 @@@@
 AC_SUBST_LIST(MOZ_CAIRO_OSLIBS)
 AC_SUBST(MOZ_TREE_PIXMAN)
 
-BINDGEN_SYSTEM_FLAGS="$_BINDGEN_CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $MOZ_PIXMAN_CFLAGS $MOZ_CAIRO_CFLAGS"
+BINDGEN_SYSTEM_FLAGS="$_BINDGEN_CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $MOZ_PIXMAN_CFLAGS $MOZ_CAIRO_CFLAGS -I${PREFIX}/include/nss/nss"
 AC_SUBST(BINDGEN_SYSTEM_FLAGS)
 BINDGEN_SYSTEM_TOML_FLAGS="$BINDGEN_SYSTEM_FLAGS"
 AC_SUBST_TOML_LIST(BINDGEN_SYSTEM_TOML_FLAGS)
@


1.6
log
@tor-browser: update to 9.0.6

This version is now based on firefox68-esr and builds with the current
rust in pkgsrc.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.2 2020/03/12 19:39:35 nia Exp $
d4 1
d6 3
a8 3
--- old-configure.in.orig	2020-03-05 20:57:20.000000000 +0000
+++ old-configure.in
@@@@ -1987,6 +1987,19 @@@@ MOZ_WEBM_ENCODER=1
d28 9
@


1.6.6.1
log
@Pullup ticket #6341 - requested by wiz
security/tor-browser: security fix

Revisions pulled up:
- security/tor-browser/Makefile                                 1.76
- security/tor-browser/PLIST                                    1.9
- security/tor-browser/distinfo                                 1.29
- security/tor-browser/patches/patch-.mozconfig                 1.3
- security/tor-browser/patches/patch-aa                         1.7
- security/tor-browser/patches/patch-browser_app_profile_firefox.js 1.4
- security/tor-browser/patches/patch-build_moz.configure_rust.configure 1.4
- security/tor-browser/patches/patch-config_gcc-stl-wrapper.template.h 1.2
- security/tor-browser/patches/patch-config_makefiles_rust.mk   1.3
- security/tor-browser/patches/patch-configure.in               1.1
- security/tor-browser/patches/patch-dom_base_nsAttrName.h      1.2
- security/tor-browser/patches/patch-dom_media_CubebUtils.cpp   1.3
- security/tor-browser/patches/patch-dom_webauthn_u2f-hid-rs_src_lib.rs deleted
- security/tor-browser/patches/patch-dom_webauthn_u2f-hid-rs_src_netbsd_device.rs deleted
- security/tor-browser/patches/patch-dom_webauthn_u2f-hid-rs_src_netbsd_fd.rs deleted
- security/tor-browser/patches/patch-dom_webauthn_u2f-hid-rs_src_netbsd_mod.rs deleted
- security/tor-browser/patches/patch-dom_webauthn_u2f-hid-rs_src_netbsd_monitor.rs deleted
- security/tor-browser/patches/patch-dom_webauthn_u2f-hid-rs_src_netbsd_transaction.rs deleted
- security/tor-browser/patches/patch-dom_webauthn_u2f-hid-rs_src_netbsd_uhid.rs deleted
- security/tor-browser/patches/patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp 1.3
- security/tor-browser/patches/patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h 1.2
- security/tor-browser/patches/patch-gfx_cairo_cairo_src_cairo-type1-subset.c 1.1
- security/tor-browser/patches/patch-gfx_gl_GLContextProviderGLX.cpp deleted
- security/tor-browser/patches/patch-gfx_skia_skia_src_core_SkCpu.cpp 1.2
- security/tor-browser/patches/patch-gfx_thebes_gfxPlatform.cpp 1.2
- security/tor-browser/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc 1.4
- security/tor-browser/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc 1.5
- security/tor-browser/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc deleted
- security/tor-browser/patches/patch-ipc_glue_GeckoChildProcessHost.cpp 1.5
- security/tor-browser/patches/patch-js_src_jsfriendapi.h       1.1
- security/tor-browser/patches/patch-js_src_threading_posix_Thread.cpp deleted
- security/tor-browser/patches/patch-js_src_util_NativeStack.cpp 1.5
- security/tor-browser/patches/patch-media_ffvpx_libavutil_arm_bswap.h 1.2
- security/tor-browser/patches/patch-media_libcubeb_gtest_moz.build deleted
- security/tor-browser/patches/patch-media_libcubeb_src_cubeb.c deleted
- security/tor-browser/patches/patch-media_libcubeb_src_cubeb__alsa.c 1.5
- security/tor-browser/patches/patch-media_libcubeb_src_cubeb__sun.c 1.1
- security/tor-browser/patches/patch-media_libcubeb_src_moz.build 1.6
- security/tor-browser/patches/patch-media_libcubeb_update.sh   deleted
- security/tor-browser/patches/patch-media_libpng_pngpriv.h     1.5
- security/tor-browser/patches/patch-media_libtheora_lib_info.c 1.4
- security/tor-browser/patches/patch-media_libvorbis_lib_vorbis__info.c 1.1
- security/tor-browser/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc 1.5
- security/tor-browser/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c 1.2
- security/tor-browser/patches/patch-security_nss_lib_freebl_mpi_mpi.c 1.1
- security/tor-browser/patches/patch-third__party_rust_authenticator_.cargo-checksum.json 1.1
- security/tor-browser/patches/patch-third__party_rust_authenticator_src_lib.rs 1.1
- security/tor-browser/patches/patch-third__party_rust_authenticator_src_netbsd_device.rs 1.1
- security/tor-browser/patches/patch-third__party_rust_authenticator_src_netbsd_fd.rs 1.1
- security/tor-browser/patches/patch-third__party_rust_authenticator_src_netbsd_mod.rs 1.1
- security/tor-browser/patches/patch-third__party_rust_authenticator_src_netbsd_monitor.rs 1.1
- security/tor-browser/patches/patch-third__party_rust_authenticator_src_netbsd_transaction.rs 1.1
- security/tor-browser/patches/patch-third__party_rust_authenticator_src_netbsd_uhid.rs 1.1
- security/tor-browser/patches/patch-third__party_rust_getrandom_src_lib.rs 1.1
- security/tor-browser/patches/patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs 1.1
- security/tor-browser/patches/patch-toolkit_components_terminator_nsTerminator.cpp 1.3
- security/tor-browser/patches/patch-toolkit_library_moz.build  deleted
- security/tor-browser/patches/patch-toolkit_modules_subprocess_subprocess__shared__unix.js 1.2
- security/tor-browser/patches/patch-toolkit_moz.configure      1.4
- security/tor-browser/patches/patch-toolkit_mozapps_installer_packager.mk 1.3
- security/tor-browser/patches/patch-toolkit_xre_glxtest.cpp    deleted
- security/tor-browser/patches/patch-widget_gtk_WaylandDMABufSurface.cpp 1.1
- security/tor-browser/patches/patch-xpcom_base_nscore.h        1.5
- security/tor-browser/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build 1.5

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Wed Oct  7 11:10:35 UTC 2020

   Modified Files:
   	pkgsrc/security/tor-browser: Makefile PLIST distinfo
   	pkgsrc/security/tor-browser/patches: patch-.mozconfig patch-aa
   	    patch-browser_app_profile_firefox.js
   	    patch-build_moz.configure_rust.configure
   	    patch-config_gcc-stl-wrapper.template.h
   	    patch-config_makefiles_rust.mk patch-dom_base_nsAttrName.h
   	    patch-dom_media_CubebUtils.cpp
   	    patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp
   	    patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h
   	    patch-gfx_skia_skia_src_core_SkCpu.cpp
   	    patch-gfx_thebes_gfxPlatform.cpp
   	    patch-ipc_chromium_src_base_message__pump__libevent.cc
   	    patch-ipc_chromium_src_base_platform__thread__posix.cc
   	    patch-ipc_glue_GeckoChildProcessHost.cpp
   	    patch-js_src_util_NativeStack.cpp
   	    patch-media_ffvpx_libavutil_arm_bswap.h
   	    patch-media_libcubeb_src_cubeb__alsa.c
   	    patch-media_libcubeb_src_moz.build patch-media_libpng_pngpriv.h
   	    patch-nsprpub_pr_src_pthreads_ptsynch.c
   	    patch-toolkit_components_terminator_nsTerminator.cpp
   	    patch-toolkit_modules_subprocess_subprocess__shared__unix.js
   	    patch-toolkit_moz.configure
   	    patch-toolkit_mozapps_installer_packager.mk
   	    patch-xpcom_base_nscore.h
   	    patch-xpcom_reflect_xptcall_md_unix_moz.build
   Added Files:
   	pkgsrc/security/tor-browser/patches: patch-configure.in
   	    patch-gfx_cairo_cairo_src_cairo-type1-subset.c
   	    patch-js_src_jsfriendapi.h patch-media_libcubeb_src_cubeb__sun.c
   	    patch-media_libtheora_lib_info.c
   	    patch-media_libvorbis_lib_vorbis__info.c
   	    patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
   	    patch-security_nss_lib_freebl_mpi_mpi.c
   	    patch-third__party_rust_authenticator_.cargo-checksum.json
   	    patch-third__party_rust_authenticator_src_lib.rs
   	    patch-third__party_rust_authenticator_src_netbsd_device.rs
   	    patch-third__party_rust_authenticator_src_netbsd_fd.rs
   	    patch-third__party_rust_authenticator_src_netbsd_mod.rs
   	    patch-third__party_rust_authenticator_src_netbsd_monitor.rs
   	    patch-third__party_rust_authenticator_src_netbsd_transaction.rs
   	    patch-third__party_rust_authenticator_src_netbsd_uhid.rs
   	    patch-third__party_rust_getrandom_src_lib.rs
   	    patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
   	    patch-widget_gtk_WaylandDMABufSurface.cpp
   Removed Files:
   	pkgsrc/security/tor-browser/patches:
   	    patch-dom_webauthn_u2f-hid-rs_src_lib.rs
   	    patch-dom_webauthn_u2f-hid-rs_src_netbsd_device.rs
   	    patch-dom_webauthn_u2f-hid-rs_src_netbsd_fd.rs
   	    patch-dom_webauthn_u2f-hid-rs_src_netbsd_mod.rs
   	    patch-dom_webauthn_u2f-hid-rs_src_netbsd_monitor.rs
   	    patch-dom_webauthn_u2f-hid-rs_src_netbsd_transaction.rs
   	    patch-dom_webauthn_u2f-hid-rs_src_netbsd_uhid.rs
   	    patch-gfx_gl_GLContextProviderGLX.cpp
   	    patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc
   	    patch-js_src_threading_posix_Thread.cpp
   	    patch-media_libcubeb_gtest_moz.build
   	    patch-media_libcubeb_src_cubeb.c patch-media_libcubeb_update.sh
   	    patch-toolkit_library_moz.build patch-toolkit_xre_glxtest.cpp

   Log Message:
   tor-browser: update to 10.0.

   Tor Browser 10.0 -- September 22 2020
    * Windows + OS X + Linux
      * Update Firefox to 78.3.0esr
      * Update Tor to 0.4.4.5
      * Update Tor Launcher to 0.2.25
        * Bug 32174: Replace XUL <textbox> with <html:input>
        * Bug 33890: Rename XUL files to XHTML
        * Bug 33862: Fix usages of createTransport API
        * Bug 33906: Fix Tor-Launcher issues for Firefox 75
        * Bug 33998: Use CSS grid instead of XUL grid
        * Bug 34164: Tor Launcher deadlocks during startup (Firefox 77)
        * Bug 34206: Tor Launcher button labels are missing (Firefox 76)
        * Bug 40002: After rebasing to 80.0b2 moat is broken [tor-launcher]
        * Translations update
      * Update NoScript to 11.0.44
        * Bug 40093: Youtube videos on safer produce an error [tor-browser]
      * Translations update
      * Bug 10394: Let Tor Browser update HTTPS Everywhere
      * Bug 11154: Disable TLS 1.0 (and 1.1) by default
      * Bug 16931: Sanitize the add-on blocklist update URL
      * Bug 17374: Disable 1024-DH Encryption by default
      * Bug 21601: Remove unused media.webaudio.enabled pref
      * Bug 30682: Disable Intermediate CA Preloading
      * Bug 30812: Exempt about: pages from Resist Fingerprinting
      * Bug 31918+33533+40024+40037: Rebase Tor Browser esr68 patches for ESR 78 [tor-browser]
      * Bug 32612: Update MAR_CHANNEL_ID for the alpha
      * Bug 32886: Separate treatment of @@media interaction features for desktop and android
      * Bug 33534: Review FF release notes from FF69 to latest (FF78)
      * Bug 33697: Use old search config based on list.json
      * Bug 33721: PDF Viewer is not working in the safest security level
      * Bug 33734: Set MOZ_NORMANDY to False
      * Bug 33737: Fix aboutDialog.js error for Firefox nightlies
      * Bug 33848: Disable Enhanced Tracking Protection
      * Bug 33851: Patch out Parental Controls detection and logging
      * Bug 33852: Clean up about:logins to not mention Sync
      * Bug 33856: Set browser.privatebrowsing.forceMediaMemoryCache to True
      * Bug 33862: Fix usages of createTransport API
      * Bug 33867: Disable password manager and password generation
      * Bug 33890: Rename XUL files to XHTML
      * Bug 33892: Add brandProductName to brand.dtd and brand.properties
      * Bug 33962: Uplift patch for bug 5741 (dns leak protection)
      * Bug 34125: API change in protocolProxyService.registerChannelFilter
      * Bug 40001: Generate tor-browser-brand.ftl when importing translations [torbutton]
      * Bug 40002: Remove about:pioneer [tor-browser]
      * Bug 40002: Fix generateNSGetFactory being moved to ComponentUtils [torbutton]
      * Bug 40003: Adapt code for L10nRegistry API changes [torbutton]
      * Bug 40005: Initialize the identity UI before setting up the circuit display [torbutton]
      * Bug 40006: Fix new identity for 81 [torbutton]
      * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton]
      * Bug 40008: Style fixes for 78 [torbutton]
      * Bug 40016: Update Snowflake to discover NAT type [tor-browser-build]
      * Bug 40017: Audit Firefox 68-78 diff for proxy issues [tor-browser]
      * Bug 40022: Update new icons in Tor Browser branding [tor-browser]
      * Bug 40025: Revert add-on permissions due to Mozilla's 1560059 [tor-browser]
      * Bug 40036: Remove product version/update channel from #13379 patch [tor-browser]
      * Bug 40038: Review RemoteSettings for ESR 78 [tor-browser]
      * Bug 40048: Disable various ESR78 features via prefs [tor-browser]
      * Bug 40059: Verify our external helper patch is still working [tor-browser]
      * Bug 40066: Update existing prefs for ESR 78 [tor-browser]
      * Bug 40066: Remove default bridge 37.218.240.34 [tor-browser-build]
      * Bug 40073: Disable remote Public Suffix List fetching [tor-browser]
      * Bug 40073: Repack omni.ja to include builtin HTTPS Everywhere [tor-browser-build]
      * Bug 40078: Backport patches for bug 1651680 for now [tor-browser]
      * Bug 40082: Let JavaScript on safest setting handled by NoScript again [tor-browser]
      * Bug 40088: Moat "Submit" button does not work
      * Bug 40090: Disable v3 add-on blocklist for now [tor-browser]
      * Bug 40091: Load HTTPS Everywhere as a builtin addon [tor-browser]
      * Bug 40102: Fix UI bugs in Tor Browser 10.0 alpha [tor-browser]
      * Bug 40106: Cannot install addons in full screen mode [tor-browser]
      * Bug 40109: Playing video breaks after reloading pages [tor-browser]
      * Bug 40119: Enable v3 extension blocklisting again [tor-browser]
    * Windows
      * Bug 33855: Don't use site's icon as window icon in Windows in private mode
      * Bug 40061: Omit the Windows default browser agent from the build [tor-browser]
    * OS X
      * Bug 32252: Tor Browser does not display correctly in VMWare Fusion on macOS (mojave)
    * Build System
      * Windows + OS X + Linux
        * Bump Go to 1.14.7
        * Bug 31845: Bump GCC version to 9.3.0
        * Bug 34011: Bump clang to 9.0.1
        * Bug 34014: Enable sqlite3 support in Python
        * Bug 34390: Don't copy DBM libraries anymore
        * Bug 34391: Remove unused --enable-signmar option
        * Bug 40004: Adapt Rust project for Firefox 78 ESR [tor-browser-build]
        * Bug 40005: Adapt Node project for Firefox 78 ESR [tor-browser-build]
        * Bug 40006: Adapt cbindgen for Firefox 78 ESR [tor-browser-build]
        * Bug 40037: Move projects over to clang-source [tor-browser-build]
        * Bug 40026: Fix full .mar creation for esr78 [tor-browser-build]
        * Bug 40027: Fix incremental .mar creation for esr78 [tor-browser-build]
        * Bug 40028: Do not reference unset env variables [tor-browser-build]
        * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build]
        * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build]
        * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build]
        * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja [tor-browser-build]
      * Windows
        * Bug 34230: Update Windows toolchain for Firefox 78 ESR
        * Bug 40015: Use only 64bit fxc2 [tor-browser-build]
        * Bug 40017: Enable stripping again on Windows [tor-browser-build]
        * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build]
        * Bug 40061: Omit the Windows default browser agent from the build [tor-browser]
        * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build]
        * Bug 40077: Don't pass --no-insert-timestamp when building Firefox [tor-browser-build]
        * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore [tor-browser-build]
      * OS X
        * Bug 34229: Update macOS toolchain for Firefox 78 ESR
        * Bug 40003: Update cctools version for Firefox 78 ESR [tor-browser-build]
        * Bug 40018: Add libtapi project for cctools [tor-browser-build]
        * Bug 40019: Ship our own runtime library for macOS [tor-browser-build]
      * Linux
        * Bug 34359: Adapt abicheck.cc to deal with newer GCC version
        * Bug 34386: Fix up clang compilation on Linux
        * Bug 40053: Also create the langpacks tarball for non-release builds [tor-browser-build]

   Tor Browser 10.0a7 -- September 14 2020
    * Windows + OS X + Linux
      * Update Tor Launcher to 0.2.24
      * Update NoScript to 11.0.43
      * Translations update
      * Bug 10394: Let Tor Browser update HTTPS Everywhere
      * Bug 32017: Use ExtensionStorageIDB again
      * Bug 40006: Fix new identity for 81 [torbutton]
      * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton]
      * Bug 40008: Style fixes for 78 [torbutton]
      * Bug 40066: Remove default bridge 37.218.240.34 [tor-browser-build]
      * Bug 40073: Repack omni.ja to include builtin HTTPS Everywhere [tor-browser-build]
      * Bug 40091: Load HTTPS Everywhere as a builtin addon [tor-browser]
      * Bug 40102: Fix UI bugs in Tor Browser 10.0 alpha [tor-browser]
      * Bug 40109: Playing video breaks after reloading pages [tor-browser]
      * Big 40119: Enable v3 extension blocklisting again [tor-browser]
    * Build System
      * Windows + OS X + Linux
        * Bump Go to 1.14.7
        * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build]
        * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build]
        * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build]
        * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja [tor-browser-build]
      * Windows
        * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build]
        * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build]
        * Bug 40077: Don't pass --no-insert-timestamp when building Firefox [tor-browser-build]
        * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore [tor-browser-build]

   Tor Browser 10.0a6 -- August 26 2020
    * All Platforms
      * Update HTTPS Everywhere to 2020.08.13
    * Windows + OS X + Linux
      * Update Firefox to 78.2.0esr
      * Update Tor Launcher to 0.2.23
        * Bug 40002: After rebasing to 80.0b2 moat is broken [tor-launcher]
        * Translations update
      * Update NoScript to 11.0.39
      * Bug 21601: Remove unused media.webaudio.enabled pref
      * Bug 40002: Remove about:pioneer [tor-browser]
      * Bug 40082: Let JavaScript on safest setting handled by NoScript again [tor-browser]
      * Bug 40088: Moat "Submit" button does not work
      * Bug 40090: Disable v3 add-on blocklist for now [tor-browser]
    * OS X
      * Bug 40015: Tor Browser broken on MacOS 11 Big Sur
    * Android
      * Update Firefox to 68.12.0esr
      * Update NoScript to 11.0.38
      * Update Tor to 0.4.4.4-rc
    * Build System
      * Windows + OS X + Linux
        * Bump Go to 1.13.15
      * Linux
        * Bug 40053: Also create the langpacks tarball for non-release builds [tor-browser-build]
@
text
@d1 1
a1 1
$NetBSD$
a3 1
* Include include/nss/nss for workaround for neqo-crypto 0.1.6 of firefox-72.0
d5 3
a7 3
--- old-configure.in.orig	Tue Jan  7 17:23:36 2020
+++ old-configure.in	Fri Jan 17 16:03:40 2020
@@@@ -1960,6 +1960,19 @@@@
a26 9
@@@@ -2744,7 +2757,7 @@@@
 AC_SUBST_LIST(MOZ_CAIRO_OSLIBS)
 AC_SUBST(MOZ_TREE_PIXMAN)
 
-BINDGEN_SYSTEM_FLAGS="$_BINDGEN_CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $MOZ_PIXMAN_CFLAGS $MOZ_CAIRO_CFLAGS"
+BINDGEN_SYSTEM_FLAGS="$_BINDGEN_CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $MOZ_PIXMAN_CFLAGS $MOZ_CAIRO_CFLAGS -I${PREFIX}/include/nss/nss"
 AC_SUBST(BINDGEN_SYSTEM_FLAGS)
 BINDGEN_SYSTEM_TOML_FLAGS="$BINDGEN_SYSTEM_FLAGS"
 AC_SUBST_TOML_LIST(BINDGEN_SYSTEM_TOML_FLAGS)
@


1.5
log
@tor-browser: add sun audio backend. requested by wiz.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.4 2019/06/01 20:24:03 wiz Exp $
a2 3
* Disable libjpeg-turbo check
* Add system libraries option
* Add OSS audio support
d5 1
a5 1
--- old-configure.in.orig	2019-05-15 06:47:08.000000000 +0000
d7 2
a8 14
@@@@ -1785,11 +1785,7 @@@@ if test "$MOZ_SYSTEM_JPEG" = 1; then
                      #include <jpeglib.h> ],
                    [ #if JPEG_LIB_VERSION < $MOZJPEG
                      #error "Insufficient JPEG library version ($MOZJPEG required)."
-                     #endif
-                     #ifndef JCS_EXTENSIONS
-                     #error "libjpeg-turbo JCS_EXTENSIONS required"
-                     #endif
-                     ],
+                     #endif ],
                    MOZ_SYSTEM_JPEG=1,
                    AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
 fi
@@@@ -2577,6 +2573,71 @@@@ AC_DEFINE(MOZ_WEBM_ENCODER)
d11 2
a12 2
 dnl ==================================
+dnl = Check OSS availability
d15 1
a15 1
+dnl If using Linux, Solaris or BSDs, ensure that OSS is available
d17 2
a18 5
+Linux|DragonFly|FreeBSD|GNU/kFreeBSD)
+    MOZ_OSS=1
+    ;;
+NetBSD|SunOS)
+    MOZ_SUN=1
d22 1
a22 32
+MOZ_ARG_WITH_STRING(oss,
+[  --with-oss[=PFX]        Enable OpenSoundSystem support [installed at prefix PFX]],
+   OSSPREFIX=$withval)
+
+if test -n "$OSSPREFIX"; then
+    if test "$OSSPREFIX" != "no"; then
+        MOZ_OSS=1
+    else
+        MOZ_OSS=
+    fi
+fi
+
+_SAVE_CFLAGS=$CFLAGS
+_SAVE_LIBS=$LIBS
+if test -n "$MOZ_OSS"; then
+    dnl Prefer 4Front implementation
+    AC_MSG_CHECKING([MOZ_OSS_CFLAGS])
+    if test "$OSSPREFIX" != "yes"; then
+        oss_conf=${OSSPREFIX%/usr}/etc/oss.conf
+        if test -f "$oss_conf"; then
+            . "$oss_conf"
+        else
+            OSSLIBDIR=$OSSPREFIX/lib/oss
+        fi
+        if test -d "$OSSLIBDIR"; then
+            MOZ_OSS_CFLAGS="$MOZ_OSS_CFLAGS -I$OSSLIBDIR/include"
+        fi
+    fi
+    AC_MSG_RESULT([$MOZ_OSS_CFLAGS])
+
+    CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS"
+    MOZ_CHECK_HEADERS(sys/soundcard.h soundcard.h)
d24 3
a26 22
+    if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \
+            "$ac_cv_header_soundcard_h" != "yes"; then
+        AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET.  Disable with --without-oss.])
+    fi
+
+    dnl Assume NetBSD implementation over SunAudio
+    AC_CHECK_LIB(ossaudio, _oss_ioctl,
+        [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/audio")
+         MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"])
+fi
+CFLAGS=$_SAVE_CFLAGS
+LIBS=$_SAVE_LIBS
+
+AC_SUBST(MOZ_SUN)
+AC_SUBST(MOZ_OSS)
+AC_SUBST_LIST(MOZ_OSS_CFLAGS)
+AC_SUBST_LIST(MOZ_OSS_LIBS)
+
+dnl ==================================
 dnl = Check alsa availability on Linux
 dnl ==================================
 
@


1.4
log
@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
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.3 2019/02/25 15:32:24 wiz Exp $
d6 1
d8 1
a8 1
--- old-configure.in.orig	2018-05-03 16:58:31.000000000 +0000
d10 1
a10 1
@@@@ -1804,11 +1804,7 @@@@ if test "$MOZ_SYSTEM_JPEG" = 1; then
d23 1
a23 1
@@@@ -2596,6 +2592,67 @@@@ AC_DEFINE(MOZ_WEBM_ENCODER)
d32 1
a32 1
+Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD)
d35 3
d86 1
@


1.3
log
@tor-browser: update to 8.5.

This is based on a git checkout from a couple days ago; not completely
sure about the version number.

The Makefile now contains a short how-to for updating this package.

Many thanks for the www/firefox60 patches!

Use at your own risk!
Survives basic browsing and check.torproject.org claims it connects via tor.

Changes: too many to document.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1 2018/06/28 14:04:10 ryoon Exp $
d76 1
a76 1
+        [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound")
@


1.2
log
@Update to 6.0.8

* Use OpenBSD Ports distfile
* Profile directory has changed to $HOME/TorBrowser-Data
* Besed on Firefox 45.6.0
@
text
@d1 1
a1 1
$NetBSD$
d3 7
a9 45
--- configure.in.orig	2017-01-22 03:59:19.858941700 +0000
+++ configure.in
@@@@ -1746,7 +1746,7 @@@@ fi
 dnl ========================================================
 dnl SPS Profiler
 dnl ========================================================
-MOZ_ENABLE_PROFILER_SPS=1
+MOZ_ENABLE_PROFILER_SPS=
 
 case "${OS_TARGET}" in
 Android)
@@@@ -1996,7 +1996,6 @@@@ case "$target" in
         _PLATFORM_DEFAULT_TOOLKIT='cairo-uikit'
         direct_nspr_config=1
     else
-        AC_DEFINE(XP_MACOSX)
         AC_DEFINE(XP_DARWIN)
         _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
         # The ExceptionHandling framework is needed for Objective-C exception
@@@@ -2574,8 +2573,7 @@@@ MOZ_CXX11
 
 AC_LANG_C
 
-dnl Check for .hidden assembler directive and visibility attribute.
-dnl Borrowed from glibc configure.in
+dnl Setup default hidden visibility and wrapped system headers.
 dnl ===============================================================
 if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
   AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
@@@@ -3467,6 +3465,14 @@@@ if test -n "$YASM"; then
   _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
 fi
 
+if test -n "${LIBXUL_SDK_DIR}"; then
+    AC_MSG_WARN([pkgsrc: LIBXUL_SDK_DIR is set; assuming we want nss and nspr from xulrunner.])
+    NSPR_CFLAGS="-I${prefix}/include/xulrunner/unstable `pkg-config --cflags nspr`"
+    NSPR_LIBS="`pkg-config --libs nspr`"
+    NSS_CFLAGS="`pkg-config --cflags nss`"
+    NSS_LIBS="`pkg-config --libs nss`"
+fi
+
 if test -z "$SKIP_LIBRARY_CHECKS"; then
 dnl system JPEG support
 dnl ========================================================
@@@@ -3494,11 +3500,7 @@@@ if test "$MOZ_NATIVE_JPEG" = 1; then
d19 1
a19 1
                    MOZ_NATIVE_JPEG=1,
d22 1
a22 165
@@@@ -4255,6 +4257,10 @@@@ cairo-gonk)
 
 esac
 
+if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
+   AC_DEFINE(XP_MACOSX)
+fi
+
 AC_SUBST(MOZ_PDF_PRINTING)
 if test "$MOZ_PDF_PRINTING"; then
    PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
@@@@ -5013,6 +5019,9 @@@@ if test -n "$MOZ_WEBRTC"; then
     MOZ_VPX=1
     MOZ_VPX_ERROR_CONCEALMENT=1
 
+    dnl with libv4l2 we can support more cameras
+    PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
+
 dnl enable once Signaling lands
     MOZ_WEBRTC_SIGNALING=1
     AC_DEFINE(MOZ_WEBRTC_SIGNALING)
@@@@ -5156,6 +5165,142 @@@@ if test "${ac_cv_c_attribute_aligned}" !
 fi
 
 dnl ========================================================
+dnl Check for libogg
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-ogg,
+[  --with-system-ogg       Use system libogg (located with pkgconfig)],
+MOZ_NATIVE_OGG=1,
+MOZ_NATIVE_OGG=)
+
+if test -n "$MOZ_NATIVE_OGG"; then
+    PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
+
+    _SAVE_LIBS=$LIBS
+    LIBS="$LIBS $MOZ_OGG_LIBS"
+    AC_CHECK_FUNC(ogg_set_mem_functions, [],
+      [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)])
+    LIBS=$_SAVE_LIBS
+fi
+
+AC_SUBST(MOZ_NATIVE_OGG)
+
+dnl ========================================================
+dnl Check for libvorbis
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-vorbis,
+[  --with-system-vorbis    Use system libvorbis (located with pkgconfig)],
+MOZ_NATIVE_VORBIS=1,
+MOZ_NATIVE_VORBIS=)
+
+if test -n "$MOZ_NATIVE_VORBIS"; then
+    PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
+fi
+
+AC_SUBST(MOZ_NATIVE_VORBIS)
+
+dnl ========================================================
+dnl Check for integer-only libvorbis aka tremor
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-tremor,
+[  --with-system-tremor    Use system libtremor (located with pkgconfig)],
+MOZ_NATIVE_TREMOR=1,
+MOZ_NATIVE_TREMOR=)
+
+if test -n "$MOZ_NATIVE_TREMOR"; then
+    PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)
+fi
+
+AC_SUBST(MOZ_NATIVE_TREMOR)
+
+dnl ========================================================
+dnl Check for libcelt
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-celt,
+[  --with-system-celt      Use system libcelt (located with pkgconfig)],
+MOZ_NATIVE_CELT=1,
+MOZ_NATIVE_CELT=)
+
+if test -n "$MOZ_NATIVE_CELT"; then
+    PKG_CHECK_MODULES(MOZ_CELT, celt)
+else
+    MOZ_CELT_CFLAGS='-I$(topsrcdir)/media/libopus'
+fi
+
+AC_SUBST(MOZ_NATIVE_CELT)
+
+dnl ========================================================
+dnl Check for libopus
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-opus,
+[  --with-system-opus      Use system libopus (located with pkgconfig)],
+MOZ_NATIVE_OPUS=1,
+MOZ_NATIVE_OPUS=)
+
+if test -n "$MOZ_NATIVE_OPUS"; then
+    PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1)
+else
+    MOZ_OPUS_CFLAGS='-I$(topsrcdir)/media/libopus/include'
+fi
+
+AC_SUBST(MOZ_NATIVE_OPUS)
+
+dnl ========================================================
+dnl Check for libtheora
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-theora,
+[  --with-system-theora    Use system libtheora (located with pkgconfig)],
+MOZ_NATIVE_THEORA=1,
+MOZ_NATIVE_THEORA=)
+
+if test -n "$MOZ_NATIVE_THEORA"; then
+    PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2)
+fi
+
+AC_SUBST(MOZ_NATIVE_THEORA)
+
+dnl ========================================================
+dnl Check for libsoundtouch
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-soundtouch,
+[  --with-system-soundtouch Use system libsoundtouch (located with pkgconfig)],
+MOZ_NATIVE_SOUNDTOUCH=1,
+MOZ_NATIVE_SOUNDTOUCH=)
+
+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
+    PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.8.0)
+
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+    _SAVE_CXXFLAGS=$CXXFLAGS
+    CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
+    AC_CACHE_CHECK(for soundtouch sample type,
+                   ac_cv_soundtouch_sample_type,
+                   [AC_TRY_COMPILE([#include <SoundTouch.h>
+                                    #ifndef SOUNDTOUCH_INTEGER_SAMPLES
+                                    #error soundtouch expects float samples
+                                    #endif],
+                                   [],
+                                   [ac_cv_soundtouch_sample_type=short],
+                                   [ac_cv_soundtouch_sample_type=float])])
+    CXXFLAGS=$_SAVE_CXXFLAGS
+    AC_LANG_RESTORE
+
+    if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
+         -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
+        AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
+    fi
+fi
+
+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)
+
+dnl ========================================================
 dnl = Disable VP8 decoder support
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(webm,
@@@@ -5558,6 +5703,67 @@@@ fi
d31 1
a31 1
+Linux|SunOS|DragonFly|FreeBSD|GNU/kFreeBSD)
d54 1
a54 1
+        oss_conf=${OSSPREFIX}/etc/oss.conf
d71 1
a71 1
+        AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET.  Disable with --disable-ogg --disable-wave --disable-webm.])
a89 98
@@@@ -5571,12 +5777,23 @@@@ MOZ_ARG_ENABLE_BOOL(alsa,
    MOZ_ALSA=1,
    MOZ_ALSA=)
 
+MOZ_ARG_DISABLE_BOOL(alsa-dlopen,
+[  --disable-alsa-dlopen   Disable runtime linking of libasound.so],
+   DISABLE_LIBASOUND_DLOPEN=1,
+   DISABLE_LIBASOUND_DLOPEN=)
+
 if test -n "$MOZ_ALSA"; then
     PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
          [echo "$MOZ_ALSA_PKG_ERRORS"
           AC_MSG_ERROR([Need alsa for audio output on Linux. (On Ubuntu, you might try installing the package libasound2-dev.)])])
 fi
 
+if test -n "$DISABLE_LIBASOUND_DLOPEN"; then
+    AC_DEFINE(DISABLE_LIBASOUND_DLOPEN)
+else
+    MOZ_ALSA_LIBS=
+fi
+
 AC_SUBST(MOZ_ALSA)
 
 dnl ========================================================
@@@@ -6539,12 +6756,23 @@@@ if test -n "$TOR_BROWSER_UPDATE"; then
     AC_DEFINE(TOR_BROWSER_UPDATE)
 fi
 
+MOZ_ARG_ENABLE_BOOL(tor-browser-data-in-home-dir,
+[  --enable-tor-browser-data-in-home-dir
+                          Enable Tor Browser data in home dir],
+    TOR_BROWSER_DATA_IN_HOME_DIR=1,
+    TOR_BROWSER_DATA_IN_HOME_DIR= )
+
 MOZ_ARG_ENABLE_BOOL(tor-browser-data-outside-app-dir,
 [  --enable-tor-browser-data-outside-app-dir
                           Enable Tor Browser data outside of app directory],
     TOR_BROWSER_DATA_OUTSIDE_APP_DIR=1,
     TOR_BROWSER_DATA_OUTSIDE_APP_DIR= )
 
+if test -n "$TOR_BROWSER_DATA_IN_HOME_DIR"; then
+    TOR_BROWSER_DATA_OUTSIDE_APP_DIR=1
+    AC_DEFINE(TOR_BROWSER_DATA_IN_HOME_DIR)
+fi
+
 if test -n "$TOR_BROWSER_DATA_OUTSIDE_APP_DIR"; then
     AC_DEFINE(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
 fi
@@@@ -8170,6 +8398,49 @@@@ if test "$USE_FC_FREETYPE"; then
 fi
 
 dnl ========================================================
+dnl Check for harfbuzz
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-harfbuzz,
+[  --with-system-harfbuzz  Use system harfbuzz (located with pkgconfig)],
+MOZ_NATIVE_HARFBUZZ=1,
+MOZ_NATIVE_HARFBUZZ=)
+
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
+    PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.34)
+fi
+
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
+
+dnl ========================================================
+dnl Check for graphite2
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-graphite2,
+[  --with-system-graphite2 Use system graphite2 (located with pkgconfig)],
+MOZ_NATIVE_GRAPHITE2=1,
+MOZ_NATIVE_GRAPHITE2=)
+
+if test -n "$MOZ_NATIVE_GRAPHITE2"; then
+    PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2)
+
+    dnl graphite2.pc has bogus version, check manually
+    AC_TRY_COMPILE([ #include <graphite2/Font.h>
+                     #define GR2_VERSION_REQUIRE(major,minor,bugfix)  \
+                             ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \
+                               * 100 + GR2_VERSION_BUGFIX >= \
+                               (major) * 10000 + (minor) * 100 + (bugfix) )
+                   ], [
+                     #if !GR2_VERSION_REQUIRE(1,2,4)
+                     #error "Insufficient graphite2 version."
+                     #endif
+                   ], [],
+                   [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
+fi
+
+AC_SUBST(MOZ_NATIVE_GRAPHITE2)
+
+dnl ========================================================
 dnl Check for pixman and cairo
 dnl ========================================================
 
@


1.1
log
@Import tor-browser-5.5.2 as security/tor-browser.

What is the Tor Browser?

The Tor software protects you by bouncing your communications around
a distributed network of relays run by volunteers all around the
world: it prevents somebody watching your Internet connection from
learning what sites you visit, it prevents the sites you visit from
learning your physical location, and it lets you access sites which
are blocked.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1 2015/07/09 14:13:51 ryoon Exp $
d3 1
a3 14
* The profiler does not support Darwin/PPC so don't try to enable it
  on that platform.

* Cocoa gamepad backend can only be used if the toolkit is cocoa too.

* The preprocessor macro XP_MACOSX is misused everywhere. They tend to
  say "#if defined(XP_MACOSX)" to actually mean
  "#if defined(MOZ_WIDGET_COCOA)". It's okay to equate XP_MACOSX with
  XP_DARWIN but equating it with MOZ_WIDGET_COCOA is just wrong. As a
  result, cairo-gtk2 build on Darwin is completely broken and needs
  heavy patching. Ideally they should be fixed individually but that
  will be an extremely hard work, so don't define XP_MACOSX for now.

--- configure.in.orig	2015-05-04 00:43:23.000000000 +0000
d5 10
a14 26
@@@@ -1794,7 +1794,13 @@@@ Linux)
         MOZ_ENABLE_PROFILER_SPS=
     esac
     ;;
-WINNT|Darwin) ;;
+WINNT|Darwin)
+    case "${CPU_ARCH}" in
+    x86 | x86_64) ;;
+    *)
+        MOZ_ENABLE_PROFILER_SPS=
+    esac
+    ;;
 *)
     MOZ_ENABLE_PROFILER_SPS=
     ;;
@@@@ -1898,7 +1904,7 @@@@ case "$host" in
     ;;
 
 *-darwin*)
-    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
+    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
     HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
     ;;
@@@@ -2022,7 +2028,6 @@@@ case "$target" in
         AC_DEFINE(XP_DARWIN)
d16 1
d22 1
a22 1
@@@@ -2641,8 +2646,7 @@@@ MOZ_CXX11
d32 1
a32 1
@@@@ -3663,6 +3667,14 @@@@ if test -n "$YASM"; then
d47 1
a47 1
@@@@ -3690,11 +3702,7 @@@@ if test "$MOZ_NATIVE_JPEG" = 1; then
d60 1
a60 1
@@@@ -4392,6 +4400,10 @@@@ cairo-gonk)
d71 1
a71 10
@@@@ -4408,7 +4420,7 @@@@ fi
 
 if test "$COMPILE_ENVIRONMENT"; then
   if test "$MOZ_ENABLE_GTK3"; then
-    PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 atk-bridge-2.0 $GDK_PACKAGES)
+    PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES)
     MOZ_GTK3_CFLAGS="-I${_topsrcdir}/widget/gtk/compat-gtk3 $MOZ_GTK3_CFLAGS"
     dnl Contrary to MOZ_GTK2_LIBS, MOZ_GTK3_LIBS needs to be literally added to TK_LIBS instead
     dnl of a make reference because of how TK_LIBS is mangled in toolkit/library/moz.build
@@@@ -5149,6 +5161,9 @@@@ if test -n "$MOZ_WEBRTC"; then
d81 1
a81 1
@@@@ -5252,6 +5267,157 @@@@ if test "${ac_cv_c_attribute_aligned}" !
a184 15
+dnl Check for libspeex resampler
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-speex,
+[  --with-system-speex     Use system libspeex (located with pkgconfig)],
+MOZ_NATIVE_SPEEX=1,
+MOZ_NATIVE_SPEEX=)
+
+if test -n "$MOZ_NATIVE_SPEEX"; then
+    PKG_CHECK_MODULES(MOZ_SPEEX, speexdsp >= 1.2)
+fi
+
+AC_SUBST(MOZ_NATIVE_SPEEX)
+
+dnl ========================================================
d224 1
a224 1
@@@@ -5606,6 +5772,67 @@@@ fi
d233 1
a233 1
+Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD)
d256 1
a256 1
+        oss_conf=${OSSPREFIX%/usr}/etc/oss.conf
d292 1
a292 1
@@@@ -5619,12 +5846,23 @@@@ MOZ_ARG_ENABLE_BOOL(alsa,
d316 25
a340 12
@@@@ -6046,7 +6284,9 @@@@ MOZ_ARG_DISABLE_BOOL(gamepad,
 if test "$MOZ_GAMEPAD"; then
     case "$OS_TARGET" in
     Darwin)
-        MOZ_GAMEPAD_BACKEND=cocoa
+        if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
+            MOZ_GAMEPAD_BACKEND=cocoa
+        fi
         ;;
     WINNT)
         MOZ_GAMEPAD_BACKEND=windows
@@@@ -8066,6 +8306,49 @@@@ if test "$USE_FC_FREETYPE"; then
@