New package: v2ray-4.44.0
This commit is contained in:
parent
000c8e5fee
commit
bf274327db
3 changed files with 102 additions and 0 deletions
srcpkgs/v2ray
3
srcpkgs/v2ray/files/v2ray/run
Normal file
3
srcpkgs/v2ray/files/v2ray/run
Normal file
|
@ -0,0 +1,3 @@
|
|||
#!/bin/sh
|
||||
|
||||
exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1
|
|
@ -0,0 +1,47 @@
|
|||
From 77b88171d6bd837b76a5ad6e6b23689391530ed6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=E6=9C=B1=E8=81=96=E9=BB=8E=20=28Zhu=20Sheng=20Li=29?=
|
||||
<digglife@gmail.com>
|
||||
Date: Sat, 6 Nov 2021 22:09:26 +0800
|
||||
Subject: [PATCH] fix: readRequest API changed since go1.17 (#1370)
|
||||
|
||||
fixed: #1265
|
||||
---
|
||||
transport/internet/headers/http/http.go | 4 ++--
|
||||
transport/internet/headers/http/linkedreadRequest.go | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/transport/internet/headers/http/http.go b/transport/internet/headers/http/http.go
|
||||
index c73f7a63..54611889 100644
|
||||
--- a/transport/internet/headers/http/http.go
|
||||
+++ b/transport/internet/headers/http/http.go
|
||||
@@ -90,7 +90,7 @@ func (h *HeaderReader) Read(reader io.Reader) (*buf.Buffer, error) {
|
||||
buffer.Clear()
|
||||
copy(buffer.Extend(lenEnding), leftover)
|
||||
|
||||
- if _, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes())), false); err != io.ErrUnexpectedEOF {
|
||||
+ if _, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes()))); err != io.ErrUnexpectedEOF {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
@@ -110,7 +110,7 @@ func (h *HeaderReader) Read(reader io.Reader) (*buf.Buffer, error) {
|
||||
}
|
||||
|
||||
// Parse the request
|
||||
- if req, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes())), false); err != nil {
|
||||
+ if req, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes()))); err != nil {
|
||||
return nil, err
|
||||
} else { // nolint: golint
|
||||
h.req = req
|
||||
diff --git a/transport/internet/headers/http/linkedreadRequest.go b/transport/internet/headers/http/linkedreadRequest.go
|
||||
index 35154b87..45773312 100644
|
||||
--- a/transport/internet/headers/http/linkedreadRequest.go
|
||||
+++ b/transport/internet/headers/http/linkedreadRequest.go
|
||||
@@ -9,4 +9,4 @@ import (
|
||||
)
|
||||
|
||||
//go:linkname readRequest net/http.readRequest
|
||||
-func readRequest(b *bufio.Reader, deleteHostHeader bool) (req *http.Request, err error)
|
||||
+func readRequest(b *bufio.Reader) (req *http.Request, err error)
|
||||
--
|
||||
2.33.1
|
||||
|
52
srcpkgs/v2ray/template
Normal file
52
srcpkgs/v2ray/template
Normal file
|
@ -0,0 +1,52 @@
|
|||
# Template file for 'v2ray'
|
||||
pkgname=v2ray
|
||||
version=4.44.0
|
||||
revision=1
|
||||
wrksrc=${pkgname}-core-${version}
|
||||
build_style=go
|
||||
go_import_path="github.com/v2fly/v2ray-core/v4"
|
||||
go_ldflags="-X github.com/v2fly/v2ray-core/v4.codename=$pkgname -X github.com/v2fly/v2ray-core/v4.version=$version -X github.com/v2fly/v2ray-core/v4.build=$SOURCE_DATE_EPOCH -s -w -buildid="
|
||||
short_desc="Platform for building proxies to bypass network restrictions"
|
||||
maintainer="ipkalm <ipkalm@outlook.com>"
|
||||
license="MIT"
|
||||
homepage="https://github.com/v2fly/v2ray-core"
|
||||
distfiles="https://github.com/v2fly/v2ray-core/archive/v${version}/${pkgname}-${version}.tar.gz"
|
||||
checksum=d9973bafd3020f60a51fa3495b24ab417b08b3c8f9539a3748d00da6c68d0103
|
||||
conf_files="/etc/v2ray/config.json"
|
||||
|
||||
system_accounts="_v2ray"
|
||||
|
||||
export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
|
||||
export CGO_ENABLED=0
|
||||
|
||||
do_build() {
|
||||
go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main
|
||||
go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ctl" -tags "confonly" ./infra/control/main
|
||||
}
|
||||
|
||||
do_check() {
|
||||
local pkgs=$(go list ./... | grep -v \
|
||||
-e 'app/dns$' \
|
||||
-e 'app/stats$' \
|
||||
-e 'app/router$' \
|
||||
-e 'app/router/command$' \
|
||||
-e 'common/task$' \
|
||||
-e 'common/signal$' \
|
||||
-e 'testing/scenarios$' \
|
||||
-e 'proxy/vmess$' \
|
||||
-e 'transport/pipe$' \
|
||||
-e 'transport/internet/websocket$' \
|
||||
-e 'transport/internet/quic$' \
|
||||
-e 'v4/infra/conf/rule$' \
|
||||
-e 'v4/infra/conf/geodata/memconservative$' \
|
||||
-e 'v4/transport/internet/kcp$' \
|
||||
)
|
||||
go test $pkgs
|
||||
}
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE
|
||||
vmkdir etc/v2ray
|
||||
vcopy release/config/*.json etc/v2ray/
|
||||
vsv v2ray
|
||||
}
|
Loading…
Reference in a new issue