From f111b0ec705a5145a6176cf8c94cbaea982db371 Mon Sep 17 00:00:00 2001 From: Kevin WIlliams Date: Sat, 12 Aug 2023 17:21:38 +0800 Subject: [PATCH] fix(main/frp): upgrade quic-go to 0.37.4 Signed-off-by: Kevin WIlliams --- packages/frp/build.sh | 1 + packages/frp/upgrade-quic-go-to-0.37.4.patch | 42 ++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 packages/frp/upgrade-quic-go-to-0.37.4.patch diff --git a/packages/frp/build.sh b/packages/frp/build.sh index 184a0d0cf13e39..992573029f5f28 100644 --- a/packages/frp/build.sh +++ b/packages/frp/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A fast reverse proxy to expose a local server behind a N TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="2096779623 " TERMUX_PKG_VERSION="0.51.2" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/fatedier/frp/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=23b8f91fc1f86feb2ef4e7af4cf509be46360e0d16c3f71036f7206394417ddb # Depend on its subpackages. diff --git a/packages/frp/upgrade-quic-go-to-0.37.4.patch b/packages/frp/upgrade-quic-go-to-0.37.4.patch new file mode 100644 index 00000000000000..9587398f4fcc66 --- /dev/null +++ b/packages/frp/upgrade-quic-go-to-0.37.4.patch @@ -0,0 +1,42 @@ +diff -uNr frp-0.51.2/go.mod frp-0.51.2.mod/go.mod +--- frp-0.51.2/go.mod 2023-07-25 21:35:08.000000000 +0800 ++++ frp-0.51.2.mod/go.mod 2023-08-12 17:14:57.789269790 +0800 +@@ -18,7 +18,7 @@ + github.com/pion/stun v0.6.1 + github.com/pires/go-proxyproto v0.7.0 + github.com/prometheus/client_golang v1.16.0 +- github.com/quic-go/quic-go v0.36.2 ++ github.com/quic-go/quic-go v0.37.4 + github.com/rodaine/table v1.1.0 + github.com/samber/lo v1.38.1 + github.com/spf13/cobra v1.7.0 +@@ -62,8 +62,7 @@ + github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.42.0 // indirect + github.com/prometheus/procfs v0.10.1 // indirect +- github.com/quic-go/qtls-go1-19 v0.3.2 // indirect +- github.com/quic-go/qtls-go1-20 v0.2.2 // indirect ++ github.com/quic-go/qtls-go1-20 v0.3.1 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect +diff -uNr frp-0.51.2/go.sum frp-0.51.2.mod/go.sum +--- frp-0.51.2/go.sum 2023-07-25 21:35:08.000000000 +0800 ++++ frp-0.51.2.mod/go.sum 2023-08-12 17:14:57.789269790 +0800 +@@ -126,12 +126,10 @@ + github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= + github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= + github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +-github.com/quic-go/qtls-go1-19 v0.3.2 h1:tFxjCFcTQzK+oMxG6Zcvp4Dq8dx4yD3dDiIiyc86Z5U= +-github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= +-github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E= +-github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= +-github.com/quic-go/quic-go v0.36.2 h1:ZX/UNQ4gvpCv2RmwdbA6lrRjF6EBm5yZ7TMoT4NQVrA= +-github.com/quic-go/quic-go v0.36.2/go.mod h1:zPetvwDlILVxt15n3hr3Gf/I3mDf7LpLKPhR4Ez0AZQ= ++github.com/quic-go/qtls-go1-20 v0.3.1 h1:O4BLOM3hwfVF3AcktIylQXyl7Yi2iBNVy5QsV+ySxbg= ++github.com/quic-go/qtls-go1-20 v0.3.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= ++github.com/quic-go/quic-go v0.37.4 h1:ke8B73yMCWGq9MfrCCAw0Uzdm7GaViC3i39dsIdDlH4= ++github.com/quic-go/quic-go v0.37.4/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU= + github.com/rodaine/table v1.1.0 h1:/fUlCSdjamMY8VifdQRIu3VWZXYLY7QHFkVorS8NTr4= + github.com/rodaine/table v1.1.0/go.mod h1:Qu3q5wi1jTQD6B6HsP6szie/S4w1QUQ8pq22pz9iL8g= + github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=