[UPDATE] Tor Browser 7.0.11 (was: Re: [UPDATE] Tor Browser 7.0.10)

2018-01-09 Thread attila 
attila  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.

7.0.11 was released in the interim:
  https://blog.torproject.org/tor-browser-7011-released

Updated 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 -	1.11
+++ www/tor-browser/Makefile.inc	9 Jan 2018 21:30:33 -
@@ -2,12 +2,12 @@
 
 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
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- www/tor-browser/browser/Makefile	16 Nov 2017 23:20:40 -	1.21
+++ www/tor-browser/browser/Makefile	9 Jan 2018 21:30:33 -
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2017/11/16 23:20:40 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2017/10/21 20:18:45 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=${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.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
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 -	1.10
+++ www/tor-browser/browser/distinfo	9 Jan 2018 21:30:33 -
@@ -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

Re: [UPDATE] Tor Browser 7.0.10

2017-11-27 Thread attila 
attila  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 -	1.11
+++ www/tor-browser/Makefile.inc	17 Nov 2017 21:02:47 -
@@ -2,12 +2,12 @@
 
 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.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 -	1.20
+++ www/tor-browser/browser/Makefile	17 Nov 2017 21:02:47 -
@@ -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 -	1.10
+++ www/tor-browser/browser/distinfo	17 Nov 2017 21:02:47 -
@@ -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 -	1.10
+++ www/tor-browser/https-everywhere/Makefile	17 Nov 2017 21:02:47 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.10 2017/10/21 20:18:45 sthen Exp $