[PR PATCH] New package: v2ray-4.38.3

[PR PATCH] New package: v2ray-4.38.3

[ipkalm]

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

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

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.38.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 52e089dd7adb4680ff6a7772097b7d13166e7319 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sun, 9 May 2021 19:06:35 +0700
Subject: [PATCH] New package: v2ray-4.38.3

---
 srcpkgs/v2ray/files/v2ray/run |  3 +++
 srcpkgs/v2ray/template        | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..4622d509d5a7
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u nobody:nogroup v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..2688b22a952c
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,36 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.38.3
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+short_desc="Platform for building proxies to bypass network restrictions"
+maintainer="ipkalm <ipkalm@outlool.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=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
+conf_files="/etc/v2ray/config.json"
+
+do_build() {
+		export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external"
+		go build -o v2ray ./main
+		go build -o v2ctl ./infra/control/main
+}
+
+do_check() {
+		go test -p 1 -tags json -v -timeout 30m ./...
+}
+
+pre_install() {
+		vmkdir etc/v2ray
+		vcopy release/config/*.json etc/v2ray/
+}
+
+do_install() {
+		vlicense LICENSE
+		vbin v2ray
+		vbin v2ctl
+		vsv v2ray
+}

Re: New package: v2ray-4.38.3

[noarchwastaken]

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

New comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-835869631

Comment:
It seems like you are using the `nobody` user here. It seems tempting to use since it's the least privileged user in the system, but the consequence is that you get access to other processes running as `nobody`, such as NFS.

https://askubuntu.com/questions/329714/what-is-the-purpose-of-the-nobody-user

I think we should add a dedicated user for this package.

Re: New package: v2ray-4.38.3

[noarchwastaken]

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

New comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-835869631

Comment:
It seems like you are using the `nobody` user here. It is tempting to use since it's the least privileged user in the system, but the consequence is that you get access to other processes running as `nobody`, such as NFS.

https://askubuntu.com/questions/329714/what-is-the-purpose-of-the-nobody-user

I think we should add a dedicated user for this package.

Re: New package: v2ray-4.38.3

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-835878428

Comment:
Agreed, look into system accounts in the manual.

Re: [PR REVIEW] New package: v2ray-4.38.3

[noarchwastaken]

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

New review comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#discussion_r628937584

Comment:
```suggestion

system_accounts="v2ray"

```

Re: [PR REVIEW] New package: v2ray-4.38.3

[noarchwastaken]

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

New review comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#discussion_r628936862

Comment:
```suggestion
exec chpst -u v2ray:v2ray v2ray -config=/etc/v2ray/config.json 2>&1
```

Re: [PR REVIEW] New package: v2ray-4.38.3

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#discussion_r628939591

Comment:
Accounts provided by packages should be prefixed with `_`: `_v2ray`.

Re: [PR PATCH] [Updated] New package: v2ray-4.38.3

[ipkalm]

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

There is an updated pull request by ipkalm against master on the void-packages repository

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.38.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 52e089dd7adb4680ff6a7772097b7d13166e7319 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sun, 9 May 2021 19:06:35 +0700
Subject: [PATCH 1/2] New package: v2ray-4.38.3

---
 srcpkgs/v2ray/files/v2ray/run |  3 +++
 srcpkgs/v2ray/template        | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..4622d509d5a7
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u nobody:nogroup v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..2688b22a952c
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,36 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.38.3
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+short_desc="Platform for building proxies to bypass network restrictions"
+maintainer="ipkalm <ipkalm@outlool.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=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
+conf_files="/etc/v2ray/config.json"
+
+do_build() {
+		export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external"
+		go build -o v2ray ./main
+		go build -o v2ctl ./infra/control/main
+}
+
+do_check() {
+		go test -p 1 -tags json -v -timeout 30m ./...
+}
+
+pre_install() {
+		vmkdir etc/v2ray
+		vcopy release/config/*.json etc/v2ray/
+}
+
+do_install() {
+		vlicense LICENSE
+		vbin v2ray
+		vbin v2ctl
+		vsv v2ray
+}

From 1ae6f0dd926b239c570d76aa03dbe4dcdc94ef49 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Mon, 10 May 2021 11:23:14 +0700
Subject: [PATCH 2/2] Update srcpkgs/v2ray/template

Co-authored-by: noarchwastaken <noarch@n0ar.ch>
---
 srcpkgs/v2ray/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 2688b22a952c..aa8f55e6091b 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -13,6 +13,8 @@ distfiles="https://github.com/v2fly/v2ray-core/archive/v${version}/${pkgname}-${
 checksum=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
 conf_files="/etc/v2ray/config.json"
 
+system_accounts="v2ray"
+
 do_build() {
 		export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external"
 		go build -o v2ray ./main

Re: [PR PATCH] [Updated] New package: v2ray-4.38.3

[ipkalm]

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

There is an updated pull request by ipkalm against master on the void-packages repository

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.38.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 52e089dd7adb4680ff6a7772097b7d13166e7319 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sun, 9 May 2021 19:06:35 +0700
Subject: [PATCH 1/3] New package: v2ray-4.38.3

---
 srcpkgs/v2ray/files/v2ray/run |  3 +++
 srcpkgs/v2ray/template        | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..4622d509d5a7
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u nobody:nogroup v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..2688b22a952c
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,36 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.38.3
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+short_desc="Platform for building proxies to bypass network restrictions"
+maintainer="ipkalm <ipkalm@outlool.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=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
+conf_files="/etc/v2ray/config.json"
+
+do_build() {
+		export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external"
+		go build -o v2ray ./main
+		go build -o v2ctl ./infra/control/main
+}
+
+do_check() {
+		go test -p 1 -tags json -v -timeout 30m ./...
+}
+
+pre_install() {
+		vmkdir etc/v2ray
+		vcopy release/config/*.json etc/v2ray/
+}
+
+do_install() {
+		vlicense LICENSE
+		vbin v2ray
+		vbin v2ctl
+		vsv v2ray
+}

From 1ae6f0dd926b239c570d76aa03dbe4dcdc94ef49 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Mon, 10 May 2021 11:23:14 +0700
Subject: [PATCH 2/3] Update srcpkgs/v2ray/template

Co-authored-by: noarchwastaken <noarch@n0ar.ch>
---
 srcpkgs/v2ray/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 2688b22a952c..aa8f55e6091b 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -13,6 +13,8 @@ distfiles="https://github.com/v2fly/v2ray-core/archive/v${version}/${pkgname}-${
 checksum=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
 conf_files="/etc/v2ray/config.json"
 
+system_accounts="v2ray"
+
 do_build() {
 		export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external"
 		go build -o v2ray ./main

From 4bacec72bb4279918cbee77d567f4179f0681f76 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Mon, 10 May 2021 11:24:47 +0700
Subject: [PATCH 3/3] Update srcpkgs/v2ray/files/v2ray/run

Co-authored-by: noarchwastaken <noarch@n0ar.ch>
---
 srcpkgs/v2ray/files/v2ray/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
index 4622d509d5a7..2046a0f6ab61 100644
--- a/srcpkgs/v2ray/files/v2ray/run
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec chpst -u nobody:nogroup v2ray -config=/etc/v2ray/config.json 2>&1
+exec chpst -u v2ray:v2ray v2ray -config=/etc/v2ray/config.json 2>&1

Re: New package: v2ray-4.38.3

[noarchwastaken]

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

New comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-836151693

Comment:
emm... Sorry for my advice being not completely correct, please use `_v2ray` as suggested by @ericonr.

BTW, you might need to clean the commits by force-pushing instead of adding new commits.

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-836155917

Comment:
@noarchwastaken I'll try do my best. This is 2nd PR in my life. Hope for understanding :blush: 

Re: New package: v2ray-4.38.3

[noarchwastaken]

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

New comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-836157632

Comment:
wait, I just looked at your template again and it seems like you are specifying the `do_build` yourself...

You don't need to do that. The whole point of the templates is to simplify the templates; same as `do_check`. Those are usually managed by `xbps-src`.

Check out other Go packages like `caddy` for some examples.

Re: New package: v2ray-4.38.3

[noarchwastaken]

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

New comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-836157632

Comment:
wait, I just looked at your template again and it seems like you are specifying the `do_build` yourself...

You don't need to do that. The whole point of `build_style` is to simplify the templates; same as `do_check`. Those are usually managed by `xbps-src`.

Check out other Go packages like `caddy` for some examples.

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-836158675

Comment:
@noarchwastaken ok, thank you.

Re: [PR PATCH] [Updated] New package: v2ray-4.38.3

[ipkalm]

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

There is an updated pull request by ipkalm against master on the void-packages repository

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.38.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 347b6eb936281cbf25f31017c1f6cc6efc4cacd5 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sun, 9 May 2021 19:06:35 +0700
Subject: [PATCH 01/41] New package: v2ray-4.38.3

---
 srcpkgs/v2ray/files/v2ray/run |  3 +++
 srcpkgs/v2ray/template        | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..3b1ac46ab240
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..976753b98e35
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,34 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.38.3
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+go_ldflags="-s -w"
+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=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
+conf_files="/etc/v2ray/config.json"
+
+system_accounts="_v2ray"
+
+do_build() {
+		export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
+		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() {
+		go test -p 1 -tags json -v -timeout 30m ./...
+}
+
+post_install() {
+		vlicense LICENSE
+		vmkdir etc/v2ray
+		vcopy release/config/*.json etc/v2ray/
+		vsv v2ray
+}

From e020047a069e36130b9bba528fa4ca77b6e0da43 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 May 2021 17:10:40 +0200
Subject: [PATCH 02/41] libimagequant: update to 2.15.0.

---
 srcpkgs/libimagequant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimagequant/template b/srcpkgs/libimagequant/template
index 629732b28bbe..225895bb8b67 100644
--- a/srcpkgs/libimagequant/template
+++ b/srcpkgs/libimagequant/template
@@ -1,6 +1,6 @@
 # Template file for 'libimagequant'
 pkgname=libimagequant
-version=2.14.1
+version=2.15.0
 revision=1
 build_style=configure
 configure_args="--with-openmp"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://pngquant.org/lib/"
 distfiles="https://github.com/ImageOptim/libimagequant/archive/${version}.tar.gz"
-checksum=b5fa27da1f3cf3e8255dd02778bb6a51dc71ce9f99a4fc930ea69b83200a7c74
+checksum=11b15f4057feb9de724415f71a8e369942218e1691bb75838167bc986591fc36
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*) configure_args+=" --enable-sse";;

From 9e955e80dba11421733cb772fb25e729f83e50a7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 May 2021 17:11:04 +0200
Subject: [PATCH 03/41] pngquant: update to 2.15.0.

---
 srcpkgs/pngquant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pngquant/template b/srcpkgs/pngquant/template
index 9e74557dc2a8..bb57194e77ec 100644
--- a/srcpkgs/pngquant/template
+++ b/srcpkgs/pngquant/template
@@ -1,6 +1,6 @@
 # Template file for 'pngquant'
 pkgname=pngquant
-version=2.14.1
+version=2.15.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-openmp"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://pngquant.org/"
 distfiles="https://github.com/pornel/${pkgname}/archive/${version}.tar.gz"
-checksum=5b2e29d61f548b18b0dd37156a49f87625123250577815add666e473fd1ca1af
+checksum=263f1dee605a3e300fd4df957476ca3c125de6b8d001c2c43e31fe469a710712
 make_check_target=test
 
 case "$XBPS_TARGET_MACHINE" in

From 03da22c1e30792f6b8f025583b836744e9b2ee5f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 May 2021 17:14:04 +0200
Subject: [PATCH 04/41] netpbm: update to 10.94.03.

---
 srcpkgs/netpbm/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 72fc4b2d4611..bb8deb828688 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.94.02
+version=10.94.03
 revision=1
-_githash=877641742255c9eeb82438eb54fd772f65e61e84
-_githash_guide=2d01412ab83361b8ed8d8db8f364cb223bd1c152
+_githash=5f3f8a1273d87104c0884995e6e58eab392de08b
+_githash_guide=6616ab1ac1f91aaf5a7f4eb2e2f3b920e86ebaa0
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="7d5104abe1046da49fb0aedc4f2bdcc077b559c998992d0e491cec74c742f31d
- 794cf365b1c3b6b9b2f9536b8b173ccbcbc74a96cf6eaa4377aa4a684af4ad58"
+checksum="03ce04ab50afae5e97aad4bd6932587e2ab45bf0ee2c18983de152257b6b63d9
+ 85236a7ae2ae8d5d22a5017a2d336ada79a19ece644e44fec8d6dfcbda36d9c3"
 
 post_extract() {
 	cd $build_wrksrc

From e78d3f43b641c70a1ba51b83adf61b8f66b2db4e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 May 2021 17:14:08 +0200
Subject: [PATCH 05/41] python3-userpath: update to 1.5.0.

---
 srcpkgs/python3-userpath/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-userpath/template b/srcpkgs/python3-userpath/template
index 117866eb9b8b..923ee33b79eb 100644
--- a/srcpkgs/python3-userpath/template
+++ b/srcpkgs/python3-userpath/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-userpath'
 pkgname=python3-userpath
-version=1.4.2
+version=1.5.0
 revision=1
 wrksrc="userpath-${version}"
 build_style=python3-module
 pycompile_module="userpath"
 hostmakedepends="python3-setuptools"
-depends="python3-distro python3-click"
+depends="python3-click"
 short_desc="Cross-platform tool for adding locations to the user PATH"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/ofek/userpath"
 distfiles="${PYPI_SITE}/u/userpath/userpath-${version}.tar.gz"
-checksum=dd4b5496e4ef2c1a3bbb103ffefa7738fa4ba15f23580918bb9f949dcd61a8a7
+checksum=61f84899b7280800a8b6cc1b959a0cf250f6757e6f6c7176d7455bb693a4423a
 
 post_install() {
 	vlicense LICENSE-MIT

From f8da1325c2b2a059d770382fb3be6b47e2f2c030 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 9 May 2021 17:04:36 +0200
Subject: [PATCH 06/41] roxterm: update to 3.10.4.

Closes: #30767 [via git-merge-pr]
---
 srcpkgs/roxterm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/roxterm/template b/srcpkgs/roxterm/template
index d511563b1773..b34b8b5e70ba 100644
--- a/srcpkgs/roxterm/template
+++ b/srcpkgs/roxterm/template
@@ -1,6 +1,6 @@
 # Template file for 'roxterm'
 pkgname=roxterm
-version=3.10.1
+version=3.10.4
 revision=1
 build_style=cmake
 hostmakedepends="ImageMagick glib-devel itstool librsvg-utils libtool
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://github.com/realh/roxterm"
 changelog="https://raw.githubusercontent.com/realh/roxterm/master/debian/changelog"
 distfiles="https://github.com/realh/roxterm/archive/${version}.tar.gz"
-checksum=ac5bad93afbbfec54c67a638835ad3493cf08f18a04d51ae6c27eceaa63d7041
+checksum=f04e3d607a2003d1992759434cc8b21a3a8fe49dcd9407b9ccd8440445331524

From 5696911d0e7bae7cfe87621be5c56612ff6c0ffb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 9 May 2021 14:33:22 -0400
Subject: [PATCH 07/41] python3-matplotlib: update to 3.4.2.

---
 srcpkgs/python3-matplotlib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 43c126fc4811..dd5492a8dd5c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.1
+version=3.4.2
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e662bdde3f493b0f14f658095d91c36521d0f2d96c0a4b9fad55fca6d6300a87
+checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"

From c6dd9c6ccdc800e512a17999c3b7fd1b2f94fc0f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 May 2021 20:46:56 +0200
Subject: [PATCH 08/41] redo: fix homepage/distfiles.

---
 srcpkgs/redo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/redo/template b/srcpkgs/redo/template
index 12ff84c893a9..b8af94ccc102 100644
--- a/srcpkgs/redo/template
+++ b/srcpkgs/redo/template
@@ -1,14 +1,14 @@
 # Template file for 'redo'
 pkgname=redo
 version=1.5
-revision=2
+revision=3
 create_wrksrc=yes
 hostmakedepends="perl"
 short_desc="Incremental build system (version of de Boyne Pollard)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
-homepage="https://jdebp.eu/Softwares/redo/"
-distfiles="https://jdebp.eu/Repository/freebsd/redo-${version}.tar.gz"
+homepage="http://jdebp.info/Softwares/redo/"
+distfiles="http://jdebp.info/Repository/freebsd/redo-${version}.tar.gz"
 checksum=5ff21779993418cf16f5632c593e30d9a2780bfc38cef9de9ab9427154736d36
 
 do_configure() {

From abb8eacf0ddce1f0d837d3e755cc0aa68b0a20d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 9 May 2021 17:11:51 +0200
Subject: [PATCH 09/41] homebank: update to 5.5.2.

---
 srcpkgs/homebank/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index c92efe7057be..abd7b17ac15f 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.1
+version=5.5.2
 revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=9bb39eaad3c4c68d2bcbe21e2f6c4a5274e3a3f385afb2b2ff73ae5fd998da08
+checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From 7d968dd741a5a34bba6423a7da31885c0a818a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 9 May 2021 17:02:27 +0200
Subject: [PATCH 10/41] qpdf: update to 10.3.2.

---
 srcpkgs/qpdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index f3b5524a1539..55f9eb480eee 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'qpdf'
 pkgname=qpdf
-version=10.3.1
+version=10.3.2
 revision=1
 wrksrc="qpdf-release-qpdf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://github.com/qpdf/qpdf"
 changelog="https://raw.githubusercontent.com/qpdf/qpdf/master/ChangeLog"
 distfiles="${homepage}/archive/release-qpdf-${version}.tar.gz"
-checksum=311dd965ed33bdf68e77c1b5945b548f846bd394562358c632c05e98c4f9e342
+checksum=8f1f42d1c36f62cf5bb4d2511e80e4fc0125093adc7fc444bc96cb7e79e71402
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 44fce4067a99d40e5101c67cc1ae38d3ff0c29a3 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 9 May 2021 16:28:27 +0200
Subject: [PATCH 11/41] kubetail: update to 1.6.13.

---
 srcpkgs/kubetail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubetail/template b/srcpkgs/kubetail/template
index f5d64db70579..83c9e6a3c9bd 100644
--- a/srcpkgs/kubetail/template
+++ b/srcpkgs/kubetail/template
@@ -1,6 +1,6 @@
 # Template file for 'kubetail'
 pkgname=kubetail
-version=1.6.12
+version=1.6.13
 revision=1
 depends="bash"
 short_desc="Bash script to tail Kubernetes logs from multiple pods at the same time"
@@ -8,7 +8,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="Apache-2.0"
 homepage="https://github.com/johanhaleby/kubetail"
 distfiles="https://github.com/johanhaleby/kubetail/archive/${version}.tar.gz"
-checksum=b5f3229361d520cc2f2de4b24d309ac49582e126e271525c85dc4b0975d57e59
+checksum=a4aeea1cffede44d5e8b030b6ead3ffe25fd3c1e7c5b7c82905df65cceac1254
 
 do_install() {
 	vbin kubetail

From 8c77edbdead5e55c18f235b5deff2c8aa2acb755 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 9 May 2021 20:22:01 +0200
Subject: [PATCH 12/41] cozy: update to 0.9.5.

---
 srcpkgs/cozy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 646f6049a13e..d959c923a2c7 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,10 +1,10 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=0.8.1
+version=0.9.5
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils"
 makedepends="glib-devel python3-distro python3-peewee python3-mutagen
  python3-gobject-devel libhandy1-devel"
 depends="python3 python3-peewee gst-libav gst-plugins-good1 gst1-python3
@@ -15,4 +15,4 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=16fdb225ee24a1e1acff62c3e3c3eb7bf8fd602350f4aa66508ee741ae13d030
+checksum=4a7fdd7fead6e74aaaa3eab1589f13a88a99a25e5c9c4f0ed6b1f0ee901630c3

From d2b4955d8cd934d2fc1a940aff4ecdfa7c376b7e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 17:25:33 -0700
Subject: [PATCH 13/41] python-enum34: update to 1.1.10

---
 srcpkgs/python-enum34/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python-enum34/template b/srcpkgs/python-enum34/template
index 99ca2ade67a1..55894323fbbe 100644
--- a/srcpkgs/python-enum34/template
+++ b/srcpkgs/python-enum34/template
@@ -1,22 +1,21 @@
 # Template file for 'python-enum34'
 pkgname=python-enum34
-version=1.1.6
-revision=2
+version=1.1.10
+revision=1
 wrksrc="enum34-${version}"
 build_style=python2-module
 hostmakedepends="python-setuptools"
 depends="python"
-pycompile_module="enum"
 short_desc="Backport of Python 3.4 enum module"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://bitbucket.org/stoneleaf/enum34"
-license="3-clause-BSD"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/enum34/"
 distfiles="${PYPI_SITE}/e/enum34/enum34-${version}.tar.gz"
-checksum=8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1
+checksum=cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248
 
 pre_build() {
 	# remove doc
-	sed -i "/'enum' :/,+6d" setup.py
+	vsed -i "/'enum' :/,+6d" setup.py
 }
 post_install() {
 	vlicense enum/LICENSE

From 22d308d942d48107ef00cafcbd86cb1f410737a8 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 9 May 2021 16:39:36 +0200
Subject: [PATCH 14/41] yq-go: update to 4.7.1.

---
 srcpkgs/yq-go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index f94fe745cd47..b212620e7343 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,6 +1,6 @@
 # Template file for 'yq-go'
 pkgname=yq-go
-version=4.6.3
+version=4.7.1
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/mikefarah/yq"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=85d7e0cbc12ac690fd86e77bef7a7ce27e0969191a9b6d3bb491ec690659d681
+checksum=19a7c43aaac678065f436ddfdf8b0a75dd3883984f4b9548cabdf53eb09932f9
 
 do_check() {
 	go test -v

From 4b48587131efd505b83ca58d5cdfa94fc5d7daa5 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 9 May 2021 10:26:26 +0200
Subject: [PATCH 15/41] miniflux: update to 2.0.30.

---
 srcpkgs/miniflux/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index b6c677a2aa70..f35a15a42d6c 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,10 +1,11 @@
 # Template file for 'miniflux'
 pkgname=miniflux
-version=2.0.29
+version=2.0.30
 revision=1
 wrksrc="v2-${version}"
 build_style=go
 go_import_path="miniflux.app"
+go_ldflags="-X miniflux.app/version.Version=${version}"
 hostmakedepends="git"
 short_desc="Minimalist and opinionated feed reader written in Go"
 maintainer="Frank Steinborn <steinex@nognu.de>"
@@ -12,7 +13,7 @@ license="Apache-2.0"
 homepage="https://miniflux.app"
 changelog="https://raw.githubusercontent.com/miniflux/v2/master/ChangeLog"
 distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
-checksum=dcce29b07738cd2ffe1da3cf1401d8c49ead421a81e2b2239323f3423c867200
+checksum=b5328c99e176439c44647cfec48fd6b5557b18060d0c93871bf8cbbac98e9594
 system_accounts="_miniflux"
 
 post_install() {

From 7865d35b0d1f6fa10632f57caf9697a48dbdb1a9 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 8 May 2021 16:26:41 +0200
Subject: [PATCH 16/41] tor: double MAX_OPEN_FILES yet again.

---
 srcpkgs/tor/files/tor/run | 2 +-
 srcpkgs/tor/template      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tor/files/tor/run b/srcpkgs/tor/files/tor/run
index d0d402d25f5a..389850ff0342 100755
--- a/srcpkgs/tor/files/tor/run
+++ b/srcpkgs/tor/files/tor/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
-ulimit -n ${MAX_OPEN_FILES:-8192}
+ulimit -n ${MAX_OPEN_FILES:-16384}
 exec tor ${OPTS:=--quiet} --runasdaemon 0 2>&1
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index cef10708f390..ef6d68483a56 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.5.6
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 0b7bc1f82fa907b3c3ada7cc17d7ca8bf6d9342d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 7 May 2021 23:03:20 -0700
Subject: [PATCH 17/41] perl-Digest-HMAC: update to 1.04

Technically a no-op but it keeps the version checker happy while also
fixing various linting issues.
---
 srcpkgs/perl-Digest-HMAC/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/perl-Digest-HMAC/template b/srcpkgs/perl-Digest-HMAC/template
index 97dd9b696e81..72eb4e0679cd 100644
--- a/srcpkgs/perl-Digest-HMAC/template
+++ b/srcpkgs/perl-Digest-HMAC/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Digest-HMAC'
 pkgname=perl-Digest-HMAC
-version=1.03
-revision=4
+version=1.04
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="${hostmakedepends}"
 depends="${makedepends}"
 short_desc="Perl interface to HMAC message-digest algorithms"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Digest-HMAC"
-license="Artistic, GPL-1"
 distfiles="${CPAN_SITE}/Digest/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3bc72c6d3ff144d73aefb90e9a78d33612d58cf1cd1631ecfb8985ba96da4a59
+checksum=d6bc8156aa275c44d794b7c18f44cdac4a58140245c959e6b19b2c3838b08ed4

From 1aabdb79588d8ee2d10975f3572a9fbac9c0ef7e Mon Sep 17 00:00:00 2001
From: Anubhav Kini <anubhavkini@gmail.com>
Date: Sat, 8 May 2021 21:24:13 +0530
Subject: [PATCH 18/41] timeshift: update outdated homepage

---
 srcpkgs/timeshift/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 9a01c60cf05d..ebdbb9ee28be 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -9,7 +9,7 @@ depends="rsync psmisc"
 short_desc="System restore tool"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="http://www.teejeetech.in/p/timeshift.html"
+homepage="https://teejeetech.com/timeshift/"
 distfiles="https://github.com/teejee2008/timeshift/archive/v${version}.tar.gz"
 checksum=c6dcca80b42f80a8c8d9d03e91eb17aa634be2f1031f667bba3f483410297abb
 

From 7db297d6a7e6df19e0a4ec69685b8543f7fe1da5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 10:51:45 -0700
Subject: [PATCH 19/41] perl-User-Identity: update to 1.00

---
 srcpkgs/perl-User-Identity/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/perl-User-Identity/template b/srcpkgs/perl-User-Identity/template
index 1005686e7261..52b82d5c4de5 100644
--- a/srcpkgs/perl-User-Identity/template
+++ b/srcpkgs/perl-User-Identity/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-User-Identity'
 pkgname=perl-User-Identity
-version=0.99
-revision=2
+version=1.00
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="${hostmakedepends}"
 depends="${makedepends}"
 short_desc="Perl module for abstracting information about a physical person"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/User-Identity"
-license="Artistic, GPL-1"
 distfiles="${CPAN_SITE}/User/${pkgname/perl-/}-${version}.tar.gz"
-checksum=f53b388897c965e529352aac2053298ef3f8a0f8bfac3c942795597c5fe75830
+checksum=9219b4271cfeb726330e9564589ea3a7db4b6dd6f6f4423746048df1a08e9f4a

From ba2aa70795c6ecb70206fbef5dd5eb32782532fb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 13:55:30 -0700
Subject: [PATCH 20/41] python-chardet: fix license, other lint

---
 srcpkgs/python-chardet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-chardet/template b/srcpkgs/python-chardet/template
index 276b8e949804..4af1148333f5 100644
--- a/srcpkgs/python-chardet/template
+++ b/srcpkgs/python-chardet/template
@@ -1,7 +1,7 @@
 # Template file for 'python-chardet'
 pkgname=python-chardet
 version=4.0.0
-revision=1
+revision=2
 wrksrc="chardet-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
@@ -9,8 +9,8 @@ depends="python-setuptools"
 checkdepends="python3-pytest python-pytest"
 short_desc="Universal encoding detector for Python 2 and 3 (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="LGPL-2.1-only"
 homepage="https://github.com/chardet/chardet"
-license="LGPL-2.1"
 distfiles="${PYPI_SITE}/c/chardet/chardet-${version}.tar.gz"
 checksum=0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa
 alternatives="chardet:chardetect:/usr/bin/chardetect2"

From d821ba8d467a30e4f0986462cf96a9af8b7e09fc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 14:12:22 -0700
Subject: [PATCH 21/41] python-backports: fix license, update homepage

---
 srcpkgs/python-backports/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-backports/template b/srcpkgs/python-backports/template
index 8bd3bb28526d..77409ecd82f1 100644
--- a/srcpkgs/python-backports/template
+++ b/srcpkgs/python-backports/template
@@ -1,15 +1,14 @@
 # Template file for 'python-backports'
 pkgname=python-backports
 version=1.0
-revision=4
+revision=5
 wrksrc="backports-${version}"
 build_style=python2-module
-pycompile_module="backports"
 hostmakedepends="python"
 depends="python"
 short_desc="Namespace for backported Python features"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://bitbucket.org/brandon/backports"
-license="PSF"
+license="PSF-2.0"
+homepage="https://pypi.org/project/backports/"
 distfiles="https://dev.gentoo.org/~radhermit/dist/backports-${version}.tar.gz"
 checksum=ee43d5b7bf4e79e04fbab30a09421cb5cbf4f56e7c14769393a7d1c34ea5e740

From 178129114a2bb8772256a7709ddb28945fa03209 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 14:19:20 -0700
Subject: [PATCH 22/41] python-distutils-extra: fix license, other lint

---
 srcpkgs/python-distutils-extra/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-distutils-extra/template b/srcpkgs/python-distutils-extra/template
index 61648d80cedf..47d4c8cf11f7 100644
--- a/srcpkgs/python-distutils-extra/template
+++ b/srcpkgs/python-distutils-extra/template
@@ -1,21 +1,19 @@
 # Template file for 'python-distutils-extra'
 pkgname=python-distutils-extra
 version=2.39
-revision=6
+revision=7
 build_style=python-module
-pycompile_module="DistUtilsExtra"
 hostmakedepends="intltool python-setuptools python3-setuptools"
 depends="python"
 short_desc="Enhancements to the Python2 build system"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="https://launchpad.net/python-distutils-extra"
-license="GPL-2"
 distfiles="http://launchpad.net/${pkgname}/trunk/${version}/+download/${pkgname}-${version}.tar.gz"
 checksum=723f24f4d65fc8d99b33a002fbbb3771d4cc9d664c97085bf37f3997ae8063af
 
 python3-distutils-extra_package() {
 	depends="python3"
-	pycompile_module="DistUtilsExtra"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*

From 1300428884ec96683e0ceb2087b238dfa8bc5caf Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 15:16:37 -0700
Subject: [PATCH 23/41] python-pgpdump: fix license, other lint

---
 srcpkgs/python-pgpdump/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-pgpdump/template b/srcpkgs/python-pgpdump/template
index 4c629009edb5..f43a49156374 100644
--- a/srcpkgs/python-pgpdump/template
+++ b/srcpkgs/python-pgpdump/template
@@ -1,21 +1,23 @@
 # Template file for 'python-pgpdump'
 pkgname=python-pgpdump
 version=1.5
-revision=8
+revision=9
 build_style=python-module
-pycompile_module="pgpdump"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Python2 library for parsing PGP packets"
 maintainer="Duncaen <mail@duncano.de>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://github.com/toofishes/python-pgpdump"
 distfiles="https://github.com/toofishes/python-pgpdump/archive/${version}.tar.gz"
 checksum=05383f66e467e855299d1ed51161c6038ac338d9d10bd33476b574dc3bef64ff
 
+post_install() {
+	vlicense COPYRIGHT
+}
+
 python3-pgpdump_package() {
 	depends="python3"
-	pycompile_module="pgpdump"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*

From fda294653ebb3c39409bd860c5c23af66e87a254 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 15:21:37 -0700
Subject: [PATCH 24/41] python-ply: fix license, other lint

---
 srcpkgs/python-ply/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-ply/template b/srcpkgs/python-ply/template
index 37282837f2fa..55a017a9b66c 100644
--- a/srcpkgs/python-ply/template
+++ b/srcpkgs/python-ply/template
@@ -1,16 +1,15 @@
 # Template file for 'python-ply'
 pkgname=python-ply
 version=3.11
-revision=4
+revision=5
 wrksrc="ply-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
-pycompile_module="ply"
 short_desc="Lex and Yacc for Python2"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
 homepage="http://www.dabeaz.com/ply/"
-license="3-clause-BSD"
 distfiles="${PYPI_SITE}/p/ply/ply-${version}.tar.gz"
 checksum=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3
 
@@ -21,7 +20,6 @@ post_install() {
 
 python3-ply_package() {
 	depends="python3"
-	pycompile_module="ply"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*

From fd01b27a4b8b6f4b1fb3e18caeaa1bd0b4f6d100 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 15:24:38 -0700
Subject: [PATCH 25/41] python-spambayes: fix license

---
 srcpkgs/python-spambayes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-spambayes/template b/srcpkgs/python-spambayes/template
index b05815bf02ae..04386eb3942f 100644
--- a/srcpkgs/python-spambayes/template
+++ b/srcpkgs/python-spambayes/template
@@ -1,14 +1,14 @@
 # Template file for 'python-spambayes'
 pkgname=python-spambayes
 version=1.1b3
-revision=2
+revision=3
 wrksrc=${pkgname#*-}-${version}
 build_style=python2-module
 hostmakedepends="python-setuptools"
 depends="python-lockfile python-pydns"
 short_desc="Spam classification system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="PSF"
+license="PSF-2.0"
 homepage="http://spambayes.sourceforge.net/"
 distfiles="${PYPI_SITE}/s/spambayes/spambayes-${version}.tar.gz"
 checksum=188d650fa930b27f74c96233429bd48f96d304a22d401b34cde32839c81bd904

From 5467d4cda0a1b6ee7e8f89e204fa16080dd0db62 Mon Sep 17 00:00:00 2001
From: noarchwastaken <noarch@n0ar.ch>
Date: Sun, 9 May 2021 00:25:44 -0400
Subject: [PATCH 26/41] libusb: fix descriptor parsing

backported upstream commit
<https://github.com/libusb/libusb/commit/f6d2cb56>

which fixes a regression for multi-configuration devices, e.g. iPhone.
---
 .../patches/fix-descriptor-parsing.patch      | 35 +++++++++++++++++++
 srcpkgs/libusb/template                       |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libusb/patches/fix-descriptor-parsing.patch

diff --git a/srcpkgs/libusb/patches/fix-descriptor-parsing.patch b/srcpkgs/libusb/patches/fix-descriptor-parsing.patch
new file mode 100644
index 000000000000..41b78b7348b3
--- /dev/null
+++ b/srcpkgs/libusb/patches/fix-descriptor-parsing.patch
@@ -0,0 +1,35 @@
+--- libusb/os/linux_usbfs.c
++++ libusb/os/linux_usbfs.c
+@@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx,
+ 	uint8_t *buffer, size_t len)
+ {
+ 	struct usbi_descriptor_header *header;
+-	int offset = 0;
++	int offset;
++
++	/* Start seeking past the config descriptor */
++	offset = LIBUSB_DT_CONFIG_SIZE;
++	buffer += LIBUSB_DT_CONFIG_SIZE;
++	len -= LIBUSB_DT_CONFIG_SIZE;
+ 
+ 	while (len > 0) {
+ 		if (len < 2) {
+@@ -718,7 +723,7 @@ static int parse_config_descriptors(struct libusb_device *dev)
+ 		}
+ 
+ 		if (priv->sysfs_dir) {
+-			 /*
++			/*
+ 			 * In sysfs wTotalLength is ignored, instead the kernel returns a
+ 			 * config descriptor with verified bLength fields, with descriptors
+ 			 * with an invalid bLength removed.
+@@ -727,8 +732,7 @@ static int parse_config_descriptors(struct libusb_device *dev)
+ 			int offset;
+ 
+ 			if (num_configs > 1 && idx < num_configs - 1) {
+-				offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE,
+-							     remaining - LIBUSB_DT_CONFIG_SIZE);
++				offset = seek_to_next_config(ctx, buffer, remaining);
+ 				if (offset < 0)
+ 					return offset;
+ 				sysfs_config_len = (uint16_t)offset;
diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index 1f2036d0ecad..8c5ff6054eed 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -1,7 +1,7 @@
 # Template file for 'libusb'
 pkgname=libusb
 version=1.0.24
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel"

From 6c812b8878434b93e900d4bbf038291d7f8807b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 9 May 2021 19:08:54 -0300
Subject: [PATCH 27/41] gufw: fix path to python module.

The gufw-pkexec script hardcodes the path to the python module; this
made it error out:

  python3: can't open file '/usr/share/gufw/gufw/gufw.py':
  [Errno 2] No such file or directory

The issue was missed when the package was updated.

Using python entry points should be suggested to upstream, since that's
the standard way of distributing python programs with setuptools.
---
 srcpkgs/gufw/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gufw/template b/srcpkgs/gufw/template
index 56e5d1de74e8..6495bd7b1488 100644
--- a/srcpkgs/gufw/template
+++ b/srcpkgs/gufw/template
@@ -1,7 +1,7 @@
 # Template file for 'gufw'
 pkgname=gufw
 version=21.04.0
-revision=1
+revision=2
 wrksrc="gufw-${version}"
 build_style=python3-module
 hostmakedepends="python3-distutils-extra intltool"
@@ -14,5 +14,7 @@ distfiles="https://github.com/costales/gufw/archive/refs/tags/$version.tar.gz"
 checksum=b57892ec9817ca1520b2fef31cc3ef404b243ef1230bdccfdc6d75ed4e461841
 
 pre_configure() {
-	vsed -i -e "s/python3.5/python$py3_ver/" bin/gufw-pkexec
+	vsed -i -e \
+		"s|/usr/share/gufw/gufw/gufw.py|/usr/lib/python${py3_ver}/site-packages/gufw/gufw.py|" \
+		bin/gufw-pkexec
 }

From fbad058d29edab1d04cad8b58cb2bff2fef86bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 9 May 2021 19:18:29 -0300
Subject: [PATCH 28/41] pipewire: use >= for version constraints.

Using ${pkgname}-${version}_${revision} can be ambiguous, since it can
be interpreted as the package's actual name. Using
${pkgname}>=${version}_${revision} is preferred.

Since we are here, make depends for pipewire itself also require
specific versions of the libspa-* packages.
---
 srcpkgs/pipewire/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 7ed96573fbb9..fb5c149e8a42 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.26
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
  -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
@@ -10,7 +10,8 @@ hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
 makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
-depends="libspa-alsa libspa-audioconvert libspa-audiomixer libspa-control"
+depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
+ libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Kridsada Thanabulpong <sirn@ogsite.net>"
 license="MIT"
@@ -47,7 +48,7 @@ libpipewire_package() {
 }
 
 pipewire-devel_package() {
-	depends="libpipewire-${version}_${revision}"
+	depends="libpipewire>=${version}_${revision}"
 	short_desc+=" - pipewire and libspa development files"
 	pkg_install() {
 		vmove usr/include/pipewire-0.3
@@ -136,7 +137,7 @@ gstreamer1-pipewire_package() {
 }
 
 alsa-pipewire_package() {
-	depends="libpipewire-${version}_${revision}"
+	depends="libpipewire>=${version}_${revision}"
 	short_desc+=" - ALSA client library"
 	pkg_install() {
 		vmove usr/lib/alsa-lib
@@ -145,7 +146,7 @@ alsa-pipewire_package() {
 }
 
 libjack-pipewire_package() {
-	depends="libpipewire-${version}_${revision}"
+	depends="libpipewire>=${version}_${revision}"
 	short_desc+=" - JACK client library"
 	pkg_install() {
 		vmove usr/lib/pipewire-0.3/jack

From 5a9b376eb8d9008998539371e69801453bb24ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 9 May 2021 19:21:58 -0300
Subject: [PATCH 29/41] mbuffer: update to 20210328.

---
 .../0001-mbuffer-don-t-cancel-ReaderThr.patch | 33 -------------------
 srcpkgs/mbuffer/template                      |  6 ++--
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/mbuffer/patches/0001-mbuffer-don-t-cancel-ReaderThr.patch

diff --git a/srcpkgs/mbuffer/patches/0001-mbuffer-don-t-cancel-ReaderThr.patch b/srcpkgs/mbuffer/patches/0001-mbuffer-don-t-cancel-ReaderThr.patch
deleted file mode 100644
index 1dd160547225..000000000000
--- a/srcpkgs/mbuffer/patches/0001-mbuffer-don-t-cancel-ReaderThr.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Subject: [PATCH] mbuffer: don't cancel ReaderThr.
-
-joinSenders is called after ReaderThr has been joined, which makes the
-pthread_cancel call in cancelAll undefined behavior and a case of
-use-after-free. Since the thread will already have been joined in main
-by the time joinSenders is called, there is no need to cancel it, so
-that call can simply be removed.
-
-Furthermore, we don't have to account for situations where pthread_join
-can fail, because this program doesn't generate them. If there were
-other threads which tried to join readerThr at the same time, a
-successful pthread_join call should also set Status=0, so pthread_cancel
-isn't called. However, that isn't necessary.
----
- mbuffer.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/mbuffer.c b/mbuffer.c
-index 79c997f..6e65277 100644
---- a/mbuffer.c
-+++ b/mbuffer.c
-@@ -166,8 +166,6 @@ static void cancelAll(void)
- 			d->result = "canceled";
- 		d = d->next;
- 	} while (d);
--	if (Status)
--		(void) pthread_cancel(ReaderThr);
- }
- 
- 
--- 
-2.30.2
-
diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index fa30e2134c17..97e0daac30e8 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,7 +1,7 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
-version=20210209
-revision=2
+version=20210328
+revision=1
 build_style=gnu-configure
 makedepends="openssl-devel"
 checkdepends="tar"
@@ -10,6 +10,6 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.maier-komor.de/mbuffer.html"
 distfiles="https://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"
-checksum=e81f2788e2621f20f848181ef2cb19ac6d12328691437f301574b253fd899a0c
+checksum=51b5b8d8488991a55fe1dfce90130f9e47bc1ce286ba03b4f628c04b784fdc5d
 patch_args=-Np1
 conf_files="/etc/mbuffer.rc"

From 8d936d668b9590bee8076a6b56f9e2afaf06c02d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 10 May 2021 01:41:23 +0300
Subject: [PATCH 30/41] sublime-merge-bin: update to 2054.

---
 srcpkgs/sublime-merge-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index 3eb3184ee6ef..f627603bf28c 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2049
+version=2054
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=bbe44b5c128f8e86582312e167e7fbf57be223b58290ac02c4c0c606c108ffbd
+checksum=539e0b514197e91aee756009d86ee505470d48350b2bcc3defbea11a789aac48
 _license_checksum=0cf0c605c296198b1b176dcb56343e7eb4f297fdcc7ec64dc347bcabf48fc4e8
 nopie=yes
 repository=nonfree

From 16bca58ea7c8352dd4685d4db8f9a4469414a8ac Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 10 May 2021 01:30:37 +0300
Subject: [PATCH 31/41] notcurses: update to 2.2.11.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index eaa93ff2c60f..e66e1e73ded2 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.2.8
+version=2.2.11
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=dc744f6a11bf8ca81dc8a73f56c4d9021cf4d56ef89a9a658974dff7984df376
+checksum=b49674891d42e3cb95da9db6e2f436b0274b72becb6697d64e4b24c6f9c8326e
 patch_args=-Np1
 
 build_options="man"

From a29bc694a73297328df578b20bd4c3fbf9b2ee9e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 10 May 2021 01:34:20 +0300
Subject: [PATCH 32/41] growlight: update to 1.2.33.

---
 srcpkgs/growlight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 4456db1f8185..863c318d4081 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,6 +1,6 @@
 # Template file for 'growlight'
 pkgname=growlight
-version=1.2.32
+version=1.2.33
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://nick-black.com/dankwiki/index.php/Growlight"
 distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
-checksum=f15357602d04e10a34d5d3f0d83a66a328638ce40c7b20ffaeac68459318edf2
+checksum=ef26904412ff6134018c350fe9e1f943d37fb82a623d06327195f9bd2b939408
 patch_args=-Np1
 
 build_options="man zfs"

From dff2aeba84cd88b30b7f391ffddafbe9f3f2d0b7 Mon Sep 17 00:00:00 2001
From: Quentin Rameau <quinq@fifth.space>
Date: Mon, 10 May 2021 00:51:04 +0200
Subject: [PATCH 33/41] surf: update to 2.1

---
 srcpkgs/surf/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/surf/template b/srcpkgs/surf/template
index b4937c4894fe..402209854a57 100644
--- a/srcpkgs/surf/template
+++ b/srcpkgs/surf/template
@@ -1,24 +1,17 @@
 # Template file for 'surf'
 pkgname=surf
-version=2.0
-revision=2
+version=2.1
+revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
-makedepends="webkit2gtk-devel"
-depends="xprop"
+makedepends="webkit2gtk-devel gcr-devel"
+depends="xprop dmenu"
 short_desc="Simple web browser based on WebKit/GTK+"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://surf.suckless.org"
 distfiles="http://dl.suckless.org/surf/$pkgname-$version.tar.gz"
-checksum=faee4c7a62c38fc9791eff1ad06787c3c9b2b79f338806827f5152a7bc54951d
-
-do_build() {
-	sed -i 's,/usr/include,,g;s,/usr/lib,,g' config.mk
-	sed -i "/CFLAGS/s|\${CPPFLAGS}|& $CFLAGS|g" config.mk
-	sed -i "/LDFLAGS/s|\-s|$LDFLAGS|g" config.mk
-	make CC=$CC ${makejobs}
-}
+checksum=72e582920ba25a646203e93c2d2331d87f03037a28894d6c7e99af00ee043257
 
 post_install() {
 	vlicense LICENSE

From e0bfc3d9674c43329f2bcd4fc5a32621278127d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 9 May 2021 20:48:32 -0300
Subject: [PATCH 34/41] void-docs: update to 2021.05.09.

And switch void-docs-browse to fully portable C-only dependencies.
---
 srcpkgs/void-docs/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/void-docs/template b/srcpkgs/void-docs/template
index 95aa4657d606..3ffb0c2c5649 100644
--- a/srcpkgs/void-docs/template
+++ b/srcpkgs/void-docs/template
@@ -1,28 +1,25 @@
 # Template file for 'void-docs'
 pkgname=void-docs
-version=2020.12.23
+version=2021.05.09
 revision=1
-hostmakedepends="mdBook fd pandoc texlive perl perl-JSON librsvg-utils"
+hostmakedepends="mdBook lowdown texlive perl perl-JSON librsvg-utils"
 short_desc="Documentation for Void Linux"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="CC-BY-SA-4.0"
 homepage="https://github.com/void-linux/void-docs"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=bc6f25392b14b3de33378fbfe84a93e4838cba21603cc9d742fd842ab32c4db5
-
-export PREFIX=/usr
+checksum=96f6676bfbff213a9862c245227641da1723b4ca2d775582cb3a08a518ff4df9
 
 do_build() {
-	res/build.sh
+	PREFIX=/usr res/build.sh
 }
 
 do_install() {
-	export DESTDIR
-	res/install.sh
+	PREFIX=/usr DESTDIR=$DESTDIR res/install.sh
 }
 
 void-docs-browse_package() {
-	depends="${sourcepkg}>=${version}_${revision} skim mdcat"
+	depends="${sourcepkg}>=${version}_${revision} pick lowdown"
 	short_desc+=" - browsing utilities"
 	build_style=meta
 }

From bbfc4e3c82bccfc4e16e22f7ca560d9c1001ea99 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 10 May 2021 04:09:07 +0200
Subject: [PATCH 35/41] gnome-control-center: drop alsa-plugins-pulseaudio
 dependency

---
 srcpkgs/gnome-control-center/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index a20f50cf9361..06e002cce6fc 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
 version=40.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcheese=$(vopt_if cheese true false)"
@@ -16,9 +16,8 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
  libsoup-devel $(vopt_if cheese cheese-devel)"
-depends="alsa-plugins-pulseaudio desktop-file-utils upower colord cups-pk-helper
- gsettings-desktop-schemas hicolor-icon-theme iso-codes sound-theme-freedesktop
- cracklib"
+depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
+ gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
 short_desc="GNOME control center"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 97936428fd75348f6673fe17d5d82cbf4bc6f65e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 10 May 2021 04:12:32 +0200
Subject: [PATCH 36/41] gnome-session: drop alsa-plugins-pulseaudio dependency

---
 srcpkgs/gnome-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 61dc64010ba6..5b69454eb4ae 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
 version=40.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
 hostmakedepends="glib-devel intltool pkg-config xmlto"
 makedepends="elogind-devel gnome-desktop-devel gtk+3-devel json-glib-devel
  libglib-devel libICE-devel libSM-devel libXtst-devel startup-notification-devel
  upower-devel xtrans"
-depends="alsa-plugins-pulseaudio dconf desktop-file-utils bash
+depends="dconf desktop-file-utils bash
  gsettings-desktop-schemas hicolor-icon-theme polkit"
 short_desc="GNOME session management utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 7233f5e3f3bc2b3c0f26353a479bc4158b610d48 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 10 May 2021 04:19:44 +0200
Subject: [PATCH 37/41] gnome-sound-recorder: depend on gst-plugins-good1, not
 pulseaudio

---
 srcpkgs/gnome-sound-recorder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 24431907839c..2887819e5a8b 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-sound-recorder'
 pkgname=gnome-sound-recorder
 version=40.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="gjs-devel libglib-devel gtk+3-devel gst-plugins-bad1-devel
  libhandy1-devel"
 depends="desktop-file-utils gjs gsettings-desktop-schemas gst-plugins-bad1
- libhandy1 pulseaudio"
+ gst-plugins-good1 libhandy1"
 short_desc="GNOME sound recorder application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9b9d26f150afb16984d64e28bee06e6740022da4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 10 May 2021 08:05:30 +0200
Subject: [PATCH 38/41] pinebookpro-kernel: update to 5.10.35.

---
 srcpkgs/pinebookpro-kernel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index dd338fd233a9..5908c8021ce4 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -1,6 +1,6 @@
 # Template file for 'pinebookpro-kernel'
 pkgname=pinebookpro-kernel
-version=5.10.23
+version=5.10.35
 revision=1
 archs="aarch64*"
 wrksrc="linux-${version}"
@@ -9,7 +9,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f6e21c03ec6ff85b26d77c59fdab81e64707792a57593643307df192749edb6a
+checksum=ac37a19d45b77a87e58e3aae8b127a6e7eb85ed7467fc8e58474b387bfd498fd
 patch_args="-Np1"
 python_version=3
 

From 9a5e2db09cea740b1025cd5fe4ed762dd6947619 Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Fri, 25 Dec 2020 22:35:08 +0100
Subject: [PATCH 39/41] New package: nx-libs-3.5.99.26

---
 common/shlibs                                 |  3 +
 .../patches/fix-musl-headers-x86.patch        | 11 ++++
 srcpkgs/nx-libs/patches/xf86bigfont.patch     | 10 +++
 srcpkgs/nx-libs/template                      | 62 +++++++++++++++++++
 4 files changed, 86 insertions(+)
 create mode 100644 srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch
 create mode 100644 srcpkgs/nx-libs/patches/xf86bigfont.patch
 create mode 100644 srcpkgs/nx-libs/template

diff --git a/common/shlibs b/common/shlibs
index 2afcbb9a6dea..0d4bdcffac05 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3987,3 +3987,6 @@ libmariadb.so.3 libmariadbclient-10.5.9_1
 libmariadbd.so.19 libmariadbclient-10.5.9_1
 libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
 libbasu.so.0 basu-0.2.0_1
+libXcomp.so.3 nx-libs-3.5.99.24_1
+libXcompshad.so.3 nx-libs-3.5.99.24_1
+libNX_X11.so.6 nx-libs-3.5.99.24_1
diff --git a/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch b/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch
new file mode 100644
index 000000000000..3f51b8e4b1a1
--- /dev/null
+++ b/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch
@@ -0,0 +1,11 @@
+--- ./nx-X11/extras/Mesa/src/mesa/main/glheader.h.orig
++++ ./nx-X11/extras/Mesa/src/mesa/main/glheader.h
+@@ -62,7 +62,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#if defined(__linux__) && defined(__i386__)
++#if defined(__GLIBC__) && defined(__i386__)
+ #include <fpu_control.h>
+ #endif
+ #endif
diff --git a/srcpkgs/nx-libs/patches/xf86bigfont.patch b/srcpkgs/nx-libs/patches/xf86bigfont.patch
new file mode 100644
index 000000000000..b5f29e493372
--- /dev/null
+++ b/srcpkgs/nx-libs/patches/xf86bigfont.patch
@@ -0,0 +1,10 @@
+--- nx-X11/programs/Xserver/Xext/xf86bigfont.c	2021-02-04 14:34:56.000000000 +0100
++++ -	2021-05-10 08:55:11.108944904 +0200
+@@ -45,7 +45,6 @@
+ /* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
+    Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
+    PAGE_SIZE. It is defined in <asm/page.h>. */
+-#include <asm/page.h>
+ #include <limits.h>
+ #endif
+ #ifdef SVR4
diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template
new file mode 100644
index 000000000000..e0b01308bc97
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,62 @@
+# Template file for 'nx-libs'
+pkgname=nx-libs
+version=3.5.99.26
+revision=1
+build_style=gnu-configure
+make_build_args="CONFIGURE=echo IMAKE_DEFINES=-DUseTIRPC=YES"
+make_install_args="PREFIX=/usr"
+hostmakedepends="autoconf automake libtool pkg-config which imake xkbcomp gccmakedep"
+makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel
+ libXext-devel libXdamage-devel libXrandr-devel libXtst-devel pixman-devel
+ libXfont2-devel libxml2-devel libXcomposite-devel libXinerama-devel
+ libtirpc-devel libXpm-devel font-util xkbcomp"
+short_desc="NX X11 protocol compression libraries"
+maintainer="eoli3n <jkirsz@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/ArcticaProject/nx-libs"
+distfiles="https://github.com/ArcticaProject/nx-libs/archive/$version/$pkgname-$version.tar.gz"
+checksum=3ce7ca4e6b57b3a2d7588b2d0f4009036d2566a8925ca2c62f08a8dc0df50357
+python_version=3
+nocross="imake attempts to run target executables on host"
+
+post_patch() {
+	# Replace hard-coded /usr/local ProjectRoot
+	vsed -e '/ProjectRoot/s,/usr/local,/usr,' -i nx-X11/config/cf/site.def
+	# Manually run autoreconf in pre_configure, disable in Makefile
+	vsed -e 's/autoreconf/echo &-disabled/' -i Makefile
+}
+
+pre_configure() {
+	# Create configure scripts for all subprojects
+	local _subdir
+	for _subdir in nxcomp nx-X11/lib nxcompshad nxproxy nxdialog; do
+		( cd ${_subdir} && autoreconf -vfsi )
+	done
+}
+
+do_configure() {
+	# Configure all subprojects in advance of build
+	local _subdir
+	for _subdir in nxcomp nxcompshad nxproxy nxdialog; do
+		( cd ${_subdir} && ./configure ${configure_args} )
+	done
+
+	# nx-X11 configure has an extra argument
+	( cd nx-X11/lib && ./configure ${configure_args} --disable-poll )
+}
+
+post_install() {
+	# Remove conflicting GL headers
+	rm -rf ${DESTDIR}/usr/include/GL
+}
+
+nx-libs-devel_install() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 38a9c849bf201cb25fcc8b96a4f496f593697776 Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Fri, 25 Dec 2020 22:35:54 +0100
Subject: [PATCH 40/41] New package: x2goclient-4.1.2.2

---
 srcpkgs/x2goclient/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/x2goclient/template

diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
new file mode 100644
index 000000000000..76dbc1e2f258
--- /dev/null
+++ b/srcpkgs/x2goclient/template
@@ -0,0 +1,20 @@
+# Template file for 'x2goclient'
+pkgname=x2goclient
+version=4.1.2.2
+revision=1
+build_style=gnu-makefile
+build_helper=qmake
+make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
+make_build_target="build_client build_man"
+make_install_args="$make_build_args"
+make_install_target="install_client install_man"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="qt5-svg-devel qt5-x11extras-devel libldap-devel
+ libssh-devel libXpm-devel cups-devel"
+depends="nx-libs"
+short_desc="Graphical Qt5 client for X2Go"
+maintainer="eoli3n <jkirsz@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.x2go.org"
+distfiles="http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=c9953267c40fa67119ad96a73bacb1f266196da2059f0cdcd1b8d5199421d12a

From afa0df08bb7c78fc578a317e9688c9c4ef1bfa74 Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Mon, 28 Dec 2020 23:15:17 +0100
Subject: [PATCH 41/41] New package: x2goserver-4.1.0.3

---
 srcpkgs/x2goserver/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/x2goserver/template

diff --git a/srcpkgs/x2goserver/template b/srcpkgs/x2goserver/template
new file mode 100644
index 000000000000..158130a96717
--- /dev/null
+++ b/srcpkgs/x2goserver/template
@@ -0,0 +1,28 @@
+# Template file for 'x2goserver'
+pkgname=x2goserver
+version=4.1.0.3
+revision=1
+build_style=gnu-makefile
+hostmakedepends="pkg-config perl"
+makedepends="libssh2-devel"
+depends="perl perl-Config-Simple perl-DBI perl-Capture-Tiny perl-DBD-SQLite bash iproute2 makepasswd openssh lsof xauth perl-File-BaseDir nx-libs perl-File-Which"
+short_desc="Open source graphical Remote Desktop based on NX technology"
+maintainer="eoli3n <jkirsz@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.x2go.org"
+distfiles="http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0
+system_groups="x2gouser"
+system_accounts="x2gouser"
+x2gouser_homedir="/var/lib/x2go"
+x2gouser_shell="/bin/false"
+
+post_extract() {
+	# Replace hard-coded /usr/sbin
+	for _file in x2goserver-printing/Makefile x2goserver/Makefile x2goserver-xsession/Makefile libx2go-server-db-perl/Makefile x2goserver-common/Makefile; do
+		vsed -e 's,/sbin,/bin,g' -i "$_file"
+	done
+	for _file in bin/x2golistdesktops bin/x2goresume-session bin/x2gostartagent sbin/x2gocleansessions; do
+		vsed -e 's,/usr/sbin,/usr/bin,g' -i x2goserver/"$_file"
+	done
+}

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-836453497

Comment:
Looks like I did huge mistakes :scream: 

Re: [PR PATCH] [Updated] New package: v2ray-4.38.3

[ipkalm]

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

There is an updated pull request by ipkalm against master on the void-packages repository

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.38.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 52e089dd7adb4680ff6a7772097b7d13166e7319 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sun, 9 May 2021 19:06:35 +0700
Subject: [PATCH 1/3] New package: v2ray-4.38.3

---
 srcpkgs/v2ray/files/v2ray/run |  3 +++
 srcpkgs/v2ray/template        | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..4622d509d5a7
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u nobody:nogroup v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..2688b22a952c
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,36 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.38.3
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+short_desc="Platform for building proxies to bypass network restrictions"
+maintainer="ipkalm <ipkalm@outlool.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=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
+conf_files="/etc/v2ray/config.json"
+
+do_build() {
+		export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external"
+		go build -o v2ray ./main
+		go build -o v2ctl ./infra/control/main
+}
+
+do_check() {
+		go test -p 1 -tags json -v -timeout 30m ./...
+}
+
+pre_install() {
+		vmkdir etc/v2ray
+		vcopy release/config/*.json etc/v2ray/
+}
+
+do_install() {
+		vlicense LICENSE
+		vbin v2ray
+		vbin v2ctl
+		vsv v2ray
+}

From 1ae6f0dd926b239c570d76aa03dbe4dcdc94ef49 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Mon, 10 May 2021 11:23:14 +0700
Subject: [PATCH 2/3] Update srcpkgs/v2ray/template

Co-authored-by: noarchwastaken <noarch@n0ar.ch>
---
 srcpkgs/v2ray/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 2688b22a952c..aa8f55e6091b 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -13,6 +13,8 @@ distfiles="https://github.com/v2fly/v2ray-core/archive/v${version}/${pkgname}-${
 checksum=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
 conf_files="/etc/v2ray/config.json"
 
+system_accounts="v2ray"
+
 do_build() {
 		export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external"
 		go build -o v2ray ./main

From 4bacec72bb4279918cbee77d567f4179f0681f76 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Mon, 10 May 2021 11:24:47 +0700
Subject: [PATCH 3/3] Update srcpkgs/v2ray/files/v2ray/run

Co-authored-by: noarchwastaken <noarch@n0ar.ch>
---
 srcpkgs/v2ray/files/v2ray/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
index 4622d509d5a7..2046a0f6ab61 100644
--- a/srcpkgs/v2ray/files/v2ray/run
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec chpst -u nobody:nogroup v2ray -config=/etc/v2ray/config.json 2>&1
+exec chpst -u v2ray:v2ray v2ray -config=/etc/v2ray/config.json 2>&1

Re: [PR PATCH] [Updated] New package: v2ray-4.38.3

[ipkalm]

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

There is an updated pull request by ipkalm against master on the void-packages repository

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.38.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 52e089dd7adb4680ff6a7772097b7d13166e7319 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sun, 9 May 2021 19:06:35 +0700
Subject: [PATCH 1/4] New package: v2ray-4.38.3

---
 srcpkgs/v2ray/files/v2ray/run |  3 +++
 srcpkgs/v2ray/template        | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..4622d509d5a7
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u nobody:nogroup v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..2688b22a952c
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,36 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.38.3
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+short_desc="Platform for building proxies to bypass network restrictions"
+maintainer="ipkalm <ipkalm@outlool.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=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
+conf_files="/etc/v2ray/config.json"
+
+do_build() {
+		export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external"
+		go build -o v2ray ./main
+		go build -o v2ctl ./infra/control/main
+}
+
+do_check() {
+		go test -p 1 -tags json -v -timeout 30m ./...
+}
+
+pre_install() {
+		vmkdir etc/v2ray
+		vcopy release/config/*.json etc/v2ray/
+}
+
+do_install() {
+		vlicense LICENSE
+		vbin v2ray
+		vbin v2ctl
+		vsv v2ray
+}

From 1ae6f0dd926b239c570d76aa03dbe4dcdc94ef49 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Mon, 10 May 2021 11:23:14 +0700
Subject: [PATCH 2/4] Update srcpkgs/v2ray/template

Co-authored-by: noarchwastaken <noarch@n0ar.ch>
---
 srcpkgs/v2ray/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 2688b22a952c..aa8f55e6091b 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -13,6 +13,8 @@ distfiles="https://github.com/v2fly/v2ray-core/archive/v${version}/${pkgname}-${
 checksum=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
 conf_files="/etc/v2ray/config.json"
 
+system_accounts="v2ray"
+
 do_build() {
 		export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external"
 		go build -o v2ray ./main

From 4bacec72bb4279918cbee77d567f4179f0681f76 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Mon, 10 May 2021 11:24:47 +0700
Subject: [PATCH 3/4] Update srcpkgs/v2ray/files/v2ray/run

Co-authored-by: noarchwastaken <noarch@n0ar.ch>
---
 srcpkgs/v2ray/files/v2ray/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
index 4622d509d5a7..2046a0f6ab61 100644
--- a/srcpkgs/v2ray/files/v2ray/run
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec chpst -u nobody:nogroup v2ray -config=/etc/v2ray/config.json 2>&1
+exec chpst -u v2ray:v2ray v2ray -config=/etc/v2ray/config.json 2>&1

From dc4548ceaac37f5382abe8cbff3017dffe2fc08a Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Mon, 10 May 2021 16:41:51 +0700
Subject: [PATCH 4/4] New package: v2ray-4.38.3

---
 srcpkgs/v2ray/files/v2ray/run |  2 +-
 srcpkgs/v2ray/template        | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
index 2046a0f6ab61..3b1ac46ab240 100644
--- a/srcpkgs/v2ray/files/v2ray/run
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec chpst -u v2ray:v2ray v2ray -config=/etc/v2ray/config.json 2>&1
+exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index aa8f55e6091b..976753b98e35 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -5,34 +5,30 @@ revision=1
 wrksrc=${pkgname}-core-${version}
 build_style=go
 go_import_path="github.com/v2fly/v2ray-core/v4"
+go_ldflags="-s -w"
 short_desc="Platform for building proxies to bypass network restrictions"
-maintainer="ipkalm <ipkalm@outlool.com>"
+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=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
 conf_files="/etc/v2ray/config.json"
 
-system_accounts="v2ray"
+system_accounts="_v2ray"
 
 do_build() {
-		export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external"
-		go build -o v2ray ./main
-		go build -o v2ctl ./infra/control/main
+		export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
+		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() {
 		go test -p 1 -tags json -v -timeout 30m ./...
 }
 
-pre_install() {
+post_install() {
+		vlicense LICENSE
 		vmkdir etc/v2ray
 		vcopy release/config/*.json etc/v2ray/
-}
-
-do_install() {
-		vlicense LICENSE
-		vbin v2ray
-		vbin v2ctl
 		vsv v2ray
 }

Re: [PR PATCH] [Updated] New package: v2ray-4.38.3

[ipkalm]

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

There is an updated pull request by ipkalm against master on the void-packages repository

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.38.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 96fb6ba9a1998ad4d98aed7e7fb761f1d33b2a81 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sun, 9 May 2021 19:06:35 +0700
Subject: [PATCH] New package: v2ray-4.38.3

---
 srcpkgs/v2ray/files/v2ray/run |  3 +++
 srcpkgs/v2ray/template        | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..3b1ac46ab240
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..976753b98e35
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,34 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.38.3
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+go_ldflags="-s -w"
+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=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
+conf_files="/etc/v2ray/config.json"
+
+system_accounts="_v2ray"
+
+do_build() {
+		export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
+		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() {
+		go test -p 1 -tags json -v -timeout 30m ./...
+}
+
+post_install() {
+		vlicense LICENSE
+		vmkdir etc/v2ray
+		vcopy release/config/*.json etc/v2ray/
+		vsv v2ray
+}

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-836514088

Comment:
Well. Now it is single commit! I did it :)

About my template file: `do_check` function doesn't provided in `common/build-style/go.sh`. So I wrote it into template. And because v2ray project uses `github.com/v2fly/v2ray-core/main` for `v2ray` binary and `github.com/v2fly/v2ray-core/infra/control/main` for `v2ctl` binary, `go install` command from `common/build-style/go.sh` build all this binary files with name `main` and put into the same directory. That is why I added `do_build()` func into `template` file. As example I used kubernetes, caddy, prometheus, docker templates from `srcpkgs` directory.

Hope you understand my English :grimacing: 

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-836514088

Comment:
Well. Now it is single commit! I did it :)

About my template file: `do_check` function doesn't provided in `common/build-style/go.sh`. So I wrote it into template. And because v2ray project uses `github.com/v2fly/v2ray-core/main` for `v2ray` binary and `github.com/v2fly/v2ray-core/infra/control/main` for `v2ctl` binary, `go install` command from `common/build-style/go.sh` build all this binary files with name `main` and put into the same directory. That is why I added `do_build()` func into `template` file. To build this binaries with specific names, then put them into `${GOPATH}/bin` directory. And `do_isntall` func from `common/build-style/go.sh` could install this files. As example I used kubernetes, caddy, prometheus, docker templates from `srcpkgs` directory.

Hope you understand my English :grimacing: 

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-836453497

Comment:
Looks like I did huge mistakes :scream: 

Re: New package: v2ray-4.38.3

[noarchwastaken]

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

New comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-836769301

Comment:
> To build this binaries with specific names, then put them into `${GOPATH}/bin` directory. And `do_isntall` func from `common/build-style/go.sh` could install this files. As example I used kubernetes, caddy, prometheus, docker templates from `srcpkgs` directory.

FYI, you can also move those binaries in `post_build`. For multiple main's in one repo, I guess yours is the way to go.

> Hope you understand my English grimacing

I'm a newcomer here too! I only have a few PRs and just stumbled upon yours because I use v2ray in China as well.

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-836959980

Comment:
> FYI, you can also move those binaries in `post_build`. For multiple main's in one repo, I guess yours is the way to go.

Do you mean move in `post_build` without my custom `do_build`?

Re: New package: v2ray-4.38.3

[noarchwastaken]

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

New comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-837282150

Comment:
> > FYI, you can also move those binaries in `post_build`. For multiple main's in one repo, I guess yours is the way to go.
> 
> Do you mean move in `post_build` without my custom `do_build`?

Yes. As you said, it's a multi-main repo, I'm not sure if it would build at all without the custom do_build.

Re: New package: v2ray-4.38.3

[noarchwastaken]

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

New comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-837282150

Comment:
> > FYI, you can also move those binaries in `post_build`. For multiple main's in one repo, I guess yours is the way to go.
> 
> Do you mean move in `post_build` without my custom `do_build`?

Yes. But, as you said, it's a multi-main repo, I'm not sure if it would build at all without the custom do_build.

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-837304242

Comment:
> Yes. But, as you said, it's a multi-main repo, I'm not sure if it would build at all without the custom do_build.

I think it impossible.
In freebsd ports I saw this:
```
GO_TARGET=	./main:v2ray \
		./infra/control/main:v2ctl
```  
For each package we can specify name for output files. But I didn't find similar feature for xbps template.

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-837304242

Comment:
> Yes. But, as you said, it's a multi-main repo, I'm not sure if it would build at all without the custom do_build.

I think it impossible.
In freebsd ports I saw this:
```
GO_TARGET=	./main:v2ray \
		./infra/control/main:v2ctl
```  
For each package we can specify name for output files. But I didn't find similar feature for xbps template.

Or maybe I should create 2 different xbps package templates:
1. `v2ray-${version}`
2. `v2ctl-${version}`

This provide more simpler template files. But in other Linux distros (and ports) uses 1 package for these 2 applications.

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-838851012

Comment:
@ericonr hi. Can you check please my commit? Thank you.

Re: New package: v2ray-4.38.3

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-838922844

Comment:
Try taking a look at the `go_package` variable to build two binaries without a custom `do_build`.

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-838948897

Comment:
> Try taking a look at the `go_package` variable to build two binaries without a custom `do_build`.

I tried. But all packages build with same name `main`. `v2ray` go_package locate at "github.com/v2fly/v2ray-core/`main`" and `v2ctl` at "github.com/v2fly/v2ray-core/infra/control/`main`". `go install` command uses in `common/build-style/go.sh` script can't take any flags for giving custom name for binary.

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-838948897

Comment:
> Try taking a look at the `go_package` variable to build two binaries without a custom `do_build`.

I tried. But all `go_package`s build with same name `main`. `v2ray` go_package locate at "github.com/v2fly/v2ray-core/`main`" and `v2ctl` at "github.com/v2fly/v2ray-core/infra/control/`main`". `go install` command uses in `common/build-style/go.sh` script can't take any flags for giving custom name for binary.

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-838948897

Comment:
> Try taking a look at the `go_package` variable to build two binaries without a custom `do_build`.

I tried. But all `go_package`s build with same name `main`. `v2ray` go_package locate at "github.com/v2fly/v2ray-core/`main`" and `v2ctl` at "github.com/v2fly/v2ray-core/infra/control/`main`". `go install` command uses in `common/build-style/go.sh` script can't take any flags for giving custom name for binary.

Or maybe I should create 2 different xbps package templates:

1. `v2ray-${version}`
2. `v2ctl-${version}`
This provide more simpler template files. But in other Linux distros (and ports) uses 1 package for these 2 applications.

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-838948897

Comment:
> Try taking a look at the `go_package` variable to build two binaries without a custom `do_build`.

I tried. But all `go_package`s build with same name `main`. `v2ray` go_package locate at "github.com/v2fly/v2ray-core/`main`" and `v2ctl` at "github.com/v2fly/v2ray-core/infra/control/`main`". `go install` command uses in `common/build-style/go.sh` script can't take any flags for giving custom name for binary.

Or maybe I should create 2 different xbps package templates:

1. `v2ray-${version}`
2. `v2ctl-${version}`

This provide more simpler template files. But in other Linux distros (and ports) uses 1 package for these 2 applications.

Re: New package: v2ray-4.38.3

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-838975069

Comment:
In that case we can remain with the custom function and a single package, no worries :)

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-838977713

Comment:
@ericonr nice, thank you 😊

Re: [PR PATCH] [Updated] New package: v2ray-4.38.3

[ipkalm]

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

There is an updated pull request by ipkalm against master on the void-packages repository

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.38.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 96fb6ba9a1998ad4d98aed7e7fb761f1d33b2a81 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sun, 9 May 2021 19:06:35 +0700
Subject: [PATCH] New package: v2ray-4.38.3

---
 srcpkgs/v2ray/files/v2ray/run |  3 +++
 srcpkgs/v2ray/template        | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..3b1ac46ab240
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..976753b98e35
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,34 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.38.3
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+go_ldflags="-s -w"
+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=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
+conf_files="/etc/v2ray/config.json"
+
+system_accounts="_v2ray"
+
+do_build() {
+		export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
+		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() {
+		go test -p 1 -tags json -v -timeout 30m ./...
+}
+
+post_install() {
+		vlicense LICENSE
+		vmkdir etc/v2ray
+		vcopy release/config/*.json etc/v2ray/
+		vsv v2ray
+}

Re: [PR PATCH] [Updated] New package: v2ray-4.38.3

[ipkalm]

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

There is an updated pull request by ipkalm against master on the void-packages repository

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.38.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 96fb6ba9a1998ad4d98aed7e7fb761f1d33b2a81 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sun, 9 May 2021 19:06:35 +0700
Subject: [PATCH] New package: v2ray-4.38.3

---
 srcpkgs/v2ray/files/v2ray/run |  3 +++
 srcpkgs/v2ray/template        | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..3b1ac46ab240
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..976753b98e35
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,34 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.38.3
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+go_ldflags="-s -w"
+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=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
+conf_files="/etc/v2ray/config.json"
+
+system_accounts="_v2ray"
+
+do_build() {
+		export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
+		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() {
+		go test -p 1 -tags json -v -timeout 30m ./...
+}
+
+post_install() {
+		vlicense LICENSE
+		vmkdir etc/v2ray
+		vcopy release/config/*.json etc/v2ray/
+		vsv v2ray
+}

Re: [PR PATCH] [Closed]: New package: v2ray-4.38.3

[ipkalm]

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

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

New package: v2ray-4.38.3
https://github.com/void-linux/void-packages/pull/30762

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Re: [PR PATCH] [Updated] New package: v2ray-4.38.3

[ipkalm]

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

There is an updated pull request by ipkalm against master on the void-packages repository

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.38.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

Re: [PR PATCH] [Updated] New package: v2ray-4.38.3

[ipkalm]

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

There is an updated pull request by ipkalm against master on the void-packages repository

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.38.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 7aca24b8f411bfee4d27c4999372d8c47edcc23b Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sun, 9 May 2021 19:06:35 +0700
Subject: [PATCH] New package: v2ray-4.38.3

---
 srcpkgs/v2ray/files/v2ray/run |  3 +++
 srcpkgs/v2ray/template        | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..3b1ac46ab240
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..976753b98e35
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,34 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.38.3
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+go_ldflags="-s -w"
+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=b06d2bf63fd08d8a92d51824f69e41345bd90d747d444ca37770b2017a2a5a00
+conf_files="/etc/v2ray/config.json"
+
+system_accounts="_v2ray"
+
+do_build() {
+		export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
+		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() {
+		go test -p 1 -tags json -v -timeout 30m ./...
+}
+
+post_install() {
+		vlicense LICENSE
+		vmkdir etc/v2ray
+		vcopy release/config/*.json etc/v2ray/
+		vsv v2ray
+}

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-840033304

Comment:
Sorry about reopen. I tried cherry-pick this PR commit from <my fork>-<master> branch to <my fork>-<v2ray> branch... But I couldn't. 😬

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-841128015

Comment:
@ericonr greetings. Aare there any other improvements or changes required from me?

Re: New package: v2ray-4.38.3

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-841128015

Comment:
@ericonr greetings. Are there any other improvements or changes required from me?

Re: [PR PATCH] [Updated] New package: v2ray-4.38.3

[ipkalm]

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

There is an updated pull request by ipkalm against master on the void-packages repository

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.38.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 38acb6d5c8772e7ed8b96b7c698574fb668b1e81 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sun, 9 May 2021 19:06:35 +0700
Subject: [PATCH] New package: v2ray-4.39.2

---
 srcpkgs/v2ray/files/v2ray/run |  3 +++
 srcpkgs/v2ray/template        | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..3b1ac46ab240
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..f9cf205ecd9a
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,34 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.39.2
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+go_ldflags="-s -w"
+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=bcb35c0fd3fed604762b4c2a0950718b0118d7f4cb0ca9987d716a6a6e471b2b
+conf_files="/etc/v2ray/config.json"
+
+system_accounts="_v2ray"
+
+do_build() {
+		export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
+		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() {
+		go test -p 1 -tags json -v -timeout 30m ./...
+}
+
+post_install() {
+		vlicense LICENSE
+		vmkdir etc/v2ray
+		vcopy release/config/*.json etc/v2ray/
+		vsv v2ray
+}

Re: [PR PATCH] [Updated] New package: v2ray-4.39.2

[ipkalm]

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

There is an updated pull request by ipkalm against master on the void-packages repository

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.39.2
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 38acb6d5c8772e7ed8b96b7c698574fb668b1e81 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sun, 9 May 2021 19:06:35 +0700
Subject: [PATCH] New package: v2ray-4.39.2

---
 srcpkgs/v2ray/files/v2ray/run |  3 +++
 srcpkgs/v2ray/template        | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..3b1ac46ab240
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..f9cf205ecd9a
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,34 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.39.2
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+go_ldflags="-s -w"
+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=bcb35c0fd3fed604762b4c2a0950718b0118d7f4cb0ca9987d716a6a6e471b2b
+conf_files="/etc/v2ray/config.json"
+
+system_accounts="_v2ray"
+
+do_build() {
+		export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
+		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() {
+		go test -p 1 -tags json -v -timeout 30m ./...
+}
+
+post_install() {
+		vlicense LICENSE
+		vmkdir etc/v2ray
+		vcopy release/config/*.json etc/v2ray/
+		vsv v2ray
+}

Re: [PR PATCH] [Updated] New package: v2ray-4.39.2

[ipkalm]

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

There is an updated pull request by ipkalm against master on the void-packages repository

https://github.com/ipkalm/void-packages master
https://github.com/void-linux/void-packages/pull/30762

New package: v2ray-4.39.2
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 38acb6d5c8772e7ed8b96b7c698574fb668b1e81 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sun, 9 May 2021 19:06:35 +0700
Subject: [PATCH 1/2] New package: v2ray-4.39.2

---
 srcpkgs/v2ray/files/v2ray/run |  3 +++
 srcpkgs/v2ray/template        | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..3b1ac46ab240
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..f9cf205ecd9a
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,34 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.39.2
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+go_ldflags="-s -w"
+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=bcb35c0fd3fed604762b4c2a0950718b0118d7f4cb0ca9987d716a6a6e471b2b
+conf_files="/etc/v2ray/config.json"
+
+system_accounts="_v2ray"
+
+do_build() {
+		export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
+		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() {
+		go test -p 1 -tags json -v -timeout 30m ./...
+}
+
+post_install() {
+		vlicense LICENSE
+		vmkdir etc/v2ray
+		vcopy release/config/*.json etc/v2ray/
+		vsv v2ray
+}

From ad2c02754065cf567007e4bb7942cdaaa22f4fae Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Thu, 24 Jun 2021 11:22:11 +0700
Subject: [PATCH 2/2] New package: v2ray-4.40.1

---
 srcpkgs/v2ray/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index f9cf205ecd9a..2617e5d5ee8e 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -1,6 +1,6 @@
 # Template file for 'v2ray'
 pkgname=v2ray
-version=4.39.2
+version=4.40.1
 revision=1
 wrksrc=${pkgname}-core-${version}
 build_style=go
@@ -11,7 +11,7 @@ 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=bcb35c0fd3fed604762b4c2a0950718b0118d7f4cb0ca9987d716a6a6e471b2b
+checksum=75b599cb9866c2469056b71f2c0c69cbdab08cf15f6bd2273c893cd0bd16f175
 conf_files="/etc/v2ray/config.json"
 
 system_accounts="_v2ray"

Re: [PR PATCH] [Closed]: New package: v2ray-4.39.2

[ipkalm]

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

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

New package: v2ray-4.39.2
https://github.com/void-linux/void-packages/pull/30762

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Re: New package: v2ray-4.39.2

[abenson]

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-867324249

Comment:
Why did you close this?  You just need to rebase on master to get rid of the merge commit.

Re: New package: v2ray-4.39.2

[ipkalm]

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

New comment by ipkalm on void-packages repository

https://github.com/void-linux/void-packages/pull/30762#issuecomment-868446501

Comment:
@abenson sorry, but I did many mistakes while work with fork (most big is create changes in master branch, not in separate branch). I promise to be more careful for the next time.