From 0b460c26c9ecbdbb6ba83e706e6e3a65e618574d Mon Sep 17 00:00:00 2001 From: HystericalDragon Date: Sat, 30 Mar 2024 12:58:09 +0800 Subject: [PATCH] chore: update dependencies * Update metacubexd * Update geosite * Update gomobile cmd to [6bc27c2027e816ac1779bf80058b1a7710dad260](https://github.com/SagerNet/gomobile/commit/6bc27c2027e816ac1779bf80058b1a7710dad260), about #1 * Update sing-box to v1.9.0-rc.3 Signed-off-by: HystericalDragon --- buildScript/init/version.sh | 6 +++--- libcore/build.sh | 1 + libcore/go.mod | 8 ++++---- libcore/go.sum | 12 ++++++------ libcore/init.sh | 6 ++---- metacubexd | 2 +- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/buildScript/init/version.sh b/buildScript/init/version.sh index ea54f7d8..753be3f6 100755 --- a/buildScript/init/version.sh +++ b/buildScript/init/version.sh @@ -1,9 +1,9 @@ #!/bin/bash -GO_VERSION=1.22.1 +GO_VERSION="1.22.1" # https://github.com/Dreamacro/maxmind-geoip -GEOIP_VERSION=20240312 +GEOIP_VERSION="20240312" # https://github.com/v2fly/domain-list-community -GEOSITE_VERSION=20240316051411 +GEOSITE_VERSION="20240324094850" diff --git a/libcore/build.sh b/libcore/build.sh index b6a5bf2a..6e766e02 100755 --- a/libcore/build.sh +++ b/libcore/build.sh @@ -16,6 +16,7 @@ TAGS=( IFS="," BUILD_TAGS="${TAGS[*]}" +# -buildvcs require: https://github.com/SagerNet/gomobile/commit/6bc27c2027e816ac1779bf80058b1a7710dad260 gomobile bind -v -androidapi 21 -trimpath -buildvcs=false -ldflags='-s -w -buildid=' \ -tags="$BUILD_TAGS" . || exit 1 diff --git a/libcore/go.mod b/libcore/go.mod index 66c4200c..fdb55677 100644 --- a/libcore/go.mod +++ b/libcore/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/miekg/dns v1.1.58 github.com/sagernet/gomobile v0.1.3 - github.com/sagernet/sing v0.4.0-beta.3 - github.com/sagernet/sing-box v1.9.0-beta.17 // Bump core version here. + github.com/sagernet/sing v0.4.0-beta.6 + github.com/sagernet/sing-box v1.9.0-rc.3 // Bump core version here. github.com/sagernet/sing-dns v0.2.0-beta.16 - github.com/sagernet/sing-tun v0.2.5-beta.2 + github.com/sagernet/sing-tun v0.2.6-beta.1 github.com/xchacha20-poly1305/TLS-scribe v0.3.0 github.com/xchacha20-poly1305/cazilla v0.2.1 github.com/xchacha20-poly1305/libping v0.1.1 @@ -94,6 +94,6 @@ require ( lukechampine.com/blake3 v1.2.1 // indirect ) -replace github.com/sagernet/sing-box => github.com/xchacha20-poly1305/sing-box v1.9.0-beta.17 +replace github.com/sagernet/sing-box => github.com/xchacha20-poly1305/sing-box v1.9.0-rc.3 replace github.com/sagernet/sing-quic => github.com/xchacha20-poly1305/sing-quic v0.1.9-beta.3 diff --git a/libcore/go.sum b/libcore/go.sum index 6e38802e..a422d0b4 100644 --- a/libcore/go.sum +++ b/libcore/go.sum @@ -103,8 +103,8 @@ github.com/sagernet/quic-go v0.42.0-beta.2/go.mod h1:lf8OYop+fMxIlrfM/ZHpENt/7ZD github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 h1:5Th31OC6yj8byLGkEnIYp6grlXfo1QYUfiYFGjewIdc= github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU= github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo= -github.com/sagernet/sing v0.4.0-beta.3 h1:TYA4DJtxs0dWDG6ahjU/Fh+eg6vintiqGjXN4h9BbiA= -github.com/sagernet/sing v0.4.0-beta.3/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI= +github.com/sagernet/sing v0.4.0-beta.6 h1:z7plSB0lWX2vt3e5UYYNQi1+bNqfxU9uh1nWlPZFwj8= +github.com/sagernet/sing v0.4.0-beta.6/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI= github.com/sagernet/sing-dns v0.2.0-beta.16 h1:bzd4B8eHD7/WO3HrYknvgE8A56/R3n5oXBjNF97iPzQ= github.com/sagernet/sing-dns v0.2.0-beta.16/go.mod h1:XU6Vqr6aHcMz/34Fcv8jmXpRCEuShzW+B7Qg1Xe1nxY= github.com/sagernet/sing-mux v0.2.0 h1:4C+vd8HztJCWNYfufvgL49xaOoOHXty2+EAjnzN3IYo= @@ -115,8 +115,8 @@ github.com/sagernet/sing-shadowsocks2 v0.2.0 h1:wpZNs6wKnR7mh1wV9OHwOyUr21VkS3wK github.com/sagernet/sing-shadowsocks2 v0.2.0/go.mod h1:RnXS0lExcDAovvDeniJ4IKa2IuChrdipolPYWBv9hWQ= github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k= github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4= -github.com/sagernet/sing-tun v0.2.5-beta.2 h1:mOWW80jYEup8LIFG3VuWASWgiRzyusuX5kH+Lbl+V7s= -github.com/sagernet/sing-tun v0.2.5-beta.2/go.mod h1:E+KwQKzYkdGEhfIxjmoaB1ZkADaxeXUNzx6GRDRKOfE= +github.com/sagernet/sing-tun v0.2.6-beta.1 h1:6yfOJQaa706/VAKb7SVa8ziXppTxVOg/p9p63qk2N/o= +github.com/sagernet/sing-tun v0.2.6-beta.1/go.mod h1:E+KwQKzYkdGEhfIxjmoaB1ZkADaxeXUNzx6GRDRKOfE= github.com/sagernet/sing-vmess v0.1.8 h1:XVWad1RpTy9b5tPxdm5MCU8cGfrTGdR8qCq6HV2aCNc= github.com/sagernet/sing-vmess v0.1.8/go.mod h1:vhx32UNzTDUkNwOyIjcZQohre1CaytquC5mPplId8uA= github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ= @@ -146,8 +146,8 @@ github.com/xchacha20-poly1305/cazilla v0.2.1 h1:GuKdZWIS7Wrka+vm11TJXCS/Nbmzgn9U github.com/xchacha20-poly1305/cazilla v0.2.1/go.mod h1:CRNqqSLuWw8gStu7qDwjPYmsLE91OCVWazN9AH4LyWc= github.com/xchacha20-poly1305/libping v0.1.1 h1:dVAX1oaBr+xYwlX4phBu4z2OPFOUHDY7O4rrx3SMyt8= github.com/xchacha20-poly1305/libping v0.1.1/go.mod h1:6nudHCYwr+1S2ptMloM/t+ciK2ITD2ild76g+6HTvOA= -github.com/xchacha20-poly1305/sing-box v1.9.0-beta.17 h1:sQ1mQXbQtJrrvnwXYXqnrKG3Qnme8uLkJd3bUh9L5YA= -github.com/xchacha20-poly1305/sing-box v1.9.0-beta.17/go.mod h1:veGCep/a/s6wwLlYnt7S3ijEMzYoovCBrwZMFy6jjqk= +github.com/xchacha20-poly1305/sing-box v1.9.0-rc.3 h1:Qrp8WyUB0+iSELwhHbibbSK042d9FI7uAmXCqja5WdQ= +github.com/xchacha20-poly1305/sing-box v1.9.0-rc.3/go.mod h1:pHjzUk2TYZbUtEMrKE09cMYGx9/d8qYsrfcSPwRyNHQ= github.com/xchacha20-poly1305/sing-quic v0.1.9-beta.3 h1:q7uBHCG9nY6yNZhQJK5BsZutPDI90xqAfJOMoQXh0i8= github.com/xchacha20-poly1305/sing-quic v0.1.9-beta.3/go.mod h1:oXe0g8T7edh2Xxl0QcpTO4Tret8M478LpMcr3CPuqWE= github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY= diff --git a/libcore/init.sh b/libcore/init.sh index 28dfd60a..641bdf9b 100755 --- a/libcore/init.sh +++ b/libcore/init.sh @@ -4,10 +4,8 @@ set -e [[ -e "inited" ]] && exit 0 # Install gomobile -if [ ! -f "$GOPATH/bin/gomobile" ]; then - CGO_ENABLED=0 go install -v -trimpath -ldflags="-w -s" github.com/sagernet/gomobile/cmd/gobind@v0.1.3 - CGO_ENABLED=0 go install -v -trimpath -ldflags="-w -s" github.com/sagernet/gomobile/cmd/gomobile@v0.1.3 -fi +CGO_ENABLED=0 go install -v -trimpath -ldflags="-w -s" github.com/sagernet/gomobile/cmd/gobind@6bc27c2027e816ac1779bf80058b1a7710dad260 +CGO_ENABLED=0 go install -v -trimpath -ldflags="-w -s" github.com/sagernet/gomobile/cmd/gomobile@6bc27c2027e816ac1779bf80058b1a7710dad260 gomobile init touch inited diff --git a/metacubexd b/metacubexd index 495faf20..c78f5878 160000 --- a/metacubexd +++ b/metacubexd @@ -1 +1 @@ -Subproject commit 495faf2088dcffacfc3c975f2414e1d7f59f48ef +Subproject commit c78f58783f31dc159b2bd4d8d9a6e9ad92572d28