Re: UPDATE: Tor Browser 11.0.3

Stefan Hagen <sh+openbsd-ports@codevoid.de> writes:

> Omar Polo wrote:
>> Caspar Schutijser <caspar@schutijser.com> writes:
>>
>> > And here is an update to 11.0.3. Again tested on amd64.
>> > More information here:
>> > https://blog.torproject.org/new-release-tor-browser-1103/
>> >
>> > Caspar Schutijser
>>
>> build and works fine, just like the 11.0.2 :)
>>
>> Haven't had any troubles with the fonts, be it monospace or not.
>>
>> OK op if anyone wants to commit.
>
> I'm seeing missing wantlibs and some extras.
>
> tb-browser-11.0.3(www/tor-browser/browser):
> Missing: Xt.11 (/usr/local/lib/tor-browser/libxul.so.7.0) (system lib)
> Missing: gthread-2.0.4200 from glib2-2.70.2 (/usr/local/lib/tor-browser/libxul.so.7.0)
> Missing: pangoft2-1.0.3801 from pango-1.50.3 (/usr/local/lib/tor-browser/libxul.so.7.0)
> Extra: Xcomposite.4 Xcursor.5 Xdamage.4 Xfixes.6 Xi.12 gdk-x11-2.0.2400
> Extra: gtk-x11-2.0.2400
> WANTLIB += Xt gthread-2.0 pangoft2-1.0

my bad, forgot to do some checks. It still packaged because glib and
pango are in the dependency tree.

> The updated patch below leads to this output:
>
> tb-browser-11.0.3(www/tor-browser/browser):
> Extra: Xcomposite.4 Xdamage.4 Xfixes.6 gdk-x11-2.0.2400 gtk-x11-2.0.2400

these seems to come from www/mozilla/mozzilla.port.mk (grep for
MODMOZ_WANTLIB) and are added unconditionally.

FWIW the WANTLIB were in sync with www/mozilla-firefox and
www/firefox-esr so maybe the same issue applies there too? (I haven't
tried to build either to verify.)

> Best Regards,
> Stefan
>
> Index: meta/tor-browser/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/meta/tor-browser/Makefile,v
> retrieving revision 1.47
> diff -u -p -u -p -r1.47 Makefile
> --- meta/tor-browser/Makefile 20 Nov 2021 17:56:33 -0000 1.47
> +++ meta/tor-browser/Makefile 23 Dec 2021 17:07:57 -0000
> @@ -4,11 +4,11 @@ COMMENT= Tor Browser meta package
>
> MAINTAINER= Caspar Schutijser <caspar@schutijser.com>
>
> -PKGNAME= tor-browser-11.0.1
> +PKGNAME= tor-browser-11.0.3
> ONLY_FOR_ARCHS = amd64
>
> -RUN_DEPENDS= www/tor-browser/browser>=11.0.1 \
> +RUN_DEPENDS= www/tor-browser/browser>=11.0.3 \
> www/tor-browser/noscript>=11.2.11 \
> - net/tor>=0.4.6.8
> + net/tor>=0.4.6.9
>
> .include <bsd.port.mk>
> Index: www/tor-browser/Makefile.inc
> ===================================================================
> RCS file: /home/cvs/ports/www/tor-browser/Makefile.inc,v
> retrieving revision 1.45
> diff -u -p -u -p -r1.45 Makefile.inc
> --- www/tor-browser/Makefile.inc 17 Nov 2021 21:08:21 -0000 1.45
> +++ www/tor-browser/Makefile.inc 23 Dec 2021 17:07:57 -0000
> @@ -5,7 +5,7 @@ HOMEPAGE ?= https://www.torproject.org
> PERMIT_PACKAGE ?= Yes
> CATEGORIES = www
> BROWSER_NAME = tor-browser
> -TB_VERSION = 11.0.1
> +TB_VERSION = 11.0.3
> TB_PREFIX = tb
>
> SUBST_VARS += BROWSER_NAME TB_VERSION
> Index: www/tor-browser/browser/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/www/tor-browser/browser/Makefile,v
> retrieving revision 1.70
> diff -u -p -u -p -r1.70 Makefile
> --- www/tor-browser/browser/Makefile 17 Nov 2021 21:08:21 -0000 1.70
> +++ www/tor-browser/browser/Makefile 24 Dec 2021 09:55:04 -0000
> @@ -16,7 +16,7 @@ EXTRACT_SUFX = .tar.xz
> PATCHORIG = .pat.orig
>
> PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
> -DISTNAME = src-firefox-tor-browser-91.3.0esr-11.0-1-build4
> +DISTNAME = src-firefox-tor-browser-91.4.1esr-11.0-1-build1
>
> FIX_EXTRACT_PERMISSIONS = Yes
> EXTRACT_ONLY += ${DISTNAME}.tar.xz \
> @@ -56,8 +56,9 @@ BUILD_DEPENDS += devel/cbindgen>=0.19.0
> BUILD_DEPENDS += devel/m4
>
> # uses pledge()
> -WANTLIB += X11-xcb Xcursor Xi intl xcb xcb-shm harfbuzz ${COMPILER_LIBCXX}
> -WANTLIB += Xcomposite Xdamage Xfixes
> +# Extra: Xcomposite.4 Xdamage.4 Xfixes.6 gdk-x11-2.0.2400 gtk-x11-2.0.2400
> +WANTLIB += X11-xcb Xt gthread-2.0 harfbuzz intl pangoft2-1.0
> +WANTLIB += xcb xcb-shm ${COMPILER_LIBCXX}
>
> # Regression tests are too hard to adapt to run here
> NO_TEST = Yes
> @@ -84,7 +85,7 @@ BUILD_DEPENDS += devel/py-virtualenv
>
> BUILD_DEPENDS += archivers/unzip archivers/zip
>
> -RUN_DEPENDS += net/tor>=0.4.6.8
> +RUN_DEPENDS += net/tor>=0.4.6.9
>
> CONFIGURE_ARGS += --enable-release #1386371
> CONFIGURE_ARGS += --enable-sandbox
> Index: www/tor-browser/browser/distinfo
> ===================================================================
> RCS file: /home/cvs/ports/www/tor-browser/browser/distinfo,v
> retrieving revision 1.44
> diff -u -p -u -p -r1.44 distinfo
> --- www/tor-browser/browser/distinfo 17 Nov 2021 21:08:21 -0000 1.44
> +++ www/tor-browser/browser/distinfo 23 Dec 2021 17:07:57 -0000
> @@ -1,8 +1,8 @@
> SHA256 (mozilla/https-everywhere-2021.4.15-eff.xpi) = fl9ygI6hSL7M1BbsvfM+oevEOkMuTnhbXl4TObeitwg=
> -SHA256 (mozilla/src-firefox-tor-browser-91.3.0esr-11.0-1-build4.tar.xz) = etFSS3LCqNAbWnFZQfJo9IiEDfR49fzaXPO7uKY6MA0=
> +SHA256 (mozilla/src-firefox-tor-browser-91.4.1esr-11.0-1-build1.tar.xz) = Jghm176evWq2NRBaQ9YcSbvVPdI4cMmNG3jrcKxPCQU=
> SHA256 (mozilla/src-tor-launcher-0.2.32.tar.xz) = WYvM6cGDVH9NFkLK0oBZ0JxYBI3sEuqMNUp/SHVFa3g=
> -SHA256 (mozilla/tor-browser-linux64-11.0.1_en-US.tar.xz) = E6GCjMiSs4sPUDNIJhHJ/zB0aj3xe/DzWcUpxNZHpbM=
> +SHA256 (mozilla/tor-browser-linux64-11.0.3_en-US.tar.xz) = ZdyTB9qfPhvGW6pZiP6OZPOVnuhY9r7ARfOFJ2vvVqg=
> SIZE (mozilla/https-everywhere-2021.4.15-eff.xpi) = 1746434
> -SIZE (mozilla/src-firefox-tor-browser-91.3.0esr-11.0-1-build4.tar.xz) = 413488416
> +SIZE (mozilla/src-firefox-tor-browser-91.4.1esr-11.0-1-build1.tar.xz) = 413497744
> SIZE (mozilla/src-tor-launcher-0.2.32.tar.xz) = 228884
> -SIZE (mozilla/tor-browser-linux64-11.0.1_en-US.tar.xz) = 86368976
> +SIZE (mozilla/tor-browser-linux64-11.0.3_en-US.tar.xz) = 86291308
> Index: www/tor-browser/browser/pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/www/tor-browser/browser/pkg/PLIST,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 PLIST
> --- www/tor-browser/browser/pkg/PLIST 17 Nov 2021 21:08:22 -0000 1.12
> +++ www/tor-browser/browser/pkg/PLIST 23 Dec 2021 17:07:57 -0000
> @@ -60,7 +60,6 @@ lib/${BROWSER_NAME}/browser/fonts/NotoSa
> lib/${BROWSER_NAME}/browser/fonts/NotoSansEthiopic-Regular.ttf
> lib/${BROWSER_NAME}/browser/fonts/NotoSansGeorgian-Regular.ttf
> lib/${BROWSER_NAME}/browser/fonts/NotoSansGujarati-Regular.ttf
> -lib/${BROWSER_NAME}/browser/fonts/NotoSansGurmukhi-Regular.ttf
> lib/${BROWSER_NAME}/browser/fonts/NotoSansHebrew-Regular.ttf
> lib/${BROWSER_NAME}/browser/fonts/NotoSansJP-Regular.otf
> lib/${BROWSER_NAME}/browser/fonts/NotoSansKR-Regular.otf
> @@ -72,7 +71,6 @@ lib/${BROWSER_NAME}/browser/fonts/NotoSa
> lib/${BROWSER_NAME}/browser/fonts/NotoSansMyanmar-Regular.ttf
> lib/${BROWSER_NAME}/browser/fonts/NotoSansOriya-Regular.ttf
> lib/${BROWSER_NAME}/browser/fonts/NotoSansSC-Regular.otf
> -lib/${BROWSER_NAME}/browser/fonts/NotoSansSinhala-Regular.ttf
> lib/${BROWSER_NAME}/browser/fonts/NotoSansTC-Regular.otf
> lib/${BROWSER_NAME}/browser/fonts/NotoSansTamil-Regular.ttf
> lib/${BROWSER_NAME}/browser/fonts/NotoSansTelugu-Regular.ttf