attila <att...@stalphonsos.com> writes: > Hi ports@, > > Attached is a patch for the -stable ports tree to bring Tor Browser up > to 6.5.2. I have not been able to test the packages myself so I could > really use some testing. I cooked some packages for testing if anyone > cares: https://bits.haqistan.net/~tdp/amd64/stable/ > > Feedback most welcome. > > Pax, -A
Ping. Pax, -A -- https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net} pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D 09C1 4068 D5D5 62A7 29CF
Index: meta/tor-browser/Makefile =================================================================== RCS file: /cvs/ports/meta/tor-browser/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- meta/tor-browser/Makefile 31 Jan 2017 13:48:18 -0000 1.4 +++ meta/tor-browser/Makefile 24 May 2017 12:46:35 -0000 @@ -4,7 +4,7 @@ COMMENT= Tor Browser meta package MAINTAINER= Sean Levy <att...@stalphonsos.com> -PKGNAME= tor-browser-6.5 +PKGNAME= tor-browser-6.5.2 RUN_DEPENDS= www/tor-browser/browser \ www/tor-browser/torbutton \ Index: www/tor-browser/Makefile.inc =================================================================== RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v retrieving revision 1.4 diff -u -p -r1.4 Makefile.inc --- www/tor-browser/Makefile.inc 31 Jan 2017 13:48:18 -0000 1.4 +++ www/tor-browser/Makefile.inc 24 May 2017 12:46:35 -0000 @@ -5,8 +5,9 @@ HOMEPAGE ?= https://www.torproject.org GH_ACCOUNT ?= torbsd PERMIT_PACKAGE_CDROM ?= Yes CATEGORIES = www +# XXX If updating, bump REVISION of any extensions which did not get updated. BROWSER_NAME = tor-browser -TB_VERSION = 6.5 +TB_VERSION = 6.5.2 TB_PREFIX = tb SUBST_VARS += BROWSER_NAME TB_VERSION Index: www/tor-browser/browser/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- www/tor-browser/browser/Makefile 18 Feb 2017 16:22:54 -0000 1.6 +++ www/tor-browser/browser/Makefile 24 May 2017 12:46:35 -0000 @@ -15,7 +15,7 @@ DIST_SUBDIR = ${BROWSER_NAME} WRKDIST = ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//} GH_PROJECT = torb -GH_TAGNAME = v${TB_VERSION}-esr45.7.0 +GH_TAGNAME = v${TB_VERSION}-esr45.9.0 PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION} DISTNAME = ${GH_TAGNAME} @@ -75,7 +75,7 @@ CONFIGURE_ARGS += --disable-webrtc CONFIGURE_ARGS += --disable-gstreamer -RUN_DEPENDS += net/tor>=0.2.9.9p0 +RUN_DEPENDS += net/tor>=0.2.9.10 # bug 857628 CONFIGURE_ARGS += --enable-pie Index: www/tor-browser/browser/distinfo =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- www/tor-browser/browser/distinfo 31 Jan 2017 13:48:18 -0000 1.4 +++ www/tor-browser/browser/distinfo 24 May 2017 12:46:35 -0000 @@ -1,2 +1,2 @@ -SHA256 (tor-browser/v6.5-esr45.7.0.tar.gz) = RIKh9Ura08i7pYMfz1mjNZn50kAetrnpmOBppzGvXcM= -SIZE (tor-browser/v6.5-esr45.7.0.tar.gz) = 256763405 +SHA256 (tor-browser/v6.5.2-esr45.9.0.tar.gz) = WZFZ4ullzb1Ox9oEmwC8tvl+gQgkwtobZ5k+hKj5Bd0= +SIZE (tor-browser/v6.5.2-esr45.9.0.tar.gz) = 256788819 Index: www/tor-browser/browser/files/extension-overrides.js =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v retrieving revision 1.3 diff -u -p -r1.3 extension-overrides.js --- www/tor-browser/browser/files/extension-overrides.js 24 Dec 2016 20:15:06 -0000 1.3 +++ www/tor-browser/browser/files/extension-overrides.js 24 May 2017 12:46:35 -0000 @@ -2,15 +2,6 @@ # Tor Browser Bundle # Do not edit this file. -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); pref("extensions.https_everywhere.toolbar_hint_shown", true); @@ -79,8 +70,6 @@ pref("extensions.torlauncher.default_bri pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); - pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); @@ -101,8 +90,10 @@ pref("extensions.torlauncher.default_bri pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); +/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.prompt_for_locale", false); pref("intl.locale.matchOS", false); Index: www/tor-browser/https-everywhere/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- www/tor-browser/https-everywhere/Makefile 31 Jan 2017 13:48:18 -0000 1.4 +++ www/tor-browser/https-everywhere/Makefile 24 May 2017 12:46:35 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.4 2017/01/31 13:48:18 landry Exp $ ADDON_NAME = https-everywhere -V = 5.2.9 +V = 5.2.14 COMMENT = Tor Browser add-on: force https where possible HOMEPAGE = https://www.eff.org/https-everywhere MASTER_SITES = https://www.eff.org/files/ Index: www/tor-browser/https-everywhere/distinfo =================================================================== RCS file: /cvs/ports/www/tor-browser/https-everywhere/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- www/tor-browser/https-everywhere/distinfo 31 Jan 2017 13:48:18 -0000 1.4 +++ www/tor-browser/https-everywhere/distinfo 24 May 2017 12:46:35 -0000 @@ -1,2 +1,2 @@ -SHA256 (https-everywhere-5.2.9-eff.xpi) = xygcUliVA0oSXDTRF6S8h5xPuq9lpjrfVCrRBWjaPJQ= -SIZE (https-everywhere-5.2.9-eff.xpi) = 2798649 +SHA256 (https-everywhere-5.2.14-eff.xpi) = o6O9uLKeYLQ41eVD5opvgPvWs7FKd/oMHsnXlzPI5ao= +SIZE (https-everywhere-5.2.14-eff.xpi) = 2897016 Index: www/tor-browser/noscript/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- www/tor-browser/noscript/Makefile 31 Jan 2017 13:48:18 -0000 1.5 +++ www/tor-browser/noscript/Makefile 24 May 2017 12:46:35 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.5 2017/01/31 13:48:18 landry Exp $ ADDON_NAME = noscript -V = 2.9.5.3 +V = 5.0.2 COMMENT = Tor Browser add-on: flexible JS blocker HOMEPAGE = http://noscript.net MASTER_SITES = https://secure.informaction.com/download/releases/ Index: www/tor-browser/noscript/distinfo =================================================================== RCS file: /cvs/ports/www/tor-browser/noscript/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- www/tor-browser/noscript/distinfo 31 Jan 2017 13:48:18 -0000 1.3 +++ www/tor-browser/noscript/distinfo 24 May 2017 12:46:35 -0000 @@ -1,2 +1,2 @@ -SHA256 (noscript-2.9.5.3.xpi) = zpd5o6WiV0uVj45NB5qZ1DqPhBk771LFh8cE7YHC+70= -SIZE (noscript-2.9.5.3.xpi) = 555119 +SHA256 (noscript-5.0.2.xpi) = Mbp3Q2md7vtga8xJGX0m2Sb2tOPTUmzS+KM5+FegT7E= +SIZE (noscript-5.0.2.xpi) = 557292 Index: www/tor-browser/tor-launcher/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/tor-launcher/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- www/tor-browser/tor-launcher/Makefile 31 Jan 2017 13:48:18 -0000 1.4 +++ www/tor-browser/tor-launcher/Makefile 24 May 2017 12:46:35 -0000 @@ -2,6 +2,7 @@ ADDON_NAME = tor-launcher V = 0.2.10.3 +REVISION = 0 COMMENT = Tor Browser add-on to manage tor instance GUID = tor-launc...@torproject.org PKGNAME = ${TB_NAME} Index: www/tor-browser/torbutton/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/torbutton/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- www/tor-browser/torbutton/Makefile 31 Jan 2017 13:48:18 -0000 1.4 +++ www/tor-browser/torbutton/Makefile 24 May 2017 12:46:35 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.4 2017/01/31 13:48:18 landry Exp $ ADDON_NAME = torbutton -V = 1.9.6.12 +V = 1.9.6.14 COMMENT = Tor Browser add-on for configuring Tor Browser settings GUID = torbut...@torproject.org PKGNAME = ${TB_NAME} Index: www/tor-browser/torbutton/distinfo =================================================================== RCS file: /cvs/ports/www/tor-browser/torbutton/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- www/tor-browser/torbutton/distinfo 31 Jan 2017 13:48:18 -0000 1.4 +++ www/tor-browser/torbutton/distinfo 24 May 2017 12:46:35 -0000 @@ -1,2 +1,2 @@ -SHA256 (torbutton-1.9.6.12.tar.gz) = c2xlZ8lyePGIpiufWcL0lAe9D+H2o3eArGgGELyWfpU= -SIZE (torbutton-1.9.6.12.tar.gz) = 600920 +SHA256 (torbutton-1.9.6.14.tar.gz) = A1tF2RZr4Lj4CghtD4CGzr2wXPNLrV9uAxNia8yZ7Wc= +SIZE (torbutton-1.9.6.14.tar.gz) = 601034
