From: cinerea0 <cinerea0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] wstunnel: update to 9.0.0
Date: Wed, 10 Jan 2024 03:04:55 +0100 [thread overview]
Message-ID: <20240110020455.fHTnwU5ta-dmZ4BLT0AcG51z6cP9TYL1VbGyIvdcMBw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48115@inbox.vuxu.org>
[-- 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/48115
wstunnel: update to 9.0.0
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/48115.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wstunnel-48115.patch --]
[-- Type: text/x-diff, Size: 3086 bytes --]
From fc3a427b6f115d43147fb4744201cf8d928bb8e9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 9 Jan 2024 21:04:40 -0500
Subject: [PATCH] wstunnel: update to 9.0.0
---
srcpkgs/wstunnel/patches/build-on-1.74.patch | 16 ----------------
srcpkgs/wstunnel/patches/fix-test.patch | 14 --------------
srcpkgs/wstunnel/template | 5 +++--
3 files changed, 3 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..54d4569575732 100644
--- a/srcpkgs/wstunnel/template
+++ b/srcpkgs/wstunnel/template
@@ -1,6 +1,6 @@
# Template file for 'wstunnel'
pkgname=wstunnel
-version=8.5.4
+version=9.0.0
revision=1
build_style=cargo
make_check_args="-- --skip tcp::tests::test_proxy_connection" # test requires docker
@@ -8,8 +8,9 @@ short_desc="Tunnel traffic over websocket protocol"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/erebe/wstunnel"
+changelog="https://github.com/erebe/wstunnel/releases"
distfiles="https://github.com/erebe/wstunnel/archive/refs/tags/v${version}.tar.gz"
-checksum=ae0d6268660925d2a8a89896afba13fa1f1616b0308c7aa34546c85dbc224a81
+checksum=75ac24ed8aa31e6ec6d24ddb15b7c4f4b099985a74723b30a7504da10811b462
make_check=ci-skip # remaining tests require port binding which can't be done in CI
post_install() {
next prev parent reply other threads:[~2024-01-10 2:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-08 2:36 [PR PATCH] wstunnel: update to 8.6.0 cinerea0
2024-01-08 2:41 ` [PR PATCH] [Updated] " cinerea0
2024-01-09 21:25 ` cinerea0
2024-01-10 1:41 ` [PR REVIEW] wstunnel: update to 9.0.0 classabbyamp
2024-01-10 2:04 ` cinerea0 [this message]
2024-01-10 2:05 ` cinerea0
2024-01-10 2:17 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240110020455.fHTnwU5ta-dmZ4BLT0AcG51z6cP9TYL1VbGyIvdcMBw@z \
--to=cinerea0@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).