[PR PATCH] frp: update to 0.61.1.

[PR PATCH] frp: update to 0.61.1.

[Anachron]

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

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

https://github.com/Anachron/void-packages frp
https://github.com/void-linux/void-packages/pull/53970

frp: update to 0.61.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)


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

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

From aa901fc62935da3589b85f184852e508c9074e5e Mon Sep 17 00:00:00 2001
From: Anachron <gith@cron.world>
Date: Wed, 15 Jan 2025 08:57:36 +0100
Subject: [PATCH] frp: update to 0.61.1.

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

diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index 9f2ea6468905ba..e1483b1074934c 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,7 +1,7 @@
 # Template file for 'frp'
 pkgname=frp
-version=0.58.1
-revision=2
+version=0.61.1
+revision=1
 build_style=go
 go_import_path=github.com/fatedier/frp
 go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps"
@@ -10,7 +10,7 @@ maintainer="Anachron <gith@cron.world>"
 license="Apache-2.0"
 homepage="https://github.com/fatedier/frp"
 distfiles="https://github.com/fatedier/frp/archive/v${version}.tar.gz"
-checksum=c6eabdc2bf39bdb4a7ab7794a4b2ad94be5e0cab50b6cc540a6431e61208b1e6
+checksum=95c567188d5635a7ac8897a6f93ae0568d0ac4892581a96c89874a992dd6a73c
 
 conf_files="/etc/frp/*.toml"
 

Re: frp: update to 0.61.1.

[Anachron]

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

New comment by Anachron on void-packages repository

https://github.com/void-linux/void-packages/pull/53970#issuecomment-2592173027

Comment:
Okay, how do I go from here? Try to patch https://github.com/fatedier/frp/blob/master/hack/run-e2e.sh#L21 or just disable the check for now? 

Re: frp: update to 0.61.1.

[tranzystorekk]

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

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/53970#issuecomment-2592386472

Comment:
Whichever feels more convenient, but I'd try to disable just the failing test, not all of them.

Re: frp: update to 0.61.1.

[Anachron]

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

New comment by Anachron on void-packages repository

https://github.com/void-linux/void-packages/pull/53970#issuecomment-2592788671

Comment:
Tried to disable the tests with multiple tries but still fails. Will disable all tests for now, hopefully figuring out what's going on later.

```sh
	#vsed -i -e "s;\${ROOT}/bin;${PWD}/_build-frp-xbps/bin;g" hack/run-e2e.sh
	#vsed -i -e "s;\`pwd\`/lastversion/;${PWD}/_build-frp-xbps/bin/;g" Makefile
	#vsed -i -e "s|ROOT=.*|ROOT=\"${PWD}\"|g" hack/run-e2e.sh || exit 1
	#vsed -i -e '/^alltest:/s/ e2e//' Makefile
	vsed -i -e '/^alltest:/d' Makefile
```

Re: [PR PATCH] [Updated] frp: update to 0.61.1.

[Anachron]

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

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

https://github.com/Anachron/void-packages frp
https://github.com/void-linux/void-packages/pull/53970

frp: update to 0.61.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)


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

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

From aa901fc62935da3589b85f184852e508c9074e5e Mon Sep 17 00:00:00 2001
From: Anachron <gith@cron.world>
Date: Wed, 15 Jan 2025 08:57:36 +0100
Subject: [PATCH 1/2] frp: update to 0.61.1.

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

diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index 9f2ea6468905ba..e1483b1074934c 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,7 +1,7 @@
 # Template file for 'frp'
 pkgname=frp
-version=0.58.1
-revision=2
+version=0.61.1
+revision=1
 build_style=go
 go_import_path=github.com/fatedier/frp
 go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps"
@@ -10,7 +10,7 @@ maintainer="Anachron <gith@cron.world>"
 license="Apache-2.0"
 homepage="https://github.com/fatedier/frp"
 distfiles="https://github.com/fatedier/frp/archive/v${version}.tar.gz"
-checksum=c6eabdc2bf39bdb4a7ab7794a4b2ad94be5e0cab50b6cc540a6431e61208b1e6
+checksum=95c567188d5635a7ac8897a6f93ae0568d0ac4892581a96c89874a992dd6a73c
 
 conf_files="/etc/frp/*.toml"
 

From 37dd2a7142d86f6d703ff557075c4ac7b9e876fe Mon Sep 17 00:00:00 2001
From: Anachron <gith@cron.world>
Date: Wed, 15 Jan 2025 13:57:19 +0100
Subject: [PATCH 2/2] frp: disable checks

---
 srcpkgs/frp/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index e1483b1074934c..fdf64333b1ac4b 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -14,6 +14,12 @@ checksum=95c567188d5635a7ac8897a6f93ae0568d0ac4892581a96c89874a992dd6a73c
 
 conf_files="/etc/frp/*.toml"
 
+# disable for now, errors out with
+# load frpc-path error: stat ../../bin/frpc: no such file or directory
+do_check() {
+	:
+}
+
 post_install() {
 	vmkdir etc/frp
 	vcopy conf/*.toml etc/frp

Re: [PR REVIEW] frp: update to 0.61.1.

[tranzystorekk]

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

New review comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/53970#discussion_r1916874126

Comment:
use `make_check=no` to disable tests

Re: [PR PATCH] [Updated] frp: update to 0.61.1.

[Anachron]

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

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

https://github.com/Anachron/void-packages frp
https://github.com/void-linux/void-packages/pull/53970

frp: update to 0.61.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)


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

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

From aa901fc62935da3589b85f184852e508c9074e5e Mon Sep 17 00:00:00 2001
From: Anachron <gith@cron.world>
Date: Wed, 15 Jan 2025 08:57:36 +0100
Subject: [PATCH 1/2] frp: update to 0.61.1.

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

diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index 9f2ea6468905ba..e1483b1074934c 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,7 +1,7 @@
 # Template file for 'frp'
 pkgname=frp
-version=0.58.1
-revision=2
+version=0.61.1
+revision=1
 build_style=go
 go_import_path=github.com/fatedier/frp
 go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps"
@@ -10,7 +10,7 @@ maintainer="Anachron <gith@cron.world>"
 license="Apache-2.0"
 homepage="https://github.com/fatedier/frp"
 distfiles="https://github.com/fatedier/frp/archive/v${version}.tar.gz"
-checksum=c6eabdc2bf39bdb4a7ab7794a4b2ad94be5e0cab50b6cc540a6431e61208b1e6
+checksum=95c567188d5635a7ac8897a6f93ae0568d0ac4892581a96c89874a992dd6a73c
 
 conf_files="/etc/frp/*.toml"
 

From 4212fe6de9590166c93f047dd7bcec80e5c9bbaa Mon Sep 17 00:00:00 2001
From: Anachron <gith@cron.world>
Date: Wed, 15 Jan 2025 17:26:03 +0100
Subject: [PATCH 2/2] frp: disable checks

---
 srcpkgs/frp/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index e1483b1074934c..3f688e323018e5 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -12,6 +12,10 @@ homepage="https://github.com/fatedier/frp"
 distfiles="https://github.com/fatedier/frp/archive/v${version}.tar.gz"
 checksum=95c567188d5635a7ac8897a6f93ae0568d0ac4892581a96c89874a992dd6a73c
 
+# disable for now, errors out with
+# load frpc-path error: stat ../../bin/frpc: no such file or directory
+make_check=no
+
 conf_files="/etc/frp/*.toml"
 
 post_install() {

Re: [PR REVIEW] frp: update to 0.61.1.

[Anachron]

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

New review comment by Anachron on void-packages repository

https://github.com/void-linux/void-packages/pull/53970#discussion_r1916978753

Comment:
Done.

Re: [PR PATCH] [Merged]: frp: update to 0.61.1.

[tranzystorekk]

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

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

frp: update to 0.61.1.
https://github.com/void-linux/void-packages/pull/53970

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)