diff --git a/community/v2ray/APKBUILD b/community/v2ray/APKBUILD
index b8ce063ebbbdf837739a9bc0dbb0f3f573eeda9a..762858383f8e1bcef4bf47e2535dfaba54a8cafa 100644
--- a/community/v2ray/APKBUILD
+++ b/community/v2ray/APKBUILD
@@ -17,6 +17,7 @@ source="$pkgname-core-$pkgver.tar.gz::https://github.com/v2fly/v2ray-core/archiv
geoip-$_geoip_ver.dat::https://github.com/v2fly/geoip/releases/download/$_geoip_ver/geoip.dat
v2ray.initd
0001-fix-readRequest-API-changed-since-go1.17-1370.patch
+ go1.18.patch
"
builddir="$srcdir/$pkgname-core-$pkgver"
@@ -77,8 +78,11 @@ package() {
install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
}
-sha512sums="72498120202b3f0e02996d5937f8bc84b2af4aeb4e83f64cb0d3059c503a4f67056a32e621a282c0f9c2a9330680604f8980d718d129fdb300b63c5475819e06 v2ray-core-4.44.0.tar.gz
+sha512sums="
+72498120202b3f0e02996d5937f8bc84b2af4aeb4e83f64cb0d3059c503a4f67056a32e621a282c0f9c2a9330680604f8980d718d129fdb300b63c5475819e06 v2ray-core-4.44.0.tar.gz
48f656b951d25396e7bd123241983d1c37914487e8156d94a95ead65754b78bdb987848a81d51d5aaba996cfccf8f9806c9c9a1610d4105a9ea9cdeebaa8c51c geosite-20211203092402.dat
88e2ca95ef42bd5bcca0dc6a4df469a886f06f849d58913355bcfec159c7f918ee32a0e9b4b7b7ccce4f2cf84336a87ce03ad782821216e677a08fa09d2bc6d9 geoip-202112060252.dat
f22cd2ef4182a003a4e0f94a550e5805c6c30d608d9e655c98e850b5fd8b3785c30df9a8e07c2d5460e6dac9088316f901018a89143e47c9da168e3aee3b94ca v2ray.initd
-d5d0d6f2dde30e1b97352fdbe46fa3c75797963d72648778345bd6bbb844b77f1304be26461678a07d7d654401376bca126aca26da76deb8280dc419c0984c0c 0001-fix-readRequest-API-changed-since-go1.17-1370.patch"
+d5d0d6f2dde30e1b97352fdbe46fa3c75797963d72648778345bd6bbb844b77f1304be26461678a07d7d654401376bca126aca26da76deb8280dc419c0984c0c 0001-fix-readRequest-API-changed-since-go1.17-1370.patch
+1a2a94134fc391ae784605616892947b56a2b4a3bafddf4cd62105993f281f0fd708cbcf715150af464a83600d8aa986748af98a9356345894dd848b9daf14c3 go1.18.patch
+"
diff --git a/community/v2ray/go1.18.patch b/community/v2ray/go1.18.patch
new file mode 100644
index 0000000000000000000000000000000000000000..62ca87a5c8d78d5b8f27eea1e4864b4d666b9e64
--- /dev/null
+++ b/community/v2ray/go1.18.patch
@@ -0,0 +1,84 @@
+Update netaddr and quic-go to more recent versions which support go 1.18.
+See: https://github.com/inetaf/netaddr/commit/c74959edd3b6ab3e864c55fd889ca8c13a835a81
+and https://github.com/lucas-clemente/quic-go/releases/tag/v0.25.0
+
+--- a/go.mod
++++ b/go.mod
+@@ -8,7 +8,7 @@ require (
+ github.com/google/go-cmp v0.5.6
+ github.com/gorilla/websocket v1.4.2
+ github.com/jhump/protoreflect v1.9.0
+- github.com/lucas-clemente/quic-go v0.23.0
++ github.com/lucas-clemente/quic-go v0.25.0
+ github.com/miekg/dns v1.1.43
+ github.com/pires/go-proxyproto v0.6.1
+ github.com/seiflotfy/cuckoofilter v0.0.0-20201222105146-bc6005554a0c
+@@ -24,7 +24,7 @@ require (
+ google.golang.org/grpc v1.41.0
+ google.golang.org/protobuf v1.27.1
+ h12.io/socks v1.0.3
+- inet.af/netaddr v0.0.0-20210903134321-85fa6c94624e
++ inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6
+ )
+
+ require (
+@@ -37,13 +37,14 @@ require (
+ github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
+ github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
+ github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
++ github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 // indirect
+ github.com/nxadm/tail v1.4.8 // indirect
+ github.com/onsi/ginkgo v1.16.4 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
+ github.com/xtaci/smux v1.5.15 // indirect
+- go4.org/intern v0.0.0-20210108033219-3eb7198706b2 // indirect
+- go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063 // indirect
++ go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
++ go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
+ golang.org/x/mod v0.4.2 // indirect
+ golang.org/x/text v0.3.6 // indirect
+ golang.org/x/tools v0.1.1 // indirect
+--- a/go.sum
++++ b/go.sum
+@@ -190,6 +190,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+ github.com/lucas-clemente/quic-go v0.23.0 h1:5vFnKtZ6nHDFsc/F3uuiF4T3y/AXaQdxjUqiVw26GZE=
+ github.com/lucas-clemente/quic-go v0.23.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
++github.com/lucas-clemente/quic-go v0.25.0 h1:K+X9Gvd7JXsOHtU0N2icZ2Nw3rx82uBej3mP4CLgibc=
++github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
+ github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
+ github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
+ github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
+@@ -201,6 +203,8 @@ github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2i
+ github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
+ github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk=
+ github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
++github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 h1:EnzzN9fPUkUck/1CuY1FlzBaIYMoiBsdwTNmNGkwUUM=
++github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
+ github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+ github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+@@ -353,9 +357,13 @@ go4.org v0.0.0-20180809161055-417644f6feb5 h1:+hE86LblG4AyDgwMCLTE6FOlM9+qjHSYS+
+ go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
+ go4.org/intern v0.0.0-20210108033219-3eb7198706b2 h1:VFTf+jjIgsldaz/Mr00VaCSswHJrI2hIjQygE/W4IMg=
+ go4.org/intern v0.0.0-20210108033219-3eb7198706b2/go.mod h1:vLqJ+12kCw61iCWsPto0EOHhBS+o4rO5VIucbc9g2Cc=
++go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE=
++go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA=
+ go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222175341-b30ae309168e/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+ go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063 h1:1tk03FUNpulq2cuWpXZWj649rwJpk0d20rxWiopKRmc=
+ go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
++go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 h1:Tx9kY6yUkLge/pFG7IEMwDZy6CS2ajFc9TvQdPCW0uA=
++go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+ golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
+ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+ golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+@@ -607,6 +615,8 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
+ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+ inet.af/netaddr v0.0.0-20210903134321-85fa6c94624e h1:tvgqez5ZQoBBiBAGNU/fmJy247yB/7++kcLOEoMYup0=
+ inet.af/netaddr v0.0.0-20210903134321-85fa6c94624e/go.mod h1:z0nx+Dh+7N7CC8V5ayHtHGpZpxLQZZxkIaaz6HN65Ls=
++inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 h1:acCzuUSQ79tGsM/O50VRFySfMm19IoMKL+sZztZkCxw=
++inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6/go.mod h1:y3MGhcFMlh0KZPMuXXow8mpjxxAk3yoDNsp4cQz54i8=
+ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+ sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
+ sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=