Re: WIP: Tor Browser 9.0.4

2020-02-15 Thread attila 
Landry Breuil  wrote:
> On Wed, Feb 12, 2020 at 09:02:08PM +0100, Caspar Schutijser wrote:
> > On Wed, Feb 12, 2020 at 03:22:04PM +0100, clematis wrote:
> > > On Wed, Feb 12, 2020 at 10:54:19AM +0100, Landry Breuil wrote:
> > > > On Wed, Feb 12, 2020 at 07:30:22AM +0100, clematis wrote:
> > > > > On Tue, Feb 11, 2020 at 10:12:20PM +0100, Caspar Schutijser wrote:
> > > > > > On Tue, Feb 11, 2020 at 03:23:03PM +0100, Landry Breuil wrote:
> > > > > > > On Sat, Jan 11, 2020 at 03:43:06PM +0100, Caspar Schutijser wrote:
> > > > > > > > On Fri, Jan 10, 2020 at 10:31:15AM +, Stuart Henderson 
> > > > > > > > wrote:
> > > > > > > > > On 2019/12/28 09:07, Caspar Schutijser wrote:
> > > > ok good, it's just that in mozilla land, build1 is "first release
> > > > candidate", that's all - cf
> > > > of course TB-browser might not use the same convention :)
> > > 
> > > FYI, here is the reply from Nicolas Vigier (@boklm torproject): 
> > > 
> > > === 8< ===
> > > The naming convention is based on the git tag we are using:
> > >   
> > > src-firefox-tor-browser-${firefox_version}-${torbrowser_branch}-${n}-build${m}
> > > 
> > > ${n} is a number that we increase if we rebase our patches. Usually we
> > > don't rebase them on the same firefox version, so most of the time it
> > > is '1'.
> > > 
> > > ${m} is a number that we increase when we added new patches. A -build2
> > > for example indicates that we did a first build, then added new patches
> > > and did a second build (however only the last one is uploaded to
> > > dist.tpo).
> > > === 8< ===
> > > 
> > > Also note that:
> > > Release Candidates are uploaded under the ~/ of whoever is building it.
> > > There should always be only one firefox source tarball for each Tor
> > > Browser version on dist.tpo.
> > > 
> > > Caspar, if you are interested in this, Nicolas offered to send an email
> > > out when they have a Release Candidate if you want to test build before
> > > it gets released.
> > > 
> > > His complete email reply to tbb-dev:
> > > https://lists.torproject.org/pipermail/tbb-dev/2020-February/001046.html
> > 
> > Thanks for clearing that up and also for making sure it still builds
> > with Rust 1.41. For now, it is not necessary for me to receive an email
> > about release candidates.
> > 
> > Regarding Tor Browser 9.0.5, I'll probably send a diff for that during
> > the weekend.
> 
> In the meantime i've commited the 9.0.4 update, after all its been
> waiting since last year... some minor nits after the fact (that you can
> address in the 9.0.5 update):
> - usr/local shouldnt be hardcoded in
>   
> patch-browser_extensions_tor-launcher_src_defaults_preferences_torlauncher-prefs_js,
> usually you patch with ${LOCALBASE} and then use ${SUBST_CMD} in
> post-patch to set the 'real' value.
> - from my understanding this will enable the pledge codepaths, or not ?
>   i didnt see anything configuring pledge strings (as it was in 72 that
> they moved to files)
> - i suppose you blindly added patch-config_system-headers_mozbuild to
>   give a chance to arm64 to build ?
> 
> besides that, thanks for the hard work ! I think (if you want so) you
> should take maintainership for this port so that it gets updates.. sean,
> can you at least acknowledge this mail ?

ack.  do it.  signing off the lists after this, send private email
if necc.

> Landry
> > 
> > Thanks,
> > Caspar Schutijser
> >

Re: update www/tor-browser on stable

2019-06-14 Thread attila 
Solene Rapenne  wrote:
> I propose applying the following www/tor-browser update on 6.5-stable
> (it's the exact same patch than on current)

Thank you so much for doing this.

> tor-browser on 6.5 has the same bug that hit firefox last month,
> extensions are disabled.
> Tested, works well.

I cannot test it easily in my current situation but I'm all for this
if others have tested it.

Thanks a ton.

Pax, -A

> 
> Index: ports/www/tor-browser/Makefile.inc
> diff -u ports/www/tor-browser/Makefile.inc:1.15 
> ports/www/tor-browser/Makefile.inc:1.17
> --- ports/www/tor-browser/Makefile.inc:1.15   Sat Oct  6 00:02:12 2018
> +++ ports/www/tor-browser/Makefile.incThu May  9 08:31:17 2019
> @@ -1,4 +1,4 @@
> -# $OpenBSD: Makefile.inc,v 1.15 2018/10/05 22:02:12 sthen Exp $
> +# $OpenBSD: Makefile.inc,v 1.17 2019/05/09 06:31:17 landry Exp $
>  
>  MAINTAINER ?=Sean Levy 
>  HOMEPAGE ?=  https://www.torproject.org
> @@ -6,7 +6,7 @@
>  PERMIT_PACKAGE_CDROM ?= Yes
>  CATEGORIES = www
>  BROWSER_NAME =   tor-browser
> -TB_VERSION = 8.0.2
> +TB_VERSION = 8.0.9
>  TB_PREFIX =  tb
>  
>  SUBST_VARS +=BROWSER_NAME TB_VERSION
> Index: ports/www/tor-browser/browser/Makefile
> diff -u ports/www/tor-browser/browser/Makefile:1.31 
> ports/www/tor-browser/browser/Makefile:1.32
> --- ports/www/tor-browser/browser/Makefile:1.31   Mon Mar 11 20:04:38 2019
> +++ ports/www/tor-browser/browser/MakefileWed May  1 19:36:30 2019
> @@ -1,4 +1,4 @@
> -# $OpenBSD: Makefile,v 1.31 2019/03/11 19:04:38 semarie Exp $
> +# $OpenBSD: Makefile,v 1.32 2019/05/01 17:36:30 landry 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).
> @@ -9,7 +9,6 @@
>  MOZILLA_VERSION =${TB_VERSION}
>  MOZILLA_PROJECT =${BROWSER_NAME}
>  MOZILLA_CODENAME =   browser
> -REVISION =   0
>  
>  EXTRACT_SUFX =   .tar.gz
>  PATCHORIG =  .pat.orig
> @@ -17,7 +16,7 @@
>  PKGNAME =${TB_PREFIX}-browser-${TB_VERSION}
>  DISTNAME =   ${BROWSER_NAME}-${TB_VERSION}
>  
> -SO_VERSION = 3.0
> +SO_VERSION = 4.0
>  MOZILLA_LIBS =   xul clearkey lgpllibs mozavcodec mozavutil 
> mozgtk
>  MOZILLA_LIBS +=  freebl3 nss3 nssckbi nssdbm3
>  MOZILLA_LIBS +=  nssutil3 smime3 softokn3 ssl3
> Index: ports/www/tor-browser/browser/distinfo
> diff -u ports/www/tor-browser/browser/distinfo:1.14 
> ports/www/tor-browser/browser/distinfo:1.16
> --- ports/www/tor-browser/browser/distinfo:1.14   Sat Oct  6 00:02:12 2018
> +++ ports/www/tor-browser/browser/distinfoThu May  9 08:31:17 2019
> @@ -1,2 +1,2 @@
> -SHA256 (mozilla/tor-browser-8.0.2.tar.gz) = 
> 0jsZDX8VhqhTF4ZHPaCXgqnZWzDS1QHIY0LncLuuYks=
> -SIZE (mozilla/tor-browser-8.0.2.tar.gz) = 385480115
> +SHA256 (mozilla/tor-browser-8.0.9.tar.gz) = 
> B2YOSrwnXSihuHRczush6oYeo9LPFSJGNqoTlE3cmAI=
> +SIZE (mozilla/tor-browser-8.0.9.tar.gz) = 387604509
> Index: 
> ports/www/tor-browser/browser/patches/patch-build_moz_configure_init_configure
> diff -u 
> ports/www/tor-browser/browser/patches/patch-build_moz_configure_init_configure:1.2
>  
> ports/www/tor-browser/browser/patches/patch-build_moz_configure_init_configure:removed
> --- 
> ports/www/tor-browser/browser/patches/patch-build_moz_configure_init_configure:1.2
> Wed Oct  3 16:55:36 2018
> +++ 
> ports/www/tor-browser/browser/patches/patch-build_moz_configure_init_configure
> Fri Jun 14 22:56:32 2019
> @@ -1,24 +0,0 @@
> -$OpenBSD: patch-build_moz_configure_init_configure,v 1.2 2018/10/03 14:55:36 
> sthen Exp $
> -
> -Fix build with rust 1.29.
> -https://hg.mozilla.org/mozilla-central/rev/36f4ba2fb6f5
> -https://hg.mozilla.org/releases/mozilla-esr60/rev/381ae910e9b2712699fdc6a9bb9702c04bccb8f5
> -
> -Index: build/moz.configure/init.configure
>  build/moz.configure/init.configure.orig
> -+++ build/moz.configure/init.configure
> -@@ -577,7 +577,13 @@ def split_triplet(triplet, allow_unknown=False):
> - # There is also a quartet form:
> - #   CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
> - # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
> --cpu, manufacturer, os = triplet.split('-', 2)
> -+parts = triplet.split('-', 2)
> -+if len(parts) == 3:
> -+cpu, _, os = parts
> -+elif len(parts) == 2:
> -+cpu, os = parts
> -+else:
> -+die("Unexpected triplet string: %s" % triplet)
> - 
> - # Autoconf uses config.sub to validate and canonicalize those triplets,
> - # but the granularity of its results has never been satisfying to our
> Index: ports/www/tor-browser/https-everywhere/Makefile
> diff -u ports/www/tor-browser/https-everywhere/Makefile:1.13 
> ports/www/tor-browser/https-everywhere/Makefile:1.15
> ---

[UPDATE] Tor Browser 8.0.9

2019-05-08 Thread attila 
Hi ports@,

Attached is an update to Tor Browser 8.0.9, released to deal with the
certificate expiration fiasco that affected most of the Mozillan
world.

Please read the TPO blog post on the subject if you had your NoScript
extension disabled in Tor Browser:


Lightly tested under amd64.

Pax, -A

Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile.inc
--- www/tor-browser/Makefile.inc1 May 2019 17:36:30 -   1.16
+++ www/tor-browser/Makefile.inc8 May 2019 19:01:18 -
@@ -6,7 +6,7 @@ MASTER_SITES ?= https://bits.torbsd.org
 PERMIT_PACKAGE_CDROM ?= Yes
 CATEGORIES =   www
 BROWSER_NAME = tor-browser
-TB_VERSION =   8.0.8
+TB_VERSION =   8.0.9
 TB_PREFIX =tb
 
 SUBST_VARS +=  BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- www/tor-browser/browser/distinfo1 May 2019 17:36:30 -   1.15
+++ www/tor-browser/browser/distinfo8 May 2019 19:01:18 -
@@ -1,2 +1,2 @@
-SHA256 (mozilla/tor-browser-8.0.8.tar.gz) = 
cLUrSyd9M80aNGbtm+CnQzKL6FaQsSghQw8TnQbDv90=
-SIZE (mozilla/tor-browser-8.0.8.tar.gz) = 387583620
+SHA256 (mozilla/tor-browser-8.0.9.tar.gz) = 
B2YOSrwnXSihuHRczush6oYeo9LPFSJGNqoTlE3cmAI=
+SIZE (mozilla/tor-browser-8.0.9.tar.gz) = 387604509
Index: www/tor-browser/https-everywhere/Makefile
===
RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- www/tor-browser/https-everywhere/Makefile   1 May 2019 17:36:30 -   
1.14
+++ www/tor-browser/https-everywhere/Makefile   8 May 2019 19:01:18 -
@@ -2,6 +2,7 @@
 
 ADDON_NAME =   https-everywhere
 V =2019.1.31
+REVISION = 0
 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/noscript/Makefile
===
RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- www/tor-browser/noscript/Makefile   1 May 2019 17:36:30 -   1.15
+++ www/tor-browser/noscript/Makefile   8 May 2019 19:01:18 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.15 2019/05/01 17:36:30 landry Exp $
 
 ADDON_NAME =   noscript
-V =10.2.4
+V =10.6.1
 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.12
diff -u -p -r1.12 distinfo
--- www/tor-browser/noscript/distinfo   1 May 2019 17:36:30 -   1.12
+++ www/tor-browser/noscript/distinfo   8 May 2019 19:01:18 -
@@ -1,2 +1,2 @@
-SHA256 (noscript-10.2.4.xpi) = n1W+zeIzA0jINUusEs4pXcHlg49vxhYUpHbHeF9dQ/Q=
-SIZE (noscript-10.2.4.xpi) = 502546
+SHA256 (noscript-10.6.1.xpi) = sVBH0ARdEvKLLh5ES9uGgAJXtcpsyPTIAisgxVDNlyc=
+SIZE (noscript-10.6.1.xpi) = 519725
Index: www/tor-browser/tor-launcher/Makefile
===
RCS file: /cvs/ports/www/tor-browser/tor-launcher/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- www/tor-browser/tor-launcher/Makefile   1 May 2019 17:36:30 -   
1.14
+++ www/tor-browser/tor-launcher/Makefile   8 May 2019 19:01:18 -
@@ -2,7 +2,7 @@
 
 ADDON_NAME =   tor-launcher
 V =0.2.16.6
-REVISION = 0
+REVISION = 1
 COMMENT =  Tor Browser add-on to manage tor instance
 GUID = tor-launc...@torproject.org
 PKGNAME =  ${TB_NAME}
Index: www/tor-browser/torbutton/Makefile
===
RCS file: /cvs/ports/www/tor-browser/torbutton/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- www/tor-browser/torbutton/Makefile  1 May 2019 17:36:30 -   1.14
+++ www/tor-browser/torbutton/Makefile  8 May 2019 19:01:18 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.14 2019/05/01 17:36:30 landry Exp $
 
 ADDON_NAME =   torbutton
-V =2.0.11
+V =2.0.13
 COMMENT =  Tor Browser add-on for configuring Tor Browser settings
 GUID =

[UPDATE] Tor Browser 8.0.8

2019-05-01 Thread attila 
Hi ports@,

Attached is an update to for Tor Browser to version 8.0.8:


Pax, -A

Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile.inc
--- www/tor-browser/Makefile.inc5 Oct 2018 22:02:12 -   1.15
+++ www/tor-browser/Makefile.inc1 May 2019 14:14:19 -
@@ -6,7 +6,7 @@ MASTER_SITES ?= https://bits.torbsd.org
 PERMIT_PACKAGE_CDROM ?= Yes
 CATEGORIES =   www
 BROWSER_NAME = tor-browser
-TB_VERSION =   8.0.2
+TB_VERSION =   8.0.8
 TB_PREFIX =tb
 
 SUBST_VARS +=  BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- www/tor-browser/browser/Makefile11 Mar 2019 19:04:38 -  1.31
+++ www/tor-browser/browser/Makefile1 May 2019 14:14:19 -
@@ -9,7 +9,6 @@ ONLY_FOR_ARCHS =amd64 i386
 MOZILLA_VERSION =  ${TB_VERSION}
 MOZILLA_PROJECT =  ${BROWSER_NAME}
 MOZILLA_CODENAME = browser
-REVISION = 0
 
 EXTRACT_SUFX = .tar.gz
 PATCHORIG =.pat.orig
@@ -17,7 +16,7 @@ PATCHORIG =   .pat.orig
 PKGNAME =  ${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME = ${BROWSER_NAME}-${TB_VERSION}
 
-SO_VERSION =   3.0
+SO_VERSION =   4.0
 MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk
 MOZILLA_LIBS +=freebl3 nss3 nssckbi nssdbm3
 MOZILLA_LIBS +=nssutil3 smime3 softokn3 ssl3
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- www/tor-browser/browser/distinfo5 Oct 2018 22:02:12 -   1.14
+++ www/tor-browser/browser/distinfo1 May 2019 14:14:19 -
@@ -1,2 +1,2 @@
-SHA256 (mozilla/tor-browser-8.0.2.tar.gz) = 
0jsZDX8VhqhTF4ZHPaCXgqnZWzDS1QHIY0LncLuuYks=
-SIZE (mozilla/tor-browser-8.0.2.tar.gz) = 385480115
+SHA256 (mozilla/tor-browser-8.0.8.tar.gz) = 
cLUrSyd9M80aNGbtm+CnQzKL6FaQsSghQw8TnQbDv90=
+SIZE (mozilla/tor-browser-8.0.8.tar.gz) = 387583620
Index: www/tor-browser/browser/patches/patch-build_moz_configure_init_configure
===
RCS file: 
www/tor-browser/browser/patches/patch-build_moz_configure_init_configure
diff -N www/tor-browser/browser/patches/patch-build_moz_configure_init_configure
--- www/tor-browser/browser/patches/patch-build_moz_configure_init_configure
3 Oct 2018 14:55:36 -   1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,24 +0,0 @@
-$OpenBSD: patch-build_moz_configure_init_configure,v 1.2 2018/10/03 14:55:36 
sthen Exp $
-
-Fix build with rust 1.29.
-https://hg.mozilla.org/mozilla-central/rev/36f4ba2fb6f5
-https://hg.mozilla.org/releases/mozilla-esr60/rev/381ae910e9b2712699fdc6a9bb9702c04bccb8f5
-
-Index: build/moz.configure/init.configure
 build/moz.configure/init.configure.orig
-+++ build/moz.configure/init.configure
-@@ -577,7 +577,13 @@ def split_triplet(triplet, allow_unknown=False):
- # There is also a quartet form:
- #   CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
- # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
--cpu, manufacturer, os = triplet.split('-', 2)
-+parts = triplet.split('-', 2)
-+if len(parts) == 3:
-+cpu, _, os = parts
-+elif len(parts) == 2:
-+cpu, os = parts
-+else:
-+die("Unexpected triplet string: %s" % triplet)
- 
- # Autoconf uses config.sub to validate and canonicalize those triplets,
- # but the granularity of its results has never been satisfying to our
Index: www/tor-browser/https-everywhere/Makefile
===
RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- www/tor-browser/https-everywhere/Makefile   28 Sep 2018 14:54:26 -  
1.13
+++ www/tor-browser/https-everywhere/Makefile   1 May 2019 14:14:19 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.13 2018/09/28 14:54:26 sthen Exp $
 
 ADDON_NAME =   https-everywhere
-V =2018.8.22
+V =2019.1.31
 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.13
diff

[UPDATE] Tor Browser 8.0.2

2018-10-05 Thread attila 
Hi ports@,

Hot on the heels of 8.0.1 is 8.0.2, which is just an upgrade to
ESR60.2.1 due to security issues:
https://blog.torproject.org/new-release-tor-browser-802

Not sure if the version bumps in the extensions are strictly necessary
since the paths under /usr/local/lib don't change now.

Tested on amd64.

Pax, -A

Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- meta/tor-browser/Makefile	28 Sep 2018 14:54:26 -	1.14
+++ meta/tor-browser/Makefile	5 Oct 2018 03:15:14 -
@@ -4,12 +4,12 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy 
 
-PKGNAME=	tor-browser-8.0.1
+PKGNAME=	tor-browser-8.0.2
 
-RUN_DEPENDS=	www/tor-browser/browser>=8.0.1 \
-		www/tor-browser/torbutton>=2.0.7 \
-		www/tor-browser/tor-launcher>=0.2.16.6 \
-		www/tor-browser/noscript>=10.1.9.6 \
-		www/tor-browser/https-everywhere>=2018.8.22
+RUN_DEPENDS=	www/tor-browser/browser>=8.0.2 \
+		www/tor-browser/torbutton>=2.0.7p0 \
+		www/tor-browser/tor-launcher>=0.2.16.6p0 \
+		www/tor-browser/noscript>=10.1.9.6p0 \
+		www/tor-browser/https-everywhere>=2018.8.22p0
 
 .include 
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile.inc
--- www/tor-browser/Makefile.inc	28 Sep 2018 14:54:26 -	1.14
+++ www/tor-browser/Makefile.inc	5 Oct 2018 03:15:14 -
@@ -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 =		8.0.1
+TB_VERSION =		8.0.2
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- www/tor-browser/browser/Makefile	4 Oct 2018 19:56:38 -	1.28
+++ www/tor-browser/browser/Makefile	5 Oct 2018 03:15:14 -
@@ -9,7 +9,6 @@ ONLY_FOR_ARCHS =	amd64 i386
 MOZILLA_VERSION =	${TB_VERSION}
 MOZILLA_PROJECT =	${BROWSER_NAME}
 MOZILLA_CODENAME =	browser
-REVISION =		0
 
 EXTRACT_SUFX =		.tar.gz
 PATCHORIG =		.pat.orig
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- www/tor-browser/browser/distinfo	28 Sep 2018 14:54:26 -	1.13
+++ www/tor-browser/browser/distinfo	5 Oct 2018 03:15:14 -
@@ -1,2 +1,2 @@
-SHA256 (mozilla/tor-browser-8.0.1.tar.gz) = 2hOMhEREUF/1QmUWW4KPzCQLQAR+H6H15KpwLjMWG2U=
-SIZE (mozilla/tor-browser-8.0.1.tar.gz) = 385419887
+SHA256 (mozilla/tor-browser-8.0.2.tar.gz) = 0jsZDX8VhqhTF4ZHPaCXgqnZWzDS1QHIY0LncLuuYks=
+SIZE (mozilla/tor-browser-8.0.2.tar.gz) = 385480115
Index: www/tor-browser/https-everywhere/Makefile
===
RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- www/tor-browser/https-everywhere/Makefile	28 Sep 2018 14:54:26 -	1.13
+++ www/tor-browser/https-everywhere/Makefile	5 Oct 2018 03:15:14 -
@@ -2,6 +2,7 @@
 
 ADDON_NAME =		https-everywhere
 V =			2018.8.22
+REVISION =		0
 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/noscript/Makefile
===
RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- www/tor-browser/noscript/Makefile	28 Sep 2018 14:54:26 -	1.14
+++ www/tor-browser/noscript/Makefile	5 Oct 2018 03:15:14 -
@@ -2,6 +2,7 @@
 
 ADDON_NAME =		noscript
 V =			10.1.9.6
+REVISION =		0
 COMMENT =		Tor Browser add-on: flexible JS blocker
 HOMEPAGE =		http://noscript.net
 MASTER_SITES =		https://secure.informaction.com/download/releases/
Index: www/tor-browser/tor-launcher/Makefile
===
RCS file: /cvs/ports/www/tor-browser/tor-launcher/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- www/tor-browser/tor-launcher/Makefile	28 Sep 2018 14:54:26 -	1.13
+++ www/tor-browser/tor-launcher/Makefile	5 Oct 2018 03:15:14 -
@@ -2,6 +2,7 @@
 
 ADDON_NAME =		tor-launcher
 V =			0.2.16.6
+REVISION =		0
 COMMENT =		Tor Browser add-on to manage tor instance
 GUID =			tor-launc...@torproject.org
 PKGNAME =		${TB_NAME}
Index: www/tor-browser/torbutton/Makefile
===
RCS file: /cvs/ports/www/tor-browser/torbutton/Makefile,v
retrieving revision 1.13

[UPDATE] Tor Browser 8.0.1

2018-09-27 Thread attila 
Hi ports@,

Attached is a patch to bring -current ports up to Tor Browser 8.0.1.
Lightly tested on amd64.  Full release announcement here:
https://blog.torproject.org/new-release-tor-browser-801
The release announcement for 8.0 is also relevant:
https://blog.torproject.org/new-release-tor-browser-80

Pax, -A

Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- meta/tor-browser/Makefile	4 Sep 2018 12:46:16 -	1.13
+++ meta/tor-browser/Makefile	27 Sep 2018 21:24:54 -
@@ -4,13 +4,12 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy 
 
-PKGNAME=	tor-browser-7.5.3
-REVISION=	0
+PKGNAME=	tor-browser-8.0.1
 
-RUN_DEPENDS=	www/tor-browser/browser>=7.5.3 \
-		www/tor-browser/torbutton>=1.9.8.6 \
-		www/tor-browser/tor-launcher>=0.2.14.4 \
-		www/tor-browser/noscript>=5.1.8.4 \
-		www/tor-browser/https-everywhere>=2018.3.13
+RUN_DEPENDS=	www/tor-browser/browser>=8.0.1 \
+		www/tor-browser/torbutton>=2.0.7 \
+		www/tor-browser/tor-launcher>=0.2.16.6 \
+		www/tor-browser/noscript>=10.1.9.6 \
+		www/tor-browser/https-everywhere>=2018.8.22
 
 .include 
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.inc
--- www/tor-browser/Makefile.inc	24 Apr 2018 18:06:30 -	1.13
+++ www/tor-browser/Makefile.inc	27 Sep 2018 21:24:54 -
@@ -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.5.3
+TB_VERSION =		8.0.1
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
@@ -37,7 +37,7 @@ CONFIGURE_STYLE ?=	none
 BUILD_DEPENDS +=	archivers/zip archivers/unzip
 RUN_DEPENDS +=		www/tor-browser/browser
 
-EXTDIR_ROOT ?=		lib/${BROWSER_NAME}-${TB_VERSION}
+EXTDIR_ROOT ?=		lib/${BROWSER_NAME}
 REAL_EXTDIR ?=		${PREFIX}/${EXTDIR_ROOT}/browser/extensions
 
 SUBST_VARS +=		EXTDIR_ROOT GUID
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- www/tor-browser/browser/Makefile	27 Jun 2018 21:04:06 -	1.26
+++ www/tor-browser/browser/Makefile	27 Sep 2018 21:24:54 -
@@ -15,13 +15,12 @@ PATCHORIG =		.pat.orig
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${BROWSER_NAME}-${TB_VERSION}
-REVISION =		1
 
-SO_VERSION =		2.0
-MOZILLA_LIBS =		xul lgpllibs mozavcodec mozavutil
+SO_VERSION =		3.0
+MOZILLA_LIBS =		xul clearkey lgpllibs mozavcodec mozavutil mozgtk
 MOZILLA_LIBS +=		freebl3 nss3 nssckbi nssdbm3
 MOZILLA_LIBS +=		nssutil3 smime3 softokn3 ssl3
-MOZILLA_LIBS +=		mozsqlite3
+MOZILLA_LIBS +=		nspr4 mozsqlite3 plc4 plds4
 
 # mozilla public license
 PERMIT_PACKAGE_CDROM=	Yes
@@ -33,13 +32,27 @@ MODPY_RUNDEP =		No
 COMPILER =		base-clang ports-clang
 MODCLANG_ARCHS =	amd64 i386
 
-MOZILLA_USE_BUNDLED_NSS =	Yes
+# firefox >= 44 doesnt build with base libevent
 MOZILLA_USE_BUNDLED_LIBEVENT =	Yes
+# firefox >= 46 defaults to gtk+3
+MOZILLA_USE_GTK3 =	 	Yes
+# 56 requires 59.1
+MOZILLA_USE_BUNDLED_ICU =	Yes
+# 59 is broken with system cairo and the option is being dropped
+MOZILLA_USE_BUNDLED_CAIRO = Yes
+# #1460600
+MOZILLA_USE_BUNDLED_HUNSPELL =	Yes
+# tor-browser needs built-in nss, sqlite
+MOZILLA_USE_BUNDLED_NSPR =	Yes
+MOZILLA_USE_BUNDLED_NSS =	Yes
 MOZILLA_USE_BUNDLED_SQLITE =	Yes
 
-WANTLIB +=		X11-xcb intl pixman-1 xcb xcb-shm ${COMPILER_LIBCXX}
+# firefox >= 53 needs rust
+BUILD_DEPENDS +=	lang/rust
+# stylo build needs LLVM
+BUILD_DEPENDS +=	devel/llvm
 
-LIB_DEPENDS +=		devel/gettext
+WANTLIB += X11-xcb Xcursor Xi fribidi intl xcb xcb-shm ${COMPILER_LIBCXX}
 
 # Regression tests are too hard to adapt to run here
 NO_TEST =		Yes
@@ -47,6 +60,11 @@ NO_TEST =		Yes
 CONFIGURE_STYLE =	simple
 CONFIGURE_ARGS +=	--prefix=${PREFIX}
 
+# app-name etc. for tor-browser
+CONFIGURE_ARGS +=	--with-app-name=${BROWSER_NAME}			\
+			--with-tor-browser-version=${TB_VERSION}	\
+			--disable-tor-browser-update
+
 # for nss build system
 MAKE_ENV +=		BUILD_OPT=1 \
 			LOCALBASE="${LOCALBASE}" \
@@ -54,14 +72,17 @@ MAKE_ENV +=		BUILD_OPT=1 \
 			XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 BUILD_DEPENDS +=	devel/py-virtualenv
 
-CONFIGURE_ARGS +=	--with-app-name=${BROWSER_NAME}			\
-			--with-tor-browser-version=${TB_VERSION}	\
-			--disable-tor-browser-update
-
-RUN_DEPENDS +=		net/tor>=0.3.2.10
+RUN_DEPENDS +=		net/tor>=0.3.4.8
 
 # bug 857628
 CONFIGURE_ARGS +=	--enable-pie
+CONFIGURE_ARGS +=	--enable-release #1386371
+CONFIGURE_ARGS +=	--enable-rust-simd #1261841
+.if ${MACHINE_ARCH} == "i386"
+CONFIGURE_ARGS +=	--disable-debug-symbols
+MAKE_ENV +=		RUSTFLAGS="-C target-cpu=pentium4 --cfg

[UPDATE] Tor Browser 7.5.3 backport to -stable

2018-04-26 Thread attila 
Hi ports@,

Now that 7.5.3 has been committed to -current I'd like to propose a
patch to backport to -stable.  This has been lightly tested on an
amd64 -stable machine with all patches.

We're going to be building and publishing signed packages for -stable
in the way that landry@ does for the regular Mozillan ports.

Signing Key: https://bits.torbsd.org/pub/OpenBSD/torbsd-pkg.pub
 RWSrDOvkXBL2Z8d8BnXpVCOmmtYX/gphG1E6BPWOM2s3XZT+9KDqh0te
Packages:https://bits.torbsd.org/pub/OpenBSD/6.3/packages/amd64/

I will announce on our blog (https://torbsd.org) the availability of
signed packages in that directory once the backport patch is accepted.
Until then anything you see there is a mirage.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- meta/tor-browser/Makefile	10 Jan 2018 13:22:25 -	1.11
+++ meta/tor-browser/Makefile	25 Apr 2018 22:18:45 -
@@ -4,12 +4,12 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-7.0.11
+PKGNAME=	tor-browser-7.5.3
 
-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
+RUN_DEPENDS=	www/tor-browser/browser>=7.5.3 \
+		www/tor-browser/torbutton>=1.9.8.6 \
+		www/tor-browser/tor-launcher>=0.2.14.4 \
+		www/tor-browser/noscript>=5.1.8.4 \
+		www/tor-browser/https-everywhere>=2018.3.13
 
 .include 
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile.inc
--- www/tor-browser/Makefile.inc	10 Jan 2018 13:22:25 -	1.12
+++ www/tor-browser/Makefile.inc	25 Apr 2018 22:18:45 -
@@ -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.11
+TB_VERSION =		7.5.3
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- www/tor-browser/browser/Makefile	13 Mar 2018 19:21:08 -	1.23
+++ www/tor-browser/browser/Makefile	25 Apr 2018 22:18:45 -
@@ -9,7 +9,6 @@ ONLY_FOR_ARCHS =	amd64 i386
 MOZILLA_VERSION =	${TB_VERSION}
 MOZILLA_PROJECT =	${BROWSER_NAME}
 MOZILLA_CODENAME =	browser
-REVISION =	0
 
 EXTRACT_SUFX =		.tar.gz
 PATCHORIG =		.pat.orig
@@ -37,7 +36,7 @@ MOZILLA_USE_BUNDLED_NSS =	Yes
 MOZILLA_USE_BUNDLED_LIBEVENT =	Yes
 MOZILLA_USE_BUNDLED_SQLITE =	Yes
 
-WANTLIB +=		X11-xcb intl xcb xcb-shm ${COMPILER_LIBCXX}
+WANTLIB +=		X11-xcb intl pixman-1 xcb xcb-shm ${COMPILER_LIBCXX}
 
 LIB_DEPENDS +=		devel/gettext
 
@@ -58,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.9
+RUN_DEPENDS +=		net/tor>=0.3.2.10
 
 # bug 857628
 CONFIGURE_ARGS +=	--enable-pie
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- www/tor-browser/browser/distinfo	10 Jan 2018 13:22:25 -	1.11
+++ www/tor-browser/browser/distinfo	25 Apr 2018 22:18:45 -
@@ -1,2 +1,2 @@
-SHA256 (mozilla/tor-browser-7.0.11.tar.gz) = 8kL4PfuYjSkV9UtU9q/mnKfM1w6vVMwp9xXBPjgQsA0=
-SIZE (mozilla/tor-browser-7.0.11.tar.gz) = 296597747
+SHA256 (mozilla/tor-browser-7.5.3.tar.gz) = MA9Oo5DeWcFq+voe8G4buEA1wlRLXypiJDqvtlQ4Ar0=
+SIZE (mozilla/tor-browser-7.5.3.tar.gz) = 296661624
Index: www/tor-browser/browser/files/extension-overrides.js
===
RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v
retrieving revision 1.8
diff -u -p -r1.8 extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js	26 Sep 2017 19:55:17 -	1.8
+++ www/tor-browser/browser/files/extension-overrides.js	25 Apr 2018 22:18:45 -
@@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolba
 
 # NoScript Preferences:
 pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:cert

Re: [UPDATE] Tor Browser 7.5.3

2018-04-19 Thread attila 
Артур Истомин <art.is...@yandex.ru> wrote:
> On Wed, Apr 18, 2018 at 02:16:09PM -0500, attila wrote:
> > Hi ports@,
> > 
> > Attached is an update to Tor Browser 7.5.3.  Tested lightly on amd64,
> > more testing would be welcome.
> 
> Hi, attila! Is it possible to compile it on OpenBSD-stable?

The plan is to backport updates and offer packages for -stable on
torbsd.org similar to the way that landry@ does it for the Firefox
ports (at least amd64, other archs on request).  We have not yet
gotten this going, I hope this update will be the first one.

I'll announce it here when it happens.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

[UPDATE] Tor Browser 7.5.3

2018-04-18 Thread attila 
Hi ports@,

Attached is an update to Tor Browser 7.5.3.  Tested lightly on amd64,
more testing would be welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- meta/tor-browser/Makefile	10 Jan 2018 13:22:25 -	1.11
+++ meta/tor-browser/Makefile	18 Apr 2018 19:12:22 -
@@ -4,12 +4,12 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-7.0.11
+PKGNAME=	tor-browser-7.5.3
 
-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
+RUN_DEPENDS=	www/tor-browser/browser>=7.5.3 \
+		www/tor-browser/torbutton>=1.9.8.6 \
+		www/tor-browser/tor-launcher>=0.2.14.4 \
+		www/tor-browser/noscript>=5.1.8.4 \
+		www/tor-browser/https-everywhere>=2018.3.13
 
 .include 
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile.inc
--- www/tor-browser/Makefile.inc	10 Jan 2018 13:22:25 -	1.12
+++ www/tor-browser/Makefile.inc	18 Apr 2018 19:12:22 -
@@ -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.11
+TB_VERSION =		7.5.3
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- www/tor-browser/browser/Makefile	13 Mar 2018 19:21:08 -	1.23
+++ www/tor-browser/browser/Makefile	18 Apr 2018 19:12:22 -
@@ -9,7 +9,6 @@ ONLY_FOR_ARCHS =	amd64 i386
 MOZILLA_VERSION =	${TB_VERSION}
 MOZILLA_PROJECT =	${BROWSER_NAME}
 MOZILLA_CODENAME =	browser
-REVISION =	0
 
 EXTRACT_SUFX =		.tar.gz
 PATCHORIG =		.pat.orig
@@ -37,7 +36,7 @@ MOZILLA_USE_BUNDLED_NSS =	Yes
 MOZILLA_USE_BUNDLED_LIBEVENT =	Yes
 MOZILLA_USE_BUNDLED_SQLITE =	Yes
 
-WANTLIB +=		X11-xcb intl xcb xcb-shm ${COMPILER_LIBCXX}
+WANTLIB +=		X11-xcb intl pixman-1 xcb xcb-shm ${COMPILER_LIBCXX}
 
 LIB_DEPENDS +=		devel/gettext
 
@@ -58,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.9
+RUN_DEPENDS +=		net/tor>=0.3.2.10
 
 # bug 857628
 CONFIGURE_ARGS +=	--enable-pie
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- www/tor-browser/browser/distinfo	10 Jan 2018 13:22:25 -	1.11
+++ www/tor-browser/browser/distinfo	18 Apr 2018 19:12:22 -
@@ -1,2 +1,2 @@
-SHA256 (mozilla/tor-browser-7.0.11.tar.gz) = 8kL4PfuYjSkV9UtU9q/mnKfM1w6vVMwp9xXBPjgQsA0=
-SIZE (mozilla/tor-browser-7.0.11.tar.gz) = 296597747
+SHA256 (mozilla/tor-browser-7.5.3.tar.gz) = MA9Oo5DeWcFq+voe8G4buEA1wlRLXypiJDqvtlQ4Ar0=
+SIZE (mozilla/tor-browser-7.5.3.tar.gz) = 296661624
Index: www/tor-browser/browser/files/extension-overrides.js
===
RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v
retrieving revision 1.8
diff -u -p -r1.8 extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js	26 Sep 2017 19:55:17 -	1.8
+++ www/tor-browser/browser/files/extension-overrides.js	18 Apr 2018 19:12:22 -
@@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolba
 
 # NoScript Preferences:
 pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-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("capability.policy.maonoscript.sites", "[System+Principal]

Re: [NEW] net/onionshare

2018-02-20 Thread attila 
> attila wrote:
> > Klemens Nanni wrote:
> > > On Tue, Dec 12, 2017 at 10:45:21AM -0600, attila wrote:
> > > > Klemens Nanni <k...@posteo.org> wrote:
> > > > > You should zap V and PKGNAME, set GH_TAGNAME=v1.1 and move GH_* right
> > > > > beneath COMMENT; see infrastructure/templates/Makefile.template.
> > > > >
> > > > > RUN_DEPENDS lacks net/tor.
> > > > > onionshare-gui still starts but python will dump core when
> > > > > /usr/local/bin/tor is missing. It also mentions our net/tor package as
> > > > > "Tor that is bundled with OpenShare" which is misleading.
> > > > >
> > > > > TEST_DEPENDS lacks net/py-stem and www/py-frozen-flask.
> > > >
> > > > Attached is an updated port that addresses all of these comments.
> > > > Thanks a lot for the feedback!
> > > Looks good to me except for the bundle bits. Optimally this should be
> > > clarified upstream.
> > 
> > There has been a new release in the interim and my patches for the old
> > release were discussed a bit on GH.  Attached is a new attempt that is
> > for the latest release (1.2) and that takes into account some of the
> > suggestions from other contributors.
> 
> After I sent this I modified my patches slightly to accomodate another
> suggestion by upstream and the pull request has now been merged, so
> all these patches can go in the next update:
> https://github.com/micahflee/onionshare/pull/585
> 
> This is also in FreeBSD ports now (thanks to fellow torbsd.org member
> Egypcio):
> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225539
> 
> > I changed TEST_DEPENDS for 1.2 but the tests fail now for me and I
> > have not had time to investigate, thus NO_TEST=Yes.  I'd like this to
> > be critiqued regardless, I don't see this as fatal to getting in if it
> > passes muster otherwise...
> 
> Still have not had time to suss this out.
> 
> Updated port attached with the actual patches that got upstream.

Ping.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Re: [NEW] net/onionshare

2018-02-07 Thread attila 
attila wrote:
> Klemens Nanni wrote:
> > On Tue, Dec 12, 2017 at 10:45:21AM -0600, attila wrote:
> > > Klemens Nanni <k...@posteo.org> wrote:
> > > > You should zap V and PKGNAME, set GH_TAGNAME=v1.1 and move GH_* right
> > > > beneath COMMENT; see infrastructure/templates/Makefile.template.
> > > >
> > > > RUN_DEPENDS lacks net/tor.
> > > > onionshare-gui still starts but python will dump core when
> > > > /usr/local/bin/tor is missing. It also mentions our net/tor package as
> > > > "Tor that is bundled with OpenShare" which is misleading.
> > > >
> > > > TEST_DEPENDS lacks net/py-stem and www/py-frozen-flask.
> > >
> > > Attached is an updated port that addresses all of these comments.
> > > Thanks a lot for the feedback!
> > Looks good to me except for the bundle bits. Optimally this should be
> > clarified upstream.
> 
> There has been a new release in the interim and my patches for the old
> release were discussed a bit on GH.  Attached is a new attempt that is
> for the latest release (1.2) and that takes into account some of the
> suggestions from other contributors.

After I sent this I modified my patches slightly to accomodate another
suggestion by upstream and the pull request has now been merged, so
all these patches can go in the next update:
https://github.com/micahflee/onionshare/pull/585

This is also in FreeBSD ports now (thanks to fellow torbsd.org member
Egypcio):
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225539

> I changed TEST_DEPENDS for 1.2 but the tests fail now for me and I
> have not had time to investigate, thus NO_TEST=Yes.  I'd like this to
> be critiqued regardless, I don't see this as fatal to getting in if it
> passes muster otherwise...

Still have not had time to suss this out.

Updated port attached with the actual patches that got upstream.

> Feedback welcome.
> 
> Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



onionshare-1.2-3.tgz
Description: Binary data

Re: [NEW] net/onionshare

2018-02-05 Thread attila 
Klemens Nanni wrote:
> On Tue, Dec 12, 2017 at 10:45:21AM -0600, attila wrote:
> > Klemens Nanni <k...@posteo.org> wrote:
> > > You should zap V and PKGNAME, set GH_TAGNAME=v1.1 and move GH_* right
> > > beneath COMMENT; see infrastructure/templates/Makefile.template.
> > >
> > > RUN_DEPENDS lacks net/tor.
> > > onionshare-gui still starts but python will dump core when
> > > /usr/local/bin/tor is missing. It also mentions our net/tor package as
> > > "Tor that is bundled with OpenShare" which is misleading.
> > >
> > > TEST_DEPENDS lacks net/py-stem and www/py-frozen-flask.
> >
> > Attached is an updated port that addresses all of these comments.
> > Thanks a lot for the feedback!
> Looks good to me except for the bundle bits. Optimally this should be
> clarified upstream.

There has been a new release in the interim and my patches for the old
release were discussed a bit on GH.  Attached is a new attempt that is
for the latest release (1.2) and that takes into account some of the
suggestions from other contributors.

I changed TEST_DEPENDS for 1.2 but the tests fail now for me and I
have not had time to investigate, thus NO_TEST=Yes.  I'd like this to
be critiqued regardless, I don't see this as fatal to getting in if it
passes muster otherwise...

Feedback welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



onionshare-1.2-2.tgz
Description: Binary data

[PATCH] net/obfs4proxy/pkg/README

2018-01-10 Thread attila 
Hi ports@,

A typo in the pkg/README for net/obfs4proxy was reported to me on IRC.
The attached patch fixes it.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Index: pkg/README
===
RCS file: /cvs/ports/net/obfs4proxy/pkg/README,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README
--- pkg/README	29 Aug 2017 17:02:48 -	1.1.1.1
+++ pkg/README	10 Jan 2018 21:01:44 -
@@ -13,7 +13,7 @@ To enable this Pluggable Transport in yo
 following configurations in your 'torrc' file:
 
 	# Use obfs4proxy to provide the obfuscator
-	ServerTransportPlugin obfs4 exec ${PREFIX}/bin/obfs4proxy managed
+	ServerTransportPlugin obfs4 exec ${PREFIX}/bin/obfs4proxy
 
 	# Enable Extended ORPort
 	ExtORPort auto

Re: [NEW] net/onionshare

2018-01-09 Thread attila 
Klemens Nanni <k...@posteo.org> wrote:
> On Tue, Dec 12, 2017 at 10:45:21AM -0600, attila wrote:
> > Klemens Nanni <k...@posteo.org> wrote:
> > > You should zap V and PKGNAME, set GH_TAGNAME=v1.1 and move GH_* right
> > > beneath COMMENT; see infrastructure/templates/Makefile.template.
> > >
> > > RUN_DEPENDS lacks net/tor.
> > > onionshare-gui still starts but python will dump core when
> > > /usr/local/bin/tor is missing. It also mentions our net/tor package as
> > > "Tor that is bundled with OpenShare" which is misleading.
> > > 
> > > TEST_DEPENDS lacks net/py-stem and www/py-frozen-flask.
> > 
> > Attached is an updated port that addresses all of these comments.
> > Thanks a lot for the feedback!
> Looks good to me except for the bundle bits. Optimally this should be
> clarified upstream.

Attached is an updated attempt that uses MULTI_PACKAGES, as you
suggested in another post.  I still have not figured out how to deal
with the "bundled" thing, sorry, will look at it next.

Pax, -A
-- 
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



onionshare-4.tgz
Description: Binary data

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

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

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 <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.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.

Re: [NEW] net/onionshare

2017-12-12 Thread attila 
Klemens Nanni <k...@posteo.org> wrote:
> You should zap V and PKGNAME, set GH_TAGNAME=v1.1 and move GH_* right
> beneath COMMENT; see infrastructure/templates/Makefile.template.
>
> RUN_DEPENDS lacks net/tor.
> onionshare-gui still starts but python will dump core when
> /usr/local/bin/tor is missing. It also mentions our net/tor package as
> "Tor that is bundled with OpenShare" which is misleading.
> 
> TEST_DEPENDS lacks net/py-stem and www/py-frozen-flask.

Attached is an updated port that addresses all of these comments.
Thanks a lot for the feedback!

> Otherwise at least the CLI version works for me. It would be nice imho
> to split CLI and GUI into separate FLAVORS if possible.

As sthen@ points out in a subsequent email, it seems like this should
be multi-packages and not flavors, but in any event I didn't have time
to address it.  Posting what I have in the hope that it is good enough
to go in and we can improve it later...

Pax, -A
-- 
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



onionshare-3.tgz
Description: Binary data

Re: [NEW] net/onionshare

2017-12-07 Thread attila 
Jiri B <ji...@devio.us> wrote:
> OMG, again these...
> 
> -if not gui_mode or common.get_platform() == 'Linux':
> +if not gui_mode or common.platform_is_unixy():

Yup, it is sometimes an uphill battle to get people with a Lin/Win/Mac
mindset to go beyond that, but engaging with them is better than not
IMHO.

> Is this piece of sw really good enough to be trusted by people who really
> depend on anonymity and bad quality of such sw could cause them serious
> personal consequences?

Onionshare is a much-used application in the PETs community, I suspect
because it is simple.  It is the simplest thing that a normal person
can do to make use of Tor: share a file.  It's included in TAILs and
is well-known.  I'd like it to be available under OpenBSD.

> Why are those diffs not pushed upstream?

Thanks for the nudge: https://github.com/micahflee/onionshare/pull/489

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Re: [NEW] net/onionshare

2017-12-06 Thread attila 
attila <att...@stalphonsos.com> wrote:
> Hi ports@,

Rehi ports@,

> 
> Attached is a port OnionShare (https://onionshare.org).  It requires
> the net/stem python3 flavor patch I posted earlier.  Both GUI and CLI
> have been lightly tested.
> 
> $ cat pkg/DESCR
> Tool for sharing files of any size anonymously over the Tor public
> anonymity network.
> 
> It works by starting a web server, making it accessible as a Tor onion
> service, and generating an unguessable URL to access and download the
> files. It doesn't require setting up a server on the internet somewhere
> or using a third party file-sharing service. The file on your own
> computer and use a Tor onion service to make it temporarily accessible
> over the internet. The other user just needs to use Tor Browser to
> download the file from you.

Ping w/updated port attached that depends on the newly renamed
net/py-stem3.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



onionshare-2.tgz
Description: Binary data

Re: [UPDATE] Tor Browser 7.0.10

2017-11-27 Thread attila 
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 -	1.11
+++ www/tor-browser/Makefile.inc	17 Nov 2017 21:02:47 -
@@ -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 -	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 20

[UPDATE] Tor Browser 7.0.10

2017-11-17 Thread attila 
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.

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 <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 -	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 $
 
 ADDON_NAME =		https-everywhere
-V =			2017.9.12

Re: [PATCH] add python3 flavor to net/stem

2017-11-11 Thread attila 
attila <att...@stalphonsos.com> wrote:
> Daniel Jakots <danj+o...@chown.me> wrote:
> > On Thu, 09 Nov 2017 11:30:24 -0600, attila <att...@stalphonsos.com>
> > wrote:
> > 
> > > The attached patch adds a python3 flavor to net/stem.
> > 
> > It's more complicated than that because PKGNAME must be renamed in
> > py-stem.
> 
> After some feedback on IRC and email I have another attempt, attached.

Sigh.  Let's try again after cvs add.  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: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.542
diff -u -p -r1.542 Makefile
--- devel/quirks/Makefile	11 Nov 2017 10:48:25 -	1.542
+++ devel/quirks/Makefile	11 Nov 2017 20:44:14 -
@@ -5,7 +5,7 @@ CATEGORIES =	devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =	quirks-2.387
+PKGNAME =	quirks-2.388
 PKG_ARCH =	*
 MAINTAINER =	Marc Espie <es...@openbsd.org>
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.555
diff -u -p -r1.555 Quirks.pm
--- devel/quirks/files/Quirks.pm	11 Nov 2017 10:48:25 -	1.555
+++ devel/quirks/files/Quirks.pm	11 Nov 2017 20:44:14 -
@@ -494,6 +494,7 @@ my $stem_extensions = {
 	'ruby-arirang' => 'arirang',
 	'ja-mplus-ttf' => 'mixfont-mplus-ipa',
 	'kdirstat' => 'qdirstat',
+	'stem' => 'py-stem',
 };
 
 my $obsolete_reason = {
Index: net/stem/Makefile
===
RCS file: /cvs/ports/net/stem/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- net/stem/Makefile	9 Nov 2017 16:37:42 -	1.6
+++ net/stem/Makefile	11 Nov 2017 20:44:14 -
@@ -5,7 +5,7 @@ COMMENT =		Tor controller library
 MODPY_EGG_VERSION =	1.6.0
 V =			${MODPY_EGG_VERSION:S/b//}
 DISTNAME =		stem-${MODPY_EGG_VERSION}
-PKGNAME =		stem-${V}
+PKGNAME =		py-stem-${V}
 WRKDIST =		${WRKDIR}/stem-${V}
 
 SUBST_VARS +=		V
@@ -19,9 +19,17 @@ MAINTAINER =		Pascal Stumpf <pascal@stum
 # GPLv3
 PERMIT_PACKAGE_CDROM =	Yes
 
+FLAVORS =		python3
+FLAVOR ?=
+
 MODULES =		lang/python
 MODPY_PI =		Yes
 
+RUN_DEPENDS =		security/py-crypto${MODPY_FLAVOR}
+
 NO_TEST =		Yes
+
+post-install:
+	mv ${PREFIX}/bin/tor-prompt{,${MODPY_BIN_SUFFIX}}
 
 .include 
Index: net/stem/pkg/PFRAG.no-python3
===
RCS file: net/stem/pkg/PFRAG.no-python3
diff -N net/stem/pkg/PFRAG.no-python3
--- /dev/null	1 Jan 1970 00:00:00 -
+++ net/stem/pkg/PFRAG.no-python3	11 Nov 2017 20:44:14 -
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+@pkgpath net/stem
Index: net/stem/pkg/PLIST
===
RCS file: /cvs/ports/net/stem/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- net/stem/pkg/PLIST	9 Nov 2017 16:37:42 -	1.5
+++ net/stem/pkg/PLIST	11 Nov 2017 20:44:14 -
@@ -1,107 +1,113 @@
 @comment $OpenBSD: PLIST,v 1.5 2017/11/09 16:37:42 pascal Exp $
-bin/tor-prompt
+!%%python3%%
+@conflict stem-*
+bin/tor-prompt${MODPY_BIN_SUFFIX}
 lib/python${MODPY_VERSION}/site-packages/stem/
-lib/python${MODPY_VERSION}/site-packages/stem-${V}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/stem/__init__.py
-lib/python${MODPY_VERSION}/site-packages/stem/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}control.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}exit_policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}manual.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}prereq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}process.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}socket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/stem/cached_tor_manual.sqlite
 lib/python${MODPY_VERSION}/site-packages/stem/connection.py
-lib/python${MODPY_VERSION}/site-packages/stem/connection.pyc
 lib/python${MODPY_VERSION}/site-packages/stem/control.py
-lib/python${MODPY_VERSION}/site-packages/stem/control.pyc
-lib/python$

Re: [PATCH] add python3 flavor to net/stem

2017-11-11 Thread attila 
Daniel Jakots <danj+o...@chown.me> wrote:
> On Thu, 09 Nov 2017 11:30:24 -0600, attila <att...@stalphonsos.com>
> wrote:
> 
> > The attached patch adds a python3 flavor to net/stem.
> 
> It's more complicated than that because PKGNAME must be renamed in
> py-stem.

After some feedback on IRC and email I have another attempt, attached.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

? net/stem/pkg/PFRAG.no-python3
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.542
diff -u -p -r1.542 Makefile
--- devel/quirks/Makefile	11 Nov 2017 10:48:25 -	1.542
+++ devel/quirks/Makefile	11 Nov 2017 20:11:08 -
@@ -5,7 +5,7 @@ CATEGORIES =	devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =	quirks-2.387
+PKGNAME =	quirks-2.388
 PKG_ARCH =	*
 MAINTAINER =	Marc Espie <es...@openbsd.org>
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.555
diff -u -p -r1.555 Quirks.pm
--- devel/quirks/files/Quirks.pm	11 Nov 2017 10:48:25 -	1.555
+++ devel/quirks/files/Quirks.pm	11 Nov 2017 20:11:08 -
@@ -494,6 +494,7 @@ my $stem_extensions = {
 	'ruby-arirang' => 'arirang',
 	'ja-mplus-ttf' => 'mixfont-mplus-ipa',
 	'kdirstat' => 'qdirstat',
+	'stem' => 'py-stem',
 };
 
 my $obsolete_reason = {
Index: net/stem/Makefile
===
RCS file: /cvs/ports/net/stem/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- net/stem/Makefile	9 Nov 2017 16:37:42 -	1.6
+++ net/stem/Makefile	11 Nov 2017 20:11:08 -
@@ -5,7 +5,7 @@ COMMENT =		Tor controller library
 MODPY_EGG_VERSION =	1.6.0
 V =			${MODPY_EGG_VERSION:S/b//}
 DISTNAME =		stem-${MODPY_EGG_VERSION}
-PKGNAME =		stem-${V}
+PKGNAME =		py-stem-${V}
 WRKDIST =		${WRKDIR}/stem-${V}
 
 SUBST_VARS +=		V
@@ -19,9 +19,17 @@ MAINTAINER =		Pascal Stumpf <pascal@stum
 # GPLv3
 PERMIT_PACKAGE_CDROM =	Yes
 
+FLAVORS =		python3
+FLAVOR ?=
+
 MODULES =		lang/python
 MODPY_PI =		Yes
 
+RUN_DEPENDS =		security/py-crypto${MODPY_FLAVOR}
+
 NO_TEST =		Yes
+
+post-install:
+	mv ${PREFIX}/bin/tor-prompt{,${MODPY_BIN_SUFFIX}}
 
 .include 
Index: net/stem/pkg/PLIST
===
RCS file: /cvs/ports/net/stem/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- net/stem/pkg/PLIST	9 Nov 2017 16:37:42 -	1.5
+++ net/stem/pkg/PLIST	11 Nov 2017 20:11:08 -
@@ -1,107 +1,113 @@
 @comment $OpenBSD: PLIST,v 1.5 2017/11/09 16:37:42 pascal Exp $
-bin/tor-prompt
+!%%python3%%
+@conflict stem-*
+bin/tor-prompt${MODPY_BIN_SUFFIX}
 lib/python${MODPY_VERSION}/site-packages/stem/
-lib/python${MODPY_VERSION}/site-packages/stem-${V}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/stem/__init__.py
-lib/python${MODPY_VERSION}/site-packages/stem/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}control.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}exit_policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}manual.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}prereq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}process.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}socket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/stem/cached_tor_manual.sqlite
 lib/python${MODPY_VERSION}/site-packages/stem/connection.py
-lib/python${MODPY_VERSION}/site-packages/stem/connection.pyc
 lib/python${MODPY_VERSION}/site-packages/stem/control.py
-lib/python${MODPY_VERSION}/site-packages/stem/control.pyc
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/
 lib/python${MODPY_VERSION}/site-packages/stem/descriptor/__init__.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_

Re: [PATCH] add python3 flavor to net/stem

2017-11-09 Thread attila 
Daniel Jakots <danj+o...@chown.me> wrote:
> On Thu, 09 Nov 2017 11:30:24 -0600, attila <att...@stalphonsos.com>
> wrote:
> 
> > The attached patch adds a python3 flavor to net/stem.
> 
> It's more complicated than that because PKGNAME must be renamed in
> py-stem.

I was following the pattern in other ports that are Pythonic but don't
have the py-* prefix (pyflakes was one, I think).  I had a diff that
changed it to py-stem but then wasn't sure if this was the thing to do
or not, so I opted for the minimal diff.  Should the port also be
renamed to py-stem, like the attached tarball?  If so then I should
also fix the dep in my proposed net/onionshare...

> Cheers,
> Daniel

Thanks for the feedback.

Pax, -A
-- 
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



py-stem.tgz
Description: net/stem -> net/py-stem

[NEW] net/onionshare

2017-11-09 Thread attila 
Hi ports@,

Attached is a port OnionShare (https://onionshare.org).  It requires
the net/stem python3 flavor patch I posted earlier.  Both GUI and CLI
have been lightly tested.

$ cat pkg/DESCR
Tool for sharing files of any size anonymously over the Tor public
anonymity network.

It works by starting a web server, making it accessible as a Tor onion
service, and generating an unguessable URL to access and download the
files. It doesn't require setting up a server on the internet somewhere
or using a third party file-sharing service. The file on your own
computer and use a Tor onion service to make it temporarily accessible
over the internet. The other user just needs to use Tor Browser to
download the file from you.



Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



onionshare.tgz
Description: port of onionshare

[PATCH] add python3 flavor to net/stem

2017-11-09 Thread attila 
Hi ports@,

The attached patch adds a python3 flavor to net/stem.  This is
required for another port I have waiting in the wings, net/onionshare,
which requires python3 stem as a dep.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Index: Makefile
===
RCS file: /cvs/ports/net/stem/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile	12 Mar 2017 17:54:55 -	1.5
+++ Makefile	18 Sep 2017 22:53:07 -
@@ -19,8 +19,16 @@ MAINTAINER =		Pascal Stumpf <pascal@stum
 # GPLv3
 PERMIT_PACKAGE_CDROM =	Yes
 
+FLAVORS =		python3
+FLAVOR ?=
+
 MODULES =		lang/python
 MODPY_PI =		Yes
+
+RUN_DEPENDS =		security/py-crypto${MODPY_FLAVOR}
+.if ${FLAVOR:Mpython3}
+PKGNAME =		stem${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
+.endif
 
 NO_TEST =		Yes
 
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/stem/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST	12 Mar 2017 17:54:55 -	1.4
+++ pkg/PLIST	18 Sep 2017 22:53:07 -
@@ -3,103 +3,108 @@ bin/tor-prompt
 lib/python${MODPY_VERSION}/site-packages/stem/
 lib/python${MODPY_VERSION}/site-packages/stem-${V}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/stem/__init__.py
-lib/python${MODPY_VERSION}/site-packages/stem/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}control.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}exit_policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}manual.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}prereq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}process.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}socket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/stem/cached_tor_manual.cfg
 lib/python${MODPY_VERSION}/site-packages/stem/connection.py
-lib/python${MODPY_VERSION}/site-packages/stem/connection.pyc
 lib/python${MODPY_VERSION}/site-packages/stem/control.py
-lib/python${MODPY_VERSION}/site-packages/stem/control.pyc
 lib/python${MODPY_VERSION}/site-packages/stem/descriptor/
 lib/python${MODPY_VERSION}/site-packages/stem/descriptor/__init__.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}export.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}extrainfo_descriptor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}hidden_service_descriptor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}microdescriptor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}networkstatus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}reader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}remote.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}router_status_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}server_descriptor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}tordnsel.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/stem/descriptor/export.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/export.pyc
 lib/python${MODPY_VERSION}/site-packages/stem/descriptor/extrainfo_descriptor.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/extrainfo_descriptor.pyc
 lib/python${MODPY_VERSION}/site-packages/stem/descriptor/fallback_directories.cfg
 lib/python${MODPY_VERSION}/site-packages/stem/descriptor/hidden_service_descriptor.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/hidden_service_descriptor.pyc
 lib/python${MODPY_VERSION}/site-packages/stem/descriptor/microdescriptor.py
-lib/python${MODPY_VERSION}/site-packages/stem/descrip

[PATCH] split net/tor into stable/ and alpha/

2017-11-09 Thread attila 
Hi ports@,

I propose that we split net/tor into net/tor/stable (which is the
current net/tor) and net/tor/alpha to make it easier to experiment
with and run relays based on the latest Tor.  Posing this as a patch
seemed confusing to me because of all the changes in directory
structure, so instead of a patch I'm attaching a tarball with the
proposed new structure.  We're running a tor 0.3.2.3-alpha relay built
from the proposed net/tor/alpha on torbsd.org, seems to be working
fine but not yet heavily tested.  Both ports pass tests.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



tor-split.tgz
Description: proposd new net/tor structure

[UPDATE] Tor Browser 7.0.6

2017-10-18 Thread attila 
Hi ports@,

Attached is an update to Tor Browser 7.0.6:

   * Update Firefox to 52.4.0esr
   * Update Torbutton to 1.9.7.7
 * Bug 22542: Security Settings window too small on macOS 10.12 (fixup)
 * Bug 20375: Warn users after entering fullscreen mode
   * Update HTTPS-Everywhere to 2017.9.12
   * Update NoScript to 5.0.10
   * Bug 21830: Copying large text from web console leaks to /tmp
   * Bug 23393: Don't crash all tabs when closing one tab

Tested under amd64.

Feedback most welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- meta/tor-browser/Makefile	26 Sep 2017 19:55:17 -	1.9
+++ meta/tor-browser/Makefile	18 Oct 2017 16:43:07 -
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-7.0.5
+PKGNAME=	tor-browser-7.0.6
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.inc
--- www/tor-browser/Makefile.inc	26 Sep 2017 19:55:17 -	1.10
+++ www/tor-browser/Makefile.inc	18 Oct 2017 16:43:07 -
@@ -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.5
+TB_VERSION =		7.0.6
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- www/tor-browser/browser/Makefile	28 Sep 2017 16:33:24 -	1.19
+++ www/tor-browser/browser/Makefile	18 Oct 2017 16:43:07 -
@@ -7,11 +7,10 @@ COMMENT =		modified version of Firefox E
 ONLY_FOR_ARCHS =	amd64 i386
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr52.3.0
+GH_TAGNAME =		v${TB_VERSION}-esr52.4.0
 MOZILLA_VERSION =	${TB_VERSION}
 MOZILLA_PROJECT =	${BROWSER_NAME}
 MOZILLA_CODENAME =	browser
-REVISION =	0
 
 MASTER_SITES =		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/
 EXTRACT_SUFX =		.tar.gz
@@ -64,7 +63,7 @@ CONFIGURE_ARGS +=	--with-app-name=${BROW
 			--with-tor-browser-version=${TB_VERSION}	\
 			--disable-tor-browser-update
 
-RUN_DEPENDS +=		net/tor>=0.3.0.10
+RUN_DEPENDS +=		net/tor>=0.3.1.7
 
 # bug 857628
 CONFIGURE_ARGS +=	--enable-pie
@@ -79,6 +78,7 @@ post-patch:
 
 BROWSER_DIR = ${PREFIX}/lib/${BROWSER_NAME}-${TB_VERSION}
 BROWSER_CFG = ${BROWSER_DIR}/${BROWSER_NAME}.cfg
+BROWSER_INI = ${BROWSER_DIR}/distribution/distribution.ini
 
 post-install:
 	# install prefs, bookmarks, app config file for Tor browser
@@ -95,9 +95,9 @@ post-install:
 	chmod ${SHAREMODE} ${BROWSER_CFG}
 	# install distribution.ini file
 	${INSTALL_DATA_DIR} ${BROWSER_DIR}/distribution
-	echo "[Global]\nid=OpenBSD\nversion=${OSREV}\nabout=Packaged by ${MAINTAINER}\n" > \
-		${BROWSER_DIR}/distribution/distribution.ini
-	# install desktop file
+	echo "[Global]\nid=OpenBSD\nversion=${OSREV}\n" > ${BROWSER_INI}
+	echo "about=Packaged by ${MAINTAINER}\n" >> ${BROWSER_INI}
+# 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.9
diff -u -p -r1.9 distinfo
--- www/tor-browser/browser/distinfo	26 Sep 2017 19:55:17 -	1.9
+++ www/tor-browser/browser/distinfo	18 Oct 2017 16:43:07 -
@@ -1,2 +1,2 @@
-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
+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
Index: www/tor-browser/https-everywhere/Makefile
===
RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- www/tor-browser/https-everywhere/Makefile	26 Sep 2017 19:55:17 -	1.9
+++ www/tor-browser/https-everywhere/Makefile	18 Oct 2017 16:43:08 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.9 2017/09/26 19:55:17 sthen Exp $
 
 ADDON_NAME =		https-everywhere
-V =			2017.8.31
+V =			2017.9.12
 COMMENT =		Tor Browser

Re: [UPDATE] Tor Browser 7.0.5

2017-09-24 Thread attila 
> attila <att...@stalphonsos.com> wrote:
> > Hi ports@,
> > 
> > Attached is an update to Tor Browser 7.0.5, released 4 Sept 2017:
> > <https://blog.torproject.org/blog/tor-browser-705-released>
> > 
> > Feedback most welcome.
> > 
> > Pax, -A
> > --
> > https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
> > pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF
> 
> Ping.

Reping.  Would like to backport this to -stable, any takers for
-current?

Pax, -A
-- 
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Re: [UPDATE] Tor Browser 7.0.5

2017-09-13 Thread attila 
attila <att...@stalphonsos.com> wrote:
> Hi ports@,
> 
> Attached is an update to Tor Browser 7.0.5, released 4 Sept 2017:
> <https://blog.torproject.org/blog/tor-browser-705-released>
> 
> Feedback most welcome.
> 
> Pax, -A
> --
> https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
> pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Ping.

Pax, -A
-- 
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

[UPDATE] Tor Browser 7.0.5

2017-09-05 Thread attila 
Hi ports@,

Attached is an update to Tor Browser 7.0.5, released 4 Sept 2017:
<https://blog.torproject.org/blog/tor-browser-705-released>

Feedback most welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- meta/tor-browser/Makefile	27 Aug 2017 08:54:08 -	1.8
+++ meta/tor-browser/Makefile	6 Sep 2017 01:25:22 -
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-7.0.4
+PKGNAME=	tor-browser-7.0.5
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.inc
--- www/tor-browser/Makefile.inc	27 Aug 2017 08:54:08 -	1.9
+++ www/tor-browser/Makefile.inc	6 Sep 2017 01:25:22 -
@@ -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
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- www/tor-browser/browser/distinfo	27 Aug 2017 08:54:08 -	1.8
+++ www/tor-browser/browser/distinfo	6 Sep 2017 01:25:22 -
@@ -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) = gvebzFyxrLB20NBg1r+9AzLyfJoTVL10xw8/Re0Mnj0=
+SIZE (tor-browser/v7.0.5-esr52.3.0.tar.gz) = 294024479
Index: www/tor-browser/browser/files/extension-overrides.js
===
RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v
retrieving revision 1.7
diff -u -p -r1.7 extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js	27 Aug 2017 08:54:08 -	1.7
+++ www/tor-browser/browser/files/extension-overrides.js	6 Sep 2017 01:25:22 -
@@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolba
 
 # 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_bri
 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=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsa

Re: [NEW] security/go-ed25519

2017-08-25 Thread attila 
Stuart Henderson <s...@spacehopper.org> wrote:
> ...
> Stray github.com directory in the tar.gz (also the tgz has a funny filename :)

New port attached sans stray dir and I tried to keep the filename
non-funny.

Thanks!

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



go-ed25519.tgz
Description: ed25519 in go

Re: [NEW] security/go-siphash

2017-08-24 Thread attila 
attila <att...@stalphonsos.com> wrote:
> Hi ports@,
> 
> Third dependency for net/obfs4proxy: security/go-siphash
> 
> $ cat pkg/DESCR
> Go implementation of SipHash-2-4, a fast short-input PRF created by
> Jean-Philippe Aumasson and Daniel J. Bernstein.
> 

Ping.

Pax, -A
-- 
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



go-siphash.tgz
Description: siphash in Go

Re: [NEW] security/go-ed25519

2017-08-24 Thread attila 
attila <att...@stalphonsos.com> wrote:
> Hi ports@,
> 
> Second of the dependencies for net/obfs4proxy: go-ed25519
> 
> Port attached.  Feedback welcome.
> 

Ping.

Pax, -A
-- 
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



go-ed25519.tgz
Description: ed25519 in go

Re: [NEW] devel/go-goptlib

2017-08-22 Thread attila 
attila <att...@stalphonsos.com> wrote:
> 
> attila <att...@stalphonsos.com> writes:
> 
> > Hi ports@,
> >
> > This is the first of four new ports that are part of Pluggable
> > Transports, which are used in the Tor Browser Bundle but which can
> > also be used without it.  The main port is net/obfs4proxy, which needs
> > three others to support it: devel/go-goptlib, security/go-ed25519,
> > security/go-siphash.
> >
> > This is devel/go-goptlib:
> >
> > $ cat pkg/DESCR
> > goptlib is a library for writing Tor pluggable transports in Go.
> >
> > https://spec.torproject.org/pt-spec
> > https://gitweb.torproject.org/torspec.git/tree/proposals/196-transport-control-ports.txt
> > https://gitweb.torproject.org/torspec.git/tree/proposals/217-ext-orport-auth.txt
> > https://gitweb.torproject.org/torspec.git/tree/proposals/232-pluggable-transports-through-proxy.txt
> >
> > There is browseable documentation here:
> > https://godoc.org/git.torproject.org/pluggable-transports/goptlib.git
> >
> > Report bugs to the tor-...@lists.torproject.org mailing list or to the
> > bug tracker at https://trac.torproject.org/projects/tor.
> >
> > To the extent possible under law, the authors have dedicated all
> > copyright and related and neighboring rights to this software to the
> > public domain worldwide. This software is distributed without any
> > warranty. See COPYING.
> >
> >
> > Port attached.  Feedback most welcome.
> 
> Original port was lacking BUILD_DEPENDS.  Attached is a version that
> fixes it.

Ping.  Port attached.

Pax, -A
-- 
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



go-goptlib.tgz
Description: Binary data

Re: [UPDATE] Tor Browser 7.0.4

2017-08-21 Thread attila 

attila <att...@stalphonsos.com> wrote:
> Hi ports@,
> 
> We skipped 7.0.3 because it was Linux-only, but 7.0.4 is for everyone.
> Attached is an update, which also fixes the issue of the bookmarks
> toolbar looking like normal Firefox ESR's default instead of Tor
> Browser (kudos to Mike Kaply for knowing *everything* about packaging
> Mozilla and sharing it on his blog).  It also incorporates changes
> suggested by landry@ and sthen@ during the 7.0.2 update discussion.
> 
> We (George and I) have also been testing the recently-posted
> net/obfs4proxy ports in conjunction with this release, with good
> results: you can connect to Tor using obfs4 bridges by adding a line
> or two to your ~/TorBrowser-Data/Data/torrc now.  If/when
> net/obfs4proxy gets accepted I'll add an r-dep to meta/tor-browser and
> we're that much closer to having full TBB functionality.
> 
> Feedback most welcome.  Patch attached.

Ping.

> Pax, -A
> --
> https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
> pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

-- 
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Re: [NEW] security/go-ed25519

2017-08-14 Thread attila 

attila <att...@stalphonsos.com> writes:

> Hi ports@,
>
> Second of the dependencies for net/obfs4proxy: go-ed25519
>
> Port attached.  Feedback welcome.
>

As with devel/go-goptlib, I missed BUILD_DEPENDS completely.  Attached
is a new version.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



go-ed25519.tgz
Description: Binary data

Re: [NEW] devel/go-goptlib

2017-08-14 Thread attila 

attila <att...@stalphonsos.com> writes:

> Hi ports@,
>
> This is the first of four new ports that are part of Pluggable
> Transports, which are used in the Tor Browser Bundle but which can
> also be used without it.  The main port is net/obfs4proxy, which needs
> three others to support it: devel/go-goptlib, security/go-ed25519,
> security/go-siphash.
>
> This is devel/go-goptlib:
>
> $ cat pkg/DESCR
> goptlib is a library for writing Tor pluggable transports in Go.
>
> https://spec.torproject.org/pt-spec
> https://gitweb.torproject.org/torspec.git/tree/proposals/196-transport-control-ports.txt
> https://gitweb.torproject.org/torspec.git/tree/proposals/217-ext-orport-auth.txt
> https://gitweb.torproject.org/torspec.git/tree/proposals/232-pluggable-transports-through-proxy.txt
>
> There is browseable documentation here:
> https://godoc.org/git.torproject.org/pluggable-transports/goptlib.git
>
> Report bugs to the tor-...@lists.torproject.org mailing list or to the
> bug tracker at https://trac.torproject.org/projects/tor.
>
> To the extent possible under law, the authors have dedicated all
> copyright and related and neighboring rights to this software to the
> public domain worldwide. This software is distributed without any
> warranty. See COPYING.
>
>
> Port attached.  Feedback most welcome.

Original port was lacking BUILD_DEPENDS.  Attached is a version that
fixes it.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF



go-goptlib.tgz
Description: port of torproject's goptlib

[UPDATE] Tor Browser 7.0.4

2017-08-11 Thread attila 
Hi ports@,

We skipped 7.0.3 because it was Linux-only, but 7.0.4 is for everyone.
Attached is an update, which also fixes the issue of the bookmarks
toolbar looking like normal Firefox ESR's default instead of Tor
Browser (kudos to Mike Kaply for knowing *everything* about packaging
Mozilla and sharing it on his blog).  It also incorporates changes
suggested by landry@ and sthen@ during the 7.0.2 update discussion.

We (George and I) have also been testing the recently-posted
net/obfs4proxy ports in conjunction with this release, with good
results: you can connect to Tor using obfs4 bridges by adding a line
or two to your ~/TorBrowser-Data/Data/torrc now.  If/when
net/obfs4proxy gets accepted I'll add an r-dep to meta/tor-browser and
we're that much closer to having full TBB functionality.

Feedback most welcome.  Patch 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: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- meta/tor-browser/Makefile	26 Jul 2017 20:50:39 -	1.7
+++ meta/tor-browser/Makefile	11 Aug 2017 20:33:42 -
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-7.0.2
+PKGNAME=	tor-browser-7.0.4
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: meta/tor-browser/pkg/README
===
RCS file: /cvs/ports/meta/tor-browser/pkg/README,v
retrieving revision 1.2
diff -u -p -r1.2 README
--- meta/tor-browser/pkg/README	26 Jul 2017 20:50:39 -	1.2
+++ meta/tor-browser/pkg/README	11 Aug 2017 20:33:42 -
@@ -11,11 +11,11 @@ To start Tor Browser:
 This will create a ~/TorBrowser-Data directory tree if it does not
 exist.
 
-As of the 7.0.2 release Tor Browser keeps its data in ~/TorBrowser-Data/Data.
-In 6.5.2 it was ~/TorBrowser-Data/Browser.  If you wish to preserve either
-your tor configuration (bridges, etc) or your browser profile across
-the updated to 7.0.2 please do the following BEFORE starting tor-browser
-after you upgrade:
+As of the 7.0.2 release Tor Browser keeps its data in
+~/TorBrowser-Data/Data.  In 6.5.2 it was ~/TorBrowser-Data/Browser.
+If you wish to preserve either your tor configuration (bridges, etc)
+or your browser profile and are updating from a version before 7.0.2
+please do the following BEFORE starting tor-browser after you upgrade:
 
   $ mv ~/TorBrowser-Data/Browser ~/TorBrowser-Data/Data
 
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.inc
--- www/tor-browser/Makefile.inc	26 Jul 2017 20:50:39 -	1.8
+++ www/tor-browser/Makefile.inc	11 Aug 2017 20:33:42 -
@@ -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.2
+TB_VERSION =		7.0.4
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- www/tor-browser/browser/Makefile	9 Aug 2017 06:24:26 -	1.15
+++ www/tor-browser/browser/Makefile	11 Aug 2017 20:33:42 -
@@ -18,11 +18,10 @@ WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH
 PATCHORIG =		.pat.orig
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr52.2.0
+GH_TAGNAME =		v${TB_VERSION}-esr52.3.0
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
-REVISION =		1
 
 SO_VERSION =		2.0
 MOZILLA_LIBS =		xul lgpllibs mozavcodec mozavutil
@@ -44,7 +43,7 @@ MOZILLA_USE_BUNDLED_NSS =	Yes
 MOZILLA_USE_BUNDLED_LIBEVENT = 	Yes
 MOZILLA_USE_BUNDLED_SQLITE =	Yes
 
-WANTLIB +=		X11-xcb xcb xcb-shm intl iconv ${LIBECXX}
+WANTLIB +=		X11-xcb xcb xcb-shm intl ${LIBECXX}
 
 LIB_DEPENDS +=		devel/gettext
 
@@ -61,19 +60,11 @@ MAKE_ENV +=		BUILD_OPT=1 \
 			XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 BUILD_DEPENDS +=	devel/py-virtualenv
 
-# to be able to link when building with clang on i386
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS +=	--disable-debug-symbols
-.endif
-
 CONFIGURE_ARGS +=	--with-app-name=${BROWSER_NAME} 		\
 			--with-tor-browser-version=${TB_VERSION}	\
 			--disable-tor-browser-update
 
-# relies on pulseaudio for sound and broken at runtime
-#CONFIGURE_ARGS +=	--disable-webrtc
-
-RUN_DEPENDS +=		net/tor>=0.3.0.9
+RUN_DEPENDS +=		net/tor>=0.3.0.10
 
 # bug 857628
 CONFIGURE_ARGS +=	--enable-pie
@@ -82,11 +73,9 @@ post-patch:
 	# hack config/baseconfig.mk to not use MOZ_A

[NEW] net/obfs4proxy

2017-08-10 Thread attila 
Hi ports@,

The first Pluggable Transports port: net/obfs4proxy

$ cat pkg/DESCR
obfs4 (a.k.a. The Obfuscator) is a transport with the same features as
ScrambleSuit but utilizing Dan Bernstein's elligator2 technique for
public key obfuscation, and the ntor protocol for one-way
authentication. This results in a faster protocol.

Depends on the other three I just posted: devel/go-goptlib,
security/go-{ed25519,siphash}.

Port attached.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF


obfs4proxy.tgz
Description: net/obfs4proxy

[NEW] security/go-siphash

2017-08-10 Thread attila 
Hi ports@,

Third dependency for net/obfs4proxy: security/go-siphash

$ cat pkg/DESCR
Go implementation of SipHash-2-4, a fast short-input PRF created by
Jean-Philippe Aumasson and Daniel J. Bernstein.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF


go-siphash.tgz
Description: SipHash in Golang

[NEW] security/go-ed25519

2017-08-10 Thread attila 
Hi ports@,

Second of the dependencies for net/obfs4proxy: go-ed25519

Port attached.  Feedback welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF


go-ed25519.tgz
Description: ed2551 in Go

[NEW] devel/go-goptlib

2017-08-10 Thread attila 
Hi ports@,

This is the first of four new ports that are part of Pluggable
Transports, which are used in the Tor Browser Bundle but which can
also be used without it.  The main port is net/obfs4proxy, which needs
three others to support it: devel/go-goptlib, security/go-ed25519,
security/go-siphash.

This is devel/go-goptlib:

$ cat pkg/DESCR
goptlib is a library for writing Tor pluggable transports in Go.

https://spec.torproject.org/pt-spec
https://gitweb.torproject.org/torspec.git/tree/proposals/196-transport-control-ports.txt
https://gitweb.torproject.org/torspec.git/tree/proposals/217-ext-orport-auth.txt
https://gitweb.torproject.org/torspec.git/tree/proposals/232-pluggable-transports-through-proxy.txt

There is browseable documentation here:
https://godoc.org/git.torproject.org/pluggable-transports/goptlib.git

Report bugs to the tor-...@lists.torproject.org mailing list or to the
bug tracker at https://trac.torproject.org/projects/tor.

To the extent possible under law, the authors have dedicated all
copyright and related and neighboring rights to this software to the
public domain worldwide. This software is distributed without any
warranty. See COPYING.


Port attached.  Feedback most welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF


go-goptlib.tgz
Description: new port: devel/go-goptlib

Re: [UPDATE] Tor Browser 7.0.2

2017-07-31 Thread attila 

Sorry I didn't see your two messages until now, I'll reply at once:

Stuart Henderson <s...@spacehopper.org> writes:

> On 2017/07/26 22:05, Landry Breuil wrote:
>> One thing - you comment out --disable-webrtc, but i suppose/hope for you
>> TBB explicitely disables it, otherwise all the users caring about their
>> privacy will be *very* vocal about webrtc leaking their private nat ip
>> etc. You should check that carefully...
>
> I don't get any addresses reported in the usual webrtc testers.
> Though yes I do think it may be a good idea to force this configure flag.

It is disabled in the .mozconfig that comes with TB.  My patch to
.mozconfig leaves this be.  If you would prefer that we explicitly
acknowledge that WebRTC is disabled in the Makefile I will uncomment
that line.  I can see the argument for this as a kind of
documentation, since most users won't go rooting around in the source
for .mozconfig.

>> As for files/configure, i get it that its a straight copy from mozilla
>> upstream, but seeing python2.7 like this makes me cringe. Why not
>> writing your own script with ${MODPY_BIN} directly calling $(dirname
>> $0)/configure.py "$@" ? (and exporting OLD_CONFIGURE) - your call.
>
> I'd prefer that too.
>
> I've committed what we have so far - these are valid points but I think
> not critical, and it's much easier to test/review small diffs for these
> changes than small changes to a monster diff :)

7.0.3 just came out; it is a bigfix-only release for a Linux-only bug
and so doesn't affect our users, but it will still complain that it's
out of date so I'll get it to it ASAP and incorporate your feedback
when I do.

Thanks a lot!

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Re: [UPDATE] Tor Browser 7.0.2

2017-07-26 Thread attila 

Stuart Henderson <s...@spacehopper.org> writes:

> On 2017/07/26 16:30, George Rosamond wrote:
>> Stuart Henderson:
>> > On 2017/07/26 15:22, Marc Espie wrote:
>> >> Good news, the update builds with clang... so that's a go for me.
>> >>
>> >
>> > It builds and runs for me, I don't see any problems with toolbars
>> > (admittedly only light use).
>>
>> The issue is related to the bookmarks toolbar, which shows the default
>> Firefox ones instead of the default TB ones.  It's not displayed by default.
>
> This is what I see if I enable it: https://junkpile.org/tb702.png
> I've never used tor-browser before to know if that's what is expected or
> not. It's not using bookmarks from my normal Firefox installation but
> I'm not sure if that's what you mean..
>
> Is this very bad? (The other option will be "no package" as the old version
> isn't going to build).

It is disturbing and annoying because I just can't suss out why it
started happening.  Also, it didn't happen to me in my testing, but my
only viable method of testing ATM is to use X11 forwarding over SSH on
a crappy net.  When I fire up tor-browser this way on the machine in
NYC that I work on, I don't get that toolbar, which is how TB normally
looks.

I cannot explain this yet.  It's seriously bugging me.  If anyone has
any clues I'd love to hear them.

That much said it seems clear we should get the update in if possible
and worry about these details later.

>> > I do see a crash if I try to view certificate information on an HTTPS
>> > site, but I think it's probably better to commit the update and then try
>> > to track that down afterwards. (I haven't tested the old version to see
>> > if it's new, and I'm on a machine with full clang-built packages so it's
>> > hard to go back and try it now). Unless there are objections I'll go
>> > ahead and do that.
>> >
>>
>> I'm not seeing that after checking a few different certs.
>
> Ok I'm thinking let's ignore that for now..

In the interests of forward progress I'm attaching an updated update
that addresses the following:

* PATCHORIG
* remove post-extract search-and-destroy
* mung WANTLIB/LIB_DEPENDS as per sthen@ (port-lib-depends-check
  seems happy)
* go back to files/configure, ditch the two configure.in patches

Thanks for all the feedback.  Am always open to more.

Pax -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- meta/tor-browser/Makefile	11 May 2017 01:26:37 -	1.6
+++ meta/tor-browser/Makefile	26 Jul 2017 17:01:44 -
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-6.5.2
+PKGNAME=	tor-browser-7.0.2
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: meta/tor-browser/pkg/README
===
RCS file: /cvs/ports/meta/tor-browser/pkg/README,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README
--- meta/tor-browser/pkg/README	13 Nov 2016 21:18:48 -	1.1.1.1
+++ meta/tor-browser/pkg/README	26 Jul 2017 17:01:44 -
@@ -8,7 +8,16 @@ To start Tor Browser:
 
   $ tor-browser
 
-This will create a ~/TorBrowser-Data directory if it does not exist.
+This will create a ~/TorBrowser-Data directory tree if it does not
+exist.
+
+As of the 7.0.2 release Tor Browser keeps its data in ~/TorBrowser-Data/Data.
+In 6.5.2 it was ~/TorBrowser-Data/Browser.  If you wish to preserve either
+your tor configuration (bridges, etc) or your browser profile across
+the updated to 7.0.2 please do the following BEFORE starting tor-browser
+after you upgrade:
+
+  $ mv ~/TorBrowser-Data/Browser ~/TorBrowser-Data/Data
 
 Tor Browser uses its own instance of the tor server running on a
 different port than the net/tor port is configured to use by default.
@@ -18,12 +27,14 @@ daemon you have running via the standard
 tor).
 
 The tor instance used by Tor Browser stores its configuration in
-~/TorBrowser-Data/Browser/torrc; the tor daemon state lives in
-~/TorBrowser-Data/Browser/tor_data.  When you use Tor Browser to
-change your configuration (e.g. add bridges) the above torrc is
-updated.  You can also add bridges by editing your torrc yourself.
-Make sure Tor Browser is not running before doing so if you use this
-method; if Tor Browser is running it might overwrite your torrc.
+~/TorBrowser-Data/Data/torrc; the tor daemon state lives in
+~/TorBrowser-Data/Data/tor_data.
+
+When you use Tor Browser to change your configuration (e.g. add
+bridge

Re: [UPDATE] Tor Browser 7.0.2

2017-07-25 Thread attila 

Stuart Henderson <s...@spacehopper.org> writes:

> On 2017/07/24 22:33, Landry Breuil wrote:
>> myeah, i dont really have an opinion on that mess, but the autoconf goo
>> is going away someday. I see that all sub-ports were also bumped so we
>> shouldnt have update issues. No opinion on the update itself, it looks
>> fine portswise (i'm just not sure at all the gettext module is needed
>> anymore)
>
> Yep we're trying to get rid of gettext module use, I'd rather not re-add it
> as this diff does.

Trying a build with no devel/gettext now, although it sounds like it's
certainly going to be okay... just like to make sure.

>> - someone running this should take care of properly testing it.
>
> Presumably Sean has already done that so we are probably just down to
> ports nitpicking now :)

While nitpicking, I prefer "attila" to "Sean" :-)

As for testing, no, I'm afraid you're wrong: I was not able to do
nearly as much testing as is needed, which is why I called for testers
in my original post.  The one person who tests my TB builds regularly
was seeing some bizarre behavior with regard to the toolbars: the
normal firefox personal bookmarks toolbar was appearing for him, and I
can't explain why or how.  I could not get this to happen for me, but
my ability to test is limited due to my crap network connection.

So: I really need testers for this.  I don't normally like to post an
update that hasn't been tested better than this but it was simply
taking too long to get this update out, I got lapped by upstream twice
as it is and I figured there must be others out there who are
interested in testing.

> : -# there are sometimes .orig files in the source, messes with update-patches
> :  post-extract:
> : +   # there have been .orig files in source, messes with update-patches
> : -find ${WRKSRC} -name '*.orig' -exec rm {} \;
>
> Probably better to set PATCHORIG, this will avoid the need for running this
> find(1) across the source tree for each build.

I didn't know about PATCHORIG.  Thanks!

> :  # relies on pulseaudio for sound and broken at runtime
> : -CONFIGURE_ARGS +=  --disable-webrtc
> : -
> : -CONFIGURE_ARGS +=  --disable-gstreamer
> : +#CONFIGURE_ARGS += --disable-webrtc
>
> It looks a bit odd to have a commented-out --disable-webrtc here, was
> that intentional?

Much of the churn in this update's browser/Makefile was to try to get
back closer to www/firefox-esr/Makefile, to make it easier to see
changes.  This bit was along those lines.  I can remove it if desired,
but in general I like to stay as close to landry@'s Makefile as I can.

>> I think you can remove the skia/gfx patches for i386, iirc they're not
>> needed in 52. To be tested.
>
> Since they're no longer present in firefox-esr I would be ok with just
> dropping them, if I run into problems in i386 bulk I can always re-add them.


I did remove them, using cvs rm; they look removed to me in my patch
(+++ /dev/null)... did I mess it up?

I'm waiting to confirm that the build w/o devel/gettext looks good and
then I'll post another update that uses PATCHORIG.  If nobody cares
about the files/configure issue maybe I'll leave it the way it was
originally: one more thing in files/ vs two new patches.  If there
are feelings the other way please say so.

Thanks a lot for the feedback.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Re: [UPDATE] Tor Browser 7.0.2

2017-07-24 Thread attila 

Landry Breuil <lan...@openbsd.org> writes:

> On Sat, Jul 22, 2017 at 09:56:00AM -0500, attila wrote:
>>
>> attila <att...@stalphonsos.com> writes:
>>
>> > Hi ports@,
>> >
>> > Attached is an update from Tor Browser 6.5.2 to the latest release,
>> > 7.0.2.  I would really appreciate some testing if anyone has the time.
>>
>> An alert reader pointed out in private email that my patch was missing
>> a new file due to a forgotten cvs add.  Revised patch attached with
>> the missing file.
>
> Can you elaborate a bit more on the files/configure file ? it isnt
> provided by the tbb devs in the released tarball ?

No, there's no configure script in the tree that I grab from their git
repo and push onto GH for tarball purposes.  There is a configure.in,
which looks like a temporary placeholder to keep old autoconf-based
stuff happy.  Unfortunately, running their configure.in through m4
produced a sh script with a syntax error.  I didn't think this was
worth a patch upstream because it looks like configure.in is going to
go away eventually.

I have attached an alternate update here that dispenses with
files/configure (which is the script that m4 configure.in *should*
have produced) and instead patches configure.in and
js/src/configure.in to not produce a sh script with unbalanced quotes
when run through m4.  This is a short-term fix to get
CONFIGURE_STYLE=simple to work here like it does for firefox-esr; I
found doing anything but CONFIGURE_STYLE=simple pulls in a bunch of
gnu stuff that breaks me later (I forget the details).

I say "short-term" because I must rework my old autoconf-based patches
to work in the new python build system anyway as per a discussion with
some TB devs on IRC.  I'm hoping studying the new Python stuff will
make it clear to me how to do this better.

>
> Landry

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- meta/tor-browser/Makefile	11 May 2017 01:26:37 -	1.6
+++ meta/tor-browser/Makefile	24 Jul 2017 19:00:37 -
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-6.5.2
+PKGNAME=	tor-browser-7.0.2
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: meta/tor-browser/pkg/README
===
RCS file: /cvs/ports/meta/tor-browser/pkg/README,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README
--- meta/tor-browser/pkg/README	13 Nov 2016 21:18:48 -	1.1.1.1
+++ meta/tor-browser/pkg/README	24 Jul 2017 19:00:37 -
@@ -8,7 +8,16 @@ To start Tor Browser:
 
   $ tor-browser
 
-This will create a ~/TorBrowser-Data directory if it does not exist.
+This will create a ~/TorBrowser-Data directory tree if it does not
+exist.
+
+As of the 7.0.2 release Tor Browser keeps its data in ~/TorBrowser-Data/Data.
+In 6.5.2 it was ~/TorBrowser-Data/Browser.  If you wish to preserve either
+your tor configuration (bridges, etc) or your browser profile across
+the updated to 7.0.2 please do the following BEFORE starting tor-browser
+after you upgrade:
+
+  $ mv ~/TorBrowser-Data/Browser ~/TorBrowser-Data/Data
 
 Tor Browser uses its own instance of the tor server running on a
 different port than the net/tor port is configured to use by default.
@@ -18,12 +27,14 @@ daemon you have running via the standard
 tor).
 
 The tor instance used by Tor Browser stores its configuration in
-~/TorBrowser-Data/Browser/torrc; the tor daemon state lives in
-~/TorBrowser-Data/Browser/tor_data.  When you use Tor Browser to
-change your configuration (e.g. add bridges) the above torrc is
-updated.  You can also add bridges by editing your torrc yourself.
-Make sure Tor Browser is not running before doing so if you use this
-method; if Tor Browser is running it might overwrite your torrc.
+~/TorBrowser-Data/Data/torrc; the tor daemon state lives in
+~/TorBrowser-Data/Data/tor_data.
+
+When you use Tor Browser to change your configuration (e.g. add
+bridges) the above torrc is updated.  You can also add bridges by
+editing your torrc yourself.  Make sure Tor Browser is not running
+before doing so if you use this method; if Tor Browser is running it
+might overwrite your torrc.
 
 NOTE: The OpenBSD Tor Browser ports do not yet include Pluggable
 Transports (PT).  This means that not all features are yet available,
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.inc
--- www/tor-

Re: [UPDATE] Tor Browser 7.0.2

2017-07-22 Thread attila 

attila <att...@stalphonsos.com> writes:

> Hi ports@,
>
> Attached is an update from Tor Browser 6.5.2 to the latest release,
> 7.0.2.  I would really appreciate some testing if anyone has the time.

An alert reader pointed out in private email that my patch was missing
a new file due to a forgotten cvs add.  Revised patch attached with
the missing file.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF
Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- meta/tor-browser/Makefile	11 May 2017 01:26:37 -	1.6
+++ meta/tor-browser/Makefile	22 Jul 2017 14:52:39 -
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-6.5.2
+PKGNAME=	tor-browser-7.0.2
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: meta/tor-browser/pkg/README
===
RCS file: /cvs/ports/meta/tor-browser/pkg/README,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README
--- meta/tor-browser/pkg/README	13 Nov 2016 21:18:48 -	1.1.1.1
+++ meta/tor-browser/pkg/README	22 Jul 2017 14:52:39 -
@@ -8,7 +8,16 @@ To start Tor Browser:
 
   $ tor-browser
 
-This will create a ~/TorBrowser-Data directory if it does not exist.
+This will create a ~/TorBrowser-Data directory tree if it does not
+exist.
+
+As of the 7.0.2 release Tor Browser keeps its data in ~/TorBrowser-Data/Data.
+In 6.5.2 it was ~/TorBrowser-Data/Browser.  If you wish to preserve either
+your tor configuration (bridges, etc) or your browser profile across
+the updated to 7.0.2 please do the following BEFORE starting tor-browser
+after you upgrade:
+
+  $ mv ~/TorBrowser-Data/Browser ~/TorBrowser-Data/Data
 
 Tor Browser uses its own instance of the tor server running on a
 different port than the net/tor port is configured to use by default.
@@ -18,12 +27,14 @@ daemon you have running via the standard
 tor).
 
 The tor instance used by Tor Browser stores its configuration in
-~/TorBrowser-Data/Browser/torrc; the tor daemon state lives in
-~/TorBrowser-Data/Browser/tor_data.  When you use Tor Browser to
-change your configuration (e.g. add bridges) the above torrc is
-updated.  You can also add bridges by editing your torrc yourself.
-Make sure Tor Browser is not running before doing so if you use this
-method; if Tor Browser is running it might overwrite your torrc.
+~/TorBrowser-Data/Data/torrc; the tor daemon state lives in
+~/TorBrowser-Data/Data/tor_data.
+
+When you use Tor Browser to change your configuration (e.g. add
+bridges) the above torrc is updated.  You can also add bridges by
+editing your torrc yourself.  Make sure Tor Browser is not running
+before doing so if you use this method; if Tor Browser is running it
+might overwrite your torrc.
 
 NOTE: The OpenBSD Tor Browser ports do not yet include Pluggable
 Transports (PT).  This means that not all features are yet available,
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.inc
--- www/tor-browser/Makefile.inc	11 May 2017 01:26:37 -	1.7
+++ www/tor-browser/Makefile.inc	22 Jul 2017 14:52:39 -
@@ -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 =		6.5.2
+TB_VERSION =		7.0.2
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- www/tor-browser/browser/Makefile	14 Jun 2017 05:23:10 -	1.11
+++ www/tor-browser/browser/Makefile	22 Jul 2017 14:52:39 -
@@ -15,14 +15,13 @@ DIST_SUBDIR = 		${BROWSER_NAME}
 WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr45.9.0
+GH_TAGNAME =		v${TB_VERSION}-esr52.2.0
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
-REVISION = 0
 
-SO_VERSION =		1.0
-MOZILLA_LIBS =		browsercomps xul lgpllibs
+SO_VERSION =		2.0
+MOZILLA_LIBS =		xul lgpllibs mozavcodec mozavutil
 MOZILLA_LIBS +=		freebl3 nss3 nssckbi nssdbm3
 MOZILLA_LIBS +=		nssutil3 smime3 softokn3 ssl3
 MOZILLA_LIBS +=		mozsqlite3
@@ -30,64 +29,62 @@ MOZILLA_LIBS +=		mozsqlite3
 # mozilla public license
 PERMIT_PACKAGE_CDROM=	Yes
 
-MODULES =		www/mozilla lang/python
-
-MOZILLA_USE_BUNDLED_NSS =	Yes
-MOZILLA_USE_BUNDLED_LIBEVENT = 	Yes
-MOZILLA_USE_BUNDLED_SQLITE =	Yes
-MOZILLA_AUTOCONF_DIRS +=

[UPDATE] Tor Browser 7.0.2

2017-07-21 Thread attila 
Hi ports@,

Attached is an update from Tor Browser 6.5.2 to the latest release,
7.0.2.  I would really appreciate some testing if anyone has the time.

Patch attached.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF
? www/tor-browser/browser/files/configure
Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- meta/tor-browser/Makefile	11 May 2017 01:26:37 -	1.6
+++ meta/tor-browser/Makefile	21 Jul 2017 23:18:34 -
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-6.5.2
+PKGNAME=	tor-browser-7.0.2
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: meta/tor-browser/pkg/README
===
RCS file: /cvs/ports/meta/tor-browser/pkg/README,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README
--- meta/tor-browser/pkg/README	13 Nov 2016 21:18:48 -	1.1.1.1
+++ meta/tor-browser/pkg/README	21 Jul 2017 23:18:34 -
@@ -8,7 +8,16 @@ To start Tor Browser:
 
   $ tor-browser
 
-This will create a ~/TorBrowser-Data directory if it does not exist.
+This will create a ~/TorBrowser-Data directory tree if it does not
+exist.
+
+As of the 7.0.2 release Tor Browser keeps its data in ~/TorBrowser-Data/Data.
+In 6.5.2 it was ~/TorBrowser-Data/Browser.  If you wish to preserve either
+your tor configuration (bridges, etc) or your browser profile across
+the updated to 7.0.2 please do the following BEFORE starting tor-browser
+after you upgrade:
+
+  $ mv ~/TorBrowser-Data/Browser ~/TorBrowser-Data/Data
 
 Tor Browser uses its own instance of the tor server running on a
 different port than the net/tor port is configured to use by default.
@@ -18,12 +27,14 @@ daemon you have running via the standard
 tor).
 
 The tor instance used by Tor Browser stores its configuration in
-~/TorBrowser-Data/Browser/torrc; the tor daemon state lives in
-~/TorBrowser-Data/Browser/tor_data.  When you use Tor Browser to
-change your configuration (e.g. add bridges) the above torrc is
-updated.  You can also add bridges by editing your torrc yourself.
-Make sure Tor Browser is not running before doing so if you use this
-method; if Tor Browser is running it might overwrite your torrc.
+~/TorBrowser-Data/Data/torrc; the tor daemon state lives in
+~/TorBrowser-Data/Data/tor_data.
+
+When you use Tor Browser to change your configuration (e.g. add
+bridges) the above torrc is updated.  You can also add bridges by
+editing your torrc yourself.  Make sure Tor Browser is not running
+before doing so if you use this method; if Tor Browser is running it
+might overwrite your torrc.
 
 NOTE: The OpenBSD Tor Browser ports do not yet include Pluggable
 Transports (PT).  This means that not all features are yet available,
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.inc
--- www/tor-browser/Makefile.inc	11 May 2017 01:26:37 -	1.7
+++ www/tor-browser/Makefile.inc	21 Jul 2017 23:18:34 -
@@ -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 =		6.5.2
+TB_VERSION =		7.0.2
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- www/tor-browser/browser/Makefile	14 Jun 2017 05:23:10 -	1.11
+++ www/tor-browser/browser/Makefile	21 Jul 2017 23:18:34 -
@@ -15,14 +15,13 @@ DIST_SUBDIR = 		${BROWSER_NAME}
 WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr45.9.0
+GH_TAGNAME =		v${TB_VERSION}-esr52.2.0
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
-REVISION = 0
 
-SO_VERSION =		1.0
-MOZILLA_LIBS =		browsercomps xul lgpllibs
+SO_VERSION =		2.0
+MOZILLA_LIBS =		xul lgpllibs mozavcodec mozavutil
 MOZILLA_LIBS +=		freebl3 nss3 nssckbi nssdbm3
 MOZILLA_LIBS +=		nssutil3 smime3 softokn3 ssl3
 MOZILLA_LIBS +=		mozsqlite3
@@ -30,64 +29,62 @@ MOZILLA_LIBS +=		mozsqlite3
 # mozilla public license
 PERMIT_PACKAGE_CDROM=	Yes
 
-MODULES =		www/mozilla lang/python
-
-MOZILLA_USE_BUNDLED_NSS =	Yes
-MOZILLA_USE_BUNDLED_LIBEVENT = 	Yes
-MOZILLA_USE_BUNDLED_SQLITE =	Yes
-MOZILLA_AUTOCONF_DIRS +=	. js/src
+MODULES =		www/mozilla devel/gettext lang/python
 
 MODPY_RUNDEP =		No
 
-# necessary glue to build with the correct compiler after fx 17
 COMPILER =

Re: [BACKPORT] Tor Browser 6.5.2 for 6.1-stable

2017-06-05 Thread attila 

attila <att...@stalphonsos.com> writes:

> Hi ports@,
>
> Attached is a patch for the -stable ports tree to bring Tor Browser up
> to 6.5.2.  I have not been able to test the packages myself so I could
> really use some testing.  I cooked some packages for testing if anyone
> cares: https://bits.haqistan.net/~tdp/amd64/stable/
>
> Feedback most welcome.
>
> Pax, -A

Ping.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- meta/tor-browser/Makefile	31 Jan 2017 13:48:18 -	1.4
+++ meta/tor-browser/Makefile	24 May 2017 12:46:35 -
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-6.5
+PKGNAME=	tor-browser-6.5.2
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.inc
--- www/tor-browser/Makefile.inc	31 Jan 2017 13:48:18 -	1.4
+++ www/tor-browser/Makefile.inc	24 May 2017 12:46:35 -
@@ -5,8 +5,9 @@ HOMEPAGE ?=		https://www.torproject.org
 GH_ACCOUNT ?=		torbsd
 PERMIT_PACKAGE_CDROM ?= Yes
 CATEGORIES =		www
+# XXX If updating, bump REVISION of any extensions which did not get updated.
 BROWSER_NAME =		tor-browser
-TB_VERSION =		6.5
+TB_VERSION =		6.5.2
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- www/tor-browser/browser/Makefile	18 Feb 2017 16:22:54 -	1.6
+++ www/tor-browser/browser/Makefile	24 May 2017 12:46:35 -
@@ -15,7 +15,7 @@ DIST_SUBDIR = 		${BROWSER_NAME}
 WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr45.7.0
+GH_TAGNAME =		v${TB_VERSION}-esr45.9.0
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
@@ -75,7 +75,7 @@ CONFIGURE_ARGS +=	--disable-webrtc
 
 CONFIGURE_ARGS +=	--disable-gstreamer
 
-RUN_DEPENDS +=		net/tor>=0.2.9.9p0
+RUN_DEPENDS +=		net/tor>=0.2.9.10
 
 # bug 857628
 CONFIGURE_ARGS +=	--enable-pie
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- www/tor-browser/browser/distinfo	31 Jan 2017 13:48:18 -	1.4
+++ www/tor-browser/browser/distinfo	24 May 2017 12:46:35 -
@@ -1,2 +1,2 @@
-SHA256 (tor-browser/v6.5-esr45.7.0.tar.gz) = RIKh9Ura08i7pYMfz1mjNZn50kAetrnpmOBppzGvXcM=
-SIZE (tor-browser/v6.5-esr45.7.0.tar.gz) = 256763405
+SHA256 (tor-browser/v6.5.2-esr45.9.0.tar.gz) = WZFZ4ullzb1Ox9oEmwC8tvl+gQgkwtobZ5k+hKj5Bd0=
+SIZE (tor-browser/v6.5.2-esr45.9.0.tar.gz) = 256788819
Index: www/tor-browser/browser/files/extension-overrides.js
===
RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v
retrieving revision 1.3
diff -u -p -r1.3 extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js	24 Dec 2016 20:15:06 -	1.3
+++ www/tor-browser/browser/files/extension-overrides.js	24 May 2017 12:46:35 -
@@ -2,15 +2,6 @@
 # Tor Browser Bundle
 # Do not edit this file.
 
-# Torbutton Preferences:
-pref("extensions.torbutton.fresh_install", false);
-pref("extensions.torbutton.tor_enabled", true);
-pref("extensions.torbutton.proxies_applied", true);
-pref("extensions.torbutton.settings_applied", true);
-pref("extensions.torbutton.socks_host", "127.0.0.1");
-pref("extensions.torbutton.socks_port", 9150);
-pref("extensions.torbutton.tz_string", "UTC+00:00");
-
 # HTTPS Everywhere Preferences:
 pref("extensions.https_everywhere._observatory.popup_shown", true);
 pref("extensions.https_everywhere.toolbar_hint_shown", true);
@@ -79,8 +70,6 @@ pref("extensions.torlauncher.default_bri
 pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D");
 pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");
 
-pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2PO

[BACKPORT] Tor Browser 6.5.2 for 6.1-stable

2017-05-24 Thread attila 
Hi ports@,

Attached is a patch for the -stable ports tree to bring Tor Browser up
to 6.5.2.  I have not been able to test the packages myself so I could
really use some testing.  I cooked some packages for testing if anyone
cares: https://bits.haqistan.net/~tdp/amd64/stable/

Feedback most welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- meta/tor-browser/Makefile	31 Jan 2017 13:48:18 -	1.4
+++ meta/tor-browser/Makefile	24 May 2017 12:46:35 -
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-6.5
+PKGNAME=	tor-browser-6.5.2
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.inc
--- www/tor-browser/Makefile.inc	31 Jan 2017 13:48:18 -	1.4
+++ www/tor-browser/Makefile.inc	24 May 2017 12:46:35 -
@@ -5,8 +5,9 @@ HOMEPAGE ?=		https://www.torproject.org
 GH_ACCOUNT ?=		torbsd
 PERMIT_PACKAGE_CDROM ?= Yes
 CATEGORIES =		www
+# XXX If updating, bump REVISION of any extensions which did not get updated.
 BROWSER_NAME =		tor-browser
-TB_VERSION =		6.5
+TB_VERSION =		6.5.2
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- www/tor-browser/browser/Makefile	18 Feb 2017 16:22:54 -	1.6
+++ www/tor-browser/browser/Makefile	24 May 2017 12:46:35 -
@@ -15,7 +15,7 @@ DIST_SUBDIR = 		${BROWSER_NAME}
 WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr45.7.0
+GH_TAGNAME =		v${TB_VERSION}-esr45.9.0
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
@@ -75,7 +75,7 @@ CONFIGURE_ARGS +=	--disable-webrtc
 
 CONFIGURE_ARGS +=	--disable-gstreamer
 
-RUN_DEPENDS +=		net/tor>=0.2.9.9p0
+RUN_DEPENDS +=		net/tor>=0.2.9.10
 
 # bug 857628
 CONFIGURE_ARGS +=	--enable-pie
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- www/tor-browser/browser/distinfo	31 Jan 2017 13:48:18 -	1.4
+++ www/tor-browser/browser/distinfo	24 May 2017 12:46:35 -
@@ -1,2 +1,2 @@
-SHA256 (tor-browser/v6.5-esr45.7.0.tar.gz) = RIKh9Ura08i7pYMfz1mjNZn50kAetrnpmOBppzGvXcM=
-SIZE (tor-browser/v6.5-esr45.7.0.tar.gz) = 256763405
+SHA256 (tor-browser/v6.5.2-esr45.9.0.tar.gz) = WZFZ4ullzb1Ox9oEmwC8tvl+gQgkwtobZ5k+hKj5Bd0=
+SIZE (tor-browser/v6.5.2-esr45.9.0.tar.gz) = 256788819
Index: www/tor-browser/browser/files/extension-overrides.js
===
RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v
retrieving revision 1.3
diff -u -p -r1.3 extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js	24 Dec 2016 20:15:06 -	1.3
+++ www/tor-browser/browser/files/extension-overrides.js	24 May 2017 12:46:35 -
@@ -2,15 +2,6 @@
 # Tor Browser Bundle
 # Do not edit this file.
 
-# Torbutton Preferences:
-pref("extensions.torbutton.fresh_install", false);
-pref("extensions.torbutton.tor_enabled", true);
-pref("extensions.torbutton.proxies_applied", true);
-pref("extensions.torbutton.settings_applied", true);
-pref("extensions.torbutton.socks_host", "127.0.0.1");
-pref("extensions.torbutton.socks_port", 9150);
-pref("extensions.torbutton.tz_string", "UTC+00:00");
-
 # HTTPS Everywhere Preferences:
 pref("extensions.https_everywhere._observatory.popup_shown", true);
 pref("extensions.https_everywhere.toolbar_hint_shown", true);
@@ -79,8 +70,6 @@ pref("extensions.torlauncher.default_bri
 pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D");
 pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");
 
-pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH");
-
 pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22

Re: [UPDATE] Tor Browser 6.5.2

2017-05-08 Thread attila 

attila <att...@stalphonsos.com> writes:

> Hi ports@,
>
> Attached is an update to Tor Broweer 6.5.2.  Lightly tested on amd64.
> Would appreciate more testing and, as always, any other feedback most
> welcome.
>
> Pax, -A

Ping.

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.6
diff -u -p -r1.6 Makefile.inc
--- www/tor-browser/Makefile.inc	13 Apr 2017 13:43:29 -	1.6
+++ www/tor-browser/Makefile.inc	26 Apr 2017 22:55:54 -
@@ -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 =		6.5.1
+TB_VERSION =		6.5.2
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- www/tor-browser/browser/Makefile	12 Apr 2017 18:46:52 -	1.8
+++ www/tor-browser/browser/Makefile	26 Apr 2017 22:55:54 -
@@ -15,7 +15,7 @@ DIST_SUBDIR = 		${BROWSER_NAME}
 WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr45.8.0
+GH_TAGNAME =		v${TB_VERSION}-esr45.9.0
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- www/tor-browser/browser/distinfo	12 Apr 2017 18:46:52 -	1.5
+++ www/tor-browser/browser/distinfo	26 Apr 2017 22:55:54 -
@@ -1,2 +1,2 @@
-SHA256 (tor-browser/v6.5.1-esr45.8.0.tar.gz) = FUXcdn44q/QP0NpXdsW3nNxQ0V4GIlsv1C5Yq6h0PnI=
-SIZE (tor-browser/v6.5.1-esr45.8.0.tar.gz) = 256906108
+SHA256 (tor-browser/v6.5.2-esr45.9.0.tar.gz) = WZFZ4ullzb1Ox9oEmwC8tvl+gQgkwtobZ5k+hKj5Bd0=
+SIZE (tor-browser/v6.5.2-esr45.9.0.tar.gz) = 256788819
Index: www/tor-browser/browser/files/extension-overrides.js
===
RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v
retrieving revision 1.4
diff -u -p -r1.4 extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js	12 Apr 2017 18:46:52 -	1.4
+++ www/tor-browser/browser/files/extension-overrides.js	26 Apr 2017 22:55:54 -
@@ -90,8 +90,10 @@ pref("extensions.torlauncher.default_bri
 pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
 pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1");
+/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1");
 
-pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");
+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");
 pref("extensions.torlauncher.prompt_for_locale", false);
 pref("intl.locale.matchOS", false);
Index: www/tor-browser/https-everywhere/Makefile
===
RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- www/tor-browser/https-everywhere/Makefile	12 Ap

Re: [UPDATE] Tor Browser 6.5.2

2017-04-29 Thread attila 

Edd Barrett <e...@theunixzoo.co.uk> writes:

> On Thu, Apr 27, 2017 at 09:59:32AM -0500, attila wrote:
>> Hi ports@,
>>
>> Attached is an update to Tor Broweer 6.5.2.  Lightly tested on amd64.
>> Would appreciate more testing and, as always, any other feedback most
>> welcome.
>
> My build crashed out. I'll try again tomorrow on a new snap:

I just rebuilt 6.5.2 on the 28 April snap (dmesg at bottom) with
everything updated as of this AM.  I don't get this or any other
error.  Same for you?

> ---8<---
> ...
> cc -o 
> /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/certutil
>   -fPIC -DPIC  -ansi -Wall -Wno-switch -pipe -DOPENBSD -DXP_UNIX -DNSPR20 
> -UDEBUG -DNDEBUG -pthread -DUSE_UTIL_DIRECTLY -DNO_NSPR_10_SUPPORT 
> -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES -I/usr/local/include/nspr 
> -I/usr/local/include/nspr 
> -I/usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/include/nss  
> -I/usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/private/nss  
> -I/usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/include/dbm 
> -I/usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/include/seccmd 
> -I/usr/X11R6/include 
> /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/certext.o
>  
> /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/certutil.o
>  
> /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/keystuff.o
>   /usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/lib/libsectool.a  
> -L/usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/lib -lssl3 -lsmime3 
> -lnss3 -L/usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/lib -lnssutil3 
> -L/usr/local/lib -lplc4 -lplds4 -lnspr4
> clang-4.0: warning: argument unused during compilation: '-ansi' 
> [-Wunused-command-line-argument]
> /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/certext.o:
>  In function `AddCertPolicies':
> certext.c:(.text+0x2660): warning: warning: strcpy() is almost always 
> misused, please use strlcpy()
> /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/certutil.o:
>  In function `getObjectClass':
> certutil.c:(.text+0x88): warning: warning: sprintf() is often misused, please 
> use snprintf()
> /usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/lib/libsectool.a(secutil.o):
>  In function `printflags':
> secutil.c:(.text+0x46aa): warning: warning: strcat() is almost always 
> misused, please use strlcat()
> /usr/local/pobj/tb-browser-6.5.2/build-amd64/config/nsinstall -R -m 775 
> /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/certutil
>  /usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/bin
> gmake[4]: Leaving directory 
> '/usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil'
> gmake[3]: Leaving directory 
> '/usr/local/pobj/tb-browser-6.5.2/build-amd64/config/external/nss'
> gmake[3]: Entering directory 
> '/usr/local/pobj/tb-browser-6.5.2/build-amd64/config/external/nss/crmf'
> gmake[3]: *** No rule to make target 
> '../../../../security/nss/lib/crmf/libcrmf.a', needed by 'libcrmf.a.desc'.  
> Stop.
> gmake[3]: Leaving directory 
> '/usr/local/pobj/tb-browser-6.5.2/build-amd64/config/external/nss/crmf'
> gmake[2]: *** 
> [/usr/ports/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/config/recurse.mk:71: 
> config/external/nss/crmf/target] Error 2
> gmake[2]: Leaving directory '/usr/local/pobj/tb-browser-6.5.2/build-amd64'
> gmake[1]: *** 
> [/usr/ports/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/config/recurse.mk:33: 
> compile] Error 2
> gmake[1]: Leaving directory '/usr/local/pobj/tb-browser-6.5.2/build-amd64'
> gmake: *** 
> [/usr/ports/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/config/rules.mk:547: 
> all] Error 2
> *** Error 2 in browser (/usr/ports/infrastructure/mk/bsd.port.mk:2666 
> '/usr/ports/pobj/tb-browser-6.5.2/build-amd64/.build_done')
> *** Error 1 in browser (/usr/ports/infrastructure/mk/bsd.port.mk:1889 
> '/usr/ports/packages/amd64/all/tb-browser-6.5.2.tgz')
> *** Error 1 in browser (/usr/ports/infrastructure/mk/bsd.port.mk:2388 
> '_internal-package')
> *** Error 1 in browser (/usr/ports/infrastructure/mk/bsd.port.mk:2367 
> 'package')
> ===> Exiting www/tor-browser/browser with an error
> *** Error 1 in /usr/ports/www/tor-browser 
> (/usr/ports/infrastru

[UPDATE] Tor Browser 6.5.2

2017-04-27 Thread attila 
Hi ports@,

Attached is an update to Tor Broweer 6.5.2.  Lightly tested on amd64.
Would appreciate more testing and, as always, any other feedback most
welcome.

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.6
diff -u -p -r1.6 Makefile.inc
--- www/tor-browser/Makefile.inc	13 Apr 2017 13:43:29 -	1.6
+++ www/tor-browser/Makefile.inc	26 Apr 2017 22:55:54 -
@@ -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 =		6.5.1
+TB_VERSION =		6.5.2
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- www/tor-browser/browser/Makefile	12 Apr 2017 18:46:52 -	1.8
+++ www/tor-browser/browser/Makefile	26 Apr 2017 22:55:54 -
@@ -15,7 +15,7 @@ DIST_SUBDIR = 		${BROWSER_NAME}
 WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr45.8.0
+GH_TAGNAME =		v${TB_VERSION}-esr45.9.0
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- www/tor-browser/browser/distinfo	12 Apr 2017 18:46:52 -	1.5
+++ www/tor-browser/browser/distinfo	26 Apr 2017 22:55:54 -
@@ -1,2 +1,2 @@
-SHA256 (tor-browser/v6.5.1-esr45.8.0.tar.gz) = FUXcdn44q/QP0NpXdsW3nNxQ0V4GIlsv1C5Yq6h0PnI=
-SIZE (tor-browser/v6.5.1-esr45.8.0.tar.gz) = 256906108
+SHA256 (tor-browser/v6.5.2-esr45.9.0.tar.gz) = WZFZ4ullzb1Ox9oEmwC8tvl+gQgkwtobZ5k+hKj5Bd0=
+SIZE (tor-browser/v6.5.2-esr45.9.0.tar.gz) = 256788819
Index: www/tor-browser/browser/files/extension-overrides.js
===
RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v
retrieving revision 1.4
diff -u -p -r1.4 extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js	12 Apr 2017 18:46:52 -	1.4
+++ www/tor-browser/browser/files/extension-overrides.js	26 Apr 2017 22:55:54 -
@@ -90,8 +90,10 @@ pref("extensions.torlauncher.default_bri
 pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
 pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1");
+/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1");
 
-pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");
+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");
 pref("extensions.torlauncher.prompt_for_locale", false);
 pref("intl.locale.matchOS", false);
Index: www/tor-browser/https-everywhere/Makefile
===
RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- www/tor-browser/https-everywhere/Makefile	12 Apr 2017 18:46:52 -	1.5
+++ www/tor-browser/https-everywhere/Makefile	26 Apr 2017 22:55:54 -00

Re: [update] textproc/multimarkdown

2017-04-12 Thread attila 

attila <att...@stalphonsos.com> writes:

> attila <att...@stalphonsos.com> writes:
>
>> attila <att...@stalphonsos.com> writes:
>>
>>> attila <att...@stalphonsos.com> writes:
>>>
>>>> attila <att...@stalphonsos.com> writes:
>>>>
>>>>> Michael McConville <mm...@mykolab.com> writes:
>>>>>
>>>>>> attila wrote:
>>>>>>> Ping.
>>>>>>>
>>>>>>> Just tested that the diff works against recentish i386 snap (22 May).
>>>>>>> Patch attached.
>>>>>>
>>>>>> I can't comment on all of the changes, but this builds and runs fine for
>>>>>> me.
>>>>>>
>>>>>
>>>>> Attached is an update that brings us from 4.7.1 to 5.4.0, released 8
>>>>> Aug.  It shuffles the patches around because the source tree was
>>>>> rearranged and adds support for tests.  Sadly, the tests don't all
>>>>> pass.  I think I need a t-dep for something LaTeXish but I'm not sure
>>>>> what is best, nor am I sure if that's the only reason for the
>>>>> failures.  If anyone has a spare cycle or two to look at it I'd
>>>>> appreciate it.  If not I'll get back to it by the end of the week.
>>>>>
>>>>> Pax, -A
>>>>
>>>> I finally got back to this.  It turns out there wasn't much standing
>>>> in the way of the tests working other than me.  Attached is a patch
>>>> that brings textproc/multimarkdown up to the latest release (5.4.0
>>>> released 5 Aug).  Notable changes:
>>>>
>>>> * Switched to CMake;
>>>> * Ditched the patches I tried and failed to upstream (strcat/sprintf);
>>>> * Reworked two remaining patches (HAVE_SRAND_DETERMINISTIC) in the hope
>>>>   I might get them upstream;
>>>> * Added pledge;
>>>> * make test now passes all tests.
>>>>
>>>> Tested on amd64.
>>>>
>>>> Comments, feedback most welcome.
>>>>
>>>> Pax, -A
>>>
>>> Ping.
>>
>> I reinstated the strcat/sprintf-related patches but done slightly
>> better.  Tests pass on amd64.  Updated patch attached.
>>
>> Feedback, comments most welcome.
>>
>> Pax, -A
>
> Finally getting back to this.  Version 5.4.0 is still the latest
> stable release (6.0.x exists but is considered beta).  Just tried my
> update on the most recent snap and it passess tests and seems to work
> for me.  Patch attached.
>
> Feedback most welcome.
>
> Pax, -A

Reping.  Diff 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: Makefile
===
RCS file: /cvs/ports/textproc/multimarkdown/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	5 Apr 2015 13:31:15 -	1.2
+++ Makefile	1 Oct 2016 18:11:36 -
@@ -1,34 +1,45 @@
 # $OpenBSD: Makefile,v 1.2 2015/04/05 13:31:15 sthen Exp $
 
-V =		4.7.1
+V =		5.4.0
 COMMENT =	marked-up plain text to formatted document converter
 DISTNAME =	${GH_PROJECT}-${V}
-PKGNAME =	multimarkdown-${V}
+PKGNAME =	multimarkdown-${V:C/-/./}
 CATEGORIES =	textproc
 
 GH_ACCOUNT =	fletcher
-GH_PROJECT =	MultiMarkdown-4
+GH_PROJECT =	MultiMarkdown-5
 GH_TAGNAME =	${V}
 
+TESTS_COMMIT =	8d5ad66e3bbaeb0de8646783bfe964261ddb39c7
+DIST_SUBDIR =	multimarkdown
+MASTER_SITES_GITHUB =	https://github.com/fletcher/MMD-Test-Suite/archive/
+DISTFILES =	${DISTNAME}${EXTRACT_SUFX} ${TESTS_COMMIT}${EXTRACT_SUFX}
 HOMEPAGE =	http://fletcherpenney.net/multimarkdown/
 MAINTAINER =	Sean Levy <att...@stalphonsos.com>
 
 # Dual licensed: MIT and GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c
+# uses pledge()
+WANTLIB += 	c
 
 BUILD_DEPENDS =	devel/greg
 
-USE_GMAKE =	Yes
-ALL_TARGET =	ALL
-MAKE_FLAGS =	CFLAGS="${CFLAGS} -include GLibFacade.h -DHAVE_ARC4RANDOM" \
-		GREG=${LOCALBASE}/bin/greg
+MODULES =	devel/cmake
 
-# Test files aren't included in distfile.
-NO_TEST =	Yes
+CFLAGS +=	-DHAVE_SRAND_DETERMINISTIC
+
+CONFIGURE_ARGS += -DGREG=${LOCALBASE}/bin/greg
+
+post-extract:
+	rm -rf ${WRKSRC}/submodules/MarkdownTest
+	cp -r ${WRKDIR}/MMD-Test-Suite-${TESTS_COMMIT} \
+		${WRKSRC}/submodules/MarkdownTest
+
+pre-configure:
+	touch ${WRKBUILD}/README.html
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKBUILD}/multimarkdown ${PREFIX}/bin/
 
 .include 
Index: distinfo

Re: [UPDATE] tor-browser

2017-04-11 Thread attila 

attila <att...@stalphonsos.com> writes:

> Hi ports@,
>
> Attached is an update to the Tor Browser ports, bringing us
> to 6.5.1:
>   https://blog.torproject.org/blog/tor-browser-651-released
>
> Testing would be greatly appreciated; my ability to test personally
> has been limited of late so I need outside testers.  Comments and
> feedback most welcome.
>
> Pax, -A

Ping.  Diff attached for convenience.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF
Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- meta/tor-browser/Makefile	31 Jan 2017 13:48:18 -	1.4
+++ meta/tor-browser/Makefile	24 Mar 2017 18:49:51 -
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-6.5
+PKGNAME=	tor-browser-6.5.1
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.inc
--- www/tor-browser/Makefile.inc	31 Jan 2017 13:48:18 -	1.4
+++ www/tor-browser/Makefile.inc	24 Mar 2017 18:49:51 -
@@ -6,7 +6,7 @@ GH_ACCOUNT ?=		torbsd
 PERMIT_PACKAGE_CDROM ?= Yes
 CATEGORIES =		www
 BROWSER_NAME =		tor-browser
-TB_VERSION =		6.5
+TB_VERSION =		6.5.1
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- www/tor-browser/browser/Makefile	18 Feb 2017 16:22:54 -	1.6
+++ www/tor-browser/browser/Makefile	24 Mar 2017 18:49:51 -
@@ -15,7 +15,7 @@ DIST_SUBDIR = 		${BROWSER_NAME}
 WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr45.7.0
+GH_TAGNAME =		v${TB_VERSION}-esr45.8.0
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
@@ -75,7 +75,7 @@ CONFIGURE_ARGS +=	--disable-webrtc
 
 CONFIGURE_ARGS +=	--disable-gstreamer
 
-RUN_DEPENDS +=		net/tor>=0.2.9.9p0
+RUN_DEPENDS +=		net/tor>=0.2.9.10
 
 # bug 857628
 CONFIGURE_ARGS +=	--enable-pie
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- www/tor-browser/browser/distinfo	31 Jan 2017 13:48:18 -	1.4
+++ www/tor-browser/browser/distinfo	24 Mar 2017 18:49:51 -
@@ -1,2 +1,2 @@
-SHA256 (tor-browser/v6.5-esr45.7.0.tar.gz) = RIKh9Ura08i7pYMfz1mjNZn50kAetrnpmOBppzGvXcM=
-SIZE (tor-browser/v6.5-esr45.7.0.tar.gz) = 256763405
+SHA256 (tor-browser/v6.5.1-esr45.8.0.tar.gz) = FUXcdn44q/QP0NpXdsW3nNxQ0V4GIlsv1C5Yq6h0PnI=
+SIZE (tor-browser/v6.5.1-esr45.8.0.tar.gz) = 256906108
Index: www/tor-browser/browser/files/extension-overrides.js
===
RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v
retrieving revision 1.3
diff -u -p -r1.3 extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js	24 Dec 2016 20:15:06 -	1.3
+++ www/tor-browser/browser/files/extension-overrides.js	24 Mar 2017 18:49:51 -
@@ -2,15 +2,6 @@
 # Tor Browser Bundle
 # Do not edit this file.
 
-# Torbutton Preferences:
-pref("extensions.torbutton.fresh_install", false);
-pref("extensions.torbutton.tor_enabled", true);
-pref("extensions.torbutton.proxies_applied", true);
-pref("extensions.torbutton.settings_applied", true);
-pref("extensions.torbutton.socks_host", "127.0.0.1");
-pref("extensions.torbutton.socks_port", 9150);
-pref("extensions.torbutton.tz_string", "UTC+00:00");
-
 # HTTPS Everywhere Preferences:
 pref("extensions.https_everywhere._observatory.popup_shown", true);
 pref("extensions.https_everywhere.toolbar_hint_shown", true);
@@ -79,8 +70,6 @@ pref("extensions.torlauncher.default_bri
 pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D");
 pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");
 
-pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH");
-
 pref("extensions.torlauncher.default_bridge.obfs4.1&quo

Re: [update] textproc/multimarkdown

2017-03-27 Thread attila 

attila <att...@stalphonsos.com> writes:

> attila <att...@stalphonsos.com> writes:
>
>> attila <att...@stalphonsos.com> writes:
>>
>>> attila <att...@stalphonsos.com> writes:
>>>
>>>> Michael McConville <mm...@mykolab.com> writes:
>>>>
>>>>> attila wrote:
>>>>>> Ping.
>>>>>>
>>>>>> Just tested that the diff works against recentish i386 snap (22 May).
>>>>>> Patch attached.
>>>>>
>>>>> I can't comment on all of the changes, but this builds and runs fine for
>>>>> me.
>>>>>
>>>>
>>>> Attached is an update that brings us from 4.7.1 to 5.4.0, released 8
>>>> Aug.  It shuffles the patches around because the source tree was
>>>> rearranged and adds support for tests.  Sadly, the tests don't all
>>>> pass.  I think I need a t-dep for something LaTeXish but I'm not sure
>>>> what is best, nor am I sure if that's the only reason for the
>>>> failures.  If anyone has a spare cycle or two to look at it I'd
>>>> appreciate it.  If not I'll get back to it by the end of the week.
>>>>
>>>> Pax, -A
>>>
>>> I finally got back to this.  It turns out there wasn't much standing
>>> in the way of the tests working other than me.  Attached is a patch
>>> that brings textproc/multimarkdown up to the latest release (5.4.0
>>> released 5 Aug).  Notable changes:
>>>
>>> * Switched to CMake;
>>> * Ditched the patches I tried and failed to upstream (strcat/sprintf);
>>> * Reworked two remaining patches (HAVE_SRAND_DETERMINISTIC) in the hope
>>>   I might get them upstream;
>>> * Added pledge;
>>> * make test now passes all tests.
>>>
>>> Tested on amd64.
>>>
>>> Comments, feedback most welcome.
>>>
>>> Pax, -A
>>
>> Ping.
>
> I reinstated the strcat/sprintf-related patches but done slightly
> better.  Tests pass on amd64.  Updated patch attached.
>
> Feedback, comments most welcome.
>
> Pax, -A

Finally getting back to this.  Version 5.4.0 is still the latest
stable release (6.0.x exists but is considered beta).  Just tried my
update on the most recent snap and it passess tests and seems to work
for me.  Patch attached.

Feedback most welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF
Index: Makefile
===
RCS file: /cvs/ports/textproc/multimarkdown/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	5 Apr 2015 13:31:15 -	1.2
+++ Makefile	1 Oct 2016 18:11:36 -
@@ -1,34 +1,45 @@
 # $OpenBSD: Makefile,v 1.2 2015/04/05 13:31:15 sthen Exp $
 
-V =		4.7.1
+V =		5.4.0
 COMMENT =	marked-up plain text to formatted document converter
 DISTNAME =	${GH_PROJECT}-${V}
-PKGNAME =	multimarkdown-${V}
+PKGNAME =	multimarkdown-${V:C/-/./}
 CATEGORIES =	textproc
 
 GH_ACCOUNT =	fletcher
-GH_PROJECT =	MultiMarkdown-4
+GH_PROJECT =	MultiMarkdown-5
 GH_TAGNAME =	${V}
 
+TESTS_COMMIT =	8d5ad66e3bbaeb0de8646783bfe964261ddb39c7
+DIST_SUBDIR =	multimarkdown
+MASTER_SITES_GITHUB =	https://github.com/fletcher/MMD-Test-Suite/archive/
+DISTFILES =	${DISTNAME}${EXTRACT_SUFX} ${TESTS_COMMIT}${EXTRACT_SUFX}
 HOMEPAGE =	http://fletcherpenney.net/multimarkdown/
 MAINTAINER =	Sean Levy <att...@stalphonsos.com>
 
 # Dual licensed: MIT and GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c
+# uses pledge()
+WANTLIB += 	c
 
 BUILD_DEPENDS =	devel/greg
 
-USE_GMAKE =	Yes
-ALL_TARGET =	ALL
-MAKE_FLAGS =	CFLAGS="${CFLAGS} -include GLibFacade.h -DHAVE_ARC4RANDOM" \
-		GREG=${LOCALBASE}/bin/greg
+MODULES =	devel/cmake
 
-# Test files aren't included in distfile.
-NO_TEST =	Yes
+CFLAGS +=	-DHAVE_SRAND_DETERMINISTIC
+
+CONFIGURE_ARGS += -DGREG=${LOCALBASE}/bin/greg
+
+post-extract:
+	rm -rf ${WRKSRC}/submodules/MarkdownTest
+	cp -r ${WRKDIR}/MMD-Test-Suite-${TESTS_COMMIT} \
+		${WRKSRC}/submodules/MarkdownTest
+
+pre-configure:
+	touch ${WRKBUILD}/README.html
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKBUILD}/multimarkdown ${PREFIX}/bin/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/multimarkdown/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	24 Mar 2015 19:16:13 -	1.1.1.1
+++ distinfo	1 Oct 2016 18:11:36 -
@@ -1,2 +1,4 @@
-SHA256 (MultiMarkdown-4-4.7.1.tar.gz) = gy5dzm+hv/TWfmSsLMJPCSCujZEoDlPqh5I3odQ/SGU=
-SIZE (MultiMarkdown-4-4.7.1.tar.gz

[UPDATE] tor-browser

2017-03-24 Thread attila 
Hi ports@,

Attached is an update to the Tor Browser ports, bringing us
to 6.5.1:
  https://blog.torproject.org/blog/tor-browser-651-released

Testing would be greatly appreciated; my ability to test personally
has been limited of late so I need outside testers.  Comments and
feedback most welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF
Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- meta/tor-browser/Makefile	31 Jan 2017 13:48:18 -	1.4
+++ meta/tor-browser/Makefile	24 Mar 2017 18:49:51 -
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-6.5
+PKGNAME=	tor-browser-6.5.1
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.inc
--- www/tor-browser/Makefile.inc	31 Jan 2017 13:48:18 -	1.4
+++ www/tor-browser/Makefile.inc	24 Mar 2017 18:49:51 -
@@ -6,7 +6,7 @@ GH_ACCOUNT ?=		torbsd
 PERMIT_PACKAGE_CDROM ?= Yes
 CATEGORIES =		www
 BROWSER_NAME =		tor-browser
-TB_VERSION =		6.5
+TB_VERSION =		6.5.1
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- www/tor-browser/browser/Makefile	18 Feb 2017 16:22:54 -	1.6
+++ www/tor-browser/browser/Makefile	24 Mar 2017 18:49:51 -
@@ -15,7 +15,7 @@ DIST_SUBDIR = 		${BROWSER_NAME}
 WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr45.7.0
+GH_TAGNAME =		v${TB_VERSION}-esr45.8.0
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
@@ -75,7 +75,7 @@ CONFIGURE_ARGS +=	--disable-webrtc
 
 CONFIGURE_ARGS +=	--disable-gstreamer
 
-RUN_DEPENDS +=		net/tor>=0.2.9.9p0
+RUN_DEPENDS +=		net/tor>=0.2.9.10
 
 # bug 857628
 CONFIGURE_ARGS +=	--enable-pie
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- www/tor-browser/browser/distinfo	31 Jan 2017 13:48:18 -	1.4
+++ www/tor-browser/browser/distinfo	24 Mar 2017 18:49:51 -
@@ -1,2 +1,2 @@
-SHA256 (tor-browser/v6.5-esr45.7.0.tar.gz) = RIKh9Ura08i7pYMfz1mjNZn50kAetrnpmOBppzGvXcM=
-SIZE (tor-browser/v6.5-esr45.7.0.tar.gz) = 256763405
+SHA256 (tor-browser/v6.5.1-esr45.8.0.tar.gz) = FUXcdn44q/QP0NpXdsW3nNxQ0V4GIlsv1C5Yq6h0PnI=
+SIZE (tor-browser/v6.5.1-esr45.8.0.tar.gz) = 256906108
Index: www/tor-browser/browser/files/extension-overrides.js
===
RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v
retrieving revision 1.3
diff -u -p -r1.3 extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js	24 Dec 2016 20:15:06 -	1.3
+++ www/tor-browser/browser/files/extension-overrides.js	24 Mar 2017 18:49:51 -
@@ -2,15 +2,6 @@
 # Tor Browser Bundle
 # Do not edit this file.
 
-# Torbutton Preferences:
-pref("extensions.torbutton.fresh_install", false);
-pref("extensions.torbutton.tor_enabled", true);
-pref("extensions.torbutton.proxies_applied", true);
-pref("extensions.torbutton.settings_applied", true);
-pref("extensions.torbutton.socks_host", "127.0.0.1");
-pref("extensions.torbutton.socks_port", 9150);
-pref("extensions.torbutton.tz_string", "UTC+00:00");
-
 # HTTPS Everywhere Preferences:
 pref("extensions.https_everywhere._observatory.popup_shown", true);
 pref("extensions.https_everywhere.toolbar_hint_shown", true);
@@ -79,8 +70,6 @@ pref("extensions.torlauncher.default_bri
 pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D");
 pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");
 
-pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH");
-
 pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64

Re: [UPDATE] Tor Browser 6.5

2017-01-31 Thread attila 

Landry Breuil <lan...@openbsd.org> writes:

> On Mon, Jan 30, 2017 at 08:28:35AM -0600, attila wrote:
>> Hi ports@,
>>
>> The attached patch brings us up to Tor Browser 6.5.  It requires the
>> net/tor patch to run since we have to r-dep on net/tor>=0.2.9.9 to
>> remain true to upstream:
>> https://marc.info/?l=openbsd-ports=148562136724885=2
>>
>> Tested on amd64.
>
> Are the pkg/PLIST changes necessary/on purpose or that's make
> update-plist being too dumb as usual ?

I decided to stop fighting with update-plist.  I thought my way was
better because it was slightly shorter but really who cares, if
update-plist does effectively the same thing I should just accept it
and move on, I think.

> Landry

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

[UPDATE] Tor Browser 6.5

2017-01-30 Thread attila 
Hi ports@,

The attached patch brings us up to Tor Browser 6.5.  It requires the
net/tor patch to run since we have to r-dep on net/tor>=0.2.9.9 to
remain true to upstream:
https://marc.info/?l=openbsd-ports=148562136724885=2

Tested on amd64.

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.3
diff -u -p -r1.3 Makefile.inc
--- www/tor-browser/Makefile.inc	24 Dec 2016 20:15:05 -	1.3
+++ www/tor-browser/Makefile.inc	26 Jan 2017 22:40:05 -
@@ -6,7 +6,7 @@ GH_ACCOUNT ?=		torbsd
 PERMIT_PACKAGE_CDROM ?= Yes
 CATEGORIES =		www
 BROWSER_NAME =		tor-browser
-TB_VERSION =		6.0.8
+TB_VERSION =		6.5
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- www/tor-browser/browser/Makefile	24 Jan 2017 21:27:28 -	1.4
+++ www/tor-browser/browser/Makefile	26 Jan 2017 22:40:05 -
@@ -15,11 +15,10 @@ DIST_SUBDIR = 		${BROWSER_NAME}
 WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr45.6.0
+GH_TAGNAME =		v${TB_VERSION}-esr45.7.0
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
-REVISION =		0
 
 SO_VERSION =		1.0
 MOZILLA_LIBS =		browsercomps xul lgpllibs
@@ -81,7 +80,7 @@ WANTLIB += 		icudata icui18n icuuc
 
 CONFIGURE_ARGS +=	--disable-gstreamer
 
-RUN_DEPENDS +=		net/tor>=0.2.8.7
+RUN_DEPENDS +=		net/tor>=0.2.9.9
 
 # bug 857628
 CONFIGURE_ARGS +=	--enable-pie
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- www/tor-browser/browser/distinfo	24 Dec 2016 20:15:06 -	1.3
+++ www/tor-browser/browser/distinfo	26 Jan 2017 22:40:05 -
@@ -1,2 +1,2 @@
-SHA256 (tor-browser/v6.0.8-esr45.6.0.tar.gz) = btCnk5yi1YoQ1YA+o5VwFRHjpM9yF/mmE8YvuSAVwzY=
-SIZE (tor-browser/v6.0.8-esr45.6.0.tar.gz) = 256614669
+SHA256 (tor-browser/v6.5-esr45.7.0.tar.gz) = RIKh9Ura08i7pYMfz1mjNZn50kAetrnpmOBppzGvXcM=
+SIZE (tor-browser/v6.5-esr45.7.0.tar.gz) = 256763405
Index: www/tor-browser/browser/patches/patch-js_src_jit_ExecutableAllocator_cpp
===
RCS file: www/tor-browser/browser/patches/patch-js_src_jit_ExecutableAllocator_cpp
diff -N www/tor-browser/browser/patches/patch-js_src_jit_ExecutableAllocator_cpp
--- www/tor-browser/browser/patches/patch-js_src_jit_ExecutableAllocator_cpp	13 Nov 2016 21:15:43 -	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-js_src_jit_ExecutableAllocator_cpp,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $
-
-Brought over from www/firefox-esr 45.1.1
 js/src/jit/ExecutableAllocator.cpp.orig	Tue May 31 07:26:30 2016
-+++ js/src/jit/ExecutableAllocator.cpp	Wed Jun  1 18:34:00 2016
-@@ -88,7 +88,7 @@ ExecutableAllocator::addSizeOfCode(JS::CodeSizes* size
- }
- }
- 
--#if TARGET_OS_IPHONE
-+#if defined(__OpenBSD__) || TARGET_OS_IPHONE
- bool ExecutableAllocator::nonWritableJitCode = true;
- #else
- bool ExecutableAllocator::nonWritableJitCode = false;
Index: www/tor-browser/https-everywhere/Makefile
===
RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- www/tor-browser/https-everywhere/Makefile	24 Dec 2016 20:15:06 -	1.3
+++ www/tor-browser/https-everywhere/Makefile	26 Jan 2017 22:40:05 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.3 2016/12/24 20:15:06 landry Exp $
 
 ADDON_NAME =		https-everywhere
-V =			5.2.8
+V =			5.2.9
 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.3
diff -u -p -r1.3 distinfo
--- www/tor-browser/https-everywhere/distinfo	24 Dec 2016 20:15:06 -	1.3
+++ www/tor-browser/https-everywhere/distinfo	26 Jan 2017 22:40:05 -
@@ -1,2 +1,2 @@
-SHA256 (https-everywhere-5.2.8-eff.xpi) = rfmyjpeI2lsmQnAmmzZJrfRDfD1wgxGsMpx7pqoMnzo=
-SIZE (https-everywhere-5.2.8-eff.xpi) = 2795089
+SHA256 (https-everywhere-5.2.9-eff.xpi) = xygcUliVA0oSXDTRF6S8h5xPuq9lpjrfVCrRBWjaPJQ=
+SIZE (https-everywhere-5.2.9-eff.xpi) = 2798649
Index: www/tor-browser/https-everywhere/

[PATCH] net/tor: r1.114 of ssl.h breaks build in test_tortls.c

2017-01-28 Thread attila 
Hi ports@,

The attached patch gets net/tor 0.2.9.9 building and passing tests
again on -current.  I believe it would also be acceptable to upstream.
It is also required to test the Tor Browser 6.5 update, which I will
post next.

Feedback most welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF
Index: tor/patches/patch-src_test_test_tortls_c
===
RCS file: tor/patches/patch-src_test_test_tortls_c
diff -N tor/patches/patch-src_test_test_tortls_c
--- /dev/null	1 Jan 1970 00:00:00 -
+++ tor/patches/patch-src_test_test_tortls_c	26 Jan 2017 17:54:19 -
@@ -0,0 +1,65 @@
+$OpenBSD$
+
+OPENSSL_OPAQUE should be turned on for LibreSSL as of r1.114 of ssl.h
+Also hoist a function used by OPAQUE tests out of an #ifndef OPAQUE
+--- src/test/test_tortls.c.orig	Thu Jan 26 11:51:15 2017
 src/test/test_tortls.c	Thu Jan 26 12:50:07 2017
+@@ -46,6 +46,10 @@ ENABLE_GCC_WARNING(redundant-decls)
+ #define SSL_STATE_STR "before/accept initialization"
+ #endif
+ 
++#if defined(LIBRESSL_VERSION_NUMBER)
++#define OPENSSL_OPAQUE
++#endif
++
+ #ifndef OPENSSL_OPAQUE
+ static SSL_METHOD *
+ give_me_a_test_method(void)
+@@ -723,6 +727,23 @@ test_tortls_get_my_certs(void *ignored)
+   (void)1;
+ }
+ 
++static SSL_CIPHER *
++get_cipher_by_name(const char *name)
++{
++  int i;
++  const SSL_METHOD *method = SSLv23_method();
++  int num = method->num_ciphers();
++  for (i = 0; i < num; ++i) {
++const SSL_CIPHER *cipher = method->get_cipher(i);
++const char *ciphername = SSL_CIPHER_get_name(cipher);
++if (!strcmp(ciphername, name)) {
++  return (SSL_CIPHER *)cipher;
++}
++  }
++
++  return NULL;
++}
++
+ #ifndef OPENSSL_OPAQUE
+ static void
+ test_tortls_get_ciphersuite_name(void *ignored)
+@@ -739,23 +760,6 @@ test_tortls_get_ciphersuite_name(void *ignored)
+  done:
+   tor_free(ctx->ssl);
+   tor_free(ctx);
+-}
+-
+-static SSL_CIPHER *
+-get_cipher_by_name(const char *name)
+-{
+-  int i;
+-  const SSL_METHOD *method = SSLv23_method();
+-  int num = method->num_ciphers();
+-  for (i = 0; i < num; ++i) {
+-const SSL_CIPHER *cipher = method->get_cipher(i);
+-const char *ciphername = SSL_CIPHER_get_name(cipher);
+-if (!strcmp(ciphername, name)) {
+-  return (SSL_CIPHER *)cipher;
+-}
+-  }
+-
+-  return NULL;
+ }
+ 
+ static SSL_CIPHER *

Re: [NEW] devel/p5-Data-SExpression

2016-12-26 Thread attila 

Jeremie Courreges-Anglas <j...@wxcvbn.org> writes:

> Andrew Fresh <and...@afresh1.com> writes:
>
>> On Mon, Dec 26, 2016 at 11:51:32AM -0600, attila wrote:
>>> 
>>> attila <att...@stalphonsos.com> writes:
>>> 
>>> > attila <att...@stalphonsos.com> writes:
>>> >
>>> >> Hi ports@,
>>> >>
>>> >> Attached is a port for the Data::SExpression Perl module.  It is a
>>> >> dependency of the Perl interface I recently contributed to mail/mu
>>> >> upstream, and which will be coming down the pike in some new mu
>>> >> release fairly soon.
>>> >>
>>> >> $ cat pkg/DESCR
>>> >> Data::SExpression is a Perl module that parses LISP-like
>>> >> S-expressions into Perl data structures.
>>> >>
>>> >> Passes make test on i386.
>>
>> Also on amd64, if it is in the "cpan" directory.
>>
>>
>>> >> Comments, feedback most welcome.
>>
>> There is no "cpan" category, need to pick one.  Perhaps devel, or
>> textproc?
>
> Tough.  I'd choose devel/ because the output is perl data structures,
> and because considering s-expressions as text seems far-stretched to me.
> But then, most ports dealing with XML are under textproc/...  your call.
>
>> Don't start off the COMMENT with a capital letter unless it is
>> semantically important (like the COMMENT is the expansion of an acronym
>> or somesuch).  
>>
>> You should add yourself as maintainer if you are interested in that.
>>
>> Should add a test dependency on devel/p5-Test-Memory-Cycle to avoid
>> skipping tests.
>
> Test-Deep should probably go in TEST_DEPENDS instead of BUILD_DEPENDS,
> it's not needed to build the package.
>
>> Some of the newlines in the Makefile can go away.
>>
>> Other than that, it looks OK to me.
>
> Same here.  With the issues above addressed, ok jca@

Thanks a lot for the feedback.  Attached is a revised port that I
believe addresses all concerns raised.  Passes tests on amd64.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF


p5-Data-SExpression-bis.tgz
Description: updated port of Data::SExpression

Re: [NEW] devel/p5-Data-SExpression

2016-12-26 Thread attila 

attila <att...@stalphonsos.com> writes:

> attila <att...@stalphonsos.com> writes:
>
>> Hi ports@,
>>
>> Attached is a port for the Data::SExpression Perl module.  It is a
>> dependency of the Perl interface I recently contributed to mail/mu
>> upstream, and which will be coming down the pike in some new mu
>> release fairly soon.
>>
>> $ cat pkg/DESCR
>> Data::SExpression is a Perl module that parses LISP-like
>> S-expressions into Perl data structures.
>>
>> Passes make test on i386.
>>
>> Comments, feedback most welcome.
>>
>> Pax, -A
>
> Ping?  Port attached.

Belated reping with updated port attached, this time done via portgen
(which I did not know about the first time).  Same logic behind
submitting it: dependency needed for mail/mu Perl interface, which has
now been released upstream.

>
> Pax, -A

Feedback, comments, criticism most welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF


p5-Data-SExpression.tgz
Description: devel/p5-Data-SExpression

[UPDATE] Tor Browser 6.0.8

2016-12-24 Thread attila 
Hi ports@,

Attached is an update for the Tor Browser ports to 6.0.8, released 13
Dec.  I've had one report of some kind of warning on startup about
being out of date but this has not happened for me, so I'd really like
some testing by others.  I've tested it on the 23 Dec snap (amd64).

Feedback, comment, criticisms most welcome.

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.2
diff -u -p -r1.2 Makefile.inc
--- www/tor-browser/Makefile.inc	2 Dec 2016 08:18:18 -	1.2
+++ www/tor-browser/Makefile.inc	21 Dec 2016 03:47:26 -
@@ -6,7 +6,7 @@ GH_ACCOUNT ?=		torbsd
 PERMIT_PACKAGE_CDROM ?= Yes
 CATEGORIES =		www
 BROWSER_NAME =		tor-browser
-TB_VERSION =		6.0.7
+TB_VERSION =		6.0.8
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- www/tor-browser/browser/Makefile	2 Dec 2016 08:18:18 -	1.2
+++ www/tor-browser/browser/Makefile	21 Dec 2016 03:47:26 -
@@ -15,7 +15,7 @@ DIST_SUBDIR = 		${BROWSER_NAME}
 WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr45.5.1
+GH_TAGNAME =		v${TB_VERSION}-esr45.6.0
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- www/tor-browser/browser/distinfo	2 Dec 2016 08:18:18 -	1.2
+++ www/tor-browser/browser/distinfo	21 Dec 2016 03:47:26 -
@@ -1,2 +1,2 @@
-SHA256 (tor-browser/v6.0.7-esr45.5.1.tar.gz) = mvkYQHtZPZyiUiT5RpAnl48QcF3/YOO3x5mC4JjLuzs=
-SIZE (tor-browser/v6.0.7-esr45.5.1.tar.gz) = 256632500
+SHA256 (tor-browser/v6.0.8-esr45.6.0.tar.gz) = btCnk5yi1YoQ1YA+o5VwFRHjpM9yF/mmE8YvuSAVwzY=
+SIZE (tor-browser/v6.0.8-esr45.6.0.tar.gz) = 256614669
Index: www/tor-browser/browser/files/extension-overrides.js
===
RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v
retrieving revision 1.2
diff -u -p -r1.2 extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js	2 Dec 2016 08:18:18 -	1.2
+++ www/tor-browser/browser/files/extension-overrides.js	21 Dec 2016 03:47:26 -
@@ -81,27 +81,26 @@ pref("extensions.torlauncher.default_bri
 
 pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH");
 
-pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:9332 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
 pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0");
 pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50001 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:7920 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB328

[UPDATE] Tor Browser 6.0.7

2016-12-01 Thread attila 
Hi ports@,

Attached is an update to the Tor Browser ports that bring us up to
6.0.7, which patches CVE-2016-9079 (Use-after-free in SVG Animation).


Tested under amd64 on the 30 Nov snap.

Feedback, comments most welcome.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- meta/tor-browser/Makefile	13 Nov 2016 21:18:48 -	1.1.1.1
+++ meta/tor-browser/Makefile	1 Dec 2016 19:28:03 -
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-6.0.5
+PKGNAME=	tor-browser-6.0.7
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.inc
--- www/tor-browser/Makefile.inc	13 Nov 2016 21:15:43 -	1.1.1.1
+++ www/tor-browser/Makefile.inc	1 Dec 2016 19:28:03 -
@@ -6,7 +6,7 @@ GH_ACCOUNT ?=		torbsd
 PERMIT_PACKAGE_CDROM ?= Yes
 CATEGORIES =		www
 BROWSER_NAME =		tor-browser
-TB_VERSION =		6.0.5
+TB_VERSION =		6.0.7
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- www/tor-browser/browser/Makefile	13 Nov 2016 21:15:43 -	1.1.1.1
+++ www/tor-browser/browser/Makefile	1 Dec 2016 19:28:03 -
@@ -15,7 +15,7 @@ DIST_SUBDIR = 		${BROWSER_NAME}
 WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr45.4.0
+GH_TAGNAME =		v${TB_VERSION}-esr45.5.1
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- www/tor-browser/browser/distinfo	13 Nov 2016 21:15:43 -	1.1.1.1
+++ www/tor-browser/browser/distinfo	1 Dec 2016 19:28:03 -
@@ -1,2 +1,2 @@
-SHA256 (tor-browser/v6.0.5-esr45.4.0.tar.gz) = zDpUGriIt9TbKiV8bG5aFIxdCZ3fw2E3j4PSDkxKms8=
-SIZE (tor-browser/v6.0.5-esr45.4.0.tar.gz) = 256581824
+SHA256 (tor-browser/v6.0.7-esr45.5.1.tar.gz) = mvkYQHtZPZyiUiT5RpAnl48QcF3/YOO3x5mC4JjLuzs=
+SIZE (tor-browser/v6.0.7-esr45.5.1.tar.gz) = 256632500
Index: www/tor-browser/browser/files/extension-overrides.js
===
RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js	13 Nov 2016 21:15:43 -	1.1.1.1
+++ www/tor-browser/browser/files/extension-overrides.js	1 Dec 2016 19:28:03 -
@@ -81,24 +81,27 @@ pref("extensions.torlauncher.default_bri
 
 pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH");
 
-pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:2934 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:9332 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
 pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0");
 pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0");
 pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:5 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50001 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lP

Re: [NEW] www/tbb improved, updated

2016-11-13 Thread attila 

attila <att...@stalphonsos.com> writes:

[snip]
> Landry Breuil <lan...@openbsd.org> writes:
>> So, more nits portswise only:
>
> Thanks a lot for this feedback.  Attached is a tarball that attempts
> to address both your and danj@'s concerns.
>
>> - meta/tbb/pkg/DESCR could use some more wording, as
>>   www/tbb/tor-browser/pkg/DESCR.
>
> All of the COMMENTs and pkg/DESCR files have been updated.
>

Naturally, after I posted I found a typo in a COMMENT.  While in there
I also rewrote tor-launcher/pkg/DESCR to be a little more informative.

Updated tarball attached.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF


tbb605-bis.tgz
Description: fix typos in last update

Re: [NEW] www/tbb improved, updated

2016-11-12 Thread attila 
[Sorry for duplicate email to anyone who got one, my bad -A]

Landry Breuil <lan...@openbsd.org> writes:

> On Wed, Nov 02, 2016 at 09:55:17AM -0600, attila wrote:
n>> 
>> Landry Breuil <lan...@openbsd.org> writes:
>> 
>> > On Tue, Oct 18, 2016 at 11:07:22AM -0500, attila wrote:
>> >> 
>> >> attila <att...@stalphonsos.com> writes:
>> >> 
>> >> > attila <att...@stalphonsos.com> writes:
>> >> >
>> >> >> Hi ports@,
>> >> >>
>> >> > Feedback, comments, most welcome.
>> >> >
>> >> > Pax, -A
>> >> 
>> >> Ping.  Ports attached for convenience.
>> >
>> > Fwiw, i've built the git tip of https://github.com/torbsd/openbsd-ports
>> > on current, and they build fine.
>> 
>> I just pushed a couple of times to address your concerns; updated
>> tarball attached for convenience.
>
> So, more nits portswise only:

Thanks a lot for this feedback.  Attached is a tarball that attempts
to address both your and danj@'s concerns.

> - meta/tbb/pkg/DESCR could use some more wording, as
>   www/tbb/tor-browser/pkg/DESCR.

All of the COMMENTs and pkg/DESCR files have been updated.

> - i dont see a README anywhere installed in the pkgs (could go to
>   meta/tbb/pkg/README, with the added line to the corresponding PLIST)
> explaining the end-user how that whole stuff works, without having to
> refer to the website...

There is now a meta/tor-browser/pkg/README

> - www/tbb/Makefile -> that .if !defined(ADDONS_ONLY) block should go away

Done.

> - no need to cargo-cult BROKEN-sparc64 nor the MODGCC4 stuff for archs
>   where it wont build (yeah i know, i need to clean firefox Makefile..)

Removed.

> - the dependency on gettext looks fishy. BUILD_DEPENDS + LIB_DEPENDS +
>   RUN_DEPENDS ? i dont think so, that also looks like cargoculting.

Fixed.

> - CONFIGURE_STYLE=autoheader ?

I have "autoconf no-autoheader", which I think is correct in this case.
However there was an issue with make configure that I'm not sure I
solved well.

The issue is that the "test -f $$d/configure" in gnu.port.mk fails
because Tor Browser does not have a configure at toplevel, only a
configure.in.  I presume there's a reason why the test is not:
  -f $$d/configure.in -o -f $$d/configure.ac
but I don't understand what it is... ?

My hack was to prepend . to MOZILLA_AUTOCONF_DIRS, since you already
have a pre-configure hook in mozilla.port.mk (which is where I
would've put the "extra" call to autoconf anyway).  This has the
desired effect.  If there's a better, more generic way to deal with
autoconf'd projects that don't ship a top-level configure I would like
to be enlightened.

> - since all extensions are installed *only* for tbb, it should be
>   stressed in their COMMENT/DESCR, so that ppl dont think that
> installing 'https-everywhere' package will magically enabled httpse for
> their firefox..

My munging of PKGNAMEs attempts to address this as well as explicit
text in */pkg/DESCR and COMMENTs.  I put a tb- prefix in the PKGNAMEs
for www/tor-browser/{browser,noscript,https-everywhere}, so the full
list of PKGNAMEs is:
   tor-browser# meta package
   tb-browser # firefox esr fork
   torbutton
   tor-launcher
   tb-noscript
   tb-https-everywhere

> And there are probably other nits... :)

I have a question that might turn into a nit: portcheck complains thus
in www/tor-browser/browser:
  stdc++ in WANTLIB when gcc4 is in MODULES; run port-lib-depends-check and if 
stdc++ is still there, check actual build thoroughly, it's broken

port-lib-depends-check says:
  ...
  tb-browser-6.0.5(www/tor-browser/browser):
  Extra:  stdc++.57

I built www/firefox-esr to see what port-lib-depends-check says there
and it's the same.  I take it this is due to the way that Mozilla does
dynamic loading and there's nothing to be done about it?  This has
always been the case for TB but I forgot to ask until now.

> Landry

Again, thanks a lot for your time.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF


tbb605-is.tgz
Description: updated tor browser ports

Re: [NEW] www/tbb improved, updated

2016-11-08 Thread attila 

Daniel Jakots <danj+o...@chown.me> writes:

> On Wed, 02 Nov 2016 09:55:17 -0600, attila <att...@stalphonsos.com>
> wrote:
>
>> updated tarball attached for convenience.
>
> One concern I have is the PKGNAME. Currently it is
> PKGNAME=tbb-6.0.5
>
> To do a bit of history it was first called Tor Browser Bundle because
> at the time it was really a bundle (with at least Firefox and Vidalia).
> Once they finally got rid off Vidalia they renamed it to "Tor
> Browser" [0]. I strongly prefer that we take the name to have the same
> name than everywhere else.

I had not seen that ticket.  Thank you for noticing this.  I agree
that we should use the name upstream prefers.

> I don't really mind about the name of the ports but I think
> 'www/tbb/tor-browser' should then have a difference name. I thought
> about it and didn't find anything good.

Suggestion: rename {meta,www}/tbb to */tor-browser and
rename the current www/tbb/tor-browser to www/tor-browser/browser.

>
> [0]: https://trac.torproject.org/projects/tor/ticket/11193

Thanks much for this.

>
> Cheers,
> Daniel

I will post an update that makes the above change (unless someone else
has a better idea) and that also addresses landry@'s comments.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF

Re: [NEW] www/tbb improved, updated

2016-11-02 Thread attila 

Landry Breuil <lan...@openbsd.org> writes:

> On Tue, Oct 18, 2016 at 11:07:22AM -0500, attila wrote:
>> 
>> attila <att...@stalphonsos.com> writes:
>> 
>> > attila <att...@stalphonsos.com> writes:
>> >
>> >> Hi ports@,
>> >>
>> > Feedback, comments, most welcome.
>> >
>> > Pax, -A
>> 
>> Ping.  Ports attached for convenience.
>
> Fwiw, i've built the git tip of https://github.com/torbsd/openbsd-ports
> on current, and they build fine.

I just pushed a couple of times to address your concerns; updated
tarball attached for convenience.

> Portswise, im pretty sure all the xpi ports don't need USE_GMAKE, but
> that's a cosmetic detail.

It turns out only the tor-launcher port needs it; it comes with a
Makefile that uses GNUisms.  None of the other extensions need it so I
moved it from Makefile.inc -> tor-launcher/Makefile.

> FETCH_CMD in noscript/Makefile is a no-go, but that's already been said.

Fixed.

> I want to stress the fact that *if* those ports hit the tree, they wont
> get any special treatment - you'll have to make sure they're kept
> up-to-date in -current *and* in -stable (ie find someone to commit your
> diffs, eventually provide packages yourself until 'blessed' stable
> packages are a thing), since i suppose your end-users are especially
> crazy about running software without known vulns.

I am committed to keeping them up to date and will happily do so for
-stable as well.

> I've read https://torbsd.github.io/blog.html#torblog0, and honestly, i
> think there's way too much fuss being done about this. From my personal
> POV (as an openbsd developer, and a mozilla developer), i don't really
> like the way TBB is developed (as stated before), but i've seen the
> relationship with upstream has improved, so i'd welcome your ports in
> the tree, especially because you've spent a lot of time on this, and i
> wouldnt want this work to be lost/stay unrecognized.

Agree in hindsight re that post on the blog.  Restraint would've been
better.

> Back to reading the ports now, but i would need other developers to
> comment on them :)

I appreciate all your effort in reviewing this and pushing me to do
things better, along with everyone else here who reviewed.

As a result of semarie's critique from last time my rework of the
whole ~/TorBrowser-Data thing is on its way upstream:
https://trac.torproject.org/projects/tor/ticket/20497

> Landry

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF


tbb605-bbbis.tgz
Description: updated tor browser ports for openbsd

Re: [NEW] www/tbb improved, updated

2016-10-18 Thread attila 

attila <att...@stalphonsos.com> writes:

> attila <att...@stalphonsos.com> writes:
>
>> Hi ports@,
>>
>> Here is a new and improved tarball for the Tor Browser ports.  After
>> semarie@'s comments and the other feedback on my last attempt I came
>> up with another way that might also be acceptable to upstream.
>>
>> The issue is: where does Tor browser store its state?  The answers for
>> other platforms don't apply to our situation.  Under OSX and Windows
>> there is already a canonical place where per-user data goes, and in
>> fact the new --enable-tor-browser-data-outside-app-dir configure
>> option impacts this on both.  Under Linux the bundle takes care of
>> this by storing all the software and state under a single directory
>> tree under your home directory.
>>
>> In our case we have packaged the software to be installed under
>> /usr/local but can't store any state there.  Instead of #ifdef __OpenBSD__
>> I added an --enable-tor-browser-data-in-home-dir configure option;
>> this option implies --enable-tor-browser-data-outside-app-dir since it
>> is effectively a special case of it.
>>
>> With this, user state is stored in ~/TorBrowser-Data, which is the
>> directory name used by --enable-tor-browser-data-ouside-app-dir.  The
>> only difference is that we store it under the home directory instead
>> of a platform-specific path (~/Library/mumble... under OSX, dunno
>> under Windows).
>>
>> I think I've also addressed all the outstanding concerns raised on
>> other threads: the torbutton port no longer patches out the version
>> check, the log verbosity and output method are default again in both
>> torbutton and tor-launcher.  I'm still using the geoip data files
>> installed with net/tor but if anyone objects I can package geoip{,6}
>> with tor-launcher instead.
>>
>> The ports have been updated to 6.0.5 (released 16 Sept), which deals
>> with the recently disclosed issue with certificate pinning.
>>
>> We have built and tested these ports under amd64 and i386 on the early
>> 22 Sept snap.
>
> Thanks to Mattieu Baptiste for pointing out that the sqlite3 -> ports
> changes broke the tor-browser port build.  It turns out we should be
> using the bundled sqlite3 anyway, and mozilla.port.mk has an option to
> do this.  Attached are updated ports that reflect this and build on
> the (earliest) 3 Oct snap.  Tested on amd64.
>
> Feedback, comments, most welcome.
>
> Pax, -A

Ping.  Ports attached for convenience.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF


tbb605-bbis.tgz
Description: tor browser bundle ports

Re: [NEW] www/tbb improved, updated

2016-10-10 Thread attila 

attila <att...@stalphonsos.com> writes:

> attila <att...@stalphonsos.com> writes:
>
>> Hi ports@,
>>
>> Here is a new and improved tarball for the Tor Browser ports.  After
>> semarie@'s comments and the other feedback on my last attempt I came
>> up with another way that might also be acceptable to upstream.
>>
>> The issue is: where does Tor browser store its state?  The answers for
>> other platforms don't apply to our situation.  Under OSX and Windows
>> there is already a canonical place where per-user data goes, and in
>> fact the new --enable-tor-browser-data-outside-app-dir configure
>> option impacts this on both.  Under Linux the bundle takes care of
>> this by storing all the software and state under a single directory
>> tree under your home directory.
>>
>> In our case we have packaged the software to be installed under
>> /usr/local but can't store any state there.  Instead of #ifdef __OpenBSD__
>> I added an --enable-tor-browser-data-in-home-dir configure option;
>> this option implies --enable-tor-browser-data-outside-app-dir since it
>> is effectively a special case of it.
>>
>> With this, user state is stored in ~/TorBrowser-Data, which is the
>> directory name used by --enable-tor-browser-data-ouside-app-dir.  The
>> only difference is that we store it under the home directory instead
>> of a platform-specific path (~/Library/mumble... under OSX, dunno
>> under Windows).
>>
>> I think I've also addressed all the outstanding concerns raised on
>> other threads: the torbutton port no longer patches out the version
>> check, the log verbosity and output method are default again in both
>> torbutton and tor-launcher.  I'm still using the geoip data files
>> installed with net/tor but if anyone objects I can package geoip{,6}
>> with tor-launcher instead.
>>
>> The ports have been updated to 6.0.5 (released 16 Sept), which deals
>> with the recently disclosed issue with certificate pinning.
>>
>> We have built and tested these ports under amd64 and i386 on the early
>> 22 Sept snap.
>
> Thanks to Mattieu Baptiste for pointing out that the sqlite3 -> ports
> changes broke the tor-browser port build.  It turns out we should be
> using the bundled sqlite3 anyway, and mozilla.port.mk has an option to
> do this.  Attached are updated ports that reflect this and build on
> the (earliest) 3 Oct snap.  Tested on amd64.
>
> Feedback, comments, most welcome.
>
> Pax, -A

Ping + tiny change: attached revision removes unnecessary/wrong
configure --with-user-appdir config option.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF


tbb605-bbis.tgz
Description: tor browser bundle 6.0.5 for openbsd

Re: [NEW] www/tbb improved, updated

2016-10-03 Thread attila 

attila <att...@stalphonsos.com> writes:

> Hi ports@,
>
> Here is a new and improved tarball for the Tor Browser ports.  After
> semarie@'s comments and the other feedback on my last attempt I came
> up with another way that might also be acceptable to upstream.
>
> The issue is: where does Tor browser store its state?  The answers for
> other platforms don't apply to our situation.  Under OSX and Windows
> there is already a canonical place where per-user data goes, and in
> fact the new --enable-tor-browser-data-outside-app-dir configure
> option impacts this on both.  Under Linux the bundle takes care of
> this by storing all the software and state under a single directory
> tree under your home directory.
>
> In our case we have packaged the software to be installed under
> /usr/local but can't store any state there.  Instead of #ifdef __OpenBSD__
> I added an --enable-tor-browser-data-in-home-dir configure option;
> this option implies --enable-tor-browser-data-outside-app-dir since it
> is effectively a special case of it.
>
> With this, user state is stored in ~/TorBrowser-Data, which is the
> directory name used by --enable-tor-browser-data-ouside-app-dir.  The
> only difference is that we store it under the home directory instead
> of a platform-specific path (~/Library/mumble... under OSX, dunno
> under Windows).
>
> I think I've also addressed all the outstanding concerns raised on
> other threads: the torbutton port no longer patches out the version
> check, the log verbosity and output method are default again in both
> torbutton and tor-launcher.  I'm still using the geoip data files
> installed with net/tor but if anyone objects I can package geoip{,6}
> with tor-launcher instead.
>
> The ports have been updated to 6.0.5 (released 16 Sept), which deals
> with the recently disclosed issue with certificate pinning.
>
> We have built and tested these ports under amd64 and i386 on the early
> 22 Sept snap.

Thanks to Mattieu Baptiste for pointing out that the sqlite3 -> ports
changes broke the tor-browser port build.  It turns out we should be
using the bundled sqlite3 anyway, and mozilla.port.mk has an option to
do this.  Attached are updated ports that reflect this and build on
the (earliest) 3 Oct snap.  Tested on amd64.

Feedback, comments, most welcome.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF


tbb605-bis.tgz
Description: tor browser 6.0.5

Re: [update] textproc/multimarkdown

2016-10-01 Thread attila 

attila <att...@stalphonsos.com> writes:

> attila <att...@stalphonsos.com> writes:
>
>> attila <att...@stalphonsos.com> writes:
>>
>>> Michael McConville <mm...@mykolab.com> writes:
>>>
>>>> attila wrote:
>>>>> Ping.
>>>>> 
>>>>> Just tested that the diff works against recentish i386 snap (22 May).
>>>>> Patch attached.
>>>>
>>>> I can't comment on all of the changes, but this builds and runs fine for
>>>> me.
>>>>
>>>
>>> Attached is an update that brings us from 4.7.1 to 5.4.0, released 8
>>> Aug.  It shuffles the patches around because the source tree was
>>> rearranged and adds support for tests.  Sadly, the tests don't all
>>> pass.  I think I need a t-dep for something LaTeXish but I'm not sure
>>> what is best, nor am I sure if that's the only reason for the
>>> failures.  If anyone has a spare cycle or two to look at it I'd
>>> appreciate it.  If not I'll get back to it by the end of the week.
>>>
>>> Pax, -A
>>
>> I finally got back to this.  It turns out there wasn't much standing
>> in the way of the tests working other than me.  Attached is a patch
>> that brings textproc/multimarkdown up to the latest release (5.4.0
>> released 5 Aug).  Notable changes:
>>
>> * Switched to CMake;
>> * Ditched the patches I tried and failed to upstream (strcat/sprintf);
>> * Reworked two remaining patches (HAVE_SRAND_DETERMINISTIC) in the hope
>>   I might get them upstream;
>> * Added pledge;
>> * make test now passes all tests.
>>
>> Tested on amd64.
>>
>> Comments, feedback most welcome.
>>
>> Pax, -A
>
> Ping.

I reinstated the strcat/sprintf-related patches but done slightly
better.  Tests pass on amd64.  Updated patch attached.

Feedback, comments most welcome.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
Index: Makefile
===
RCS file: /cvs/ports/textproc/multimarkdown/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	5 Apr 2015 13:31:15 -	1.2
+++ Makefile	1 Oct 2016 18:11:36 -
@@ -1,34 +1,45 @@
 # $OpenBSD: Makefile,v 1.2 2015/04/05 13:31:15 sthen Exp $
 
-V =		4.7.1
+V =		5.4.0
 COMMENT =	marked-up plain text to formatted document converter
 DISTNAME =	${GH_PROJECT}-${V}
-PKGNAME =	multimarkdown-${V}
+PKGNAME =	multimarkdown-${V:C/-/./}
 CATEGORIES =	textproc
 
 GH_ACCOUNT =	fletcher
-GH_PROJECT =	MultiMarkdown-4
+GH_PROJECT =	MultiMarkdown-5
 GH_TAGNAME =	${V}
 
+TESTS_COMMIT =	8d5ad66e3bbaeb0de8646783bfe964261ddb39c7
+DIST_SUBDIR =	multimarkdown
+MASTER_SITES_GITHUB =	https://github.com/fletcher/MMD-Test-Suite/archive/
+DISTFILES =	${DISTNAME}${EXTRACT_SUFX} ${TESTS_COMMIT}${EXTRACT_SUFX}
 HOMEPAGE =	http://fletcherpenney.net/multimarkdown/
 MAINTAINER =	Sean Levy <att...@stalphonsos.com>
 
 # Dual licensed: MIT and GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c
+# uses pledge()
+WANTLIB += 	c
 
 BUILD_DEPENDS =	devel/greg
 
-USE_GMAKE =	Yes
-ALL_TARGET =	ALL
-MAKE_FLAGS =	CFLAGS="${CFLAGS} -include GLibFacade.h -DHAVE_ARC4RANDOM" \
-		GREG=${LOCALBASE}/bin/greg
+MODULES =	devel/cmake
 
-# Test files aren't included in distfile.
-NO_TEST =	Yes
+CFLAGS +=	-DHAVE_SRAND_DETERMINISTIC
+
+CONFIGURE_ARGS += -DGREG=${LOCALBASE}/bin/greg
+
+post-extract:
+	rm -rf ${WRKSRC}/submodules/MarkdownTest
+	cp -r ${WRKDIR}/MMD-Test-Suite-${TESTS_COMMIT} \
+		${WRKSRC}/submodules/MarkdownTest
+
+pre-configure:
+	touch ${WRKBUILD}/README.html
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKBUILD}/multimarkdown ${PREFIX}/bin/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/multimarkdown/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	24 Mar 2015 19:16:13 -	1.1.1.1
+++ distinfo	1 Oct 2016 18:11:36 -
@@ -1,2 +1,4 @@
-SHA256 (MultiMarkdown-4-4.7.1.tar.gz) = gy5dzm+hv/TWfmSsLMJPCSCujZEoDlPqh5I3odQ/SGU=
-SIZE (MultiMarkdown-4-4.7.1.tar.gz) = 120896
+SHA256 (multimarkdown/8d5ad66e3bbaeb0de8646783bfe964261ddb39c7.tar.gz) = xGdoX+aZ/y+8ND+LXK24XSgNCccYJV9S6qAW2NI/DKw=
+SHA256 (multimarkdown/MultiMarkdown-5-5.4.0.tar.gz) = HMA4X/1sghwmXpcPgcxOwAnH7Lv7EuDhFce7WzPQmoM=
+SIZE (multimarkdown/8d5ad66e3bbaeb0de8646783bfe964261ddb39c7.tar.gz) = 185408
+SIZE (multimarkdown/MultiMarkdown-5-5.4.0.tar.gz) = 136693
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null	1 Jan 1970 00:00:00 -0

[NEW] www/tbb improved, updated

2016-09-22 Thread attila 
Hi ports@,

Here is a new and improved tarball for the Tor Browser ports.  After
semarie@'s comments and the other feedback on my last attempt I came
up with another way that might also be acceptable to upstream.

The issue is: where does Tor browser store its state?  The answers for
other platforms don't apply to our situation.  Under OSX and Windows
there is already a canonical place where per-user data goes, and in
fact the new --enable-tor-browser-data-outside-app-dir configure
option impacts this on both.  Under Linux the bundle takes care of
this by storing all the software and state under a single directory
tree under your home directory.

In our case we have packaged the software to be installed under
/usr/local but can't store any state there.  Instead of #ifdef __OpenBSD__
I added an --enable-tor-browser-data-in-home-dir configure option;
this option implies --enable-tor-browser-data-outside-app-dir since it
is effectively a special case of it.

With this, user state is stored in ~/TorBrowser-Data, which is the
directory name used by --enable-tor-browser-data-ouside-app-dir.  The
only difference is that we store it under the home directory instead
of a platform-specific path (~/Library/mumble... under OSX, dunno
under Windows).

I think I've also addressed all the outstanding concerns raised on
other threads: the torbutton port no longer patches out the version
check, the log verbosity and output method are default again in both
torbutton and tor-launcher.  I'm still using the geoip data files
installed with net/tor but if anyone objects I can package geoip{,6}
with tor-launcher instead.

The ports have been updated to 6.0.5 (released 16 Sept), which deals
with the recently disclosed issue with certificate pinning.

We have built and tested these ports under amd64 and i386 on the early
22 Sept snap.

Feedback, comments, most welcome.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF


tbb605.tgz
Description: www/tbb and meta/tbb

Re: [update] textproc/multimarkdown

2016-09-22 Thread attila 

attila <att...@stalphonsos.com> writes:

> attila <att...@stalphonsos.com> writes:
>
>> Michael McConville <mm...@mykolab.com> writes:
>>
>>> attila wrote:
>>>> Ping.
>>>> 
>>>> Just tested that the diff works against recentish i386 snap (22 May).
>>>> Patch attached.
>>>
>>> I can't comment on all of the changes, but this builds and runs fine for
>>> me.
>>>
>>
>> Attached is an update that brings us from 4.7.1 to 5.4.0, released 8
>> Aug.  It shuffles the patches around because the source tree was
>> rearranged and adds support for tests.  Sadly, the tests don't all
>> pass.  I think I need a t-dep for something LaTeXish but I'm not sure
>> what is best, nor am I sure if that's the only reason for the
>> failures.  If anyone has a spare cycle or two to look at it I'd
>> appreciate it.  If not I'll get back to it by the end of the week.
>>
>> Pax, -A
>
> I finally got back to this.  It turns out there wasn't much standing
> in the way of the tests working other than me.  Attached is a patch
> that brings textproc/multimarkdown up to the latest release (5.4.0
> released 5 Aug).  Notable changes:
>
> * Switched to CMake;
> * Ditched the patches I tried and failed to upstream (strcat/sprintf);
> * Reworked two remaining patches (HAVE_SRAND_DETERMINISTIC) in the hope
>   I might get them upstream;
> * Added pledge;
> * make test now passes all tests.
>
> Tested on amd64.
>
> Comments, feedback most welcome.
>
> Pax, -A

Ping.
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF

Re: [update] textproc/multimarkdown

2016-09-15 Thread attila 

attila <att...@stalphonsos.com> writes:

> Michael McConville <mm...@mykolab.com> writes:
>
>> attila wrote:
>>> Ping.
>>> 
>>> Just tested that the diff works against recentish i386 snap (22 May).
>>> Patch attached.
>>
>> I can't comment on all of the changes, but this builds and runs fine for
>> me.
>>
>
> Attached is an update that brings us from 4.7.1 to 5.4.0, released 8
> Aug.  It shuffles the patches around because the source tree was
> rearranged and adds support for tests.  Sadly, the tests don't all
> pass.  I think I need a t-dep for something LaTeXish but I'm not sure
> what is best, nor am I sure if that's the only reason for the
> failures.  If anyone has a spare cycle or two to look at it I'd
> appreciate it.  If not I'll get back to it by the end of the week.
>
> Pax, -A

I finally got back to this.  It turns out there wasn't much standing
in the way of the tests working other than me.  Attached is a patch
that brings textproc/multimarkdown up to the latest release (5.4.0
released 5 Aug).  Notable changes:

* Switched to CMake;
* Ditched the patches I tried and failed to upstream (strcat/sprintf);
* Reworked two remaining patches (HAVE_SRAND_DETERMINISTIC) in the hope
  I might get them upstream;
* Added pledge;
* make test now passes all tests.

Tested on amd64.

Comments, feedback most welcome.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
Index: Makefile
===
RCS file: /cvs/ports/textproc/multimarkdown/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	5 Apr 2015 13:31:15 -	1.2
+++ Makefile	15 Sep 2016 21:41:05 -
@@ -1,34 +1,45 @@
 # $OpenBSD: Makefile,v 1.2 2015/04/05 13:31:15 sthen Exp $
 
-V =		4.7.1
+V =		5.4.0
 COMMENT =	marked-up plain text to formatted document converter
 DISTNAME =	${GH_PROJECT}-${V}
-PKGNAME =	multimarkdown-${V}
+PKGNAME =	multimarkdown-${V:C/-/./}
 CATEGORIES =	textproc
 
 GH_ACCOUNT =	fletcher
-GH_PROJECT =	MultiMarkdown-4
+GH_PROJECT =	MultiMarkdown-5
 GH_TAGNAME =	${V}
 
+TESTS_COMMIT =	8d5ad66e3bbaeb0de8646783bfe964261ddb39c7
+DIST_SUBDIR =	multimarkdown
+MASTER_SITES_GITHUB =	https://github.com/fletcher/MMD-Test-Suite/archive/
+DISTFILES =	${DISTNAME}${EXTRACT_SUFX} ${TESTS_COMMIT}${EXTRACT_SUFX}
 HOMEPAGE =	http://fletcherpenney.net/multimarkdown/
 MAINTAINER =	Sean Levy <att...@stalphonsos.com>
 
 # Dual licensed: MIT and GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c
+# uses pledge()
+WANTLIB += 	c
 
 BUILD_DEPENDS =	devel/greg
 
-USE_GMAKE =	Yes
-ALL_TARGET =	ALL
-MAKE_FLAGS =	CFLAGS="${CFLAGS} -include GLibFacade.h -DHAVE_ARC4RANDOM" \
-		GREG=${LOCALBASE}/bin/greg
+MODULES =	devel/cmake
 
-# Test files aren't included in distfile.
-NO_TEST =	Yes
+CFLAGS +=	-DHAVE_SRAND_DETERMINISTIC
+
+CONFIGURE_ARGS += -DGREG=${LOCALBASE}/bin/greg
+
+post-extract:
+	rm -rf ${WRKSRC}/submodules/MarkdownTest
+	cp -r ${WRKDIR}/MMD-Test-Suite-${TESTS_COMMIT} \
+		${WRKSRC}/submodules/MarkdownTest
+
+pre-configure:
+	touch ${WRKBUILD}/README.html
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKBUILD}/multimarkdown ${PREFIX}/bin/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/multimarkdown/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	24 Mar 2015 19:16:13 -	1.1.1.1
+++ distinfo	15 Sep 2016 21:41:05 -
@@ -1,2 +1,4 @@
-SHA256 (MultiMarkdown-4-4.7.1.tar.gz) = gy5dzm+hv/TWfmSsLMJPCSCujZEoDlPqh5I3odQ/SGU=
-SIZE (MultiMarkdown-4-4.7.1.tar.gz) = 120896
+SHA256 (multimarkdown/8d5ad66e3bbaeb0de8646783bfe964261ddb39c7.tar.gz) = xGdoX+aZ/y+8ND+LXK24XSgNCccYJV9S6qAW2NI/DKw=
+SHA256 (multimarkdown/MultiMarkdown-5-5.4.0.tar.gz) = HMA4X/1sghwmXpcPgcxOwAnH7Lv7EuDhFce7WzPQmoM=
+SIZE (multimarkdown/8d5ad66e3bbaeb0de8646783bfe964261ddb39c7.tar.gz) = 185408
+SIZE (multimarkdown/MultiMarkdown-5-5.4.0.tar.gz) = 136693
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt	15 Sep 2016 21:41:05 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Use installed greg
+--- CMakeLists.txt.orig	Mon Feb 22 20:05:02 2016
 CMakeLists.txt	Tue Mar 22 12:45:41 2016
+@@ -149,7 +149,7 @@ endif ()
+ # Need to build parser.c via greg
+ add_custom_command (
+ 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/parser.c
+-	COMMAND ${PROJECT_SOURCE_DIR}/submodules/greg/greg -o ${CMAKE_CURRENT_BINARY_DIR}/parser.c ${PROJECT_SOURCE_DIR}/src/parser.leg
++	COMMAND ${GREG} -o ${CMAKE_CURRENT_BINARY_DIR}/parser.c ${PROJECT_SOURCE_DIR}/src/parser.leg
+ )
+ 
+ # src_files are the primary files, and will be included i

Re: [update] textproc/multimarkdown

2016-08-09 Thread attila 

Michael McConville <mm...@mykolab.com> writes:

> attila wrote:
>> Ping.
>> 
>> Just tested that the diff works against recentish i386 snap (22 May).
>> Patch attached.
>
> I can't comment on all of the changes, but this builds and runs fine for
> me.
>

Attached is an update that brings us from 4.7.1 to 5.4.0, released 8
Aug.  It shuffles the patches around because the source tree was
rearranged and adds support for tests.  Sadly, the tests don't all
pass.  I think I need a t-dep for something LaTeXish but I'm not sure
what is best, nor am I sure if that's the only reason for the
failures.  If anyone has a spare cycle or two to look at it I'd
appreciate it.  If not I'll get back to it by the end of the week.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
Index: Makefile
===
RCS file: /cvs/ports/textproc/multimarkdown/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	5 Apr 2015 13:31:15 -	1.2
+++ Makefile	9 Aug 2016 19:50:42 -
@@ -1,15 +1,19 @@
 # $OpenBSD: Makefile,v 1.2 2015/04/05 13:31:15 sthen Exp $
 
-V =		4.7.1
+V =		5.4.0
 COMMENT =	marked-up plain text to formatted document converter
 DISTNAME =	${GH_PROJECT}-${V}
-PKGNAME =	multimarkdown-${V}
+PKGNAME =	multimarkdown-${V:C/-/./}
 CATEGORIES =	textproc
 
 GH_ACCOUNT =	fletcher
-GH_PROJECT =	MultiMarkdown-4
+GH_PROJECT =	MultiMarkdown-5
 GH_TAGNAME =	${V}
 
+TESTS_COMMIT =	8d5ad66e3bbaeb0de8646783bfe964261ddb39c7
+DIST_SUBDIR =	multimarkdown
+MASTER_SITES_GITHUB =	https://github.com/fletcher/MMD-Test-Suite/archive/
+DISTFILES =	${DISTNAME}${EXTRACT_SUFX} ${TESTS_COMMIT}${EXTRACT_SUFX}
 HOMEPAGE =	http://fletcherpenney.net/multimarkdown/
 MAINTAINER =	Sean Levy <att...@stalphonsos.com>
 
@@ -20,15 +24,24 @@ WANTLIB += c
 
 BUILD_DEPENDS =	devel/greg
 
-USE_GMAKE =	Yes
-ALL_TARGET =	ALL
-MAKE_FLAGS =	CFLAGS="${CFLAGS} -include GLibFacade.h -DHAVE_ARC4RANDOM" \
-		GREG=${LOCALBASE}/bin/greg
+MODULES =	devel/cmake
 
-# Test files aren't included in distfile.
-NO_TEST =	Yes
+CFLAGS +=	-DHAVE_SRAND_DETERMINISTIC
+
+CONFIGURE_ARGS += -DGREG=${LOCALBASE}/bin/greg
+
+# Not all tests pass now but make test does something
+#NO_TEST =	No
+
+post-extract:
+	rm -rf ${WRKSRC}/submodules/MarkdownTest
+	tar -C ${WRKSRC}/submodules -zxf ${FULLDISTDIR}/${TESTS_COMMIT}${EXTRACT_SUFX}
+	mv ${WRKSRC}/submodules/MMD-Test-Suite-${TESTS_COMMIT} ${WRKSRC}/submodules/MarkdownTest
+
+pre-configure:
+	touch ${WRKBUILD}/README.html
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKBUILD}/multimarkdown ${PREFIX}/bin/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/multimarkdown/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	24 Mar 2015 19:16:13 -	1.1.1.1
+++ distinfo	9 Aug 2016 19:50:42 -
@@ -1,2 +1,4 @@
-SHA256 (MultiMarkdown-4-4.7.1.tar.gz) = gy5dzm+hv/TWfmSsLMJPCSCujZEoDlPqh5I3odQ/SGU=
-SIZE (MultiMarkdown-4-4.7.1.tar.gz) = 120896
+SHA256 (multimarkdown/8d5ad66e3bbaeb0de8646783bfe964261ddb39c7.tar.gz) = xGdoX+aZ/y+8ND+LXK24XSgNCccYJV9S6qAW2NI/DKw=
+SHA256 (multimarkdown/MultiMarkdown-5-5.4.0.tar.gz) = HMA4X/1sghwmXpcPgcxOwAnH7Lv7EuDhFce7WzPQmoM=
+SIZE (multimarkdown/8d5ad66e3bbaeb0de8646783bfe964261ddb39c7.tar.gz) = 185408
+SIZE (multimarkdown/MultiMarkdown-5-5.4.0.tar.gz) = 136693
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt	9 Aug 2016 19:50:42 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Use installed greg
+--- CMakeLists.txt.orig	Mon Feb 22 20:05:02 2016
 CMakeLists.txt	Tue Mar 22 12:45:41 2016
+@@ -149,7 +149,7 @@ endif ()
+ # Need to build parser.c via greg
+ add_custom_command (
+ 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/parser.c
+-	COMMAND ${PROJECT_SOURCE_DIR}/submodules/greg/greg -o ${CMAKE_CURRENT_BINARY_DIR}/parser.c ${PROJECT_SOURCE_DIR}/src/parser.leg
++	COMMAND ${GREG} -o ${CMAKE_CURRENT_BINARY_DIR}/parser.c ${PROJECT_SOURCE_DIR}/src/parser.leg
+ )
+ 
+ # src_files are the primary files, and will be included in doxygen documentation
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile	24 Mar 2015 19:16:13 -	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,37 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2015/03/24 19:16:13 okan Exp $
-
-Make it possible to pass GREG=/usr/local/bin/greg in on the
-command line and avoid git submodules.
-
 Makefile.orig	Mon Mar 23 18:21:56 2015
-+++ Makefile	Mon Mar 23 18:32:22 2015
-@@ -32,18 +32,25 @@ ifeq ($(MAKECMDGOALS),static)
- L

Re: [NEW] www/tbb - Tor Browser Bundle 6.0.2

2016-06-27 Thread attila 

David Coppa <dco...@gmail.com> writes:

> On Mon, 27 Jun 2016, Landry Breuil wrote:
>
>> On Mon, Jun 27, 2016 at 09:28:06AM +0200, David Coppa wrote:
>> > On Mon, Jun 27, 2016 at 7:17 AM, Landry Breuil <lan...@rhaalovely.net> 
>> > wrote:
>> > > On Thu, Jun 23, 2016 at 05:24:58PM -0500, attila wrote:
>> > >> Hi ports@,
>> > >>
>> > >> Here is another try at the Tor Browser Bundle, updated to 6.0.2 just
>> > >> today.  I believe I have addressed all previous concerns:
>> > >>
>> > >> * Our extensions now live in /usr/local/lib/... and run directly from
>> > >>   there, they are not unpacked under the user's profile (enabledScopes
>> > >>   solved this);
>> > >> * addon PLIST files redone to just have the .xpi file;
>> > >> * No more hardcoded /usr/local paths
>> > >> * Only addons we actually have to patch are packaged by us; otherwise
>> > >>   we just wrap around the distributed .xpi (noscript, https-everywhere)
>> > >
>> > > Great stuff, thanks for spending the time to do all this right !
>> > >
>> > > Why are you overriding FETCH_CMD in noscript subdir ? That looks
>> > > wrong...
>> > 
>> > That's because it fails without "-S dont":
>> > 
>> > >> Fetch 
>> > >> https://secure.informaction.com/download/releases/noscript-2.9.0.11.xpi
>> > ftp: SSL read error: handshake failed: error:14090086:SSL
>> > routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
>> > 
>> > Probably it should be mirrored on a decent web server...
>> 
>> How... ironic. I think it'd actually be better to fetch it from
>> addons.mozilla.org, to stress that's the unmodified/official version.
>
> Indeed. This works w/o problems:
>
> --- www/tbb/noscript/Makefile.old Thu Jun 23 19:56:02 2016
> +++ www/tbb/noscript/Makefile Mon Jun 27 11:20:03 2016
> @@ -4,8 +4,7 @@
>  V =  2.9.0.11
>  COMMENT =flexible JS blocker for firefox (Tor browser variant)
>  HOMEPAGE =   http://noscript.net
> -MASTER_SITES =   
> https://secure.informaction.com/download/releases/
> -FETCH_CMD ?= /usr/bin/ftp -V ${_PROGRESS} -k 
> ${FTP_KEEPALIVE} -C -S dont
> +MASTER_SITES =   
> https://addons.mozilla.org/firefox/downloads/file/421899/
>  GUID =   {73a6fe31-595d-460b-a920-fcc0f8843232}
>  DISTFILE_IS_XPI =Yes
>  

Wow, by the time I refreshed my mail you guys had already figured out
why I did that ugly thing and fixed it.  Thanks!  Will be fixed in
next post, as soon as I address some of smarie@'s concerns.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF

Re: [NEW] www/tbb - Tor Browser Bundle 6.0.2

2016-06-27 Thread attila 

Sebastien Marie <sema...@openbsd.org> writes:

> On Thu, Jun 23, 2016 at 05:24:58PM -0500, attila wrote:
>> Hi ports@,
>> 
>> Here is another try at the Tor Browser Bundle, updated to 6.0.2 just
>> today.
>> 
> [...]
>> 
>> All feedback most welcome.
>> 
>
> Hi,
>
> I would like to ask some questions.

This makes me very happy :-).

>
> - www/tbb/tor-browser/files/tor-browser.cfg file
>
>   where does the configuration comes from you ? is it settings from you
>   or from TBB ?
>
>   I ask due to default bridges configuration (addresses, fingerprints
>   and certs), and to default plugins configuration. These configuration
>   settings are very sensible.
>

This mostly comes directly from Tor Browser.  Our tor-browser.cfg is
actually two things:

(1) the contents of extension-overrides.js from the TBB, lightly
edited to pass muster as a cfg file... for some reason they use
#comments in extension-overrides.js.  I don't know why this is
valid syntax in that context but it isn't in a cfg file, which
is pure JS;
(2) The bit at the end is my addition, whose purpose is to initialize
your ~/.tor-browser/torrc to an empty config if it doesn't exist.
This has to happen before the tor-launcher addon tries to start
tor or else we have problems.  In the past I tried to solve this
issue by adding a sh script called start-tor-browser that took
care of these things but landry@ pointed out that I should not
need to do this if I'm using moz correctly.

All of the settings that come along with (1) are verbatim what the Tor
project says.  They change between releases quite often.  I track that
file manually right now, I would like to make this more automated.

The second point needs some explanation.  We need ~/.tor-browser/torrc
to exist before tor browser starts for the first time, or else it will
never get created and tor browser won't work correctly.  Worse, it
will *appear* to work correctly the first time.  This is more an issue
in tor itself.  If you say

  $ tor -f /some/nonexistent/file --ignore-missing-torrc \
--defaults-torrc /file/that/exists ...

tor will start, using the config in /file/that/exists, and not
complain about /some/nonexistent/file, but it will also forget that
you said -f /some/nonexstent/file.  This is a problem because Tor
browser starts and controls its own instance of the tor daemon via the
control port.  One of the first things it does once it gets going is
send tor a SAVECONF command, which means: save the non-default
settings in your running config as a torrc file.  The question is:
where will it try to write them?  If -f specified a non-exstent file
that pathname gets forgotten, so under OpenBSD it ends up trying to
write onto /etc/tor/torrc.  In the best case this fails due to perms,
and the user can't really change their config via the normal means
(e.g. add bridge lines to the config when TB starts up using their
dialog, which I generally do in Mexico).  In the worst case, the user
is in the same group as the /etc/tor/torrc file and it is
group-writable (happened to me once due to stupidity which I will not
repeat), and, well...

Okay, I guess the worse case is that the user runs tor-browser as
root, which, sadly, will "work" without incident... except that your
system-wide tor config gets stomped on silently.  Somehow I have a
feeling most OpenBSD users know not to run stuff as root...

It has been on my list for a while to investigate whether this is
considered a bug by the tor people or not (-f forgets a non-existent
path).  I just haven't gotten to it, since I had a patch that dealt
with the issue regardless... death by a thousand patches.

>
> - www/tbb/tor-browser/patches/patch-toolkit_xre_nsAppRunner_cpp file
>   "Revert the file back to ESR45.1.1, all diffs were TB-specific and not 
> relevant to OpenBSD".
>
>   Can you explain why ? The diff is quite large, and reverts elements
>   like:
> - In Tor Browser, remoting is disabled by default unless -osint is
>   used (so --no-remote isn't the default anymore with TBB).

This was an oversight on my part.  I shouldn't have reverted that
part.

> - Set the application-wide C-locale. Needed to resist fingerprinting
>   of Date.toLocaleFormat().

This is another oversight.  As you point out the patch is too big and
these are good examples of why that's a bad idea, since I missed some
things I should've caught.

In the switch to ESR45 the Tor people changed their hacks to the stuff
in toolkit/xre, probably in part because moz itself changed there
between ESR38 and ESR45.  They had hacks strewn through several files
before that were effectively the core of "the bundle": stuff that
hard-coded paths relative to the location of the tor-browser binary
that didn't work how the normal moz code worked when it comes to

[NEW] www/tbb - Tor Browser Bundle 6.0.2

2016-06-23 Thread attila 
Hi ports@,

Here is another try at the Tor Browser Bundle, updated to 6.0.2 just
today.  I believe I have addressed all previous concerns:

* Our extensions now live in /usr/local/lib/... and run directly from
  there, they are not unpacked under the user's profile (enabledScopes
  solved this);
* addon PLIST files redone to just have the .xpi file;
* No more hardcoded /usr/local paths
* Only addons we actually have to patch are packaged by us; otherwise
  we just wrap around the distributed .xpi (noscript, https-everywhere)

Tested w/22 June snapshot on amd64.  We have some packages for
testing: http://mirrors.nycbug.org/snapshots/packages/amd64/README

All feedback most welcome.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF


tbb-602.tgz
Description: proposed new ports: tor browser bundle

Re: devel/gdb and shared libs with no .text

2016-06-23 Thread attila 

Caspar Schutijser <cas...@schutijser.com> writes:

> On Sunday, 12 June 2016 02:44:54 CEST, Jeremie Courreges-Anglas wrote:
>> I bumped into this problem using gdb:
>>
>> (gdb) r
>> Starting program: /usr/obj/pobj/surf-0.7/surf-0.7/surf www.google.fr
>> symfile.c:973: internal-error: sect_index_text not initialized
>> A problem internal to GDB has been detected,
>> further debugging may prove unreliable.
>> Quit this debugging session? (y or n) n
>>
>> The issue is that gdb assumes that it can find an entry point in
>> a shared library, but libicudata.so doesn't have a .text section, only
>> data.
>>
>> There are other SECT_OFF_TEXT assumptions in dwarf2read.c that
>> prevent egdb from being useful on a shared lib built with debug symbols.
>> But the patch below should at least help running egdb against all
>> programs that link against libicudata.so.  Tested against www/surf,
>> www/vimb and sysutils/dwdiff.
>>
>> Comments / ok?
>
> FWIW, I ran into this problem a little while ago and with your patch
> applied, the problem is gone. Thank you!
>

Late to the party as usual, but FWIW I had the same issue debugging
the tor-browser port yesterday and this patch made egdb work for me.

Thanks a lot.

> Best regards,
> Caspar Schutijser

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF

Re: [update] textproc/multimarkdown

2016-05-26 Thread attila 

attila <att...@stalphonsos.com> writes:

> attila <att...@stalphonsos.com> writes:
>
>> attila <att...@stalphonsos.com> writes:
>>
>>> attila <att...@stalphonsos.com> writes:
>>>
>>>> attila <att...@stalphonsos.com> writes:
>>>>
>>>>> Micah Muer <micahm...@gmail.com> writes:
>>>>>
>>>>>> On Tue, 22 Mar 2016 12:58:32 -0600
>>>>>> attila <att...@stalphonsos.com> wrote:
>>>>>>
>>>>>>> Stuart Henderson <s...@spacehopper.org> writes:
>>>>>>> 
>>>>>>> > On 2016/03/19 15:38, Michael McConville wrote:  
>>>>>>> >> > +ALL_TARGET =  deprecated
>>>>>>> >> > +
>>>>>>> >> > +# golf MAKE_FLAGS down to 80chars.. :-|
>>>>>>> >> > +_i =  -include
>>>>>>> >> > +_incs =   ${_i} src/GLibFacade.h ${_i} src/version.h 
>>>>>>> >> > ${_i} src/parser.h
>>>>>>> >> > +MAKE_FLAGS =  CFLAGS="${CFLAGS} ${_incs}"  
>>>>>>> >> 
>>>>>>> >> Why golf? Can't you just use backslashes as necessary? I would get 
>>>>>>> >> rid
>>>>>>> >> of _i and _incs.
>>>>>>> >>   
>>>>>>> >
>>>>>>> > I think this approach is dangerous, better to keep those bits which 
>>>>>>> > are
>>>>>>> > normally part of upstream's Makefile in their Makefile and change the
>>>>>>> > way that you pass in CFLAGS. (e.g. maybe pass in COPTFLAGS instead and
>>>>>>> > change their Makefile to do COPTFLAGS?=-O3 and "CFLAGS?=${COPTFLAGS} 
>>>>>>> > ...
>>>>>>> > -include ...")
>>>>>>> >
>>>>>>> > But then again, we have cmake, why not just use that? It's upstream's
>>>>>>> > preferred build infrastructure, whereas for the make-based one they 
>>>>>>> > say
>>>>>>> > "I don't recommend this approach, but it should work in a pinch"..  
>>>>>>> 
>>>>>>> Agree, this was sleazy and poorly considered.  I'm sorry.  Anytime I
>>>>>>> find myself golfing I should stop.
>>>>>>> 
>>>>>>> Attached is new attempt that uses cmake instead.  Works for me on i386.
>>>>>>> 
>>>>>>> N.B.: I set NO_TEST to Yes now because the tests are buried in a git
>>>>>>> submodule; furthermore, the repo on which the submodule is based has
>>>>>>> no tags and thus no releases, making it impossible for me to reach out
>>>>>>> for it as a distfile (unless I'm missing something).  I'm going to try
>>>>>>> to convince the upstream to start tagging that repo, but if I fail
>>>>>>> then I'll self-host a tarball for tests on the next update.
>>>>>>> 
>>>>>>> Thanks as always for the feedback.
>>>>>>> 
>>>>>>> Pax, -A
>>>>>>> --
>>>>>>> http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
>>>>>>
>>>>>> Atilla's patch works well for me on amd64. I have used it heavily for
>>>>>> several days. However, upstream has a new release, so here's a new
>>>>>> patch 99% based on atilla's.
>>>>>
>>>>> Nice!  Thanks for doing this.  Works for me on i386.
>>>>
>>>> Ping?  Diff attached that includes Micah Muer's updates.
>>>>
>>>> Pax, -A
>>>
>>> Reping?  New patch attached that brings us up to 5.2.0-1, released 16
>>> March.  Nothing new, just updated distinfo and Makefile.  Works for me
>>> under amd64, i386.
>>>
>>> Pax, -A
>>
>> Ping.
>>
>> Pax, -A
>
> Ping.
>
> Pax, -A

Ping.

Just tested that the diff works against recentish i386 snap (22 May).
Patch attached.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
Index: Makefile
===
RCS file: /cvs/ports/textproc/multimarkdown/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	5 Apr 2

Re: [update] textproc/multimarkdown

2016-05-18 Thread attila 

attila <att...@stalphonsos.com> writes:

> attila <att...@stalphonsos.com> writes:
>
>> attila <att...@stalphonsos.com> writes:
>>
>>> attila <att...@stalphonsos.com> writes:
>>>
>>>> Micah Muer <micahm...@gmail.com> writes:
>>>>
>>>>> On Tue, 22 Mar 2016 12:58:32 -0600
>>>>> attila <att...@stalphonsos.com> wrote:
>>>>>
>>>>>> Stuart Henderson <s...@spacehopper.org> writes:
>>>>>> 
>>>>>> > On 2016/03/19 15:38, Michael McConville wrote:  
>>>>>> >> > +ALL_TARGET =   deprecated
>>>>>> >> > +
>>>>>> >> > +# golf MAKE_FLAGS down to 80chars.. :-|
>>>>>> >> > +_i =   -include
>>>>>> >> > +_incs =${_i} src/GLibFacade.h ${_i} src/version.h 
>>>>>> >> > ${_i} src/parser.h
>>>>>> >> > +MAKE_FLAGS =   CFLAGS="${CFLAGS} ${_incs}"  
>>>>>> >> 
>>>>>> >> Why golf? Can't you just use backslashes as necessary? I would get rid
>>>>>> >> of _i and _incs.
>>>>>> >>   
>>>>>> >
>>>>>> > I think this approach is dangerous, better to keep those bits which are
>>>>>> > normally part of upstream's Makefile in their Makefile and change the
>>>>>> > way that you pass in CFLAGS. (e.g. maybe pass in COPTFLAGS instead and
>>>>>> > change their Makefile to do COPTFLAGS?=-O3 and "CFLAGS?=${COPTFLAGS} 
>>>>>> > ...
>>>>>> > -include ...")
>>>>>> >
>>>>>> > But then again, we have cmake, why not just use that? It's upstream's
>>>>>> > preferred build infrastructure, whereas for the make-based one they say
>>>>>> > "I don't recommend this approach, but it should work in a pinch"..  
>>>>>> 
>>>>>> Agree, this was sleazy and poorly considered.  I'm sorry.  Anytime I
>>>>>> find myself golfing I should stop.
>>>>>> 
>>>>>> Attached is new attempt that uses cmake instead.  Works for me on i386.
>>>>>> 
>>>>>> N.B.: I set NO_TEST to Yes now because the tests are buried in a git
>>>>>> submodule; furthermore, the repo on which the submodule is based has
>>>>>> no tags and thus no releases, making it impossible for me to reach out
>>>>>> for it as a distfile (unless I'm missing something).  I'm going to try
>>>>>> to convince the upstream to start tagging that repo, but if I fail
>>>>>> then I'll self-host a tarball for tests on the next update.
>>>>>> 
>>>>>> Thanks as always for the feedback.
>>>>>> 
>>>>>> Pax, -A
>>>>>> --
>>>>>> http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
>>>>>
>>>>> Atilla's patch works well for me on amd64. I have used it heavily for
>>>>> several days. However, upstream has a new release, so here's a new
>>>>> patch 99% based on atilla's.
>>>>
>>>> Nice!  Thanks for doing this.  Works for me on i386.
>>>
>>> Ping?  Diff attached that includes Micah Muer's updates.
>>>
>>> Pax, -A
>>
>> Reping?  New patch attached that brings us up to 5.2.0-1, released 16
>> March.  Nothing new, just updated distinfo and Makefile.  Works for me
>> under amd64, i386.
>>
>> Pax, -A
>
> Ping.
>
> Pax, -A

Ping.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF

Re: [update] textproc/multimarkdown

2016-05-10 Thread attila 

attila <att...@stalphonsos.com> writes:

> attila <att...@stalphonsos.com> writes:
>
>> attila <att...@stalphonsos.com> writes:
>>
>>> Micah Muer <micahm...@gmail.com> writes:
>>>
>>>> On Tue, 22 Mar 2016 12:58:32 -0600
>>>> attila <att...@stalphonsos.com> wrote:
>>>>
>>>>> Stuart Henderson <s...@spacehopper.org> writes:
>>>>> 
>>>>> > On 2016/03/19 15:38, Michael McConville wrote:  
>>>>> >> > +ALL_TARGET =deprecated
>>>>> >> > +
>>>>> >> > +# golf MAKE_FLAGS down to 80chars.. :-|
>>>>> >> > +_i =-include
>>>>> >> > +_incs = ${_i} src/GLibFacade.h ${_i} src/version.h 
>>>>> >> > ${_i} src/parser.h
>>>>> >> > +MAKE_FLAGS =CFLAGS="${CFLAGS} ${_incs}"  
>>>>> >> 
>>>>> >> Why golf? Can't you just use backslashes as necessary? I would get rid
>>>>> >> of _i and _incs.
>>>>> >>   
>>>>> >
>>>>> > I think this approach is dangerous, better to keep those bits which are
>>>>> > normally part of upstream's Makefile in their Makefile and change the
>>>>> > way that you pass in CFLAGS. (e.g. maybe pass in COPTFLAGS instead and
>>>>> > change their Makefile to do COPTFLAGS?=-O3 and "CFLAGS?=${COPTFLAGS} ...
>>>>> > -include ...")
>>>>> >
>>>>> > But then again, we have cmake, why not just use that? It's upstream's
>>>>> > preferred build infrastructure, whereas for the make-based one they say
>>>>> > "I don't recommend this approach, but it should work in a pinch"..  
>>>>> 
>>>>> Agree, this was sleazy and poorly considered.  I'm sorry.  Anytime I
>>>>> find myself golfing I should stop.
>>>>> 
>>>>> Attached is new attempt that uses cmake instead.  Works for me on i386.
>>>>> 
>>>>> N.B.: I set NO_TEST to Yes now because the tests are buried in a git
>>>>> submodule; furthermore, the repo on which the submodule is based has
>>>>> no tags and thus no releases, making it impossible for me to reach out
>>>>> for it as a distfile (unless I'm missing something).  I'm going to try
>>>>> to convince the upstream to start tagging that repo, but if I fail
>>>>> then I'll self-host a tarball for tests on the next update.
>>>>> 
>>>>> Thanks as always for the feedback.
>>>>> 
>>>>> Pax, -A
>>>>> --
>>>>> http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
>>>>
>>>> Atilla's patch works well for me on amd64. I have used it heavily for
>>>> several days. However, upstream has a new release, so here's a new
>>>> patch 99% based on atilla's.
>>>
>>> Nice!  Thanks for doing this.  Works for me on i386.
>>
>> Ping?  Diff attached that includes Micah Muer's updates.
>>
>> Pax, -A
>
> Reping?  New patch attached that brings us up to 5.2.0-1, released 16
> March.  Nothing new, just updated distinfo and Makefile.  Works for me
> under amd64, i386.
>
> Pax, -A

Ping.

Pax, -A
--
Sean Levy | cluefact...@gmail.com | cluefactory.com | software development

Re: [UPDATE] devel/py-html5lib

2016-05-02 Thread attila 

Daniel Jakots <danj+o...@chown.me> writes:

> On Fri, 29 Apr 2016 14:35:28 -0500, attila <att...@stalphonsos.com>
> wrote:
>
>> Hi ports@,
>> 
>> While looking at py-lxml's deps I came across an issue in py-html5lib.
>> py-lxml 3.6.0 broke "make test" but it turns out it's html5lib's
>> fault: it was using lxml incorrectly, the issue was noticed and fixed
>> already, but not yet released:
>> https://github.com/lxml/lxml/pull/172#issuecomment-169119391
>
> I think
> https://github.com/html5lib/html5lib-python/commit/0c551c9519e47f76f8f185089ed71cb9539b6e00
> is a better link to give.

Yes, agreed.  Comments in patches updated.

>> If nobody cares I'll also take MAINTAINER.
>
> Sure, make a new patch with that and the REVISION set to 0 as noted by
> landry@. :)

Yes, also done.

> Cheers,
> Daniel

Thank you both for the feedback.  Updated patch attached.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
Index: Makefile
===
RCS file: /cvs/ports/devel/py-html5lib/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile	1 Jan 2016 20:22:09 -	1.11
+++ Makefile	2 May 2016 16:29:32 -
@@ -6,9 +6,12 @@ MODPY_EGG_VERSION=	0.999
 DISTNAME=		html5lib-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 CATEGORIES=		devel www textproc
+REVISION=		0
 
 HOMEPAGE=		https://github.com/html5lib/html5lib-python/
 
+MAINTAINER =	Sean Levy <att...@stalphonsos.com>
+
 # MIT
 PERMIT_PACKAGE_CDROM=	Yes
 
@@ -25,6 +28,7 @@ FLAVORS =		python3
 FLAVOR ?=
 
 do-test:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests${MODPY_BIN_SUFFIX} --first-package-wins
+	cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests${MODPY_BIN_SUFFIX} \
+	--first-package-wins
 
 .include 
Index: patches/patch-html5lib_ihatexml_py
===
RCS file: patches/patch-html5lib_ihatexml_py
diff -N patches/patch-html5lib_ihatexml_py
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-html5lib_ihatexml_py	2 May 2016 16:29:32 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Backport of patch for comment issue:
+https://github.com/html5lib/html5lib-python/commit/0c551c9519e47f76f8f185089ed71cb9539b6e00
+--- html5lib/ihatexml.py.orig	Fri Apr 22 18:44:14 2016
 html5lib/ihatexml.py	Fri Apr 22 18:45:49 2016
+@@ -225,6 +225,9 @@ class InfosetFilter(object):
+ while "--" in data:
+ warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
+ data = data.replace("--", "- -")
++if data.endswith("-"):
++warnings.warn("Comments cannot end in a dash", DataLossWarning)
++data += " "
+ return data
+ 
+ def coerceCharacters(self, data):
Index: patches/patch-html5lib_treebuilders_etree_lxml_py
===
RCS file: patches/patch-html5lib_treebuilders_etree_lxml_py
diff -N patches/patch-html5lib_treebuilders_etree_lxml_py
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-html5lib_treebuilders_etree_lxml_py	2 May 2016 16:29:32 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+Backport patch from HEAD to stop test fails due to py-lxml update to 3.6.0
+https://github.com/html5lib/html5lib-python/commit/0c551c9519e47f76f8f185089ed71cb9539b6e00
+--- html5lib/treebuilders/etree_lxml.py.orig	Mon Sep  7 18:36:25 2015
 html5lib/treebuilders/etree_lxml.py	Fri Apr 22 18:50:50 2016
+@@ -54,7 +54,7 @@ class Document(object):
+ def testSerializer(element):
+ rv = []
+ finalText = None
+-infosetFilter = ihatexml.InfosetFilter()
++infosetFilter = ihatexml.InfosetFilter(preventDoubleDashComments=True)
+ 
+ def serializeElement(element, indent=0):
+ if not hasattr(element, "tag"):
+@@ -189,7 +189,7 @@ class TreeBuilder(_base.TreeBuilder):
+ 
+ def __init__(self, namespaceHTMLElements, fullTree=False):
+ builder = etree_builders.getETreeModule(etree, fullTree=fullTree)
+-infosetFilter = self.infosetFilter = ihatexml.InfosetFilter()
++infosetFilter = self.infosetFilter = ihatexml.InfosetFilter(preventDoubleDashComments=True)
+ self.namespaceHTMLElements = namespaceHTMLElements
+ 
+ class Attributes(dict):
+@@ -257,7 +257,7 @@ class TreeBuilder(_base.TreeBuilder):
+ data = property(_getData, _setData)
+ 
+ self.elementClass = Element
+-self.commentClass = builder.Comment
++self.commentClass = Comment
+ # self.fragmentClass = builder.DocumentFragment
+ _base.TreeBuilder.__init__(self, namespaceHTMLElements)
+ 
+@@ -344,7 +344,8 @@ class TreeBuilder(_base.TreeBuilder):
+ 
+ # Append the initial comments:
+ for comment_token

[UPDATE] devel/py-html5lib

2016-04-29 Thread attila 
Hi ports@,

While looking at py-lxml's deps I came across an issue in py-html5lib.
py-lxml 3.6.0 broke "make test" but it turns out it's html5lib's
fault: it was using lxml incorrectly, the issue was noticed and fixed
already, but not yet released:
https://github.com/lxml/lxml/pull/172#issuecomment-169119391

This update backports a patch from head of line to address the issue:
make test wins now with py-lxml 3.6.0.  It also has the happy property
of not breaking "make test" with the current py-lxml (3.4.3).  It also
addresses a portcheck nit (line > 80 cols).

If nobody cares I'll also take MAINTAINER.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
Index: Makefile
===
RCS file: /cvs/ports/devel/py-html5lib/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile	1 Jan 2016 20:22:09 -	1.11
+++ Makefile	27 Apr 2016 00:08:27 -
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION=	0.999
 DISTNAME=		html5lib-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 CATEGORIES=		devel www textproc
+REVISION=		1
 
 HOMEPAGE=		https://github.com/html5lib/html5lib-python/
 
@@ -25,6 +26,7 @@ FLAVORS =		python3
 FLAVOR ?=
 
 do-test:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests${MODPY_BIN_SUFFIX} --first-package-wins
+	cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests${MODPY_BIN_SUFFIX} \
+	--first-package-wins
 
 .include 
Index: patches/patch-html5lib_ihatexml_py
===
RCS file: patches/patch-html5lib_ihatexml_py
diff -N patches/patch-html5lib_ihatexml_py
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-html5lib_ihatexml_py	27 Apr 2016 00:08:27 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Backport of patch for comment issue
+--- html5lib/ihatexml.py.orig	Fri Apr 22 18:44:14 2016
 html5lib/ihatexml.py	Fri Apr 22 18:45:49 2016
+@@ -225,6 +225,9 @@ class InfosetFilter(object):
+ while "--" in data:
+ warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
+ data = data.replace("--", "- -")
++if data.endswith("-"):
++warnings.warn("Comments cannot end in a dash", DataLossWarning)
++data += " "
+ return data
+ 
+ def coerceCharacters(self, data):
Index: patches/patch-html5lib_treebuilders_etree_lxml_py
===
RCS file: patches/patch-html5lib_treebuilders_etree_lxml_py
diff -N patches/patch-html5lib_treebuilders_etree_lxml_py
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-html5lib_treebuilders_etree_lxml_py	27 Apr 2016 00:08:27 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+Backport patch from HEAD to stop test fails due to py-lxml update to 3.6.0
+https://github.com/lxml/lxml/pull/172#issuecomment-169119391
+--- html5lib/treebuilders/etree_lxml.py.orig	Mon Sep  7 18:36:25 2015
 html5lib/treebuilders/etree_lxml.py	Fri Apr 22 18:50:50 2016
+@@ -54,7 +54,7 @@ class Document(object):
+ def testSerializer(element):
+ rv = []
+ finalText = None
+-infosetFilter = ihatexml.InfosetFilter()
++infosetFilter = ihatexml.InfosetFilter(preventDoubleDashComments=True)
+ 
+ def serializeElement(element, indent=0):
+ if not hasattr(element, "tag"):
+@@ -189,7 +189,7 @@ class TreeBuilder(_base.TreeBuilder):
+ 
+ def __init__(self, namespaceHTMLElements, fullTree=False):
+ builder = etree_builders.getETreeModule(etree, fullTree=fullTree)
+-infosetFilter = self.infosetFilter = ihatexml.InfosetFilter()
++infosetFilter = self.infosetFilter = ihatexml.InfosetFilter(preventDoubleDashComments=True)
+ self.namespaceHTMLElements = namespaceHTMLElements
+ 
+ class Attributes(dict):
+@@ -257,7 +257,7 @@ class TreeBuilder(_base.TreeBuilder):
+ data = property(_getData, _setData)
+ 
+ self.elementClass = Element
+-self.commentClass = builder.Comment
++self.commentClass = Comment
+ # self.fragmentClass = builder.DocumentFragment
+ _base.TreeBuilder.__init__(self, namespaceHTMLElements)
+ 
+@@ -344,7 +344,8 @@ class TreeBuilder(_base.TreeBuilder):
+ 
+ # Append the initial comments:
+ for comment_token in self.initial_comments:
+-root.addprevious(etree.Comment(comment_token["data"]))
++comment = self.commentClass(comment_token["data"])
++root.addprevious(comment._element)
+ 
+ # Create the root document and add the ElementTree to it
+ self.document = self.documentClass()

Re: [UPDATE] textproc/py-lxml -> 3.6.0

2016-04-22 Thread attila 

Daniel Jakots <danj+o...@chown.me> writes:

> On Wed, 20 Apr 2016 12:22:05 -0500, attila <att...@stalphonsos.com>
> wrote:
>
>> attila <att...@stalphonsos.com> writes:
>> 
>> > Hi ports@,
>> >
>> > Attached is an update for textproc/py-lxml to version 3.6.0.  It
>> > passes "make test" on i386 (both python2 and python3).
>> >
>> > Feedback most welcome.
>> >
>> > Pax, -A  
>> 
>> Ping?  Patch attached again for completeness.  Feedback most welcome.
>
> Looks good to me.
>
> There are quite a lot of *_DEPENDS, did any of them get tested (either
> by you or their maintainers)?
>

I did a tiny bit of this before your email but not enough.  I've since
started looking at all of the deps and there are a few issues to deal
with (devel/py-html5lib has some for starters, starting by updating it
and seeing if the issues persist).

Thanks for the nudge.  I withdraw the update for now.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF

Re: [UPDATE] textproc/py-lxml -> 3.6.0

2016-04-20 Thread attila 

attila <att...@stalphonsos.com> writes:

> Hi ports@,
>
> Attached is an update for textproc/py-lxml to version 3.6.0.  It
> passes "make test" on i386 (both python2 and python3).
>
> Feedback most welcome.
>
> Pax, -A

Ping?  Patch attached again for completeness.  Feedback most welcome.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
Index: Makefile
===
RCS file: /cvs/ports/textproc/py-lxml/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile	29 Sep 2015 10:52:53 -	1.26
+++ Makefile	12 Apr 2016 18:47:30 -
@@ -4,8 +4,7 @@ BROKEN-hppa=	OOM on src/lxml/lxml.etree.
 
 COMMENT=	Python binding for the libxml2 and libxslt libraries
 
-MODPY_EGG_VERSION=	3.4.3
-REVISION=	1
+MODPY_EGG_VERSION=	3.6.0
 DISTNAME=	lxml-${MODPY_EGG_VERSION}
 PKGNAME=	py-lxml-${MODPY_EGG_VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/textproc/py-lxml/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo	29 Apr 2015 16:09:54 -	1.9
+++ distinfo	12 Apr 2016 18:47:30 -
@@ -1,2 +1,2 @@
-SHA256 (lxml-3.4.3.tar.gz) = bOShGrSFpnqJmqPggMl7IqnfQMcHe9kUaoIdOHLPIDc=
-SIZE (lxml-3.4.3.tar.gz) = 3541740
+SHA256 (lxml-3.6.0.tar.gz) = nHTKKKfwww3KiHIoGzxHcF4hIXyLxjkS2VyeKnysa98=
+SIZE (lxml-3.6.0.tar.gz) = 3693901
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-lxml/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST	6 Sep 2015 16:36:16 -	1.8
+++ pkg/PLIST	12 Apr 2016 18:47:31 -
@@ -283,6 +283,7 @@ share/doc/${MODPY_PY_PREFIX}lxml/html/ap
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html-pysrc.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.CheckboxGroup-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.CheckboxValues-class.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.Classes-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.ElementSoup-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.ElementSoup-pysrc.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.FieldsDict-class.html
@@ -330,6 +331,7 @@ share/doc/${MODPY_PY_PREFIX}lxml/html/ap
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.html5parser.XHTMLParser-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.soupparser-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.soupparser-pysrc.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.soupparser._PseudoTag-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.usedoctest-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.usedoctest-pysrc.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.includes-module.html
@@ -371,6 +373,10 @@ share/doc/${MODPY_PY_PREFIX}lxml/html/ap
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.dummy_http_server.HTTPRequestCollector-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.dummy_http_server.WebServer-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.dummy_http_server._RequestHandler-class.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.selftest-module.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.selftest-pysrc.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.selftest2-module.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.selftest2-pysrc.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_builder-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_builder-pysrc.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_builder.BuilderTestCase-class.html
@@ -390,7 +396,6 @@ share/doc/${MODPY_PY_PREFIX}lxml/html/ap
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_dtd.ETreeDtdTestCase-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_elementpath-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_elementpath-pysrc.html
-share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_elementpath.ElementTreeElementPathTestCase-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_elementpath.EtreeElementPathTestCase-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_elementtree-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_elementtree-pysrc.html
@@ -451,6 +456,7 @@ share/doc/${MODPY_PY_PREFIX}lxml/html/ap
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_relaxng-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_relaxng-pysrc.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_relaxng.ETreeRelaxNGTestCase-class.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_relaxng.RelaxNGCompactTestCase-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_sax-

Re: [update] textproc/multimarkdown

2016-04-15 Thread attila 

attila <att...@stalphonsos.com> writes:

> attila <att...@stalphonsos.com> writes:
>
>> Micah Muer <micahm...@gmail.com> writes:
>>
>>> On Tue, 22 Mar 2016 12:58:32 -0600
>>> attila <att...@stalphonsos.com> wrote:
>>>
>>>> Stuart Henderson <s...@spacehopper.org> writes:
>>>> 
>>>> > On 2016/03/19 15:38, Michael McConville wrote:  
>>>> >> > +ALL_TARGET = deprecated
>>>> >> > +
>>>> >> > +# golf MAKE_FLAGS down to 80chars.. :-|
>>>> >> > +_i = -include
>>>> >> > +_incs =  ${_i} src/GLibFacade.h ${_i} src/version.h 
>>>> >> > ${_i} src/parser.h
>>>> >> > +MAKE_FLAGS = CFLAGS="${CFLAGS} ${_incs}"  
>>>> >> 
>>>> >> Why golf? Can't you just use backslashes as necessary? I would get rid
>>>> >> of _i and _incs.
>>>> >>   
>>>> >
>>>> > I think this approach is dangerous, better to keep those bits which are
>>>> > normally part of upstream's Makefile in their Makefile and change the
>>>> > way that you pass in CFLAGS. (e.g. maybe pass in COPTFLAGS instead and
>>>> > change their Makefile to do COPTFLAGS?=-O3 and "CFLAGS?=${COPTFLAGS} ...
>>>> > -include ...")
>>>> >
>>>> > But then again, we have cmake, why not just use that? It's upstream's
>>>> > preferred build infrastructure, whereas for the make-based one they say
>>>> > "I don't recommend this approach, but it should work in a pinch"..  
>>>> 
>>>> Agree, this was sleazy and poorly considered.  I'm sorry.  Anytime I
>>>> find myself golfing I should stop.
>>>> 
>>>> Attached is new attempt that uses cmake instead.  Works for me on i386.
>>>> 
>>>> N.B.: I set NO_TEST to Yes now because the tests are buried in a git
>>>> submodule; furthermore, the repo on which the submodule is based has
>>>> no tags and thus no releases, making it impossible for me to reach out
>>>> for it as a distfile (unless I'm missing something).  I'm going to try
>>>> to convince the upstream to start tagging that repo, but if I fail
>>>> then I'll self-host a tarball for tests on the next update.
>>>> 
>>>> Thanks as always for the feedback.
>>>> 
>>>> Pax, -A
>>>> --
>>>> http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
>>>
>>> Atilla's patch works well for me on amd64. I have used it heavily for
>>> several days. However, upstream has a new release, so here's a new
>>> patch 99% based on atilla's.
>>
>> Nice!  Thanks for doing this.  Works for me on i386.
>
> Ping?  Diff attached that includes Micah Muer's updates.
>
> Pax, -A

Reping?  New patch attached that brings us up to 5.2.0-1, released 16
March.  Nothing new, just updated distinfo and Makefile.  Works for me
under amd64, i386.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
Index: Makefile
===
RCS file: /cvs/ports/textproc/multimarkdown/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	5 Apr 2015 13:31:15 -	1.2
+++ Makefile	15 Apr 2016 20:30:02 -
@@ -1,13 +1,13 @@
 # $OpenBSD: Makefile,v 1.2 2015/04/05 13:31:15 sthen Exp $
 
-V =		4.7.1
+V =		5.2.0-1
 COMMENT =	marked-up plain text to formatted document converter
 DISTNAME =	${GH_PROJECT}-${V}
-PKGNAME =	multimarkdown-${V}
+PKGNAME =	multimarkdown-${V:C/-/./}
 CATEGORIES =	textproc
 
 GH_ACCOUNT =	fletcher
-GH_PROJECT =	MultiMarkdown-4
+GH_PROJECT =	MultiMarkdown-5
 GH_TAGNAME =	${V}
 
 HOMEPAGE =	http://fletcherpenney.net/multimarkdown/
@@ -20,15 +20,19 @@ WANTLIB += c
 
 BUILD_DEPENDS =	devel/greg
 
-USE_GMAKE =	Yes
-ALL_TARGET =	ALL
-MAKE_FLAGS =	CFLAGS="${CFLAGS} -include GLibFacade.h -DHAVE_ARC4RANDOM" \
-		GREG=${LOCALBASE}/bin/greg
+MODULES =	devel/cmake
+
+CFLAGS +=	-DHAVE_SRAND_DETERMINISTIC
+
+CONFIGURE_ARGS += -DGREG=${LOCALBASE}/bin/greg
 
 # Test files aren't included in distfile.
 NO_TEST =	Yes
 
+pre-configure:
+	touch ${WRKBUILD}/README.html
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKBUILD}/multimarkdown ${PREFIX}/bin/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/multimarkdown/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	24 Mar 2015

[UPDATE] textproc/py-lxml -> 3.6.0

2016-04-12 Thread attila 
Hi ports@,

Attached is an update for textproc/py-lxml to version 3.6.0.  It
passes "make test" on i386 (both python2 and python3).

Feedback most welcome.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
Index: Makefile
===
RCS file: /cvs/ports/textproc/py-lxml/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile	29 Sep 2015 10:52:53 -	1.26
+++ Makefile	12 Apr 2016 18:47:30 -
@@ -4,8 +4,7 @@ BROKEN-hppa=	OOM on src/lxml/lxml.etree.
 
 COMMENT=	Python binding for the libxml2 and libxslt libraries
 
-MODPY_EGG_VERSION=	3.4.3
-REVISION=	1
+MODPY_EGG_VERSION=	3.6.0
 DISTNAME=	lxml-${MODPY_EGG_VERSION}
 PKGNAME=	py-lxml-${MODPY_EGG_VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/textproc/py-lxml/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo	29 Apr 2015 16:09:54 -	1.9
+++ distinfo	12 Apr 2016 18:47:30 -
@@ -1,2 +1,2 @@
-SHA256 (lxml-3.4.3.tar.gz) = bOShGrSFpnqJmqPggMl7IqnfQMcHe9kUaoIdOHLPIDc=
-SIZE (lxml-3.4.3.tar.gz) = 3541740
+SHA256 (lxml-3.6.0.tar.gz) = nHTKKKfwww3KiHIoGzxHcF4hIXyLxjkS2VyeKnysa98=
+SIZE (lxml-3.6.0.tar.gz) = 3693901
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-lxml/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST	6 Sep 2015 16:36:16 -	1.8
+++ pkg/PLIST	12 Apr 2016 18:47:31 -
@@ -283,6 +283,7 @@ share/doc/${MODPY_PY_PREFIX}lxml/html/ap
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html-pysrc.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.CheckboxGroup-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.CheckboxValues-class.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.Classes-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.ElementSoup-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.ElementSoup-pysrc.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.FieldsDict-class.html
@@ -330,6 +331,7 @@ share/doc/${MODPY_PY_PREFIX}lxml/html/ap
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.html5parser.XHTMLParser-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.soupparser-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.soupparser-pysrc.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.soupparser._PseudoTag-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.usedoctest-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.html.usedoctest-pysrc.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.includes-module.html
@@ -371,6 +373,10 @@ share/doc/${MODPY_PY_PREFIX}lxml/html/ap
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.dummy_http_server.HTTPRequestCollector-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.dummy_http_server.WebServer-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.dummy_http_server._RequestHandler-class.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.selftest-module.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.selftest-pysrc.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.selftest2-module.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.selftest2-pysrc.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_builder-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_builder-pysrc.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_builder.BuilderTestCase-class.html
@@ -390,7 +396,6 @@ share/doc/${MODPY_PY_PREFIX}lxml/html/ap
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_dtd.ETreeDtdTestCase-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_elementpath-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_elementpath-pysrc.html
-share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_elementpath.ElementTreeElementPathTestCase-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_elementpath.EtreeElementPathTestCase-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_elementtree-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_elementtree-pysrc.html
@@ -451,6 +456,7 @@ share/doc/${MODPY_PY_PREFIX}lxml/html/ap
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_relaxng-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_relaxng-pysrc.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_relaxng.ETreeRelaxNGTestCase-class.html
+share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_relaxng.RelaxNGCompactTestCase-class.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_sax-module.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_sax-pysrc.html
 share/doc/${MODPY_PY_PREFIX}lxml/html/api/lxml.tests.test_sax.ETreeS

Re: [update] textproc/multimarkdown

2016-03-29 Thread attila 

Micah Muer <micahm...@gmail.com> writes:

> On Tue, 22 Mar 2016 12:58:32 -0600
> attila <att...@stalphonsos.com> wrote:
>
>> Stuart Henderson <s...@spacehopper.org> writes:
>> 
>> > On 2016/03/19 15:38, Michael McConville wrote:  
>> >> > +ALL_TARGET =   deprecated
>> >> > +
>> >> > +# golf MAKE_FLAGS down to 80chars.. :-|
>> >> > +_i =   -include
>> >> > +_incs =${_i} src/GLibFacade.h ${_i} src/version.h 
>> >> > ${_i} src/parser.h
>> >> > +MAKE_FLAGS =   CFLAGS="${CFLAGS} ${_incs}"  
>> >> 
>> >> Why golf? Can't you just use backslashes as necessary? I would get rid
>> >> of _i and _incs.
>> >>   
>> >
>> > I think this approach is dangerous, better to keep those bits which are
>> > normally part of upstream's Makefile in their Makefile and change the
>> > way that you pass in CFLAGS. (e.g. maybe pass in COPTFLAGS instead and
>> > change their Makefile to do COPTFLAGS?=-O3 and "CFLAGS?=${COPTFLAGS} ...
>> > -include ...")
>> >
>> > But then again, we have cmake, why not just use that? It's upstream's
>> > preferred build infrastructure, whereas for the make-based one they say
>> > "I don't recommend this approach, but it should work in a pinch"..  
>> 
>> Agree, this was sleazy and poorly considered.  I'm sorry.  Anytime I
>> find myself golfing I should stop.
>> 
>> Attached is new attempt that uses cmake instead.  Works for me on i386.
>> 
>> N.B.: I set NO_TEST to Yes now because the tests are buried in a git
>> submodule; furthermore, the repo on which the submodule is based has
>> no tags and thus no releases, making it impossible for me to reach out
>> for it as a distfile (unless I'm missing something).  I'm going to try
>> to convince the upstream to start tagging that repo, but if I fail
>> then I'll self-host a tarball for tests on the next update.
>> 
>> Thanks as always for the feedback.
>> 
>> Pax, -A
>> --
>> http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
>
> Atilla's patch works well for me on amd64. I have used it heavily for
> several days. However, upstream has a new release, so here's a new
> patch 99% based on atilla's.

Nice!  Thanks for doing this.  Works for me on i386.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF

Re: [update] textproc/multimarkdown

2016-03-22 Thread attila 

Stuart Henderson <s...@spacehopper.org> writes:

> On 2016/03/19 15:38, Michael McConville wrote:
>> > +ALL_TARGET =  deprecated
>> > +
>> > +# golf MAKE_FLAGS down to 80chars.. :-|
>> > +_i =  -include
>> > +_incs =   ${_i} src/GLibFacade.h ${_i} src/version.h ${_i} 
>> > src/parser.h
>> > +MAKE_FLAGS =  CFLAGS="${CFLAGS} ${_incs}"
>> 
>> Why golf? Can't you just use backslashes as necessary? I would get rid
>> of _i and _incs.
>> 
>
> I think this approach is dangerous, better to keep those bits which are
> normally part of upstream's Makefile in their Makefile and change the
> way that you pass in CFLAGS. (e.g. maybe pass in COPTFLAGS instead and
> change their Makefile to do COPTFLAGS?=-O3 and "CFLAGS?=${COPTFLAGS} ...
> -include ...")
>
> But then again, we have cmake, why not just use that? It's upstream's
> preferred build infrastructure, whereas for the make-based one they say
> "I don't recommend this approach, but it should work in a pinch"..

Agree, this was sleazy and poorly considered.  I'm sorry.  Anytime I
find myself golfing I should stop.

Attached is new attempt that uses cmake instead.  Works for me on i386.

N.B.: I set NO_TEST to Yes now because the tests are buried in a git
submodule; furthermore, the repo on which the submodule is based has
no tags and thus no releases, making it impossible for me to reach out
for it as a distfile (unless I'm missing something).  I'm going to try
to convince the upstream to start tagging that repo, but if I fail
then I'll self-host a tarball for tests on the next update.

Thanks as always for the feedback.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
Index: Makefile
===
RCS file: /cvs/ports/textproc/multimarkdown/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	5 Apr 2015 13:31:15 -	1.2
+++ Makefile	22 Mar 2016 18:48:31 -
@@ -1,13 +1,13 @@
 # $OpenBSD: Makefile,v 1.2 2015/04/05 13:31:15 sthen Exp $
 
-V =		4.7.1
+V =		5.1.0
 COMMENT =	marked-up plain text to formatted document converter
 DISTNAME =	${GH_PROJECT}-${V}
 PKGNAME =	multimarkdown-${V}
 CATEGORIES =	textproc
 
 GH_ACCOUNT =	fletcher
-GH_PROJECT =	MultiMarkdown-4
+GH_PROJECT =	MultiMarkdown-5
 GH_TAGNAME =	${V}
 
 HOMEPAGE =	http://fletcherpenney.net/multimarkdown/
@@ -20,15 +20,19 @@ WANTLIB += c
 
 BUILD_DEPENDS =	devel/greg
 
-USE_GMAKE =	Yes
-ALL_TARGET =	ALL
-MAKE_FLAGS =	CFLAGS="${CFLAGS} -include GLibFacade.h -DHAVE_ARC4RANDOM" \
-		GREG=${LOCALBASE}/bin/greg
+MODULES =	devel/cmake
+
+CFLAGS +=	-DHAVE_SRAND_DETERMINISTIC
+
+CONFIGURE_ARGS += -DGREG=${LOCALBASE}/bin/greg
 
 # Test files aren't included in distfile.
 NO_TEST =	Yes
 
+pre-configure:
+	touch ${WRKBUILD}/README.html
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKBUILD}/multimarkdown ${PREFIX}/bin/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/multimarkdown/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	24 Mar 2015 19:16:13 -	1.1.1.1
+++ distinfo	22 Mar 2016 18:48:31 -
@@ -1,2 +1,2 @@
-SHA256 (MultiMarkdown-4-4.7.1.tar.gz) = gy5dzm+hv/TWfmSsLMJPCSCujZEoDlPqh5I3odQ/SGU=
-SIZE (MultiMarkdown-4-4.7.1.tar.gz) = 120896
+SHA256 (MultiMarkdown-5-5.1.0.tar.gz) = ZdT8mzDrZq9vYLN8HzJBlf3xqSb/umBoLd9+/MH4eGg=
+SIZE (MultiMarkdown-5-5.1.0.tar.gz) = 135170
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt	22 Mar 2016 18:48:31 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Use installed greg
+--- CMakeLists.txt.orig	Mon Feb 22 20:05:02 2016
 CMakeLists.txt	Tue Mar 22 12:45:41 2016
+@@ -149,7 +149,7 @@ endif ()
+ # Need to build parser.c via greg
+ add_custom_command (
+ 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/parser.c
+-	COMMAND ${PROJECT_SOURCE_DIR}/submodules/greg/greg -o ${CMAKE_CURRENT_BINARY_DIR}/parser.c ${PROJECT_SOURCE_DIR}/src/parser.leg
++	COMMAND ${GREG} -o ${CMAKE_CURRENT_BINARY_DIR}/parser.c ${PROJECT_SOURCE_DIR}/src/parser.leg
+ )
+ 
+ # src_files are the primary files, and will be included in doxygen documentation
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile	24 Mar 2015 19:16:13 -	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,37 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2015/03/24 19:16:13 okan Exp $
-
-Make it possible to pass GREG=/usr/local/bin/greg in on the
-command line and a

Re: [update] textproc/multimarkdown

2016-03-19 Thread attila 

attila <att...@stalphonsos.com> writes:

> Hi ports@,
>

Hi again, ports@.  Sorry to be a pain but this patch doesn't pass
muster.  I should never send things late at night.  Please ignore,
I'll send a better one soon.

Sorry for the noise.

> The attached patch brings textproc/multimarkdown up to the latest
> release (5.1.0).  It ditches a bunch of patches, some of which are no
> longer necessary and some of which I tried and failed to sell to the
> upstream.
>
> Works okay for me on i386.  Sadly I have no other -current machines
> right now.
>
> Pax, -A

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0xE6CC1EDB

[update] textproc/multimarkdown

2016-03-15 Thread attila 
Hi ports@,

The attached patch brings textproc/multimarkdown up to the latest
release (5.1.0).  It ditches a bunch of patches, some of which are no
longer necessary and some of which I tried and failed to sell to the
upstream.

Works okay for me on i386.  Sadly I have no other -current machines
right now.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0xE6CC1EDB
Index: Makefile
===
RCS file: /cvs/ports/textproc/multimarkdown/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	5 Apr 2015 13:31:15 -	1.2
+++ Makefile	16 Mar 2016 01:00:52 -
@@ -1,13 +1,13 @@
 # $OpenBSD: Makefile,v 1.2 2015/04/05 13:31:15 sthen Exp $
 
-V =		4.7.1
+V =		5.1.0
 COMMENT =	marked-up plain text to formatted document converter
 DISTNAME =	${GH_PROJECT}-${V}
 PKGNAME =	multimarkdown-${V}
 CATEGORIES =	textproc
 
 GH_ACCOUNT =	fletcher
-GH_PROJECT =	MultiMarkdown-4
+GH_PROJECT =	MultiMarkdown-5
 GH_TAGNAME =	${V}
 
 HOMEPAGE =	http://fletcherpenney.net/multimarkdown/
@@ -21,14 +21,18 @@ WANTLIB += c
 BUILD_DEPENDS =	devel/greg
 
 USE_GMAKE =	Yes
-ALL_TARGET =	ALL
-MAKE_FLAGS =	CFLAGS="${CFLAGS} -include GLibFacade.h -DHAVE_ARC4RANDOM" \
-		GREG=${LOCALBASE}/bin/greg
+# avoid using cmake, not necc for us
+ALL_TARGET =	deprecated
+
+# golf MAKE_FLAGS down to 80chars.. :-|
+_i =		-include
+_incs =		${_i} src/GLibFacade.h ${_i} src/version.h ${_i} src/parser.h
+MAKE_FLAGS =	CFLAGS="${CFLAGS} ${_incs}"
 
 # Test files aren't included in distfile.
 NO_TEST =	Yes
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/build/multimarkdown ${PREFIX}/bin/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/multimarkdown/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	24 Mar 2015 19:16:13 -	1.1.1.1
+++ distinfo	16 Mar 2016 01:00:52 -
@@ -1,2 +1,2 @@
-SHA256 (MultiMarkdown-4-4.7.1.tar.gz) = gy5dzm+hv/TWfmSsLMJPCSCujZEoDlPqh5I3odQ/SGU=
-SIZE (MultiMarkdown-4-4.7.1.tar.gz) = 120896
+SHA256 (MultiMarkdown-5-5.1.0.tar.gz) = ZdT8mzDrZq9vYLN8HzJBlf3xqSb/umBoLd9+/MH4eGg=
+SIZE (MultiMarkdown-5-5.1.0.tar.gz) = 135170
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/textproc/multimarkdown/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile	24 Mar 2015 19:16:13 -	1.1.1.1
+++ patches/patch-Makefile	16 Mar 2016 01:00:52 -
@@ -1,37 +1,40 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2015/03/24 19:16:13 okan Exp $
+$OpenBSD$
 
-Make it possible to pass GREG=/usr/local/bin/greg in on the
-command line and avoid git submodules.
-
 Makefile.orig	Mon Mar 23 18:21:56 2015
-+++ Makefile	Mon Mar 23 18:32:22 2015
-@@ -32,18 +32,25 @@ ifeq ($(MAKECMDGOALS),static)
- LDFLAGS += -static -static-libgcc
- endif
- 
--GREG= greg/greg
-+# OUR_GREG: the version of greg in a submodule
-+# GREG: the path to greg we want to use for parser.leg
-+#
-+# This way we can pass GREG=/usr/local/bin/greg in on
-+# the command line if we have greg installed already.
- 
-+OUR_GREG=greg/greg
-+GREG?=$(OUR_GREG)
-+
- ALL : $(PROGRAM) enumMap.txt
- static : $(PROGRAM) enumMap.txt
- 
- %.o : %.c parser.h
- 	$(CC) -c $(CFLAGS) -o $@ $<
- 
--parser.c : parser.leg greg/greg parser.h
--	greg/greg -o parser.c parser.leg
-+parser.c : parser.leg $(GREG) parser.h
-+	$(GREG) -o parser.c parser.leg
- 
--$(GREG): greg
-+$(OUR_GREG): greg
- 	$(MAKE) -C greg
+Patch up Makefile so we can use it instead of cmake.
+--- Makefile.orig	Mon Feb 22 20:05:02 2016
 Makefile	Tue Mar 15 18:56:50 2016
+@@ -1,6 +1,6 @@
+ BUILD_DIR = build
+ 
+-GREG = submodules/greg/greg
++GREG = /usr/local/bin/greg
+ 
+ # The release target will perform additional optimization
+ .PHONY : release
+@@ -81,7 +81,7 @@ $(GREG):
+ 	$(MAKE) -C submodules/greg
+ 
+ # Create build directory if it doesn't exist
+-$(BUILD_DIR): CHANGELOG
++$(BUILD_DIR):
+ 	-mkdir $(BUILD_DIR) 2>/dev/null
+ 	-cd $(BUILD_DIR); rm -rf *
+ 
+@@ -100,7 +100,7 @@ CHANGELOG:
+ #
+ # I don't recommend this approach, but it should work in a pinch
+ 
+-CFLAGS ?= -Wall -g -O3 -include src/GLibFacade.h -include src/version.h -include src/parser.h
++#CFLAGS ?= -Wall -g -O3 -include src/GLibFacade.h -include src/version.h -include src/parser.h
+ PROGRAM = multimarkdown
+ 
+ OBJS = build/multimarkdown.o build/parse_utilities.o build/parser.o build/GLibFacade.o build/writer.o build/text.o build/html.o build/latex.o build/memoir.o build/beamer.o build/lyx.o build/lyxbeamer.o build/opml.o build/odf.o build/critic.o build/rng.o build/rtf.o build/transclude.o build/toc.o 
+@@ -119,7 +119,7 @@ src/parser.c: src/parser.leg $(GREG) src/parser.h
+ 	$(GREG) -o src/parser.c src/parser.leg
+ 
+ .PHONY : deprecated
+-deprecated: $(GREG) build/$(PR

Re: NEW: www/tbb - Tor Browser Bundle

2016-02-23 Thread attila 
Landry Breuil <lan...@rhaalovely.net> writes:

> On Wed, Feb 17, 2016 at 11:51:38AM -0600, attila wrote:
>> 
>> Landry Breuil <lan...@rhaalovely.net> writes:
>> 
>> > On Mon, Feb 15, 2016 at 10:54:26AM -0600, attila wrote:
>> >> 
>> >> Landry Breuil <lan...@rhaalovely.net> writes:
>> >> 
>> >
>> > You shouldnt need to copy the xpi's to the user profile, there are ways
>> > via tweaks to make it work.
>> >
>> > 
>> >
>> > Of course, all this is documented in
>> > https://developer.mozilla.org/en-US/Add-ons/Installing_extensions and
>> > explained in
>> > https://mike.kaply.com/2012/02/21/understanding-add-on-scopes/
>> 
>> How right you are.  After doing some more digging I've come up with a
>> solution that ditches the start-tor-browser script and uses a mozilla
>> autoconfig file instead, along with some other tweaks to make it go as
>> per Mike Kaply and MDN.  Attached are the new ports, although still at
>> TBB 5.5 (still need to update to 5.5.2).
>> 
>> Thanks for the cluebat.  I learned a lot.
>
> Great, that looks *much* nicer now without the profile hackery that was
> done before :) I suppose with that, the xpis are directly opened from
> the systemwide install, and not copied to the running profile anymore ?
>
> Have you tried various settings for the scopes ? (honestly, for
> thunderbird it was a try-and-see, and i ended up with 3, i see you use
> 5, just wondering about the reasoning)

I went with 5 because it seemed like 4|1 was correct based on the
description of the flag bits at
https://developer.mozilla.org/en-US/Add-ons/Installing_extensions:

Value   Install scope
1   The current users's profile.
2   All profiles of the logged-in user.
4   Installed and owned by Firefox.
8   Installed for all users of the computer.
15  The combination of all scopes.

We want the extensions that are part of the bundle to be found and we
also want the user to be able to install their own extensions (thus my
thinking 4|1).  I wanted to give a better response than *shrug* to
your question so I've now tried with enabledScopes set to 1, 2, 3, 4, 5,
8, 15 and 0 and in all cases in my testing the same thing happened:
tor-browser copies the .xpi files from
/usr/local/lib/tor-browser-5.5/distribution/extensions to the user's
profile during initialization and seems to run them from there.  In
one case (enabledScopes = 2) an empty extensions/ subdir was created
under ~/.tor-browser (DefProfRt) as well.  When autoDisableScopes is
set to 15 it makes no difference, which surprised me a lot.  I
verified in each case in about:config that the values of
extensions.enabledScopes and .autoDisableScopes were what I thought
they were.  They default to 1 and 0 in tor-browser, respectively.

I could've sworn those .xpi files were not being recognized in
distribution/extensions before I went down this path, but somehow now
they are, so I must've be wrong.  It isn't the presence of the
autoconfig file, either, since I tried turning that off and the
extensions were still loaded, just misconfigured.  When I get time
I'll figure out why enabledScopes doesn't (seem to) matter by looking
at all their patches to ESR... there must be something in there.

> Lots of things are 'hardcoded' in tor-browser.cfg, where are those
> values coming from, can you maybe document them ?

Most of that file is from extension-overrides.js in the TBB, slightly
munged.  Its purpose is to tweak prefs in the extensions and to
configure default bridges for pluggable transports, the latter of
which we don't support at all yet.  All of those values come verbatim
from upstream - they are the way the Tor project has decided
e.g. noscript should be configured in TBB.

I didn't mean to leave that bit I added at the top and have since
moved it to the bottom so that file is more textually similar to
upstream, but I have to mung it a little because hash-style comments
don't work in an autoconfig file.  Keeping tor-browser.cfg in sync
with extension-overrides.js as it ships in the official bundle is
something I will automate as soon as I can.

> I noticed that www/tbb/tbb/Makefile still mentions gxmessage for
> start-tor-browser, i suppose that's not needed anymore ?

Right.  Gone.

> One thing more packaging-related: i see that tor-browser RUN_DEPENDS on
> the extensions, but 'conceptually' it'd be better the other way for two
> reasons:
> - the extensions are useless without tor-browser installed
> - tor-browser *could* run without the extensions (but wouldnt provide
>   the expected user-experience, agreed)
>
> Making it the other way could also allow you to get rid of the
> directories from each extension PLIST, which

Re: NEW: www/tbb - Tor Browser Bundle

2016-02-17 Thread attila 

Landry Breuil <lan...@rhaalovely.net> writes:

> On Mon, Feb 15, 2016 at 10:54:26AM -0600, attila wrote:
>> 
>> Landry Breuil <lan...@rhaalovely.net> writes:
>> 
>
> You shouldnt need to copy the xpi's to the user profile, there are ways
> via tweaks to make it work.
>
> 
>
> Of course, all this is documented in
> https://developer.mozilla.org/en-US/Add-ons/Installing_extensions and
> explained in
> https://mike.kaply.com/2012/02/21/understanding-add-on-scopes/

How right you are.  After doing some more digging I've come up with a
solution that ditches the start-tor-browser script and uses a mozilla
autoconfig file instead, along with some other tweaks to make it go as
per Mike Kaply and MDN.  Attached are the new ports, although still at
TBB 5.5 (still need to update to 5.5.2).

Thanks for the cluebat.  I learned a lot.

>
> Landry

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0xE6CC1EDB


tbb-resub3.tgz
Description: updated tbb 5.5 ports

Re: NEW: www/tbb - Tor Browser Bundle

2016-02-15 Thread attila 
 
Landry Breuil <lan...@rhaalovely.net> writes:

> On Mon, Feb 08, 2016 at 02:53:16PM -0600, attila wrote:
>> 
>> Landry Breuil <lan...@rhaalovely.net> writes:
>
> 
>
>> > Have you tried leaving the .xpi files compressed in their respective
>> > dirs at runtime (eventually unzipping/patching/rezipping) as you comment
>> > in Makefile.inc line 68 ? Iirc this should also work and is 'nicer' to
>> > the filesystem..
>> 
>> I finally just grokked in fullness what you were saying here (sorry, a
>> bit slow).  Given that I already have a start-tor-browser shell script
>> in place to set things up we could instead switch to having .xpi files
>> in distribution/extensions (or wherever) and unpack them when
>> ~/.tor-browser is populated.  I'm sorry I didn't get to it before now,
>> maybe the rest of what I've done can be critiqued and I'll make this
>> change and test it when I get my buildbox back.
>
> Fwiw, in TB 45 (and, i suppose, FX 45 but ours doesnt ship default
> extensions) the bundled xpi's stay installed as xpi, and that works just
> fine. There should be no need to unpack them in /usr/local, nor in the
> user profile - if i got it right, you copy those extensions to the user
> profile ? why ?
>

I'm sorry for not responding sooner.  The short summary of what we've
found from testing/debugging over the last few days (on amd64 only
sadly):

1. extension-overrides.js only works if you drop it into the user's
   profiledir (~/.tor-browser/profile.default/preferences).  I belive
   this has to do with the order in which things happen at startup;
2. The four addons in www/tbb must be in the user's profiledir or they
   won't be loaded (~/.tor-browser/profile.default/extensions).  It
   just doesn't work from anywhere under /usr/local/lib/tor-browser-5.5
   that I could find;
3. I was confused and not naming the .xpi files with the appid, e.g.
   https-everywhere-...@eff.org.xpi.  This is why I was convinced that
   .xpi files weren't working - they do indeed work as you said once
   you name them properly, but only in the user's profdir.

Attached are updated ports that rework the way the extensions are
packaged.  They now drop .xpi files into
/usr/local/tor-browser-5.5/distribution/extensions, as you asked.  The
start-tor-browser script copies them as before, but just .xpi files
not whole directory trees.  I've also ditched the idea of bothering to
build the https-everywhere .xpi and am grabbing the official one like
I do for noscript.  All of a sudden this is a lot easier to maintain.
Don't know what I was thinking.

I realize ports lock is in effect so this can't make it in but I
wanted to respond to get some closure on what we have so far.  The
packages we put up for testing have been updated:

http://mirrors.nycbug.org/pub/snapshots/packages/amd64/README-55.txt

We'll keep them up to date until we (hopefully) don't have to :-)
I'm now moving on to 5.5.2, which includes a major security update
(update to latest ESR to pick up Graphite fix).

Thanks for your help and patience.

> Landry

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0xE6CC1EDB


tbb-resub2.tgz
Description: updated submission: tor browser ports

Re: NEW: www/tbb - Tor Browser Bundle

2016-02-08 Thread attila 

Landry Breuil <lan...@rhaalovely.net> writes:

> On Mon, Nov 16, 2015 at 09:07:46AM -0600, attila wrote:
>> 
>> attila <att...@stalphonsos.com> writes:
>> 
>> > attila <att...@stalphonsos.com> writes:
>> >
>> >> attila <att...@stalphonsos.com> writes:
>> >>
>> >>> attila <att...@stalphonsos.com> writes:
>> >>>
>> >>>> attila <att...@stalphonsos.com> writes:
>> >>>>
>> >>>>> Hi ports@,
>> >>>>>
>> >>>>> I have been informed that my previous email re Tor Browser Bundle was
>> >>>>> malformed: the Content-Type header on the message says text/plain but
>> >>>>> should be multipart/mixed, which causes many (most?) MUAs to throw up
>> >>>>> all over it.  I'm not sure where the fault lies yet, and apologize for
>> >>>>> the screwed up attachment.
>> >>>>>
>> >>>>> In the interests of simplicity and efficacy the tarball can be found
>> >>>>> here: http://bits.haqistan.net/~attila/tbb.tgz
>> >>>>>
>> >>>>> Sorry.
>> >>>>>
>> >>>>> Pax, -A
>> >>>>
>> >>>> I've updated http://bits.haqistan.net/~attila/tbb.tgz with the
>> >>>> just-completed update to Tor Browser 4.5.3.  Tested on amd64.
>> >>>>
>> >>>> So... update & ping.
>> >>>>
>> >>>> Pax, -A
>> >>>
>> >>> Reupdate & reping:
>> >>>
>> >>> I brought the ports up to the current version, which is now 5.0.3.
>> >>> I've also solved my attachment woes; updated ports attached (URL above
>> >>> has new bits as well).  Tested on amd64.  There are packages available
>> >>> for testing at:
>> >>> http://mirrors.nycbug.org/pub/snapshots/packages/amd64/
>> >>> The README file there might be helpful if you want to test.
>> >>>
>> >>> FWIW, the GH repository is: https://github.com/torbsd/openbsd-ports
>> >>> YMMV.
>> >>>
>> >>> Pax, -A
>> >>
>> >> Re-reupdate & re-reping:
>> >>
>> >> Thanks to Daniel Jakots for pointing out that the inter-package
>> >> dependencies were all balled up and led to problems.  Updated ports
>> >> attached with better deps, updated packages for testing available at
>> >> the nycbug URL, above.
>> >>
>> >> Pax, -A
>> >
>> > Re*ping.  I know some people have been using the packages we put up
>> > for testing purposes.  I also know this is potentially sort of a
>> > controversial (set of) port(s) and that everyone is busy but if anyone
>> > could be troubled to take a look and give some feedback that would
>> > be great.
>> >
>> > Attaching the latest version of the ports for completeness.
>> >
>> > Pax, -A
>> 
>> Ping.
>
> I had a quick look a while ago at the Makefile. I would *really* prefer
> you to shrink it by reusing www/mozilla MODULE, provided you work out
> the correct changes that would be needed for tbb without breaking the
> other users of the module. Instead of copy-pasting-cargo-culting what's
> in the module...

Okay, finally, I have done at least this much.  The attached update to
the five ports is mostly about switching to the www/mozilla MODULE,
thanks to your patch for bundled nss.  It also brings us up to TBB
5.5.  Tested on amd64 with whatever the latest snapshot was on 5 Feb
(don't recall now, don't have amd64 handy ATM :-()

> Is the .mozconfig hackery really needed ?

The @CONFIG_GUESS@ token in .mozconfig does not seem to get s///'ed
correctly by autoconf.  I don't have my build machine available right
now but I seem to recall that firefox-esr doesn't ship with a
.mozconfig file, but Tor browser does... could be wrong.  When I get
my buildbox back I'll look at this again.  I'm guessing that this hack
and the other post-extract sed hack for baseconfig.mk can be sussed
out and turned into patches for upstream instead.

> The @exec lines in the PLIST should go at the bottom.

Done.

> I think you dont need files/firefox.desktop, and do you really need
> files/profiles.ini ?

This is tor-browser.desktop now.  The profiles.ini file is
unfortunately necessary given the way I pre-populate ~/.tor-browser
but if there's a better way... this is just how they do it in the
bundle.

> Have you tried

Re: NEW: www/tbb - Tor Browser Bundle

2016-02-08 Thread attila 

attila <att...@stalphonsos.com> writes:

> Landry Breuil <lan...@rhaalovely.net> writes:
>
>> On Mon, Nov 16, 2015 at 09:07:46AM -0600, attila wrote:
>>> 
>>> attila <att...@stalphonsos.com> writes:
>>> 
>>> > attila <att...@stalphonsos.com> writes:
>>> >
>>> >> attila <att...@stalphonsos.com> writes:
>>> >>
>>> >>> attila <att...@stalphonsos.com> writes:
>>> >>>
>>> >>>> attila <att...@stalphonsos.com> writes:
>>> >>>>
>>> >>>>> Hi ports@,
>>> >>>>>
>>> >>>>> I have been informed that my previous email re Tor Browser Bundle was
>>> >>>>> malformed: the Content-Type header on the message says text/plain but
>>> >>>>> should be multipart/mixed, which causes many (most?) MUAs to throw up
>>> >>>>> all over it.  I'm not sure where the fault lies yet, and apologize for
>>> >>>>> the screwed up attachment.
>>> >>>>>
>>> >>>>> In the interests of simplicity and efficacy the tarball can be found
>>> >>>>> here: http://bits.haqistan.net/~attila/tbb.tgz
>>> >>>>>
>>> >>>>> Sorry.
>>> >>>>>
>>> >>>>> Pax, -A
>>> >>>>
>>> >>>> I've updated http://bits.haqistan.net/~attila/tbb.tgz with the
>>> >>>> just-completed update to Tor Browser 4.5.3.  Tested on amd64.
>>> >>>>
>>> >>>> So... update & ping.
>>> >>>>
>>> >>>> Pax, -A
>>> >>>
>>> >>> Reupdate & reping:
>>> >>>
>>> >>> I brought the ports up to the current version, which is now 5.0.3.
>>> >>> I've also solved my attachment woes; updated ports attached (URL above
>>> >>> has new bits as well).  Tested on amd64.  There are packages available
>>> >>> for testing at:
>>> >>> http://mirrors.nycbug.org/pub/snapshots/packages/amd64/
>>> >>> The README file there might be helpful if you want to test.
>>> >>>
>>> >>> FWIW, the GH repository is: https://github.com/torbsd/openbsd-ports
>>> >>> YMMV.
>>> >>>
>>> >>> Pax, -A
>>> >>
>>> >> Re-reupdate & re-reping:
>>> >>
>>> >> Thanks to Daniel Jakots for pointing out that the inter-package
>>> >> dependencies were all balled up and led to problems.  Updated ports
>>> >> attached with better deps, updated packages for testing available at
>>> >> the nycbug URL, above.
>>> >>
>>> >> Pax, -A
>>> >
>>> > Re*ping.  I know some people have been using the packages we put up
>>> > for testing purposes.  I also know this is potentially sort of a
>>> > controversial (set of) port(s) and that everyone is busy but if anyone
>>> > could be troubled to take a look and give some feedback that would
>>> > be great.
>>> >
>>> > Attaching the latest version of the ports for completeness.
>>> >
>>> > Pax, -A
>>> 
>>> Ping.
>>
>> I had a quick look a while ago at the Makefile. I would *really* prefer
>> you to shrink it by reusing www/mozilla MODULE, provided you work out
>> the correct changes that would be needed for tbb without breaking the
>> other users of the module. Instead of copy-pasting-cargo-culting what's
>> in the module...
>
> Okay, finally, I have done at least this much.  The attached update to
> the five ports is mostly about switching to the www/mozilla MODULE,
> thanks to your patch for bundled nss.  It also brings us up to TBB
> 5.5.  Tested on amd64 with whatever the latest snapshot was on 5 Feb
> (don't recall now, don't have amd64 handy ATM :-()
>

As per ancient custom, I forgot the frigging tarball... attached here.

>> Is the .mozconfig hackery really needed ?
>
> The @CONFIG_GUESS@ token in .mozconfig does not seem to get s///'ed
> correctly by autoconf.  I don't have my build machine available right
> now but I seem to recall that firefox-esr doesn't ship with a
> .mozconfig file, but Tor browser does... could be wrong.  When I get
> my buildbox back I'll look at this again.  I'm guessing that this hack
> and the other

Re: [NEW] devel/p5-Data-SExpression

2015-11-23 Thread attila 

attila <att...@stalphonsos.com> writes:

> Hi ports@,
>
> Attached is a port for the Data::SExpression Perl module.  It is a
> dependency of the Perl interface I recently contributed to mail/mu
> upstream, and which will be coming down the pike in some new mu
> release fairly soon.
>
> $ cat pkg/DESCR
> Data::SExpression is a Perl module that parses LISP-like
> S-expressions into Perl data structures.
>
> Passes make test on i386.
>
> Comments, feedback most welcome.
>
> Pax, -A

Ping?  Port attached.

Pax, -A
-- 
http://trac.haqistan.net | att...@stalphonsos.com | 0xE6CC1EDB


p5-Data-SExpression.tgz
Description: proposed new port: devel/p5-Data-SExpression

Re: NEW: www/tbb - Tor Browser Bundle

2015-11-16 Thread attila 

Landry Breuil <lan...@rhaalovely.net> writes:

> On Mon, Nov 16, 2015 at 09:07:46AM -0600, attila wrote:
>> 
>> attila <att...@stalphonsos.com> writes:
>> 
>> > attila <att...@stalphonsos.com> writes:
>> >
>> >> attila <att...@stalphonsos.com> writes:
>> >>
>> >>> attila <att...@stalphonsos.com> writes:
>> >>>
>> >>>> attila <att...@stalphonsos.com> writes:
>> >>>>
>> >>>>> Hi ports@,
>> >>>>>
>> >>>>> I have been informed that my previous email re Tor Browser Bundle was
>> >>>>> malformed: the Content-Type header on the message says text/plain but
>> >>>>> should be multipart/mixed, which causes many (most?) MUAs to throw up
>> >>>>> all over it.  I'm not sure where the fault lies yet, and apologize for
>> >>>>> the screwed up attachment.
>> >>>>>
>> >>>>> In the interests of simplicity and efficacy the tarball can be found
>> >>>>> here: http://bits.haqistan.net/~attila/tbb.tgz
>> >>>>>
>> >>>>> Sorry.
>> >>>>>
>> >>>>> Pax, -A
>> >>>>
>> >>>> I've updated http://bits.haqistan.net/~attila/tbb.tgz with the
>> >>>> just-completed update to Tor Browser 4.5.3.  Tested on amd64.
>> >>>>
>> >>>> So... update & ping.
>> >>>>
>> >>>> Pax, -A
>> >>>
>> >>> Reupdate & reping:
>> >>>
>> >>> I brought the ports up to the current version, which is now 5.0.3.
>> >>> I've also solved my attachment woes; updated ports attached (URL above
>> >>> has new bits as well).  Tested on amd64.  There are packages available
>> >>> for testing at:
>> >>> http://mirrors.nycbug.org/pub/snapshots/packages/amd64/
>> >>> The README file there might be helpful if you want to test.
>> >>>
>> >>> FWIW, the GH repository is: https://github.com/torbsd/openbsd-ports
>> >>> YMMV.
>> >>>
>> >>> Pax, -A
>> >>
>> >> Re-reupdate & re-reping:
>> >>
>> >> Thanks to Daniel Jakots for pointing out that the inter-package
>> >> dependencies were all balled up and led to problems.  Updated ports
>> >> attached with better deps, updated packages for testing available at
>> >> the nycbug URL, above.
>> >>
>> >> Pax, -A
>> >
>> > Re*ping.  I know some people have been using the packages we put up
>> > for testing purposes.  I also know this is potentially sort of a
>> > controversial (set of) port(s) and that everyone is busy but if anyone
>> > could be troubled to take a look and give some feedback that would
>> > be great.
>> >
>> > Attaching the latest version of the ports for completeness.
>> >
>> > Pax, -A
>> 
>> Ping.
>
> I had a quick look a while ago at the Makefile. I would *really* prefer
> you to shrink it by reusing www/mozilla MODULE, provided you work out
> the correct changes that would be needed for tbb without breaking the
> other users of the module. Instead of copy-pasting-cargo-culting what's
> in the module...

I would be thrilled to do this, esp. since I already follow along
w/mozilla.port.mk changes anyway.  Will get on it.

> Is the .mozconfig hackery really needed ?

This was to get around an early hurdle; it might be that it isn't
necessary any more or that I can find a better way - will investigate.

> The @exec lines in the PLIST should go at the bottom.

Okay.

>
> I think you dont need files/firefox.desktop, and do you really need
> files/profiles.ini ?

The former you're right, it's not needed.  The latter, sadly, is
really needed to make sure a user's ~/.tor-browser has the shape
required to initialize it properly.  It is very small and it could
just be sucked into the start-tor-browser sh script instead if that's
preferable.

>
> Have you tried leaving the .xpi files compressed in their respective
> dirs at runtime (eventually unzipping/patching/rezipping) as you comment
> in Makefile.inc line 68 ? Iirc this should also work and is 'nicer' to
> the filesystem..

I tried many variations of this a few months ago and none of them
worked but I will revisit it.

> I'm still not a fan of having this in-tree, but i'd like opinions from
> other porters & tor users (us

  1   2   >