wstunnel: update to 8.5.4
This commit is contained in:
parent
e8e16c42d6
commit
3a5e8acc3b
16
srcpkgs/wstunnel/patches/build-on-1.74.patch
Normal file
16
srcpkgs/wstunnel/patches/build-on-1.74.patch
Normal file
@ -0,0 +1,16 @@
|
||||
# set_modified was stablilized in Rust 1.75, discard this patch once we've updated
|
||||
diff --git a/src/tunnel/tls_reloader.rs b/src/tunnel/tls_reloader.rs
|
||||
index 47ae5709bce..e08ab9d4bef 100644
|
||||
--- a/src/tunnel/tls_reloader.rs
|
||||
+++ b/src/tunnel/tls_reloader.rs
|
||||
@@ -86,10 +86,6 @@ impl TlsReloader {
|
||||
let Ok(file) = File::open(&path) else {
|
||||
return;
|
||||
};
|
||||
- let _ = file.set_modified(SystemTime::now()).map_err(|err| {
|
||||
- error!("Cannot force reload TLS file {:?}: {:?}", path, err);
|
||||
- error!("Old certificate will be used until the next change");
|
||||
- });
|
||||
});
|
||||
}
|
||||
|
14
srcpkgs/wstunnel/patches/fix-test.patch
Normal file
14
srcpkgs/wstunnel/patches/fix-test.patch
Normal file
@ -0,0 +1,14 @@
|
||||
# Upstream: https://github.com/erebe/wstunnel/commit/16368f4f6136442e06cfcaf2b672e72839fb4163
|
||||
diff --git a/src/tcp.rs b/src/tcp.rs
|
||||
index d064374..64af98c 100644
|
||||
--- a/src/tcp.rs
|
||||
+++ b/src/tcp.rs
|
||||
@@ -233,6 +233,7 @@ mod tests {
|
||||
1236,
|
||||
None,
|
||||
Duration::from_secs(1),
|
||||
+ &DnsResolver::System,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Template file for 'wstunnel'
|
||||
pkgname=wstunnel
|
||||
version=8.4.2
|
||||
version=8.5.4
|
||||
revision=1
|
||||
build_style=cargo
|
||||
make_check_args="-- --skip tcp::tests::test_proxy_connection" # test requires docker
|
||||
@ -9,7 +9,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
|
||||
license="BSD-3-Clause"
|
||||
homepage="https://github.com/erebe/wstunnel"
|
||||
distfiles="https://github.com/erebe/wstunnel/archive/refs/tags/v${version}.tar.gz"
|
||||
checksum=779c00e9ff949da13d4e8d82278b62e8fe905ee783fb80b387e6e96f8be9e0f5
|
||||
checksum=ae0d6268660925d2a8a89896afba13fa1f1616b0308c7aa34546c85dbc224a81
|
||||
make_check=ci-skip # remaining tests require port binding which can't be done in CI
|
||||
|
||||
post_install() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user