Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] v2ray: update to 5.1.0.
@ 2022-09-09  3:08 ketlrznt
  2022-09-10 22:12 ` [PR PATCH] [Merged]: " classabbyamp
  0 siblings, 1 reply; 2+ messages in thread
From: ketlrznt @ 2022-09-09  3:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 869 bytes --]

There is a new pull request by ketlrznt against master on the void-packages repository

https://github.com/ketlrznt/void-packages v2ray
https://github.com/void-linux/void-packages/pull/39179

v2ray: update to 5.1.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**


#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl (native masterdir)
  - i686 (native masterdir)

Changes description:

remove` v2ctl` which was removed since `v5` : [v2ray-core#488](https://github.com/v2fly/v2ray-core/pull/488)

update `go_import_path` and compile arguments

remove patch which has already been applied.




A patch file from https://github.com/void-linux/void-packages/pull/39179.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-v2ray-39179.patch --]
[-- Type: text/x-diff, Size: 4394 bytes --]

From c5659398e746a5d8919e1f59e7b290f554bc37cd Mon Sep 17 00:00:00 2001
From: ketlrznt <tansuanyinliao8888@gmail.com>
Date: Fri, 9 Sep 2022 10:44:52 +0800
Subject: [PATCH] v2ray: update to 5.1.0.

---
 ...equest-API-changed-since-go1.17-1370.patch | 47 -------------------
 srcpkgs/v2ray/template                        | 13 +++--
 2 files changed, 6 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch

diff --git a/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch b/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch
deleted file mode 100644
index 2a35b075f0a0..000000000000
--- a/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
-
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index f1a46054c205..95a2578c44c9 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -1,19 +1,19 @@
 # Template file for 'v2ray'
 pkgname=v2ray
-version=4.44.0
+version=5.1.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 -buildid="
+go_import_path="github.com/v2fly/v2ray-core/v5"
+go_ldflags="-X github.com/v2fly/v2ray-core/v5.codename=$pkgname
+ -X github.com/v2fly/v2ray-core/v5.version=$version
+ -X github.com/v2fly/v2ray-core/v5.build=$SOURCE_DATE_EPOCH -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
+checksum=b3dbd2bbee9486999b81d1968545c5a6caa7b0f4726a7259939f1bda54fcf5ea
 conf_files="/etc/v2ray/config.json"
 
 system_accounts="_v2ray"
@@ -23,7 +23,6 @@ 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() {

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: v2ray: update to 5.1.0.
  2022-09-09  3:08 [PR PATCH] v2ray: update to 5.1.0 ketlrznt
@ 2022-09-10 22:12 ` classabbyamp
  0 siblings, 0 replies; 2+ messages in thread
From: classabbyamp @ 2022-09-10 22:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 769 bytes --]

There's a merged pull request on the void-packages repository

v2ray: update to 5.1.0.
https://github.com/void-linux/void-packages/pull/39179

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**


#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl (native masterdir)
  - i686 (native masterdir)

Changes description:

remove`v2ctl` which was removed in `v5` : [v2ray-core#488](https://github.com/v2fly/v2ray-core/pull/488)

update `go_import_path` and compile arguments

remove patch which has already been applied in v2ray 5.1.0.

**quic-go build problem is solved.**




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-09-10 22:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-09  3:08 [PR PATCH] v2ray: update to 5.1.0 ketlrznt
2022-09-10 22:12 ` [PR PATCH] [Merged]: " classabbyamp

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).