attila <att...@stalphonsos.com> wrote: > Hi ports@, > > Attached is an update for the Tor Browser ports to 7.0.10. > > Relevant release notes: > https://blog.torproject.org/tor-browser-7010-released > https://blog.torproject.org/tor-browser-709-released > https://blog.torproject.org/tor-browser-708-released > https://blog.torproject.org/tor-browser-707-released > > Notable change: switch from GH to self-hosted tarballs at torbsd.org > Also: took sthen@'s suggestion to make meta/tor-browser RDEP > on specific versions. > > Lightly tested on amd64. Feedback most welcome.
Ping. Update attached. Pax, -A -- https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net} pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D 09C1 4068 D5D5 62A7 29CF
Index: www/tor-browser/Makefile.inc =================================================================== RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v retrieving revision 1.11 diff -u -p -r1.11 Makefile.inc --- www/tor-browser/Makefile.inc 21 Oct 2017 20:18:45 -0000 1.11 +++ www/tor-browser/Makefile.inc 17 Nov 2017 21:02:47 -0000 @@ -2,12 +2,12 @@ MAINTAINER ?= Sean Levy <att...@stalphonsos.com> 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.10 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 Index: www/tor-browser/browser/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- www/tor-browser/browser/Makefile 21 Oct 2017 20:18:45 -0000 1.20 +++ www/tor-browser/browser/Makefile 17 Nov 2017 21:02:47 -0000 @@ -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 ${LIBECXX} LIB_DEPENDS += devel/gettext @@ -63,7 +57,7 @@ CONFIGURE_ARGS += --with-app-name=${BROW --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.8 # 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 Index: www/tor-browser/browser/distinfo =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- www/tor-browser/browser/distinfo 21 Oct 2017 20:18:45 -0000 1.10 +++ www/tor-browser/browser/distinfo 17 Nov 2017 21:02:47 -0000 @@ -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.10.tar.gz) = xAdqSaOkHPR+bUdv6dfkmeZYpfLYIfag4c8q/7twPGk= +SIZE (mozilla/tor-browser-7.0.10.tar.gz) = 296565661 Index: www/tor-browser/https-everywhere/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- www/tor-browser/https-everywhere/Makefile 21 Oct 2017 20:18:45 -0000 1.10 +++ www/tor-browser/https-everywhere/Makefile 17 Nov 2017 21:02:47 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.10 2017/10/21 20:18:45 sthen Exp $ ADDON_NAME = https-everywhere -V = 2017.9.12 +V = 2017.10.30 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.10 diff -u -p -r1.10 distinfo --- www/tor-browser/https-everywhere/distinfo 21 Oct 2017 20:18:45 -0000 1.10 +++ www/tor-browser/https-everywhere/distinfo 17 Nov 2017 21:02:47 -0000 @@ -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.10.30-eff.xpi) = tDdmZROzFQ9f1vCaI5DPyt62t2oLcd4ssTKiLVt4lM4= +SIZE (https-everywhere-2017.10.30-eff.xpi) = 1540535 Index: www/tor-browser/noscript/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- www/tor-browser/noscript/Makefile 21 Oct 2017 20:18:45 -0000 1.11 +++ www/tor-browser/noscript/Makefile 17 Nov 2017 21:02:47 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.11 2017/10/21 20:18:45 sthen Exp $ ADDON_NAME = noscript -V = 5.0.10 +V = 5.1.5 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.8 diff -u -p -r1.8 distinfo --- www/tor-browser/noscript/distinfo 21 Oct 2017 20:18:45 -0000 1.8 +++ www/tor-browser/noscript/distinfo 17 Nov 2017 21:02:47 -0000 @@ -1,2 +1,2 @@ -SHA256 (noscript-5.0.10.xpi) = z8gBil3dKmmVgZMqmRHiixBgZnx4Sc9Sg7VItbKaZaI= -SIZE (noscript-5.0.10.xpi) = 627259 +SHA256 (noscript-5.1.5.xpi) = BiC4YIRBtaNG40egfOPB5wftyNTQTyxyr1PnOg2bbVw= +SIZE (noscript-5.1.5.xpi) = 776853 Index: www/tor-browser/tor-launcher/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/tor-launcher/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- www/tor-browser/tor-launcher/Makefile 21 Oct 2017 20:18:45 -0000 1.10 +++ www/tor-browser/tor-launcher/Makefile 17 Nov 2017 21:02:47 -0000 @@ -2,7 +2,7 @@ ADDON_NAME = tor-launcher V = 0.2.12.3 -REVISION = 1 +REVISION = 2 COMMENT = Tor Browser add-on to manage tor instance GUID = tor-launc...@torproject.org PKGNAME = ${TB_NAME} Index: www/tor-browser/tor-launcher/distinfo =================================================================== RCS file: /cvs/ports/www/tor-browser/tor-launcher/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- www/tor-browser/tor-launcher/distinfo 27 Aug 2017 08:54:08 -0000 1.5 +++ www/tor-browser/tor-launcher/distinfo 17 Nov 2017 21:02:47 -0000 @@ -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 Index: www/tor-browser/torbutton/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/torbutton/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- www/tor-browser/torbutton/Makefile 21 Oct 2017 20:18:45 -0000 1.10 +++ www/tor-browser/torbutton/Makefile 17 Nov 2017 21:02:47 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.10 2017/10/21 20:18:45 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 = 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.9 diff -u -p -r1.9 distinfo --- www/tor-browser/torbutton/distinfo 21 Oct 2017 20:18:45 -0000 1.9 +++ www/tor-browser/torbutton/distinfo 17 Nov 2017 21:02:47 -0000 @@ -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 Index: meta/tor-browser/Makefile =================================================================== RCS file: /cvs/ports/meta/tor-browser/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- meta/tor-browser/Makefile 21 Oct 2017 20:18:45 -0000 1.10 +++ meta/tor-browser/Makefile 17 Nov 2017 21:02:47 -0000 @@ -4,12 +4,12 @@ COMMENT= Tor Browser meta package MAINTAINER= Sean Levy <att...@stalphonsos.com> -PKGNAME= tor-browser-7.0.6 +PKGNAME= tor-browser-7.0.10 -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.10 \ + www/tor-browser/torbutton>=1.9.7.10 \ + www/tor-browser/tor-launcher>=0.2.12.3p2 \ + www/tor-browser/noscript>=5.1.5 \ + www/tor-browser/https-everywhere>=2017.10.30 .include <bsd.port.mk>
