[PR PATCH] wstunnel: update to 8.5.0

[PR PATCH] wstunnel: update to 8.5.0

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

There is a new pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages wstunnel
https://github.com/void-linux/void-packages/pull/47948

wstunnel: update to 8.5.0
#### Testing the changes
- I tested the changes in this PR: **YES**


A patch file from https://github.com/void-linux/void-packages/pull/47948.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wstunnel-47948.patch --]
[-- Type: text/x-diff, Size: 1142 bytes --]

From cdde73bbd1ee5fedda0e4ac3845fd09fa153a5af Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 28 Dec 2023 13:04:03 -0500
Subject: [PATCH] wstunnel: update to 8.5.0

---
 srcpkgs/wstunnel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wstunnel/template b/srcpkgs/wstunnel/template
index 3fe0d4bc22bb8..d61540221f52d 100644
--- a/srcpkgs/wstunnel/template
+++ b/srcpkgs/wstunnel/template
@@ -1,6 +1,6 @@
 # Template file for 'wstunnel'
 pkgname=wstunnel
-version=8.4.2
+version=8.5.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=779c00e9ff949da13d4e8d82278b62e8fe905ee783fb80b387e6e96f8be9e0f5
+checksum=824bc8f558cc727791c670caa95b55ae7917eaf7d5cda1ffbf93aa2b592ff50b
 make_check=ci-skip  # remaining tests require port binding which can't be done in CI
 
 post_install() {

Re: wstunnel: update to 8.5.0

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/47948#issuecomment-1872293061

Comment:
Version 8.5.2 (the latest as of this comment) requires Rust 1.75.

Re: wstunnel: update to 8.5.0

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/47948#issuecomment-1872970306

Comment:
Sure it requires?

Re: wstunnel: update to 8.5.0

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 797 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/47948#issuecomment-1874765825

Comment:
This is the error I get when compiling the new latest version (8.5.4):
```
error[E0658]: use of unstable library feature 'file_set_times'
  --> src/tunnel/tls_reloader.rs:89:26
   |
89 |             let _ = file.set_modified(SystemTime::now()).map_err(|err| {
   |                          ^^^^^^^^^^^^
   |
   = note: see issue #98245 <https://github.com/rust-lang/rust/issues/98245> for more information
```

That feature was stabilized in Rust 1.75. However, it can be made to compile by commenting out one small block that supports an edge case (see https://github.com/erebe/wstunnel/issues/209#issuecomment-1873437744). What do you think?

Re: wstunnel: update to 8.5.0

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/47948#issuecomment-1875572716

Comment:
sgtm, even if 1.75 will land soon i assume.

Re: [PR PATCH] [Updated] wstunnel: update to 8.5.0

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages wstunnel
https://github.com/void-linux/void-packages/pull/47948

wstunnel: update to 8.5.0
#### Testing the changes
- I tested the changes in this PR: **YES**


A patch file from https://github.com/void-linux/void-packages/pull/47948.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wstunnel-47948.patch --]
[-- Type: text/x-diff, Size: 2968 bytes --]

From 6d3be91de1c5b2f87ddc6d00ae112cb21ceb6285 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 3 Jan 2024 13:14:44 -0500
Subject: [PATCH] wstunnel: update to 8.5.4

---
 srcpkgs/wstunnel/patches/build-on-1.74.patch | 16 ++++++++++++++++
 srcpkgs/wstunnel/patches/fix-test.patch      | 14 ++++++++++++++
 srcpkgs/wstunnel/template                    |  4 ++--
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/wstunnel/patches/build-on-1.74.patch
 create 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
new file mode 100644
index 0000000000000..cba7122bb21d3
--- /dev/null
+++ b/srcpkgs/wstunnel/patches/build-on-1.74.patch
@@ -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");
+-            });
+         });
+     }
+ 
diff --git a/srcpkgs/wstunnel/patches/fix-test.patch b/srcpkgs/wstunnel/patches/fix-test.patch
new file mode 100644
index 0000000000000..ecb0a2efa5577
--- /dev/null
+++ b/srcpkgs/wstunnel/patches/fix-test.patch
@@ -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();
+
diff --git a/srcpkgs/wstunnel/template b/srcpkgs/wstunnel/template
index 3fe0d4bc22bb8..491a51de4fe16 100644
--- a/srcpkgs/wstunnel/template
+++ b/srcpkgs/wstunnel/template
@@ -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() {

Re: [PR PATCH] [Merged]: wstunnel: update to 8.5.4

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

There's a merged pull request on the void-packages repository

wstunnel: update to 8.5.4
https://github.com/void-linux/void-packages/pull/47948

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**