From: Caspar Schutijser <caspar@schutijser.com>
Subject: Tor Browser: use Lyrebird instead of obfs4proxy
To: ports@openbsd.org
Date: Sat, 3 Jan 2026 15:08:02 +0100

Hi,

Below is a diff to make Tor Browser use the recently imported Lyrebird
instead of obfs4proxy. Lyrebird is a obfs4proxy fork by the Tor Project.
obfs4proxy is not really maintained anymore, whereas Lyrebird is.
Additionally, Lyrebird contains an additional Pluggable Transport named
WebTunnel.

Are there any users willing to test? OKs or comments also welcome.

Caspar


Index: browser/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
diff -u -p -r1.185 Makefile
--- browser/Makefile	27 Dec 2025 17:12:58 -0000	1.185
+++ browser/Makefile	3 Jan 2026 13:59:47 -0000
@@ -12,7 +12,7 @@ EXTRACT_SUFX =		.tar.xz
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION:S/a/alpha/}
 DISTNAME =		src-firefox-tor-browser-140.6.0esr-15.0-1-build5
-REVISION =		1
+REVISION =		2
 
 FIX_EXTRACT_PERMISSIONS	= Yes
 DISTFILES +=		${DISTNAME}.tar.xz \
@@ -87,7 +87,7 @@ MAKE_ENV +=		BUILD_OPT=1 \
 			NSS_ENABLE_ECC=1 \
 			XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 
-RUN_DEPENDS +=		net/obfs4proxy>=0.0.14 \
+RUN_DEPENDS +=		net/lyrebird \
 			net/snowflake_proxy>=2.4.1 \
 			net/tor>=0.4.8.7
 
Index: browser/files/torrc-defaults
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/files/torrc-defaults,v
diff -u -p -r1.2 torrc-defaults
--- browser/files/torrc-defaults	16 Jan 2023 18:19:20 -0000	1.2
+++ browser/files/torrc-defaults	3 Jan 2026 13:59:47 -0000
@@ -12,8 +12,8 @@ CookieAuthentication 1
 GeoIPFile ${LOCALBASE}/share/tor/geoip
 GeoIPv6File ${LOCALBASE}/share/tor/geoip6
 
-## obfs4proxy configuration
-ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec /usr/local/bin/obfs4proxy
+## lyrebird configuration
+ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit,webtunnel exec /usr/local/bin/lyrebird
 
 ## snowflake configuration
 ClientTransportPlugin snowflake exec /usr/local/bin/snowflake_client
Index: browser/files/unveil.main
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/files/unveil.main,v
diff -u -p -r1.13 unveil.main
--- browser/files/unveil.main	14 Apr 2025 17:52:55 -0000	1.13
+++ browser/files/unveil.main	3 Jan 2026 13:59:47 -0000
@@ -13,7 +13,7 @@
 # normally "pledge dns" exempts this from unveil, but pledge might be disabled
 /etc/resolv.conf r
 
-/usr/local/bin/obfs4proxy rx
+/usr/local/bin/lyrebird rx
 /usr/local/bin/tor rx
 /usr/local/lib r
 /usr/local/lib/tor-browser rx