From: Christoph Liebender Subject: Re: [maintainer update] net/wstunnel 10.5.5 To: Björn Ketelaars Cc: ports@openbsd.org Date: Tue, 12 May 2026 21:25:25 +0200 On 5/12/26 21:21, Björn Ketelaars wrote: > On Tue 12/05/2026 20:42, Christoph Liebender wrote: >> hello again ports@, >> >> here we go again with a bump for wstunnel. tests, port-lib-depends and >> portcheck are happy as ever. >> >> ok? >> > >> -MODCARGO_CRATES += zerotrie 0.2.4 # Unicode-3.0 >> -MODCARGO_CRATES += zerovec 0.11.6 # Unicode-3.0 >> -MODCARGO_CRATES += zerovec-derive 0.11.3 # Unicode-3.0 >> -MODCARGO_CRATES += zmij 1.0.21 # MIT >> +# run: make modcargo-gen-crates-licenses >> +MODCARGO_CRATES += ahash 0.8.12 >> +MODCARGO_CRATES += aho-corasick 1.1.4 >> +MODCARGO_CRATES += android_system_properties 0.1.5 >> +MODCARGO_CRATES += anstream 1.0.0 > > > Please run 'make modcargo-gen-crates-licenses'. > whoops! no wonder that diff was so large... thanks! diff --git a/net/wstunnel/Makefile b/net/wstunnel/Makefile index 9ba68a7f3e5..964a4b9a7e2 100644 --- a/net/wstunnel/Makefile +++ b/net/wstunnel/Makefile @@ -5,7 +5,7 @@ COMMENT = tunnel all your traffic over Websocket or HTTP2 GH_ACCOUNT = erebe GH_PROJECT = wstunnel -GH_TAGNAME = v10.5.4 +GH_TAGNAME = v10.5.5 CATEGORIES = net diff --git a/net/wstunnel/crates.inc b/net/wstunnel/crates.inc index 3980518e1c8..6c7ad5a7ce8 100644 --- a/net/wstunnel/crates.inc +++ b/net/wstunnel/crates.inc @@ -381,9 +381,9 @@ MODCARGO_CRATES += unicode-xid 0.2.6 # MIT OR Apache-2.0 MODCARGO_CRATES += unsafe-libyaml 0.2.11 # MIT MODCARGO_CRATES += untrusted 0.7.1 # ISC MODCARGO_CRATES += untrusted 0.9.0 # ISC +MODCARGO_CRATES += unveil 0.3.2 # MIT/Apache-2.0 MODCARGO_CRATES += ureq 3.3.0 # MIT OR Apache-2.0 MODCARGO_CRATES += ureq-proto 0.6.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += unveil 0.3.2 # MIT/Apache-2.0 MODCARGO_CRATES += url 2.5.8 # MIT OR Apache-2.0 MODCARGO_CRATES += urlencoding 2.1.3 # MIT MODCARGO_CRATES += utf-8 0.7.6 # MIT OR Apache-2.0 diff --git a/net/wstunnel/distinfo b/net/wstunnel/distinfo index f45fbdf8072..2a92037f27d 100644 --- a/net/wstunnel/distinfo +++ b/net/wstunnel/distinfo @@ -463,7 +463,7 @@ SHA256 (cargo/zerotrie-0.2.4.tar.gz) = D5FS0x2weS+oP3D7L4MUjv+1wfW4x2hsNFnjYdm8I SHA256 (cargo/zerovec-0.11.6.tar.gz) = kPkRy8NZq2rxc3fSQiJfTXURmuyH6nEaiAmHsYzXsjk= SHA256 (cargo/zerovec-derive-0.11.3.tar.gz) = Yl3EJcqw3KbcPDMZUG5lk9ywip84fqOyhNvVKpLEBVU= SHA256 (cargo/zmij-1.0.21.tar.gz) = uISO5n7Miu268+QSIhev+JJjkjG+/GobWNKf/0wsq6o= -SHA256 (wstunnel-10.5.4.tar.gz) = GBW2SkcRTk10Sby3bikqB8Djo8rlO+FDReu2TrrT47Q= +SHA256 (wstunnel-10.5.5.tar.gz) = xLZ1uthmjLhqmelrbjQ6i848Y4L1TCZodTM6rKIJsfk= SIZE (cargo/ahash-0.8.12.tar.gz) = 43413 SIZE (cargo/aho-corasick-1.1.4.tar.gz) = 184015 SIZE (cargo/android_system_properties-0.1.5.tar.gz) = 5243 @@ -929,4 +929,4 @@ SIZE (cargo/zerotrie-0.2.4.tar.gz) = 83690 SIZE (cargo/zerovec-0.11.6.tar.gz) = 128583 SIZE (cargo/zerovec-derive-0.11.3.tar.gz) = 22115 SIZE (cargo/zmij-1.0.21.tar.gz) = 26665 -SIZE (wstunnel-10.5.4.tar.gz) = 1721726 +SIZE (wstunnel-10.5.5.tar.gz) = 1721833 diff --git a/net/wstunnel/patches/patch-wstunnel_src_test_integrations_rs b/net/wstunnel/patches/patch-wstunnel_src_test_integrations_rs new file mode 100644 index 00000000000..6591f709d97 --- /dev/null +++ b/net/wstunnel/patches/patch-wstunnel_src_test_integrations_rs @@ -0,0 +1,19 @@ +Don't try to use aws_lc in test as this port uses ring + +Index: wstunnel/src/test_integrations.rs +--- wstunnel/src/test_integrations.rs.orig ++++ wstunnel/src/test_integrations.rs +@@ -25,12 +25,7 @@ use url::Host; + + #[fixture] + fn dns_resolver() -> DnsResolver { +- if tokio_rustls::rustls::crypto::aws_lc_rs::default_provider() +- .install_default() +- .is_err() +- { +- let _ = tokio_rustls::rustls::crypto::ring::default_provider().install_default(); +- } ++ let _ = tokio_rustls::rustls::crypto::ring::default_provider().install_default(); + DnsResolver::new_from_urls(&[], None, SoMark::new(None), true).expect("Cannot create DNS resolver") + } +