Fri May 1 07:01:46 2020 UTC ()
tor-browser: update to 9.0.9nb4.

Install and use the fonts distributed with the Linux binary of tor-browser.
Reduces fingerprinting possibilities based on installed fonts.

Idea from Caspar Schutijser, the OpenBSD ports maintainer, and
based on his patch for OpenBSD ports.


(wiz)
diff -r1.62 -r1.63 pkgsrc/security/tor-browser/Makefile
diff -r1.6 -r1.7 pkgsrc/security/tor-browser/PLIST
diff -r1.18 -r1.19 pkgsrc/security/tor-browser/distinfo
diff -r0 -r1.1 pkgsrc/security/tor-browser/files/tor-browser.sh
diff -r1.1 -r1.2 pkgsrc/security/tor-browser/patches/patch-browser_app_profile_000-tor-browser.js
diff -r1.2 -r1.3 pkgsrc/security/tor-browser/patches/patch-toolkit_moz.configure
cvs diff -r1.62 -r1.63 pkgsrc/security/tor-browser/Makefile (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/Makefile 2020/04/30 07:52:39 1.62
+++ pkgsrc/security/tor-browser/Makefile 2020/05/01 07:01:46 1.63
@@ -1,50 +1,60 @@ @@ -1,50 +1,60 @@
1# $NetBSD: Makefile,v 1.62 2020/04/30 07:52:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.63 2020/05/01 07:01:46 wiz Exp $
2 2
3DISTNAME= src-firefox-tor-browser-68.7.0esr-9.0-2-build1 3DISTNAME= src-firefox-tor-browser-68.7.0esr-9.0-2-build1
4PKGNAME= tor-browser-9.0.9 4PKGNAME= tor-browser-9.0.9
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= security www 6CATEGORIES= security www
7MASTER_SITES= https://dist.torproject.org/torbrowser/${PKGVERSION_NOREV}/ 7MASTER_SITES= https://dist.torproject.org/torbrowser/${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9#DISTFILES= ${DISTNAME}${EXTRACT_SUFX} src-tor-launcher-0.2.20.5${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
 10DISTFILES+= tor-browser-linux64-${PKGVERSION_NOREV}_en-US${EXTRACT_SUFX}
 11#DISTFILES+= src-tor-launcher-0.2.20.5${EXTRACT_SUFX}
10 12
11MAINTAINER= wiz@NetBSD.org 13MAINTAINER= wiz@NetBSD.org
12HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en 14HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en
13COMMENT= Tor Browser based on Firefox 15COMMENT= Tor Browser based on Firefox
14LICENSE= mpl-1.1 16LICENSE= mpl-1.1
15 17
16WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} 18WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
17 19
18DEPENDS+= tor-[0-9]*:../../net/tor 20DEPENDS+= tor-[0-9]*:../../net/tor
19DEPENDS+= tor-browser-https-everywhere-[0-9]*:../../security/tor-browser-https-everywhere 21DEPENDS+= tor-browser-https-everywhere-[0-9]*:../../security/tor-browser-https-everywhere
20DEPENDS+= tor-browser-noscript-[0-9]*:../../security/tor-browser-noscript 22DEPENDS+= tor-browser-noscript-[0-9]*:../../security/tor-browser-noscript
21 23
22# How to update this package: 24# How to update this package:
23# 25#
24# replace all patches with the one from the correspoding www/firefox${ESR_RELEASE} 26# replace all patches with the one from the correspoding www/firefox${ESR_RELEASE}
25# BUT keep patch-xpcom_io_TorFileUtils.cpp 27# BUT keep patch-xpcom_io_TorFileUtils.cpp
26# AND keep patch-browser_app_profile_000-tor-browser.js 28# AND keep patch-browser_app_profile_000-tor-browser.js
 29# AND the second chunk of patch-toolkit_moz.configure
27# (AND if necessary patch-.mozconfig) 30# (AND if necessary patch-.mozconfig)
28# make the patches apply 31# make the patches apply
29# 32#
30# when packaged up, read MESSAGE and test by visiting https://check.torproject.org 33# when packaged up, read MESSAGE and test by visiting https://check.torproject.org
 34# and https://panopticlick.eff.org
31 35
32# Remove hardcoded build directory. 36# Remove hardcoded build directory.
33SUBST_CLASSES+= fix-build-dir 37SUBST_CLASSES+= fix-build-dir
34SUBST_STAGE.fix-build-dir= pre-configure 38SUBST_STAGE.fix-build-dir= pre-configure
35SUBST_FILES.fix-build-dir+= .mozconfig 39SUBST_FILES.fix-build-dir+= .mozconfig
36SUBST_SED.fix-build-dir+= -e 's,mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@,,' 40SUBST_SED.fix-build-dir+= -e 's,mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@,,'
37 41
 42SUBST_CLASSES+= fonts
 43SUBST_STAGE.fonts= pre-configure
 44SUBST_FILES.fonts+= tor-browser_en-US/Browser/TorBrowser/Data/fontconfig/fonts.conf
 45SUBST_SED.fonts+= -e 's,<dir>fonts</dir>,<dir>${PREFIX}/lib/tor-browser/browser/fonts</dir>,'
 46SUBST_MESSAGE.fonts= Fixing path to bundled fonts directory.
 47
38MOZILLA_DIR= # empty 48MOZILLA_DIR= # empty
39 49
40.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
41 51
42CONFIGURE_ARGS+= --enable-tor-browser-data-outside-app-dir 52CONFIGURE_ARGS+= --enable-tor-browser-data-outside-app-dir
43CONFIGURE_ARGS+= --with-tor-browser-version=${PKGVERSION_NOREV} 53CONFIGURE_ARGS+= --with-tor-browser-version=${PKGVERSION_NOREV}
44CFLAGS+= -DTOR_BROWSER_DATA_IN_HOME_DIR=1 54CFLAGS+= -DTOR_BROWSER_DATA_IN_HOME_DIR=1
45CFLAGS+= -DTOR_BROWSER_DATA_OUTSIDE_APP_DIR=1 55CFLAGS+= -DTOR_BROWSER_DATA_OUTSIDE_APP_DIR=1
46CFLAGS+= -fPIC 56CFLAGS+= -fPIC
47 57
48# workaround for link of libxul.so etc. 58# workaround for link of libxul.so etc.
49LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE} 59LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
50LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib 60LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib
@@ -69,42 +79,52 @@ CHECK_INTERPRETER_SKIP+= lib/firefox-sdk @@ -69,42 +79,52 @@ CHECK_INTERPRETER_SKIP+= lib/firefox-sdk
69CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/typelib.py 79CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/typelib.py
70CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py 80CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py
71CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py 81CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py
72 82
73CHECK_WRKREF_SKIP+= lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html 83CHECK_WRKREF_SKIP+= lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html
74 84
75MOZILLA= ${PKGBASE} 85MOZILLA= ${PKGBASE}
76MOZILLA_ICON= ${WRKSRC}/browser/branding/official/default48.png 86MOZILLA_ICON= ${WRKSRC}/browser/branding/official/default48.png
77MOZILLA_NAME= TorBrowser 87MOZILLA_NAME= TorBrowser
78 88
79post-extract: 89post-extract:
80 mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S 90 mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S
81 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src/cubeb_sun.c 91 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src/cubeb_sun.c
 92 mv ${WRKDIR}/tor-browser_en-US ${WRKSRC}
82# mv ${WRKDIR}/tor-launcher* ${WRKSRC}/browser/extensions/tor-launcher 93# mv ${WRKDIR}/tor-launcher* ${WRKSRC}/browser/extensions/tor-launcher
83 94
84pre-configure: 95pre-configure:
85 cd ${WRKSRC} && mkdir ${OBJDIR} 96 cd ${WRKSRC} && mkdir ${OBJDIR}
86 cd ${WRKSRC} && autoconf 97 cd ${WRKSRC} && autoconf
87 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars 98 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
88 cd ${WRKSRC}/js/src && autoconf 99 cd ${WRKSRC}/js/src && autoconf
89 100
90post-build: 101post-build:
91 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 102 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
92 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 103 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
93 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \ 104 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \
94 < ${FILESDIR}/desktop.in \ 105 < ${FILESDIR}/desktop.in \
95 > ${WRKDIR}/desktop 106 > ${WRKDIR}/desktop
 107 ${SED} -e 's|@PREFIX@|${PREFIX}|g' \
 108 < ${FILESDIR}/tor-browser.sh \
 109 > ${WRKDIR}/tor-browser.sh
 110
 111INSTALLATION_DIRS+= share/applications
 112INSTALLATION_DIRS+= share/pixmaps
 113INSTALLATION_DIRS+= ${PREFIX}/lib/tor-browser/browser/fontconfig
 114INSTALLATION_DIRS+= ${PREFIX}/lib/tor-browser/browser/fonts
96 115
97INSTALLATION_DIRS+= share/applications share/pixmaps 
98post-install: 116post-install:
99 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA} 117 ${INSTALL_SCRIPT} ${WRKDIR}/tor-browser.sh \
100 ${ECHO} '${PREFIX}/lib/tor-browser/tor-browser-bin "$$@"' >> \ 118 ${DESTDIR}${PREFIX}/bin/tor-browser
101 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 
102 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 
103 ${INSTALL_DATA} ${WRKDIR}/desktop \ 119 ${INSTALL_DATA} ${WRKDIR}/desktop \
104 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop 120 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
105 ${INSTALL_DATA} ${MOZILLA_ICON} \ 121 ${INSTALL_DATA} ${MOZILLA_ICON} \
106 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png 122 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
 123 ${INSTALL_DATA} ${WRKSRC}/tor-browser_en-US/Browser/TorBrowser/Data/fontconfig/fonts.conf \
 124 ${DESTDIR}${PREFIX}/lib/tor-browser/browser/fontconfig
 125 ${INSTALL_DATA} ${WRKSRC}/tor-browser_en-US/Browser/fonts/* \
 126 ${DESTDIR}${PREFIX}/lib/tor-browser/browser/fonts
107 127
108.include "../../sysutils/desktop-file-utils/desktopdb.mk" 128.include "../../sysutils/desktop-file-utils/desktopdb.mk"
109.include "../../sysutils/dbus-glib/buildlink3.mk" 129.include "../../sysutils/dbus-glib/buildlink3.mk"
110.include "../../mk/bsd.pkg.mk" 130.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/security/tor-browser/PLIST (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/PLIST 2020/03/13 17:59:27 1.6
+++ pkgsrc/security/tor-browser/PLIST 2020/05/01 07:01:46 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2020/03/13 17:59:27 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.7 2020/05/01 07:01:46 wiz Exp $
2bin/tor-browser 2bin/tor-browser
3lib/tor-browser/actors/AudioPlaybackChild.jsm 3lib/tor-browser/actors/AudioPlaybackChild.jsm
4lib/tor-browser/actors/AutoplayChild.jsm 4lib/tor-browser/actors/AutoplayChild.jsm
5lib/tor-browser/actors/BrowserChild.jsm 5lib/tor-browser/actors/BrowserChild.jsm
6lib/tor-browser/actors/ControllersChild.jsm 6lib/tor-browser/actors/ControllersChild.jsm
7lib/tor-browser/actors/DateTimePickerChild.jsm 7lib/tor-browser/actors/DateTimePickerChild.jsm
8lib/tor-browser/actors/ExtFindChild.jsm 8lib/tor-browser/actors/ExtFindChild.jsm
9lib/tor-browser/actors/FindBarChild.jsm 9lib/tor-browser/actors/FindBarChild.jsm
10lib/tor-browser/actors/FinderChild.jsm 10lib/tor-browser/actors/FinderChild.jsm
11lib/tor-browser/actors/FormSubmitChild.jsm 11lib/tor-browser/actors/FormSubmitChild.jsm
12lib/tor-browser/actors/KeyPressEventModelCheckerChild.jsm 12lib/tor-browser/actors/KeyPressEventModelCheckerChild.jsm
13lib/tor-browser/actors/PictureInPictureChild.jsm 13lib/tor-browser/actors/PictureInPictureChild.jsm
14lib/tor-browser/actors/PopupBlockingChild.jsm 14lib/tor-browser/actors/PopupBlockingChild.jsm
@@ -3950,26 +3950,73 @@ lib/tor-browser/browser/features/onboard @@ -3950,26 +3950,73 @@ lib/tor-browser/browser/features/onboard
3950lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/img/icons_no-icon.png 3950lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/img/icons_no-icon.png
3951lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/img/icons_tour-complete.png 3951lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/img/icons_tour-complete.png
3952lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/img/icons_tour-complete.svg 3952lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/img/icons_tour-complete.svg
3953lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/img/tor-watermark.png 3953lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/img/tor-watermark.png
3954lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/lib/UITour-lib.js 3954lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/lib/UITour-lib.js
3955lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/modules/OnboardingTourType.jsm 3955lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/modules/OnboardingTourType.jsm
3956lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/onboarding-tor-circuit-display.js 3956lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/onboarding-tor-circuit-display.js
3957lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/onboarding-tour-agent.js 3957lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/onboarding-tour-agent.js
3958lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/onboarding.css 3958lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/onboarding.css
3959lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/onboarding.js 3959lib/tor-browser/browser/features/onboarding@mozilla.org/chrome/content/onboarding.js
3960lib/tor-browser/browser/features/onboarding@mozilla.org/en-US/locale/en-US/onboarding.properties 3960lib/tor-browser/browser/features/onboarding@mozilla.org/en-US/locale/en-US/onboarding.properties
3961lib/tor-browser/browser/features/onboarding@mozilla.org/manifest.json 3961lib/tor-browser/browser/features/onboarding@mozilla.org/manifest.json
3962lib/tor-browser/browser/features/onboarding@mozilla.org/schema.json 3962lib/tor-browser/browser/features/onboarding@mozilla.org/schema.json
 3963lib/tor-browser/browser/fontconfig/fonts.conf
 3964lib/tor-browser/browser/fonts/Arimo-Bold.ttf
 3965lib/tor-browser/browser/fonts/Arimo-BoldItalic.ttf
 3966lib/tor-browser/browser/fonts/Arimo-Italic.ttf
 3967lib/tor-browser/browser/fonts/Arimo-Regular.ttf
 3968lib/tor-browser/browser/fonts/Cousine-Regular.ttf
 3969lib/tor-browser/browser/fonts/NotoEmoji-Regular.ttf
 3970lib/tor-browser/browser/fonts/NotoNaskhArabic-Regular.ttf
 3971lib/tor-browser/browser/fonts/NotoSansArmenian-Regular.ttf
 3972lib/tor-browser/browser/fonts/NotoSansBengali-Regular.ttf
 3973lib/tor-browser/browser/fonts/NotoSansBuginese-Regular.ttf
 3974lib/tor-browser/browser/fonts/NotoSansCanadianAboriginal-Regular.ttf
 3975lib/tor-browser/browser/fonts/NotoSansCherokee-Regular.ttf
 3976lib/tor-browser/browser/fonts/NotoSansDevanagari-Regular.ttf
 3977lib/tor-browser/browser/fonts/NotoSansEthiopic-Regular.ttf
 3978lib/tor-browser/browser/fonts/NotoSansGeorgian-Regular.ttf
 3979lib/tor-browser/browser/fonts/NotoSansGujarati-Regular.ttf
 3980lib/tor-browser/browser/fonts/NotoSansGurmukhi-Regular.ttf
 3981lib/tor-browser/browser/fonts/NotoSansHebrew-Regular.ttf
 3982lib/tor-browser/browser/fonts/NotoSansJP-Regular.otf
 3983lib/tor-browser/browser/fonts/NotoSansKR-Regular.otf
 3984lib/tor-browser/browser/fonts/NotoSansKannada-Regular.ttf
 3985lib/tor-browser/browser/fonts/NotoSansKhmer-Regular.ttf
 3986lib/tor-browser/browser/fonts/NotoSansLao-Regular.ttf
 3987lib/tor-browser/browser/fonts/NotoSansMalayalam-Regular.ttf
 3988lib/tor-browser/browser/fonts/NotoSansMongolian-Regular.ttf
 3989lib/tor-browser/browser/fonts/NotoSansMyanmar-Regular.ttf
 3990lib/tor-browser/browser/fonts/NotoSansOriya-Regular.ttf
 3991lib/tor-browser/browser/fonts/NotoSansSC-Regular.otf
 3992lib/tor-browser/browser/fonts/NotoSansSinhala-Regular.ttf
 3993lib/tor-browser/browser/fonts/NotoSansTC-Regular.otf
 3994lib/tor-browser/browser/fonts/NotoSansTamil-Regular.ttf
 3995lib/tor-browser/browser/fonts/NotoSansTelugu-Regular.ttf
 3996lib/tor-browser/browser/fonts/NotoSansThaana-Regular.ttf
 3997lib/tor-browser/browser/fonts/NotoSansThai-Regular.ttf
 3998lib/tor-browser/browser/fonts/NotoSansTibetan-Regular.ttf
 3999lib/tor-browser/browser/fonts/NotoSansYi-Regular.ttf
 4000lib/tor-browser/browser/fonts/NotoSerifArmenian-Regular.ttf
 4001lib/tor-browser/browser/fonts/NotoSerifKhmer-Regular.ttf
 4002lib/tor-browser/browser/fonts/NotoSerifLao-Regular.ttf
 4003lib/tor-browser/browser/fonts/NotoSerifThai-Regular.ttf
 4004lib/tor-browser/browser/fonts/STIXMath-Regular.otf
 4005lib/tor-browser/browser/fonts/Tinos-Bold.ttf
 4006lib/tor-browser/browser/fonts/Tinos-BoldItalic.ttf
 4007lib/tor-browser/browser/fonts/Tinos-Italic.ttf
 4008lib/tor-browser/browser/fonts/Tinos-Regular.ttf
 4009lib/tor-browser/browser/fonts/TwemojiMozilla.ttf
3963lib/tor-browser/browser/localization/en-US/branding/brand.ftl 4010lib/tor-browser/browser/localization/en-US/branding/brand.ftl
3964lib/tor-browser/browser/localization/en-US/browser/aboutConfig.ftl 4011lib/tor-browser/browser/localization/en-US/browser/aboutConfig.ftl
3965lib/tor-browser/browser/localization/en-US/browser/aboutDialog.ftl 4012lib/tor-browser/browser/localization/en-US/browser/aboutDialog.ftl
3966lib/tor-browser/browser/localization/en-US/browser/aboutPolicies.ftl 4013lib/tor-browser/browser/localization/en-US/browser/aboutPolicies.ftl
3967lib/tor-browser/browser/localization/en-US/browser/aboutPrivateBrowsing.ftl 4014lib/tor-browser/browser/localization/en-US/browser/aboutPrivateBrowsing.ftl
3968lib/tor-browser/browser/localization/en-US/browser/aboutRestartRequired.ftl 4015lib/tor-browser/browser/localization/en-US/browser/aboutRestartRequired.ftl
3969lib/tor-browser/browser/localization/en-US/browser/aboutRobots.ftl 4016lib/tor-browser/browser/localization/en-US/browser/aboutRobots.ftl
3970lib/tor-browser/browser/localization/en-US/browser/aboutSessionRestore.ftl 4017lib/tor-browser/browser/localization/en-US/browser/aboutSessionRestore.ftl
3971lib/tor-browser/browser/localization/en-US/browser/aboutTabCrashed.ftl 4018lib/tor-browser/browser/localization/en-US/browser/aboutTabCrashed.ftl
3972lib/tor-browser/browser/localization/en-US/browser/appMenuNotifications.ftl 4019lib/tor-browser/browser/localization/en-US/browser/appMenuNotifications.ftl
3973lib/tor-browser/browser/localization/en-US/browser/branding/brandings.ftl 4020lib/tor-browser/browser/localization/en-US/browser/branding/brandings.ftl
3974lib/tor-browser/browser/localization/en-US/browser/branding/sync-brand.ftl 4021lib/tor-browser/browser/localization/en-US/browser/branding/sync-brand.ftl
3975lib/tor-browser/browser/localization/en-US/browser/customizeMode.ftl 4022lib/tor-browser/browser/localization/en-US/browser/customizeMode.ftl
cvs diff -r1.18 -r1.19 pkgsrc/security/tor-browser/distinfo (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/distinfo 2020/04/28 19:38:49 1.18
+++ pkgsrc/security/tor-browser/distinfo 2020/05/01 07:01:46 1.19
@@ -1,22 +1,26 @@ @@ -1,22 +1,26 @@
1$NetBSD: distinfo,v 1.18 2020/04/28 19:38:49 wiz Exp $ 1$NetBSD: distinfo,v 1.19 2020/05/01 07:01:46 wiz Exp $
2 2
3SHA1 (src-firefox-tor-browser-68.7.0esr-9.0-2-build1.tar.xz) = c9be70c6cbbac9d73d1aee930703ea4d013725df 3SHA1 (src-firefox-tor-browser-68.7.0esr-9.0-2-build1.tar.xz) = c9be70c6cbbac9d73d1aee930703ea4d013725df
4RMD160 (src-firefox-tor-browser-68.7.0esr-9.0-2-build1.tar.xz) = 6289e342fa8e99c21098331d153beb6d88bc39b2 4RMD160 (src-firefox-tor-browser-68.7.0esr-9.0-2-build1.tar.xz) = 6289e342fa8e99c21098331d153beb6d88bc39b2
5SHA512 (src-firefox-tor-browser-68.7.0esr-9.0-2-build1.tar.xz) = 6cf582c1eb3092c1ecbef86c67040c89dc2c84f54805c52408b0c1051550fcff1af563e09e85ba9cd72a1a1e924b6643a812e9669676856a86e903e0063e5270 5SHA512 (src-firefox-tor-browser-68.7.0esr-9.0-2-build1.tar.xz) = 6cf582c1eb3092c1ecbef86c67040c89dc2c84f54805c52408b0c1051550fcff1af563e09e85ba9cd72a1a1e924b6643a812e9669676856a86e903e0063e5270
6Size (src-firefox-tor-browser-68.7.0esr-9.0-2-build1.tar.xz) = 348594032 bytes 6Size (src-firefox-tor-browser-68.7.0esr-9.0-2-build1.tar.xz) = 348594032 bytes
 7SHA1 (tor-browser-linux64-9.0.9_en-US.tar.xz) = 094d148a5df4efa979e2aaca5d88a6517469ebe6
 8RMD160 (tor-browser-linux64-9.0.9_en-US.tar.xz) = b880eeecc748e6584672a761615fefccb07a7a5b
 9SHA512 (tor-browser-linux64-9.0.9_en-US.tar.xz) = 72a6c080ad2d5237b20f00e82388373accd4866f19a713564823fe416bcaf41408ef774d6cb735db8c3f2766d2870655c85e6109e8ef32de8b1403fc9c63561d
 10Size (tor-browser-linux64-9.0.9_en-US.tar.xz) = 80156396 bytes
7SHA1 (patch-.mozconfig) = 66fbb2f113091eee1f022cd656231f845b04b0f8 11SHA1 (patch-.mozconfig) = 66fbb2f113091eee1f022cd656231f845b04b0f8
8SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c 12SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c
9SHA1 (patch-browser_app_profile_000-tor-browser.js) = 545cf6e80f061a6a58b429d2696046de4e34725f 13SHA1 (patch-browser_app_profile_000-tor-browser.js) = 84a0a15605fff0e22f3150bce901a296fc920280
10SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e 14SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e
11SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 15SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
12SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24 16SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24
13SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993 17SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
14SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef 18SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
15SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2c909a10a341e600392417240ad0c556f495d6ba 19SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2c909a10a341e600392417240ad0c556f495d6ba
16SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad 20SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
17SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = d84d9b4d416e049423120dcbf9199644ce1c93ab 21SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = d84d9b4d416e049423120dcbf9199644ce1c93ab
18SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c 22SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
19SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658 23SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
20SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = d634805bf3b02475081cb2f263e91e3f4c481a29 24SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = d634805bf3b02475081cb2f263e91e3f4c481a29
21SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 25e24743060acf10c776c6b3b3660f52a2e9fbe8 25SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 25e24743060acf10c776c6b3b3660f52a2e9fbe8
22SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = f8d155ee66008b7cc4052b6a889327543b89e0bb 26SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = f8d155ee66008b7cc4052b6a889327543b89e0bb
@@ -24,20 +28,20 @@ SHA1 (patch-ipc_glue_GeckoChildProcessHo @@ -24,20 +28,20 @@ SHA1 (patch-ipc_glue_GeckoChildProcessHo
24SHA1 (patch-js_src_threading_posix_Thread.cpp) = 47e612a676e614fd6dd43b8a3140218a3fbdc7fa 28SHA1 (patch-js_src_threading_posix_Thread.cpp) = 47e612a676e614fd6dd43b8a3140218a3fbdc7fa
25SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35 29SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35
26SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a 30SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
27SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4 31SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4
28SHA1 (patch-media_libcubeb_src_cubeb.c) = dcc173f0bef8b7b12c45739bf04577f3292a517e 32SHA1 (patch-media_libcubeb_src_cubeb.c) = dcc173f0bef8b7b12c45739bf04577f3292a517e
29SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a 33SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a
30SHA1 (patch-media_libcubeb_src_moz.build) = 7d66d9e0d7129b2106885201f88355262ee1a22a 34SHA1 (patch-media_libcubeb_src_moz.build) = 7d66d9e0d7129b2106885201f88355262ee1a22a
31SHA1 (patch-media_libcubeb_update.sh) = 8dcc4ca8e2812b4063f28e5d6308abbee0b1c9d9 35SHA1 (patch-media_libcubeb_update.sh) = 8dcc4ca8e2812b4063f28e5d6308abbee0b1c9d9
32SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc 36SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
33SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = c39a222c5ab16c26cb214e5e53a0b61291a00512 37SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = c39a222c5ab16c26cb214e5e53a0b61291a00512
34SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf 38SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf
35SHA1 (patch-toolkit_library_moz.build) = 57516a1cc888fdbaf39ba90f73e5de488ad1f01e 39SHA1 (patch-toolkit_library_moz.build) = 57516a1cc888fdbaf39ba90f73e5de488ad1f01e
36SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12 40SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12
37SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57 41SHA1 (patch-toolkit_moz.configure) = 9f4edca09802f6d3adb517613e879dca8d2d65be
38SHA1 (patch-toolkit_mozapps_installer_packager.mk) = b2343fbad2556504dfd13601c02e6e2357c7d2bc 42SHA1 (patch-toolkit_mozapps_installer_packager.mk) = b2343fbad2556504dfd13601c02e6e2357c7d2bc
39SHA1 (patch-toolkit_xre_glxtest.cpp) = 04942938f45f326c7d5c4da3bf8cc2d09b977c69 43SHA1 (patch-toolkit_xre_glxtest.cpp) = 04942938f45f326c7d5c4da3bf8cc2d09b977c69
40SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec 44SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec
41SHA1 (patch-xpcom_build_BinaryPath.h) = 92461769d2fee8f015b91a5326247f271afeedea 45SHA1 (patch-xpcom_build_BinaryPath.h) = 92461769d2fee8f015b91a5326247f271afeedea
42SHA1 (patch-xpcom_io_TorFileUtils.cpp) = 3f5c5490a3e4e0117cca3c558de93f2ffea05405 46SHA1 (patch-xpcom_io_TorFileUtils.cpp) = 3f5c5490a3e4e0117cca3c558de93f2ffea05405
43SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 6956c90d4c74c71e7e9a5882e4840ba2673160fa 47SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 6956c90d4c74c71e7e9a5882e4840ba2673160fa
File Added: pkgsrc/security/tor-browser/files/tor-browser.sh
#! /bin/sh
export FONTCONFIG_PATH="@PREFIX@/lib/tor-browser/browser/fontconfig/"
export FONTCONFIG_FILE="fonts.conf"

exec @PREFIX@/lib/tor-browser/tor-browser-bin "$@"
cvs diff -r1.1 -r1.2 pkgsrc/security/tor-browser/patches/patch-browser_app_profile_000-tor-browser.js (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/patches/patch-browser_app_profile_000-tor-browser.js 2020/04/28 19:38:49 1.1
+++ pkgsrc/security/tor-browser/patches/patch-browser_app_profile_000-tor-browser.js 2020/05/01 07:01:46 1.2
@@ -1,22 +1,37 @@ @@ -1,22 +1,37 @@
1$NetBSD: patch-browser_app_profile_000-tor-browser.js,v 1.1 2020/04/28 19:38:49 wiz Exp $ 1$NetBSD: patch-browser_app_profile_000-tor-browser.js,v 1.2 2020/05/01 07:01:46 wiz Exp $
 2
 3First chunk:
2 4
3Despite the warning at the top of this file, we change the default for the socks 5Despite the warning at the top of this file, we change the default for the socks
4port in pkgsrc from 9150 to 9050. 6port in pkgsrc from 9150 to 9050.
5 7
69150 is used for distributions where tor is bundled with tor-browser, so the 89150 is used for distributions where tor is bundled with tor-browser, so the
7standard port can't be used because another tor may already be running there. 9standard port can't be used because another tor may already be running there.
8 10
9pkgsrc's tor-browser uses the system-wide installation of tor and thus should use 11pkgsrc's tor-browser uses the system-wide installation of tor and thus should use
10its default port to minimize manual setup steps for the end users. 12its default port to minimize manual setup steps for the end users.
11 13
 14
 15Second chunk:
 16Hardcode font list on all pkgsrc platforms to make it harder to fingerprint.
 17
12--- browser/app/profile/000-tor-browser.js.orig 2020-04-04 03:09:31.000000000 +0000 18--- browser/app/profile/000-tor-browser.js.orig 2020-04-04 03:09:31.000000000 +0000
13+++ browser/app/profile/000-tor-browser.js 19+++ browser/app/profile/000-tor-browser.js
14@@ -161,7 +161,7 @@ pref("network.predictor.enabled", false) 20@@ -161,7 +161,7 @@ pref("network.predictor.enabled", false)
15  21
16 // Proxy and proxy security 22 // Proxy and proxy security
17 pref("network.proxy.socks", "127.0.0.1"); 23 pref("network.proxy.socks", "127.0.0.1");
18-pref("network.proxy.socks_port", 9150); 24-pref("network.proxy.socks_port", 9150);
19+pref("network.proxy.socks_port", 9050); 25+pref("network.proxy.socks_port", 9050);
20 pref("network.proxy.socks_remote_dns", true); 26 pref("network.proxy.socks_remote_dns", true);
21 pref("network.proxy.no_proxies_on", ""); // For fingerprinting and local service vulns (#10419) 27 pref("network.proxy.no_proxies_on", ""); // For fingerprinting and local service vulns (#10419)
22 pref("network.proxy.allow_hijacking_localhost", true); // Allow proxies for localhost (#31065) 28 pref("network.proxy.allow_hijacking_localhost", true); // Allow proxies for localhost (#31065)
 29@@ -370,7 +370,7 @@ pref("font.name.sans-serif.ar", "Arial")
 30 pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳ ゴシック, MS Mincho, ＭＳ 明朝, MS PGothic, ＭＳ Ｐゴシック, MS PMincho, ＭＳ Ｐ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JhengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI");
 31 #endif
 32
 33-#ifdef XP_LINUX
 34+#if 1
 35 pref("font.default.lo", "Noto Sans Lao");
 36 pref("font.default.my", "Noto Sans Myanmar");
 37 pref("font.default.x-western", "sans-serif");
cvs diff -r1.2 -r1.3 pkgsrc/security/tor-browser/patches/patch-toolkit_moz.configure (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/patches/patch-toolkit_moz.configure 2020/03/13 17:59:27 1.2
+++ pkgsrc/security/tor-browser/patches/patch-toolkit_moz.configure 2020/05/01 07:01:46 1.3
@@ -1,23 +1,33 @@ @@ -1,23 +1,33 @@
1$NetBSD: patch-toolkit_moz.configure,v 1.2 2020/03/13 17:59:27 wiz Exp $ 1$NetBSD: patch-toolkit_moz.configure,v 1.3 2020/05/01 07:01:46 wiz Exp $
2 2
3* skia part: support bigendian architectures 3* skia part: support bigendian architectures
 4* second chunk: use bundled fonts to reduce fingerprinting possibilities
4 5
5--- toolkit/moz.configure.orig 2018-05-03 16:58:41.000000000 +0000 6--- toolkit/moz.configure.orig 2020-04-04 03:09:31.000000000 +0000
6+++ toolkit/moz.configure 7+++ toolkit/moz.configure
7@@ -932,11 +932,11 @@ include('nss.configure') 8@@ -834,11 +834,11 @@ include('nss.configure')
8 # ============================================================== 9 # ==============================================================
9 option('--disable-skia', help='Disable use of Skia') 10 option('--disable-skia', help='Disable use of Skia')
10  11
11-@depends('--disable-skia') 12-@depends('--disable-skia')
12-def skia(value): 13-def skia(value):
13- if not value: 14- if not value:
14- die('--disable-skia is not supported anymore') 15- die('--disable-skia is not supported anymore')
15- else: 16- else:
16+@depends('--disable-skia', target) 17+@depends('--disable-skia', target)
17+def skia(value, target): 18+def skia(value, target):
18+ if value.origin == 'default' and target.endianness == 'big': 19+ if value.origin == 'default' and target.endianness == 'big':
19+ return None 20+ return None
20+ if value: 21+ if value:
21 return True 22 return True
22  23
23 set_config('MOZ_ENABLE_SKIA', skia) 24 set_config('MOZ_ENABLE_SKIA', skia)
 25@@ -1318,7 +1318,7 @@ set_config('MOZ_BITS_DOWNLOAD',
 26
 27 @depends(target)
 28 def bundled_fonts_default(target):
 29- return target.os == 'WINNT' or target.kernel == 'Linux'
 30+ return True
 31
 32 @depends(build_project)
 33 def allow_bundled_fonts(project):