From 4a6f5a850915e525cfd38a845896089a453fd222 Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 26 Sep 2017 19:55:17 +0000 Subject: [PATCH] update to tor-browser 7.0.5, from attila (maintainer), regen distinfo for extra commit that got added to github tar.gz --- meta/tor-browser/Makefile | 4 ++-- www/tor-browser/Makefile.inc | 4 ++-- www/tor-browser/browser/distinfo | 4 ++-- www/tor-browser/browser/files/extension-overrides.js | 8 +++++--- www/tor-browser/https-everywhere/Makefile | 4 ++-- www/tor-browser/https-everywhere/distinfo | 4 ++-- www/tor-browser/noscript/Makefile | 4 ++-- www/tor-browser/noscript/distinfo | 4 ++-- www/tor-browser/tor-launcher/Makefile | 3 ++- www/tor-browser/torbutton/Makefile | 4 ++-- www/tor-browser/torbutton/distinfo | 4 ++-- 11 files changed, 25 insertions(+), 22 deletions(-) diff --git a/meta/tor-browser/Makefile b/meta/tor-browser/Makefile index 1b67350415f..2594785b56c 100644 --- a/meta/tor-browser/Makefile +++ b/meta/tor-browser/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.8 2017/08/27 08:54:08 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2017/09/26 19:55:17 sthen Exp $ COMMENT= Tor Browser meta package MAINTAINER= Sean Levy -PKGNAME= tor-browser-7.0.4 +PKGNAME= tor-browser-7.0.5 RUN_DEPENDS= www/tor-browser/browser \ www/tor-browser/torbutton \ diff --git a/www/tor-browser/Makefile.inc b/www/tor-browser/Makefile.inc index 8de5ac784f1..24850dc3961 100644 --- a/www/tor-browser/Makefile.inc +++ b/www/tor-browser/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.9 2017/08/27 08:54:08 sthen Exp $ +# $OpenBSD: Makefile.inc,v 1.10 2017/09/26 19:55:17 sthen Exp $ MAINTAINER ?= Sean Levy HOMEPAGE ?= https://www.torproject.org @@ -7,7 +7,7 @@ PERMIT_PACKAGE_CDROM ?= Yes CATEGORIES = www BROWSER_NAME = tor-browser # XXX If updating, bump REVISION of any extensions which did not get updated. -TB_VERSION = 7.0.4 +TB_VERSION = 7.0.5 TB_PREFIX = tb SUBST_VARS += BROWSER_NAME TB_VERSION diff --git a/www/tor-browser/browser/distinfo b/www/tor-browser/browser/distinfo index 9bd79120ed4..2a2acccc86a 100644 --- a/www/tor-browser/browser/distinfo +++ b/www/tor-browser/browser/distinfo @@ -1,2 +1,2 @@ -SHA256 (tor-browser/v7.0.4-esr52.3.0.tar.gz) = 4reNo+YaVGASEYRXkh8fzh+XKSZzhiF153iH4rA539s= -SIZE (tor-browser/v7.0.4-esr52.3.0.tar.gz) = 294015740 +SHA256 (tor-browser/v7.0.5-esr52.3.0.tar.gz) = yXdrAbTQOvxyhuv9k1IkJI5m93/0xO1hkFlcG8BaNq4= +SIZE (tor-browser/v7.0.5-esr52.3.0.tar.gz) = 294026606 diff --git a/www/tor-browser/browser/files/extension-overrides.js b/www/tor-browser/browser/files/extension-overrides.js index 57e45863275..78d3684f956 100644 --- a/www/tor-browser/browser/files/extension-overrides.js +++ b/www/tor-browser/browser/files/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); @@ -94,6 +94,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 38.229.1.78:80 C8C pref("extensions.torlauncher.default_bridge.obfs4.22", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); 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"); diff --git a/www/tor-browser/https-everywhere/Makefile b/www/tor-browser/https-everywhere/Makefile index f5a84de6e02..be0d2ee414c 100644 --- a/www/tor-browser/https-everywhere/Makefile +++ b/www/tor-browser/https-everywhere/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.8 2017/08/27 08:54:08 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2017/09/26 19:55:17 sthen Exp $ ADDON_NAME = https-everywhere -V = 5.2.21 +V = 2017.8.31 COMMENT = Tor Browser add-on: force https where possible HOMEPAGE = https://www.eff.org/https-everywhere MASTER_SITES = https://www.eff.org/files/ diff --git a/www/tor-browser/https-everywhere/distinfo b/www/tor-browser/https-everywhere/distinfo index 5af40129d49..304c0f4e5ad 100644 --- a/www/tor-browser/https-everywhere/distinfo +++ b/www/tor-browser/https-everywhere/distinfo @@ -1,2 +1,2 @@ -SHA256 (https-everywhere-5.2.21-eff.xpi) = 4VUQex19pcOBCroKX1sp5cyKhukzmA9IzRuSiHtlRjQ= -SIZE (https-everywhere-5.2.21-eff.xpi) = 2953307 +SHA256 (https-everywhere-2017.8.31-eff.xpi) = JzDV+5LqHs9a4m9fyk6Fy4t8xWv1QXi4acnHjNiySNo= +SIZE (https-everywhere-2017.8.31-eff.xpi) = 1783687 diff --git a/www/tor-browser/noscript/Makefile b/www/tor-browser/noscript/Makefile index 0e22f96f27c..72fc917b07d 100644 --- a/www/tor-browser/noscript/Makefile +++ b/www/tor-browser/noscript/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.9 2017/08/27 08:54:08 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2017/09/26 19:55:17 sthen Exp $ ADDON_NAME = noscript -V = 5.0.8.1 +V = 5.0.9 COMMENT = Tor Browser add-on: flexible JS blocker HOMEPAGE = http://noscript.net MASTER_SITES = https://secure.informaction.com/download/releases/ diff --git a/www/tor-browser/noscript/distinfo b/www/tor-browser/noscript/distinfo index 0c6a33f5203..51e3f879613 100644 --- a/www/tor-browser/noscript/distinfo +++ b/www/tor-browser/noscript/distinfo @@ -1,2 +1,2 @@ -SHA256 (noscript-5.0.8.1.xpi) = 72SEVJZSQqV1g9JUEpC8+VJnR7GDNa7M3VXzmiOHO8M= -SIZE (noscript-5.0.8.1.xpi) = 560348 +SHA256 (noscript-5.0.9.xpi) = YQ3F/8xxM/LMwvGhQoDjJtNxqKL8dkl77PLVzyEleVU= +SIZE (noscript-5.0.9.xpi) = 626686 diff --git a/www/tor-browser/tor-launcher/Makefile b/www/tor-browser/tor-launcher/Makefile index a4d9d50540e..874fd2458d3 100644 --- a/www/tor-browser/tor-launcher/Makefile +++ b/www/tor-browser/tor-launcher/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.8 2017/08/27 08:54:08 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2017/09/26 19:55:17 sthen Exp $ ADDON_NAME = tor-launcher V = 0.2.12.3 +REVISION = 0 COMMENT = Tor Browser add-on to manage tor instance GUID = tor-launcher@torproject.org PKGNAME = ${TB_NAME} diff --git a/www/tor-browser/torbutton/Makefile b/www/tor-browser/torbutton/Makefile index 53d7cb0cd0a..ffbd00e48a1 100644 --- a/www/tor-browser/torbutton/Makefile +++ b/www/tor-browser/torbutton/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.8 2017/08/27 08:54:08 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2017/09/26 19:55:17 sthen Exp $ ADDON_NAME = torbutton -V = 1.9.7.5 +V = 1.9.7.6 COMMENT = Tor Browser add-on for configuring Tor Browser settings GUID = torbutton@torproject.org PKGNAME = ${TB_NAME} diff --git a/www/tor-browser/torbutton/distinfo b/www/tor-browser/torbutton/distinfo index d563209c660..ac321de506c 100644 --- a/www/tor-browser/torbutton/distinfo +++ b/www/tor-browser/torbutton/distinfo @@ -1,2 +1,2 @@ -SHA256 (torbutton-1.9.7.5.tar.gz) = Y/mIj4DhbBDuUDU008AR8qczYYHuWq29oKVQXvBE+1w= -SIZE (torbutton-1.9.7.5.tar.gz) = 598765 +SHA256 (torbutton-1.9.7.6.tar.gz) = EiyBCbkiMTrGHuWKPwpb5TWyZTiJ7EBR4R5nVCn4SG8= +SIZE (torbutton-1.9.7.6.tar.gz) = 598849