From 6d61c63f137f620d9ec1ff3afa79b37e4e1f30a0 Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 10 Jan 2018 13:22:25 +0000 Subject: [PATCH] update to tor-browser 7.0.11, from attila (maintainer) --- meta/tor-browser/Makefile | 14 +++++++------- www/tor-browser/Makefile.inc | 10 +++------- www/tor-browser/browser/Makefile | 16 +++++----------- www/tor-browser/browser/distinfo | 4 ++-- 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 | 4 ++-- www/tor-browser/tor-launcher/distinfo | 4 ++-- www/tor-browser/torbutton/Makefile | 4 ++-- www/tor-browser/torbutton/distinfo | 4 ++-- 12 files changed, 33 insertions(+), 43 deletions(-) diff --git a/meta/tor-browser/Makefile b/meta/tor-browser/Makefile index 492e2bbf7e9..5594ba13bf9 100644 --- a/meta/tor-browser/Makefile +++ b/meta/tor-browser/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.10 2017/10/21 20:18:45 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2018/01/10 13:22:25 sthen Exp $ COMMENT= Tor Browser meta package MAINTAINER= Sean Levy -PKGNAME= tor-browser-7.0.6 +PKGNAME= tor-browser-7.0.11 -RUN_DEPENDS= www/tor-browser/browser \ - www/tor-browser/torbutton \ - www/tor-browser/tor-launcher \ - www/tor-browser/noscript \ - www/tor-browser/https-everywhere +RUN_DEPENDS= www/tor-browser/browser>=7.0.11 \ + www/tor-browser/torbutton>=1.9.7.10 \ + www/tor-browser/tor-launcher>=0.2.12.3p2 \ + www/tor-browser/noscript>=5.1.8.1 \ + www/tor-browser/https-everywhere>=2017.12.6 .include diff --git a/www/tor-browser/Makefile.inc b/www/tor-browser/Makefile.inc index babad20041d..b36cd9f9c0b 100644 --- a/www/tor-browser/Makefile.inc +++ b/www/tor-browser/Makefile.inc @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile.inc,v 1.11 2017/10/21 20:18:45 sthen Exp $ +# $OpenBSD: Makefile.inc,v 1.12 2018/01/10 13:22:25 sthen Exp $ MAINTAINER ?= Sean Levy HOMEPAGE ?= https://www.torproject.org -GH_ACCOUNT ?= torbsd +MASTER_SITES ?= https://bits.torbsd.org/pub/OpenBSD/distfiles/ 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.6 +TB_VERSION = 7.0.11 TB_PREFIX = tb SUBST_VARS += BROWSER_NAME TB_VERSION @@ -32,10 +32,6 @@ ADDON_XPI_FILE ?= ${TB_NAME}.xpi # Directory that the port's makexpi.sh script dumps into, if it has one ADDON_SUBDIR ?= pkg ADDON_BUILDDIR ?= ${WRKBUILD}/${ADDON_SUBDIR} -. if !defined(MASTER_SITES) -GH_PROJECT ?= ${ADDON_NAME} -GH_TAGNAME ?= ${V} -. endif CONFIGURE_STYLE ?= none BUILD_DEPENDS += archivers/zip archivers/unzip diff --git a/www/tor-browser/browser/Makefile b/www/tor-browser/browser/Makefile index 44176aacbdb..9c2ab230418 100644 --- a/www/tor-browser/browser/Makefile +++ b/www/tor-browser/browser/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2017/11/16 23:20:40 naddy Exp $ +# $OpenBSD: Makefile,v 1.22 2018/01/10 13:22:25 sthen Exp $ # Some of this comes from www/firefox-esr as apropos, since Tor # browser is a fork of ESR. It is a good idea to look at that # Makefile when editing this one (ESR versions not always the same). @@ -6,21 +6,15 @@ COMMENT = modified version of Firefox ESR for browsing over Tor ONLY_FOR_ARCHS = amd64 i386 -GH_PROJECT = torb -GH_TAGNAME = v${TB_VERSION}-esr52.4.0 MOZILLA_VERSION = ${TB_VERSION} MOZILLA_PROJECT = ${BROWSER_NAME} MOZILLA_CODENAME = browser -MASTER_SITES = https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/ EXTRACT_SUFX = .tar.gz -DIST_SUBDIR = ${BROWSER_NAME} -WRKDIST = ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//} - PATCHORIG = .pat.orig PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION} -DISTNAME = ${GH_TAGNAME} +DISTNAME = ${BROWSER_NAME}-${TB_VERSION} SO_VERSION = 2.0 MOZILLA_LIBS = xul lgpllibs mozavcodec mozavutil @@ -42,7 +36,7 @@ MOZILLA_USE_BUNDLED_NSS = Yes MOZILLA_USE_BUNDLED_LIBEVENT = Yes MOZILLA_USE_BUNDLED_SQLITE = Yes -WANTLIB += X11-xcb xcb xcb-shm intl ${LIBECXX} +WANTLIB += X11-xcb intl xcb xcb-shm ${COMPILER_LIBCXX} LIB_DEPENDS += devel/gettext @@ -63,7 +57,7 @@ CONFIGURE_ARGS += --with-app-name=${BROWSER_NAME} \ --with-tor-browser-version=${TB_VERSION} \ --disable-tor-browser-update -RUN_DEPENDS += net/tor>=0.3.1.7 +RUN_DEPENDS += net/tor>=0.3.1.9 # bug 857628 CONFIGURE_ARGS += --enable-pie @@ -97,7 +91,7 @@ post-install: ${INSTALL_DATA_DIR} ${BROWSER_DIR}/distribution echo "[Global]\nid=OpenBSD\nversion=${OSREV}\n" > ${BROWSER_INI} echo "about=Packaged by ${MAINTAINER}\n" >> ${BROWSER_INI} -# install desktop file + # install desktop file ${INSTALL_DATA_DIR} ${PREFIX}/share/applications/ ${SUBST_DATA} ${FILESDIR}/${BROWSER_NAME}.desktop \ ${PREFIX}/share/applications/${BROWSER_NAME}.desktop diff --git a/www/tor-browser/browser/distinfo b/www/tor-browser/browser/distinfo index e90bf7be0d0..2772be4810d 100644 --- a/www/tor-browser/browser/distinfo +++ b/www/tor-browser/browser/distinfo @@ -1,2 +1,2 @@ -SHA256 (tor-browser/v7.0.6-esr52.4.0.tar.gz) = gnYmBK+i1kAa/Pkn8b3jgOPBVP/t1QRN8M5n0nY468c= -SIZE (tor-browser/v7.0.6-esr52.4.0.tar.gz) = 294076794 +SHA256 (mozilla/tor-browser-7.0.11.tar.gz) = 8kL4PfuYjSkV9UtU9q/mnKfM1w6vVMwp9xXBPjgQsA0= +SIZE (mozilla/tor-browser-7.0.11.tar.gz) = 296597747 diff --git a/www/tor-browser/https-everywhere/Makefile b/www/tor-browser/https-everywhere/Makefile index 9a1ab54ff89..f197d05eb4b 100644 --- a/www/tor-browser/https-everywhere/Makefile +++ b/www/tor-browser/https-everywhere/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.10 2017/10/21 20:18:45 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2018/01/10 13:22:25 sthen Exp $ ADDON_NAME = https-everywhere -V = 2017.9.12 +V = 2017.12.6 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 8f7f984f5de..9f2256efe5c 100644 --- a/www/tor-browser/https-everywhere/distinfo +++ b/www/tor-browser/https-everywhere/distinfo @@ -1,2 +1,2 @@ -SHA256 (https-everywhere-2017.9.12-eff.xpi) = UR9EaVxf2DWS8RpMMgueXfx7e9/2g17+WUaDIpDDGNc= -SIZE (https-everywhere-2017.9.12-eff.xpi) = 1683196 +SHA256 (https-everywhere-2017.12.6-eff.xpi) = AGy6FU1lWc04jYuIMwGC6Y+MDhj5TTnQYaaODmEjq8o= +SIZE (https-everywhere-2017.12.6-eff.xpi) = 1588091 diff --git a/www/tor-browser/noscript/Makefile b/www/tor-browser/noscript/Makefile index 58d884c5ae9..5e4cbb98db6 100644 --- a/www/tor-browser/noscript/Makefile +++ b/www/tor-browser/noscript/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.11 2017/10/21 20:18:45 sthen Exp $ +# $OpenBSD: Makefile,v 1.12 2018/01/10 13:22:25 sthen Exp $ ADDON_NAME = noscript -V = 5.0.10 +V = 5.1.8.1 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 7156e1a8fd5..5fa466f89ed 100644 --- a/www/tor-browser/noscript/distinfo +++ b/www/tor-browser/noscript/distinfo @@ -1,2 +1,2 @@ -SHA256 (noscript-5.0.10.xpi) = z8gBil3dKmmVgZMqmRHiixBgZnx4Sc9Sg7VItbKaZaI= -SIZE (noscript-5.0.10.xpi) = 627259 +SHA256 (noscript-5.1.8.1.xpi) = j/Zwc+l1fHM2bDdohBZesVdYHIGHHon8icPuDS4pQ7I= +SIZE (noscript-5.1.8.1.xpi) = 777261 diff --git a/www/tor-browser/tor-launcher/Makefile b/www/tor-browser/tor-launcher/Makefile index c6db4ca2325..7ae0e8eadc0 100644 --- a/www/tor-browser/tor-launcher/Makefile +++ b/www/tor-browser/tor-launcher/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.10 2017/10/21 20:18:45 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2018/01/10 13:22:25 sthen Exp $ ADDON_NAME = tor-launcher V = 0.2.12.3 -REVISION = 1 +REVISION = 2 COMMENT = Tor Browser add-on to manage tor instance GUID = tor-launcher@torproject.org PKGNAME = ${TB_NAME} diff --git a/www/tor-browser/tor-launcher/distinfo b/www/tor-browser/tor-launcher/distinfo index e7b59bf3a42..fd640199155 100644 --- a/www/tor-browser/tor-launcher/distinfo +++ b/www/tor-browser/tor-launcher/distinfo @@ -1,2 +1,2 @@ -SHA256 (tor-launcher-0.2.12.3.tar.gz) = r4b8Y+762pb0L5IrtDadsR11vVLdh1IezrRvEHbHbN0= -SIZE (tor-launcher-0.2.12.3.tar.gz) = 281085 +SHA256 (tor-launcher-0.2.12.3.tar.gz) = HNCk6+dNOE5Hak+cLleRBAWM5lTqdIszmr0Kbf7qva8= +SIZE (tor-launcher-0.2.12.3.tar.gz) = 278898 diff --git a/www/tor-browser/torbutton/Makefile b/www/tor-browser/torbutton/Makefile index 1270c9be559..1578ec4134a 100644 --- a/www/tor-browser/torbutton/Makefile +++ b/www/tor-browser/torbutton/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.10 2017/10/21 20:18:45 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2018/01/10 13:22:25 sthen Exp $ ADDON_NAME = torbutton -V = 1.9.7.7 +V = 1.9.7.10 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 23c41f12ea5..f3a811aa503 100644 --- a/www/tor-browser/torbutton/distinfo +++ b/www/tor-browser/torbutton/distinfo @@ -1,2 +1,2 @@ -SHA256 (torbutton-1.9.7.7.tar.gz) = whdFLOFnLxH1Wzq5oNiIQFy2H/53A/XCpQMcBi4oAb8= -SIZE (torbutton-1.9.7.7.tar.gz) = 598728 +SHA256 (torbutton-1.9.7.10.tar.gz) = R+bl5K6MZLa3crGJRaSA7I3qfBOWd/WqQmhtLB+/fYE= +SIZE (torbutton-1.9.7.10.tar.gz) = 673816