From 696d9634df15dfc0acb2b083349aae299fe59303 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 7 Jan 2024 21:35:17 -0500
Subject: [PATCH] wstunnel: update to 8.6.0

---
 srcpkgs/wstunnel/patches/build-on-1.74.patch | 16 ----------------
 srcpkgs/wstunnel/patches/fix-test.patch      | 14 --------------
 srcpkgs/wstunnel/template                    |  4 ++--
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/wstunnel/patches/build-on-1.74.patch
 delete mode 100644 srcpkgs/wstunnel/patches/fix-test.patch

diff --git a/srcpkgs/wstunnel/patches/build-on-1.74.patch b/srcpkgs/wstunnel/patches/build-on-1.74.patch
deleted file mode 100644
index cba7122bb21d3..0000000000000
--- a/srcpkgs/wstunnel/patches/build-on-1.74.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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");
--            });
-         });
-     }
- 
diff --git a/srcpkgs/wstunnel/patches/fix-test.patch b/srcpkgs/wstunnel/patches/fix-test.patch
deleted file mode 100644
index ecb0a2efa5577..0000000000000
--- a/srcpkgs/wstunnel/patches/fix-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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();
-
diff --git a/srcpkgs/wstunnel/template b/srcpkgs/wstunnel/template
index 491a51de4fe16..279d2292dc634 100644
--- a/srcpkgs/wstunnel/template
+++ b/srcpkgs/wstunnel/template
@@ -1,6 +1,6 @@
 # Template file for 'wstunnel'
 pkgname=wstunnel
-version=8.5.4
+version=8.6.0
 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=ae0d6268660925d2a8a89896afba13fa1f1616b0308c7aa34546c85dbc224a81
+checksum=537412145643a782182911223d3508aa2421e4d81eb09fe8dd00ffbd1c0e4fa6
 make_check=ci-skip  # remaining tests require port binding which can't be done in CI
 
 post_install() {