Re: WIP: Tor Browser 9.0.2

2020-01-10 Thread Stuart Henderson 
On 2019/12/28 09:07, Caspar Schutijser wrote:
> During the configure stage, I got the following error:
> mozbuild.configure.options.InvalidOptionError: --disable-eme is not available 
> in this configuration
> In interest of getting as far as I could I patched away that flag (for
> now; see patch-_mozconfig) but that is not a proper solution. I'm still
> looking for a solution (hints are appreciated, of course).
> 
> I think it is necessary to first address the --disable-eme problem
> before we can even think about committing this.

I'm no expert on firefox/tor browser, but it looks like this is for DRM
plugins which we won't have anyway.

> Did I use the @conflict and @pkgpath markers in PLIST correctly? I want
> to express the fact that tor-launcher conflicts with tb-browser because
> share/tor-browser/torrc-defaults used to be shipped with tor-launcher
> but it now shipped with tb-browser.

> @@ -1,4 +1,6 @@
>  @comment $OpenBSD: PLIST,v 1.6 2018/09/28 14:54:26 sthen Exp $
> +@conflict tor-launcher-*
> +@pkgpath www/tor-browser/tor-launcher

Add

@conflict torbutton-*
@pkgpath www/tor-browser/torbutton

and drop the quirks change, it is not needed when you merge into another
package this way.

Re: WIP: Tor Browser 9.0.2

2020-01-03 Thread Magnus Wild 
On Sat, Dec 28, 2019 at 09:07:39AM +0100, Caspar Schutijser wrote:
> 
> Below is a work in progress diff that updates the Tor Browser suite
> to 9.0.2. I want to stress that I don't have any experience with
> the Mozilla or Tor Browser code base so I would like someone more
> familiar with those code bases to look at my diff very critically.
> 

Hello!

Sadly I cannot give you any input on the diffs themselves either, but
I've tested it for a few hours on amd64 and it both builds and works
fine here too.

Thank you for working on updating this!

/Magnus

Re: WIP: Tor Browser 9.0.2

2019-12-31 Thread clematis 
On Sat, Dec 28, 2019 at 09:07:39AM +0100, Caspar Schutijser wrote:
> Hi,
> 
> Below is a work in progress diff that updates the Tor Browser suite
> to 9.0.2. I want to stress that I don't have any experience with
> the Mozilla or Tor Browser code base so I would like someone more
> familiar with those code bases to look at my diff very critically.
> 
> About the diff:
> 
> According to the release notes of Tor Browser 9.0 [1], the Tor Button
> and Tor Launcher have been integrated more tightly into the browser.
> This means that the ports for those can be removed. The source code of
> the Tor Launcher is supposed to be copied into the Tor Browser source
> during the build [2] [3]; the post-extract target takes care of that.
> 
> During the configure stage, I got the following error:
> mozbuild.configure.options.InvalidOptionError: --disable-eme is not available 
> in this configuration
> In interest of getting as far as I could I patched away that flag (for
> now; see patch-_mozconfig) but that is not a proper solution. I'm still
> looking for a solution (hints are appreciated, of course).
> 
> I think it is necessary to first address the --disable-eme problem
> before we can even think about committing this.
> 
> Did I use the @conflict and @pkgpath markers in PLIST correctly? I want
> to express the fact that tor-launcher conflicts with tb-browser because
> share/tor-browser/torrc-defaults used to be shipped with tor-launcher
> but it now shipped with tb-browser.
> 
> I built and tested this on amd64, seems to work fine here.
> 
> Feedback appreciated.
> 
> Thanks,
> Caspar Schutijser
> 
> 1: https://blog.torproject.org/new-release-tor-browser-90
> 2: 
> https://gitweb.torproject.org/builders/tor-browser-build.git/commit/?id=6d94f73dc055c1739a67ffd422f7f5bf29218723
> 3: 
> https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking#BuildingJustFirefox

Hi,
Just to confirm quickly it does compile and run OK on my amd64 as well.
Thank you.
-- 
clematis (0x7e96fd2400fe7b59)

WIP: Tor Browser 9.0.2

2019-12-28 Thread Caspar Schutijser 
Hi,

Below is a work in progress diff that updates the Tor Browser suite
to 9.0.2. I want to stress that I don't have any experience with
the Mozilla or Tor Browser code base so I would like someone more
familiar with those code bases to look at my diff very critically.

About the diff:

According to the release notes of Tor Browser 9.0 [1], the Tor Button
and Tor Launcher have been integrated more tightly into the browser.
This means that the ports for those can be removed. The source code of
the Tor Launcher is supposed to be copied into the Tor Browser source
during the build [2] [3]; the post-extract target takes care of that.

During the configure stage, I got the following error:
mozbuild.configure.options.InvalidOptionError: --disable-eme is not available 
in this configuration
In interest of getting as far as I could I patched away that flag (for
now; see patch-_mozconfig) but that is not a proper solution. I'm still
looking for a solution (hints are appreciated, of course).

I think it is necessary to first address the --disable-eme problem
before we can even think about committing this.

Did I use the @conflict and @pkgpath markers in PLIST correctly? I want
to express the fact that tor-launcher conflicts with tb-browser because
share/tor-browser/torrc-defaults used to be shipped with tor-launcher
but it now shipped with tb-browser.

I built and tested this on amd64, seems to work fine here.

Feedback appreciated.

Thanks,
Caspar Schutijser

1: https://blog.torproject.org/new-release-tor-browser-90
2: 
https://gitweb.torproject.org/builders/tor-browser-build.git/commit/?id=6d94f73dc055c1739a67ffd422f7f5bf29218723
3: 
https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking#BuildingJustFirefox

--

Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.823
diff -u -p -r1.823 Makefile
--- devel/quirks/Makefile   27 Dec 2019 05:11:30 -  1.823
+++ devel/quirks/Makefile   28 Dec 2019 08:04:18 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-3.214
+PKGNAME =  quirks-3.215
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.840
diff -u -p -r1.840 Quirks.pm
--- devel/quirks/files/Quirks.pm27 Dec 2019 05:11:30 -  1.840
+++ devel/quirks/files/Quirks.pm28 Dec 2019 08:04:18 -
@@ -1353,6 +1353,8 @@ my $obsolete_reason = {
'py-libnacl' => 3,
'py3-libnacl' => 3,
'py3-typing' => 5,
+   'torbutton' => 5,
+   'tor-launcher' => 5,
 };
 
 # reasons for obsolete packages
Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- meta/tor-browser/Makefile   2 Sep 2019 06:35:42 -   1.18
+++ meta/tor-browser/Makefile   28 Dec 2019 08:04:18 -
@@ -4,14 +4,12 @@ COMMENT=  Tor Browser meta package
 
 MAINTAINER=Sean Levy 
 
-PKGNAME=   tor-browser-8.0.9
-ONLY_FOR_ARCHS =   amd64 i386
+PKGNAME=   tor-browser-9.0.2
+ONLY_FOR_ARCHS =   amd64 i386 aarch64
 
-RUN_DEPENDS=   www/tor-browser/browser>=8.0.9 \
-   www/tor-browser/torbutton>=2.0.13 \
-   www/tor-browser/tor-launcher>=0.2.16.6p1 \
-   www/tor-browser/noscript>=10.6.1 \
-   www/tor-browser/https-everywhere>=2019.1.31p0 \
-   net/tor>=0.3.5.8
+RUN_DEPENDS=   www/tor-browser/browser>=9.0.2 \
+   www/tor-browser/noscript>=11.0.9 \
+   www/tor-browser/https-everywhere>=2019.11.7 \
+   net/tor>=0.4.1.6
 
 .include 
Index: www/tor-browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- www/tor-browser/Makefile13 Nov 2016 21:15:43 -  1.1.1.1
+++ www/tor-browser/Makefile28 Dec 2019 08:04:18 -
@@ -2,8 +2,6 @@
 
 SUBDIR =
 SUBDIR += browser
-SUBDIR += torbutton
-SUBDIR += tor-launcher
 SUBDIR += noscript
 SUBDIR += https-everywhere
 
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile.inc
--- www/tor-browser/Makefile.inc13 Jul 2019 10:59:27 -  1.18
+++ www/tor-browser/Makefile.inc28 Dec 2019 08:04:18 -
@@ -2,11 +2,10 @@
 
 MAINTAINER ?=  Sean Levy 
 HOMEPAGE ?=https://www.torproject.org
-MASTER_SITES ?=https://bits.torbsd.org/pub/OpenBSD/distfiles/
 PERMIT_PACKAGE ?=  Yes
 CATEGORIES =