Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: cloudflare-warp-2023.1.133_1
@ 2023-01-31 21:02 2trvl
  2023-01-31 21:53 ` [PR PATCH] [Updated] " 2trvl
                   ` (14 more replies)
  0 siblings, 15 replies; 16+ messages in thread
From: 2trvl @ 2023-01-31 21:02 UTC (permalink / raw)
  To: ml

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

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

https://github.com/2trvl/void-packages master
https://github.com/void-linux/void-packages/pull/42005

New package: cloudflare-warp-2023.1.133_1
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/42005.patch is attached

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

From 6653d5d612ea4cdaf74484487f4d6c5ea41c023e Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Tue, 31 Jan 2023 23:55:00 +0300
Subject: [PATCH] add cloudflare-warp

---
 .../files/cloudflare-warp/conf                |  5 ++++
 .../files/cloudflare-warp/log/run             | 12 ++++++++
 .../cloudflare-warp/files/cloudflare-warp/run |  3 ++
 srcpkgs/cloudflare-warp/template              | 29 +++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/run
 create mode 100644 srcpkgs/cloudflare-warp/template

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
new file mode 100644
index 000000000000..2cf4286aae64
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -0,0 +1,5 @@
+# Setting this to 1 enables logging, any other value - disables
+LOGGING_ENABLE=0
+
+# The directory will be created for you, if logging is enabled
+LOG_DIR="/var/log/warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
new file mode 100755
index 000000000000..f4f472e74410
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ -r ../conf ] && . ../conf
+
+if [ "$LOGGING_ENABLE" -eq 1 ]; then
+    if [ ! -d "$LOG_DIR" ]; then
+        mkdir -p "$LOG_DIR"
+    fi
+    exec svlogd -tt "$LOG_DIR"
+else
+    exec chpst -1
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
new file mode 100755
index 000000000000..b53dfd210b33
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
new file mode 100644
index 000000000000..fc23ed297c4e
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/template
@@ -0,0 +1,29 @@
+# Template file for 'cloudflare-warp'
+pkgname=cloudflare-warp
+version=2023.1.133
+revision=1
+archs="i686 x86_64"
+short_desc="Cloudflare Warp Client"
+maintainer="Andrew Shteren <dank.txt@gmail.com>"
+license="custom"
+homepage="https://1.1.1.1/"
+repository="nonfree"
+restricted="yes"
+nostrip="yes"
+
+debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
+
+do_extract() {
+    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
+    bsdtar xzpvf data.tar.gz
+}
+
+do_install() {
+    vbin bin/warp-svc
+    vbin bin/warp-taskbar
+    vbin bin/warp-diag
+    vbin bin/warp-cli
+    vsv cloudflare-warp
+}

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] New package: cloudflare-warp-2023.1.133_1
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
@ 2023-01-31 21:53 ` 2trvl
  2023-02-01 14:02 ` 2trvl
                   ` (13 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: 2trvl @ 2023-01-31 21:53 UTC (permalink / raw)
  To: ml

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

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

https://github.com/2trvl/void-packages master
https://github.com/void-linux/void-packages/pull/42005

New package: cloudflare-warp-2023.1.133_1
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/42005.patch is attached

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

From 6653d5d612ea4cdaf74484487f4d6c5ea41c023e Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Tue, 31 Jan 2023 23:55:00 +0300
Subject: [PATCH 1/2] add cloudflare-warp

---
 .../files/cloudflare-warp/conf                |  5 ++++
 .../files/cloudflare-warp/log/run             | 12 ++++++++
 .../cloudflare-warp/files/cloudflare-warp/run |  3 ++
 srcpkgs/cloudflare-warp/template              | 29 +++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/run
 create mode 100644 srcpkgs/cloudflare-warp/template

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
new file mode 100644
index 000000000000..2cf4286aae64
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -0,0 +1,5 @@
+# Setting this to 1 enables logging, any other value - disables
+LOGGING_ENABLE=0
+
+# The directory will be created for you, if logging is enabled
+LOG_DIR="/var/log/warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
new file mode 100755
index 000000000000..f4f472e74410
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ -r ../conf ] && . ../conf
+
+if [ "$LOGGING_ENABLE" -eq 1 ]; then
+    if [ ! -d "$LOG_DIR" ]; then
+        mkdir -p "$LOG_DIR"
+    fi
+    exec svlogd -tt "$LOG_DIR"
+else
+    exec chpst -1
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
new file mode 100755
index 000000000000..b53dfd210b33
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
new file mode 100644
index 000000000000..fc23ed297c4e
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/template
@@ -0,0 +1,29 @@
+# Template file for 'cloudflare-warp'
+pkgname=cloudflare-warp
+version=2023.1.133
+revision=1
+archs="i686 x86_64"
+short_desc="Cloudflare Warp Client"
+maintainer="Andrew Shteren <dank.txt@gmail.com>"
+license="custom"
+homepage="https://1.1.1.1/"
+repository="nonfree"
+restricted="yes"
+nostrip="yes"
+
+debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
+
+do_extract() {
+    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
+    bsdtar xzpvf data.tar.gz
+}
+
+do_install() {
+    vbin bin/warp-svc
+    vbin bin/warp-taskbar
+    vbin bin/warp-diag
+    vbin bin/warp-cli
+    vsv cloudflare-warp
+}

From 2945c14cca38dd11bf936f9233844137f6d2677d Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 00:53:48 +0300
Subject: [PATCH 2/2] change log folder name according to service

---
 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
index 2cf4286aae64..8d9441f6e941 100644
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -2,4 +2,4 @@
 LOGGING_ENABLE=0
 
 # The directory will be created for you, if logging is enabled
-LOG_DIR="/var/log/warp"
+LOG_DIR="/var/log/cloudflare-warp"

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] New package: cloudflare-warp-2023.1.133_1
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
  2023-01-31 21:53 ` [PR PATCH] [Updated] " 2trvl
@ 2023-02-01 14:02 ` 2trvl
  2023-02-01 14:16 ` 2trvl
                   ` (12 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: 2trvl @ 2023-02-01 14:02 UTC (permalink / raw)
  To: ml

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

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

https://github.com/2trvl/void-packages master
https://github.com/void-linux/void-packages/pull/42005

New package: cloudflare-warp-2023.1.133_1
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/42005.patch is attached

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

From 6653d5d612ea4cdaf74484487f4d6c5ea41c023e Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Tue, 31 Jan 2023 23:55:00 +0300
Subject: [PATCH 1/3] add cloudflare-warp

---
 .../files/cloudflare-warp/conf                |  5 ++++
 .../files/cloudflare-warp/log/run             | 12 ++++++++
 .../cloudflare-warp/files/cloudflare-warp/run |  3 ++
 srcpkgs/cloudflare-warp/template              | 29 +++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/run
 create mode 100644 srcpkgs/cloudflare-warp/template

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
new file mode 100644
index 000000000000..2cf4286aae64
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -0,0 +1,5 @@
+# Setting this to 1 enables logging, any other value - disables
+LOGGING_ENABLE=0
+
+# The directory will be created for you, if logging is enabled
+LOG_DIR="/var/log/warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
new file mode 100755
index 000000000000..f4f472e74410
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ -r ../conf ] && . ../conf
+
+if [ "$LOGGING_ENABLE" -eq 1 ]; then
+    if [ ! -d "$LOG_DIR" ]; then
+        mkdir -p "$LOG_DIR"
+    fi
+    exec svlogd -tt "$LOG_DIR"
+else
+    exec chpst -1
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
new file mode 100755
index 000000000000..b53dfd210b33
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
new file mode 100644
index 000000000000..fc23ed297c4e
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/template
@@ -0,0 +1,29 @@
+# Template file for 'cloudflare-warp'
+pkgname=cloudflare-warp
+version=2023.1.133
+revision=1
+archs="i686 x86_64"
+short_desc="Cloudflare Warp Client"
+maintainer="Andrew Shteren <dank.txt@gmail.com>"
+license="custom"
+homepage="https://1.1.1.1/"
+repository="nonfree"
+restricted="yes"
+nostrip="yes"
+
+debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
+
+do_extract() {
+    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
+    bsdtar xzpvf data.tar.gz
+}
+
+do_install() {
+    vbin bin/warp-svc
+    vbin bin/warp-taskbar
+    vbin bin/warp-diag
+    vbin bin/warp-cli
+    vsv cloudflare-warp
+}

From 2945c14cca38dd11bf936f9233844137f6d2677d Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 00:53:48 +0300
Subject: [PATCH 2/3] change log folder name according to service

---
 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
index 2cf4286aae64..8d9441f6e941 100644
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -2,4 +2,4 @@
 LOGGING_ENABLE=0
 
 # The directory will be created for you, if logging is enabled
-LOG_DIR="/var/log/warp"
+LOG_DIR="/var/log/cloudflare-warp"

From b1076e59b6c78cd4fa3306c2bedf72971d6efc93 Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 17:02:49 +0300
Subject: [PATCH 3/3] add service finish and update template

---
 .../files/cloudflare-warp/conf                |  4 ++--
 .../files/cloudflare-warp/finish              |  7 +++++++
 .../files/cloudflare-warp/log/run             |  2 +-
 .../cloudflare-warp/files/cloudflare-warp/run |  6 ++++++
 srcpkgs/cloudflare-warp/template              | 20 +++++++++----------
 5 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/finish

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
index 8d9441f6e941..23ac77a23089 100644
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -1,5 +1,5 @@
 # Setting this to 1 enables logging, any other value - disables
-LOGGING_ENABLE=0
+LOGGING_ENABLED=0
 
-# The directory will be created for you, if logging is enabled
+# The directory in which to store log
 LOG_DIR="/var/log/cloudflare-warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish b/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish
new file mode 100755
index 000000000000..17b10a3c4b1d
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
+    sv down cloudflare-warp/log
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
index f4f472e74410..05584efb82d3 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -2,7 +2,7 @@
 
 [ -r ../conf ] && . ../conf
 
-if [ "$LOGGING_ENABLE" -eq 1 ]; then
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
     if [ ! -d "$LOG_DIR" ]; then
         mkdir -p "$LOG_DIR"
     fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
index b53dfd210b33..a68b6d703227 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -1,3 +1,9 @@
 #!/bin/sh
 
+[ -r ./conf ] && . ./conf
+
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
+    sv up cloudflare-warp/log
+fi
+
 exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
index fc23ed297c4e..646b2ea989f4 100644
--- a/srcpkgs/cloudflare-warp/template
+++ b/srcpkgs/cloudflare-warp/template
@@ -5,25 +5,25 @@ revision=1
 archs="i686 x86_64"
 short_desc="Cloudflare Warp Client"
 maintainer="Andrew Shteren <dank.txt@gmail.com>"
-license="custom"
+license="Unknown"
 homepage="https://1.1.1.1/"
 repository="nonfree"
 restricted="yes"
 nostrip="yes"
 
-debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
-distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+_debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/$_debpkgid"
 checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
 
 do_extract() {
-    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
-    bsdtar xzpvf data.tar.gz
+	ar x "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_debpkgid}"
+	bsdtar xzpvf data.tar.gz
 }
 
 do_install() {
-    vbin bin/warp-svc
-    vbin bin/warp-taskbar
-    vbin bin/warp-diag
-    vbin bin/warp-cli
-    vsv cloudflare-warp
+	vbin bin/warp-svc
+	vbin bin/warp-taskbar
+	vbin bin/warp-diag
+	vbin bin/warp-cli
+	vsv cloudflare-warp
 }

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] New package: cloudflare-warp-2023.1.133_1
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
  2023-01-31 21:53 ` [PR PATCH] [Updated] " 2trvl
  2023-02-01 14:02 ` 2trvl
@ 2023-02-01 14:16 ` 2trvl
  2023-02-01 14:23 ` 2trvl
                   ` (11 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: 2trvl @ 2023-02-01 14:16 UTC (permalink / raw)
  To: ml

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

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

https://github.com/2trvl/void-packages master
https://github.com/void-linux/void-packages/pull/42005

New package: cloudflare-warp-2023.1.133_1
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/42005.patch is attached

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

From 6653d5d612ea4cdaf74484487f4d6c5ea41c023e Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Tue, 31 Jan 2023 23:55:00 +0300
Subject: [PATCH 1/4] add cloudflare-warp

---
 .../files/cloudflare-warp/conf                |  5 ++++
 .../files/cloudflare-warp/log/run             | 12 ++++++++
 .../cloudflare-warp/files/cloudflare-warp/run |  3 ++
 srcpkgs/cloudflare-warp/template              | 29 +++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/run
 create mode 100644 srcpkgs/cloudflare-warp/template

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
new file mode 100644
index 000000000000..2cf4286aae64
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -0,0 +1,5 @@
+# Setting this to 1 enables logging, any other value - disables
+LOGGING_ENABLE=0
+
+# The directory will be created for you, if logging is enabled
+LOG_DIR="/var/log/warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
new file mode 100755
index 000000000000..f4f472e74410
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ -r ../conf ] && . ../conf
+
+if [ "$LOGGING_ENABLE" -eq 1 ]; then
+    if [ ! -d "$LOG_DIR" ]; then
+        mkdir -p "$LOG_DIR"
+    fi
+    exec svlogd -tt "$LOG_DIR"
+else
+    exec chpst -1
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
new file mode 100755
index 000000000000..b53dfd210b33
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
new file mode 100644
index 000000000000..fc23ed297c4e
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/template
@@ -0,0 +1,29 @@
+# Template file for 'cloudflare-warp'
+pkgname=cloudflare-warp
+version=2023.1.133
+revision=1
+archs="i686 x86_64"
+short_desc="Cloudflare Warp Client"
+maintainer="Andrew Shteren <dank.txt@gmail.com>"
+license="custom"
+homepage="https://1.1.1.1/"
+repository="nonfree"
+restricted="yes"
+nostrip="yes"
+
+debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
+
+do_extract() {
+    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
+    bsdtar xzpvf data.tar.gz
+}
+
+do_install() {
+    vbin bin/warp-svc
+    vbin bin/warp-taskbar
+    vbin bin/warp-diag
+    vbin bin/warp-cli
+    vsv cloudflare-warp
+}

From 2945c14cca38dd11bf936f9233844137f6d2677d Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 00:53:48 +0300
Subject: [PATCH 2/4] change log folder name according to service

---
 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
index 2cf4286aae64..8d9441f6e941 100644
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -2,4 +2,4 @@
 LOGGING_ENABLE=0
 
 # The directory will be created for you, if logging is enabled
-LOG_DIR="/var/log/warp"
+LOG_DIR="/var/log/cloudflare-warp"

From b1076e59b6c78cd4fa3306c2bedf72971d6efc93 Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 17:02:49 +0300
Subject: [PATCH 3/4] add service finish and update template

---
 .../files/cloudflare-warp/conf                |  4 ++--
 .../files/cloudflare-warp/finish              |  7 +++++++
 .../files/cloudflare-warp/log/run             |  2 +-
 .../cloudflare-warp/files/cloudflare-warp/run |  6 ++++++
 srcpkgs/cloudflare-warp/template              | 20 +++++++++----------
 5 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/finish

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
index 8d9441f6e941..23ac77a23089 100644
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -1,5 +1,5 @@
 # Setting this to 1 enables logging, any other value - disables
-LOGGING_ENABLE=0
+LOGGING_ENABLED=0
 
-# The directory will be created for you, if logging is enabled
+# The directory in which to store log
 LOG_DIR="/var/log/cloudflare-warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish b/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish
new file mode 100755
index 000000000000..17b10a3c4b1d
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
+    sv down cloudflare-warp/log
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
index f4f472e74410..05584efb82d3 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -2,7 +2,7 @@
 
 [ -r ../conf ] && . ../conf
 
-if [ "$LOGGING_ENABLE" -eq 1 ]; then
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
     if [ ! -d "$LOG_DIR" ]; then
         mkdir -p "$LOG_DIR"
     fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
index b53dfd210b33..a68b6d703227 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -1,3 +1,9 @@
 #!/bin/sh
 
+[ -r ./conf ] && . ./conf
+
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
+    sv up cloudflare-warp/log
+fi
+
 exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
index fc23ed297c4e..646b2ea989f4 100644
--- a/srcpkgs/cloudflare-warp/template
+++ b/srcpkgs/cloudflare-warp/template
@@ -5,25 +5,25 @@ revision=1
 archs="i686 x86_64"
 short_desc="Cloudflare Warp Client"
 maintainer="Andrew Shteren <dank.txt@gmail.com>"
-license="custom"
+license="Unknown"
 homepage="https://1.1.1.1/"
 repository="nonfree"
 restricted="yes"
 nostrip="yes"
 
-debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
-distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+_debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/$_debpkgid"
 checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
 
 do_extract() {
-    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
-    bsdtar xzpvf data.tar.gz
+	ar x "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_debpkgid}"
+	bsdtar xzpvf data.tar.gz
 }
 
 do_install() {
-    vbin bin/warp-svc
-    vbin bin/warp-taskbar
-    vbin bin/warp-diag
-    vbin bin/warp-cli
-    vsv cloudflare-warp
+	vbin bin/warp-svc
+	vbin bin/warp-taskbar
+	vbin bin/warp-diag
+	vbin bin/warp-cli
+	vsv cloudflare-warp
 }

From 71dd05ae02a20100a5803908937809baecd910ec Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 17:16:14 +0300
Subject: [PATCH 4/4] remove unused chpst

---
 srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
index 05584efb82d3..10cc5eef660f 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -7,6 +7,4 @@ if [ "$LOGGING_ENABLED" -eq 1 ]; then
         mkdir -p "$LOG_DIR"
     fi
     exec svlogd -tt "$LOG_DIR"
-else
-    exec chpst -1
 fi

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] New package: cloudflare-warp-2023.1.133_1
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
                   ` (2 preceding siblings ...)
  2023-02-01 14:16 ` 2trvl
@ 2023-02-01 14:23 ` 2trvl
  2023-02-01 14:35 ` 2trvl
                   ` (10 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: 2trvl @ 2023-02-01 14:23 UTC (permalink / raw)
  To: ml

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

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

https://github.com/2trvl/void-packages master
https://github.com/void-linux/void-packages/pull/42005

New package: cloudflare-warp-2023.1.133_1
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/42005.patch is attached

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

From 6653d5d612ea4cdaf74484487f4d6c5ea41c023e Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Tue, 31 Jan 2023 23:55:00 +0300
Subject: [PATCH 1/3] add cloudflare-warp

---
 .../files/cloudflare-warp/conf                |  5 ++++
 .../files/cloudflare-warp/log/run             | 12 ++++++++
 .../cloudflare-warp/files/cloudflare-warp/run |  3 ++
 srcpkgs/cloudflare-warp/template              | 29 +++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/run
 create mode 100644 srcpkgs/cloudflare-warp/template

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
new file mode 100644
index 000000000000..2cf4286aae64
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -0,0 +1,5 @@
+# Setting this to 1 enables logging, any other value - disables
+LOGGING_ENABLE=0
+
+# The directory will be created for you, if logging is enabled
+LOG_DIR="/var/log/warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
new file mode 100755
index 000000000000..f4f472e74410
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ -r ../conf ] && . ../conf
+
+if [ "$LOGGING_ENABLE" -eq 1 ]; then
+    if [ ! -d "$LOG_DIR" ]; then
+        mkdir -p "$LOG_DIR"
+    fi
+    exec svlogd -tt "$LOG_DIR"
+else
+    exec chpst -1
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
new file mode 100755
index 000000000000..b53dfd210b33
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
new file mode 100644
index 000000000000..fc23ed297c4e
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/template
@@ -0,0 +1,29 @@
+# Template file for 'cloudflare-warp'
+pkgname=cloudflare-warp
+version=2023.1.133
+revision=1
+archs="i686 x86_64"
+short_desc="Cloudflare Warp Client"
+maintainer="Andrew Shteren <dank.txt@gmail.com>"
+license="custom"
+homepage="https://1.1.1.1/"
+repository="nonfree"
+restricted="yes"
+nostrip="yes"
+
+debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
+
+do_extract() {
+    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
+    bsdtar xzpvf data.tar.gz
+}
+
+do_install() {
+    vbin bin/warp-svc
+    vbin bin/warp-taskbar
+    vbin bin/warp-diag
+    vbin bin/warp-cli
+    vsv cloudflare-warp
+}

From 2945c14cca38dd11bf936f9233844137f6d2677d Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 00:53:48 +0300
Subject: [PATCH 2/3] change log folder name according to service

---
 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
index 2cf4286aae64..8d9441f6e941 100644
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -2,4 +2,4 @@
 LOGGING_ENABLE=0
 
 # The directory will be created for you, if logging is enabled
-LOG_DIR="/var/log/warp"
+LOG_DIR="/var/log/cloudflare-warp"

From b1076e59b6c78cd4fa3306c2bedf72971d6efc93 Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 17:02:49 +0300
Subject: [PATCH 3/3] add service finish and update template

---
 .../files/cloudflare-warp/conf                |  4 ++--
 .../files/cloudflare-warp/finish              |  7 +++++++
 .../files/cloudflare-warp/log/run             |  2 +-
 .../cloudflare-warp/files/cloudflare-warp/run |  6 ++++++
 srcpkgs/cloudflare-warp/template              | 20 +++++++++----------
 5 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/finish

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
index 8d9441f6e941..23ac77a23089 100644
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -1,5 +1,5 @@
 # Setting this to 1 enables logging, any other value - disables
-LOGGING_ENABLE=0
+LOGGING_ENABLED=0
 
-# The directory will be created for you, if logging is enabled
+# The directory in which to store log
 LOG_DIR="/var/log/cloudflare-warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish b/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish
new file mode 100755
index 000000000000..17b10a3c4b1d
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
+    sv down cloudflare-warp/log
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
index f4f472e74410..05584efb82d3 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -2,7 +2,7 @@
 
 [ -r ../conf ] && . ../conf
 
-if [ "$LOGGING_ENABLE" -eq 1 ]; then
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
     if [ ! -d "$LOG_DIR" ]; then
         mkdir -p "$LOG_DIR"
     fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
index b53dfd210b33..a68b6d703227 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -1,3 +1,9 @@
 #!/bin/sh
 
+[ -r ./conf ] && . ./conf
+
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
+    sv up cloudflare-warp/log
+fi
+
 exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
index fc23ed297c4e..646b2ea989f4 100644
--- a/srcpkgs/cloudflare-warp/template
+++ b/srcpkgs/cloudflare-warp/template
@@ -5,25 +5,25 @@ revision=1
 archs="i686 x86_64"
 short_desc="Cloudflare Warp Client"
 maintainer="Andrew Shteren <dank.txt@gmail.com>"
-license="custom"
+license="Unknown"
 homepage="https://1.1.1.1/"
 repository="nonfree"
 restricted="yes"
 nostrip="yes"
 
-debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
-distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+_debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/$_debpkgid"
 checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
 
 do_extract() {
-    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
-    bsdtar xzpvf data.tar.gz
+	ar x "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_debpkgid}"
+	bsdtar xzpvf data.tar.gz
 }
 
 do_install() {
-    vbin bin/warp-svc
-    vbin bin/warp-taskbar
-    vbin bin/warp-diag
-    vbin bin/warp-cli
-    vsv cloudflare-warp
+	vbin bin/warp-svc
+	vbin bin/warp-taskbar
+	vbin bin/warp-diag
+	vbin bin/warp-cli
+	vsv cloudflare-warp
 }

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] New package: cloudflare-warp-2023.1.133_1
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
                   ` (3 preceding siblings ...)
  2023-02-01 14:23 ` 2trvl
@ 2023-02-01 14:35 ` 2trvl
  2023-02-21 13:22 ` 2trvl
                   ` (9 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: 2trvl @ 2023-02-01 14:35 UTC (permalink / raw)
  To: ml

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

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

https://github.com/2trvl/void-packages master
https://github.com/void-linux/void-packages/pull/42005

New package: cloudflare-warp-2023.1.133_1
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/42005.patch is attached

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

From 6653d5d612ea4cdaf74484487f4d6c5ea41c023e Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Tue, 31 Jan 2023 23:55:00 +0300
Subject: [PATCH 1/4] add cloudflare-warp

---
 .../files/cloudflare-warp/conf                |  5 ++++
 .../files/cloudflare-warp/log/run             | 12 ++++++++
 .../cloudflare-warp/files/cloudflare-warp/run |  3 ++
 srcpkgs/cloudflare-warp/template              | 29 +++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/run
 create mode 100644 srcpkgs/cloudflare-warp/template

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
new file mode 100644
index 000000000000..2cf4286aae64
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -0,0 +1,5 @@
+# Setting this to 1 enables logging, any other value - disables
+LOGGING_ENABLE=0
+
+# The directory will be created for you, if logging is enabled
+LOG_DIR="/var/log/warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
new file mode 100755
index 000000000000..f4f472e74410
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ -r ../conf ] && . ../conf
+
+if [ "$LOGGING_ENABLE" -eq 1 ]; then
+    if [ ! -d "$LOG_DIR" ]; then
+        mkdir -p "$LOG_DIR"
+    fi
+    exec svlogd -tt "$LOG_DIR"
+else
+    exec chpst -1
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
new file mode 100755
index 000000000000..b53dfd210b33
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
new file mode 100644
index 000000000000..fc23ed297c4e
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/template
@@ -0,0 +1,29 @@
+# Template file for 'cloudflare-warp'
+pkgname=cloudflare-warp
+version=2023.1.133
+revision=1
+archs="i686 x86_64"
+short_desc="Cloudflare Warp Client"
+maintainer="Andrew Shteren <dank.txt@gmail.com>"
+license="custom"
+homepage="https://1.1.1.1/"
+repository="nonfree"
+restricted="yes"
+nostrip="yes"
+
+debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
+
+do_extract() {
+    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
+    bsdtar xzpvf data.tar.gz
+}
+
+do_install() {
+    vbin bin/warp-svc
+    vbin bin/warp-taskbar
+    vbin bin/warp-diag
+    vbin bin/warp-cli
+    vsv cloudflare-warp
+}

From 2945c14cca38dd11bf936f9233844137f6d2677d Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 00:53:48 +0300
Subject: [PATCH 2/4] change log folder name according to service

---
 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
index 2cf4286aae64..8d9441f6e941 100644
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -2,4 +2,4 @@
 LOGGING_ENABLE=0
 
 # The directory will be created for you, if logging is enabled
-LOG_DIR="/var/log/warp"
+LOG_DIR="/var/log/cloudflare-warp"

From b1076e59b6c78cd4fa3306c2bedf72971d6efc93 Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 17:02:49 +0300
Subject: [PATCH 3/4] add service finish and update template

---
 .../files/cloudflare-warp/conf                |  4 ++--
 .../files/cloudflare-warp/finish              |  7 +++++++
 .../files/cloudflare-warp/log/run             |  2 +-
 .../cloudflare-warp/files/cloudflare-warp/run |  6 ++++++
 srcpkgs/cloudflare-warp/template              | 20 +++++++++----------
 5 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/finish

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
index 8d9441f6e941..23ac77a23089 100644
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -1,5 +1,5 @@
 # Setting this to 1 enables logging, any other value - disables
-LOGGING_ENABLE=0
+LOGGING_ENABLED=0
 
-# The directory will be created for you, if logging is enabled
+# The directory in which to store log
 LOG_DIR="/var/log/cloudflare-warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish b/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish
new file mode 100755
index 000000000000..17b10a3c4b1d
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
+    sv down cloudflare-warp/log
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
index f4f472e74410..05584efb82d3 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -2,7 +2,7 @@
 
 [ -r ../conf ] && . ../conf
 
-if [ "$LOGGING_ENABLE" -eq 1 ]; then
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
     if [ ! -d "$LOG_DIR" ]; then
         mkdir -p "$LOG_DIR"
     fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
index b53dfd210b33..a68b6d703227 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -1,3 +1,9 @@
 #!/bin/sh
 
+[ -r ./conf ] && . ./conf
+
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
+    sv up cloudflare-warp/log
+fi
+
 exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
index fc23ed297c4e..646b2ea989f4 100644
--- a/srcpkgs/cloudflare-warp/template
+++ b/srcpkgs/cloudflare-warp/template
@@ -5,25 +5,25 @@ revision=1
 archs="i686 x86_64"
 short_desc="Cloudflare Warp Client"
 maintainer="Andrew Shteren <dank.txt@gmail.com>"
-license="custom"
+license="Unknown"
 homepage="https://1.1.1.1/"
 repository="nonfree"
 restricted="yes"
 nostrip="yes"
 
-debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
-distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+_debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/$_debpkgid"
 checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
 
 do_extract() {
-    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
-    bsdtar xzpvf data.tar.gz
+	ar x "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_debpkgid}"
+	bsdtar xzpvf data.tar.gz
 }
 
 do_install() {
-    vbin bin/warp-svc
-    vbin bin/warp-taskbar
-    vbin bin/warp-diag
-    vbin bin/warp-cli
-    vsv cloudflare-warp
+	vbin bin/warp-svc
+	vbin bin/warp-taskbar
+	vbin bin/warp-diag
+	vbin bin/warp-cli
+	vsv cloudflare-warp
 }

From 3bd47d5fd11ee51f52b4383d4c6a0a8c3a19b7de Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 17:35:14 +0300
Subject: [PATCH 4/4] replace chpst with sv

---
 srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
index 05584efb82d3..5aff9a23766e 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -8,5 +8,5 @@ if [ "$LOGGING_ENABLED" -eq 1 ]; then
     fi
     exec svlogd -tt "$LOG_DIR"
 else
-    exec chpst -1
+    sv down cloudflare-warp/log
 fi

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: New package: cloudflare-warp-2023.1.133_1
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
                   ` (4 preceding siblings ...)
  2023-02-01 14:35 ` 2trvl
@ 2023-02-21 13:22 ` 2trvl
  2023-05-02 17:44 ` [PR PATCH] [Updated] " 2trvl
                   ` (8 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: 2trvl @ 2023-02-21 13:22 UTC (permalink / raw)
  To: ml

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

New comment by 2trvl on void-packages repository

https://github.com/void-linux/void-packages/pull/42005#issuecomment-1438483403

Comment:
Ready to merge

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] New package: cloudflare-warp-2023.1.133_1
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
                   ` (5 preceding siblings ...)
  2023-02-21 13:22 ` 2trvl
@ 2023-05-02 17:44 ` 2trvl
  2023-05-02 19:13 ` [PR REVIEW] New package: cloudflare-warp-2023.3.398 Duncaen
                   ` (7 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: 2trvl @ 2023-05-02 17:44 UTC (permalink / raw)
  To: ml

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

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

https://github.com/2trvl/void-packages master
https://github.com/void-linux/void-packages/pull/42005

New package: cloudflare-warp-2023.1.133_1
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/42005.patch is attached

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

From 6653d5d612ea4cdaf74484487f4d6c5ea41c023e Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Tue, 31 Jan 2023 23:55:00 +0300
Subject: [PATCH 1/5] add cloudflare-warp

---
 .../files/cloudflare-warp/conf                |  5 ++++
 .../files/cloudflare-warp/log/run             | 12 ++++++++
 .../cloudflare-warp/files/cloudflare-warp/run |  3 ++
 srcpkgs/cloudflare-warp/template              | 29 +++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/run
 create mode 100644 srcpkgs/cloudflare-warp/template

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
new file mode 100644
index 000000000000..2cf4286aae64
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -0,0 +1,5 @@
+# Setting this to 1 enables logging, any other value - disables
+LOGGING_ENABLE=0
+
+# The directory will be created for you, if logging is enabled
+LOG_DIR="/var/log/warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
new file mode 100755
index 000000000000..f4f472e74410
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ -r ../conf ] && . ../conf
+
+if [ "$LOGGING_ENABLE" -eq 1 ]; then
+    if [ ! -d "$LOG_DIR" ]; then
+        mkdir -p "$LOG_DIR"
+    fi
+    exec svlogd -tt "$LOG_DIR"
+else
+    exec chpst -1
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
new file mode 100755
index 000000000000..b53dfd210b33
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
new file mode 100644
index 000000000000..fc23ed297c4e
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/template
@@ -0,0 +1,29 @@
+# Template file for 'cloudflare-warp'
+pkgname=cloudflare-warp
+version=2023.1.133
+revision=1
+archs="i686 x86_64"
+short_desc="Cloudflare Warp Client"
+maintainer="Andrew Shteren <dank.txt@gmail.com>"
+license="custom"
+homepage="https://1.1.1.1/"
+repository="nonfree"
+restricted="yes"
+nostrip="yes"
+
+debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
+
+do_extract() {
+    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
+    bsdtar xzpvf data.tar.gz
+}
+
+do_install() {
+    vbin bin/warp-svc
+    vbin bin/warp-taskbar
+    vbin bin/warp-diag
+    vbin bin/warp-cli
+    vsv cloudflare-warp
+}

From 2945c14cca38dd11bf936f9233844137f6d2677d Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 00:53:48 +0300
Subject: [PATCH 2/5] change log folder name according to service

---
 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
index 2cf4286aae64..8d9441f6e941 100644
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -2,4 +2,4 @@
 LOGGING_ENABLE=0
 
 # The directory will be created for you, if logging is enabled
-LOG_DIR="/var/log/warp"
+LOG_DIR="/var/log/cloudflare-warp"

From b1076e59b6c78cd4fa3306c2bedf72971d6efc93 Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 17:02:49 +0300
Subject: [PATCH 3/5] add service finish and update template

---
 .../files/cloudflare-warp/conf                |  4 ++--
 .../files/cloudflare-warp/finish              |  7 +++++++
 .../files/cloudflare-warp/log/run             |  2 +-
 .../cloudflare-warp/files/cloudflare-warp/run |  6 ++++++
 srcpkgs/cloudflare-warp/template              | 20 +++++++++----------
 5 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/finish

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
index 8d9441f6e941..23ac77a23089 100644
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -1,5 +1,5 @@
 # Setting this to 1 enables logging, any other value - disables
-LOGGING_ENABLE=0
+LOGGING_ENABLED=0
 
-# The directory will be created for you, if logging is enabled
+# The directory in which to store log
 LOG_DIR="/var/log/cloudflare-warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish b/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish
new file mode 100755
index 000000000000..17b10a3c4b1d
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
+    sv down cloudflare-warp/log
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
index f4f472e74410..05584efb82d3 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -2,7 +2,7 @@
 
 [ -r ../conf ] && . ../conf
 
-if [ "$LOGGING_ENABLE" -eq 1 ]; then
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
     if [ ! -d "$LOG_DIR" ]; then
         mkdir -p "$LOG_DIR"
     fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
index b53dfd210b33..a68b6d703227 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -1,3 +1,9 @@
 #!/bin/sh
 
+[ -r ./conf ] && . ./conf
+
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
+    sv up cloudflare-warp/log
+fi
+
 exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
index fc23ed297c4e..646b2ea989f4 100644
--- a/srcpkgs/cloudflare-warp/template
+++ b/srcpkgs/cloudflare-warp/template
@@ -5,25 +5,25 @@ revision=1
 archs="i686 x86_64"
 short_desc="Cloudflare Warp Client"
 maintainer="Andrew Shteren <dank.txt@gmail.com>"
-license="custom"
+license="Unknown"
 homepage="https://1.1.1.1/"
 repository="nonfree"
 restricted="yes"
 nostrip="yes"
 
-debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
-distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+_debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/$_debpkgid"
 checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
 
 do_extract() {
-    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
-    bsdtar xzpvf data.tar.gz
+	ar x "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_debpkgid}"
+	bsdtar xzpvf data.tar.gz
 }
 
 do_install() {
-    vbin bin/warp-svc
-    vbin bin/warp-taskbar
-    vbin bin/warp-diag
-    vbin bin/warp-cli
-    vsv cloudflare-warp
+	vbin bin/warp-svc
+	vbin bin/warp-taskbar
+	vbin bin/warp-diag
+	vbin bin/warp-cli
+	vsv cloudflare-warp
 }

From 3bd47d5fd11ee51f52b4383d4c6a0a8c3a19b7de Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 17:35:14 +0300
Subject: [PATCH 4/5] replace chpst with sv

---
 srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
index 05584efb82d3..5aff9a23766e 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -8,5 +8,5 @@ if [ "$LOGGING_ENABLED" -eq 1 ]; then
     fi
     exec svlogd -tt "$LOG_DIR"
 else
-    exec chpst -1
+    sv down cloudflare-warp/log
 fi

From 2333f2ab8e602bcc2ecb21d7f71cb22d56362929 Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Tue, 2 May 2023 20:44:35 +0300
Subject: [PATCH 5/5] bump: 2023.3.398

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

diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
index 646b2ea989f4..f39405524776 100644
--- a/srcpkgs/cloudflare-warp/template
+++ b/srcpkgs/cloudflare-warp/template
@@ -1,6 +1,6 @@
 # Template file for 'cloudflare-warp'
 pkgname=cloudflare-warp
-version=2023.1.133
+version=2023.3.398
 revision=1
 archs="i686 x86_64"
 short_desc="Cloudflare Warp Client"
@@ -11,9 +11,9 @@ repository="nonfree"
 restricted="yes"
 nostrip="yes"
 
-_debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+_debpkgid="cloudflare_warp_2023_3_398_1_amd64_002e48d521.deb"
 distfiles="https://pkg.cloudflareclient.com/uploads/$_debpkgid"
-checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
+checksum="d6f6abfbf1b75b020244b5ec30791edbbeed98f6113c55bc61ff5bd44c7d3a65"
 
 do_extract() {
 	ar x "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_debpkgid}"

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR REVIEW] New package: cloudflare-warp-2023.3.398
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
                   ` (6 preceding siblings ...)
  2023-05-02 17:44 ` [PR PATCH] [Updated] " 2trvl
@ 2023-05-02 19:13 ` Duncaen
  2023-05-02 19:13 ` Duncaen
                   ` (6 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Duncaen @ 2023-05-02 19:13 UTC (permalink / raw)
  To: ml

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

New review comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/42005#discussion_r1182945924

Comment:
This should probably be something like `custom: Proprietary`.

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR REVIEW] New package: cloudflare-warp-2023.3.398
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
                   ` (7 preceding siblings ...)
  2023-05-02 19:13 ` [PR REVIEW] New package: cloudflare-warp-2023.3.398 Duncaen
@ 2023-05-02 19:13 ` Duncaen
  2023-05-02 19:13 ` Duncaen
                   ` (5 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Duncaen @ 2023-05-02 19:13 UTC (permalink / raw)
  To: ml

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

New review comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/42005#discussion_r1182950020

Comment:
`${version//./_}` instead of hard coding the version, maybe also add the `1` to the version.

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR REVIEW] New package: cloudflare-warp-2023.3.398
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
                   ` (8 preceding siblings ...)
  2023-05-02 19:13 ` Duncaen
@ 2023-05-02 19:13 ` Duncaen
  2023-08-01  1:56 ` github-actions
                   ` (4 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Duncaen @ 2023-05-02 19:13 UTC (permalink / raw)
  To: ml

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

New review comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/42005#discussion_r1182946421

Comment:
You are only downloading and packaging `x86_64` binaries.

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: New package: cloudflare-warp-2023.3.398
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
                   ` (9 preceding siblings ...)
  2023-05-02 19:13 ` Duncaen
@ 2023-08-01  1:56 ` github-actions
  2023-08-15 12:35 ` 2trvl
                   ` (3 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: github-actions @ 2023-08-01  1:56 UTC (permalink / raw)
  To: ml

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/42005#issuecomment-1659447584

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: New package: cloudflare-warp-2023.3.398
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
                   ` (10 preceding siblings ...)
  2023-08-01  1:56 ` github-actions
@ 2023-08-15 12:35 ` 2trvl
  2023-08-15 12:35 ` 2trvl
                   ` (2 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: 2trvl @ 2023-08-15 12:35 UTC (permalink / raw)
  To: ml

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

New comment by 2trvl on void-packages repository

https://github.com/void-linux/void-packages/pull/42005#issuecomment-1678857529

Comment:
bump

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: New package: cloudflare-warp-2023.3.398
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
                   ` (11 preceding siblings ...)
  2023-08-15 12:35 ` 2trvl
@ 2023-08-15 12:35 ` 2trvl
  2023-08-15 13:00 ` 2trvl
  2023-08-15 13:00 ` [PR PATCH] [Closed]: " 2trvl
  14 siblings, 0 replies; 16+ messages in thread
From: 2trvl @ 2023-08-15 12:35 UTC (permalink / raw)
  To: ml

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

New comment by 2trvl on void-packages repository

https://github.com/void-linux/void-packages/pull/42005#issuecomment-1678857529

Comment:
bump

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: New package: cloudflare-warp-2023.3.398
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
                   ` (12 preceding siblings ...)
  2023-08-15 12:35 ` 2trvl
@ 2023-08-15 13:00 ` 2trvl
  2023-08-15 13:00 ` [PR PATCH] [Closed]: " 2trvl
  14 siblings, 0 replies; 16+ messages in thread
From: 2trvl @ 2023-08-15 13:00 UTC (permalink / raw)
  To: ml

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

New comment by 2trvl on void-packages repository

https://github.com/void-linux/void-packages/pull/42005#issuecomment-1678896916

Comment:
This service was blocked in my country, cloudflare also changed download links and I'm too lazy to learn vlogger. Therefore, I close.

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Closed]: New package: cloudflare-warp-2023.3.398
  2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
                   ` (13 preceding siblings ...)
  2023-08-15 13:00 ` 2trvl
@ 2023-08-15 13:00 ` 2trvl
  14 siblings, 0 replies; 16+ messages in thread
From: 2trvl @ 2023-08-15 13:00 UTC (permalink / raw)
  To: ml

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

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

New package: cloudflare-warp-2023.3.398
https://github.com/void-linux/void-packages/pull/42005

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

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

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->


^ permalink raw reply	[flat|nested] 16+ messages in thread
end of thread, other threads:[~2023-08-15 13:00 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-31 21:02 [PR PATCH] New package: cloudflare-warp-2023.1.133_1 2trvl
2023-01-31 21:53 ` [PR PATCH] [Updated] " 2trvl
2023-02-01 14:02 ` 2trvl
2023-02-01 14:16 ` 2trvl
2023-02-01 14:23 ` 2trvl
2023-02-01 14:35 ` 2trvl
2023-02-21 13:22 ` 2trvl
2023-05-02 17:44 ` [PR PATCH] [Updated] " 2trvl
2023-05-02 19:13 ` [PR REVIEW] New package: cloudflare-warp-2023.3.398 Duncaen
2023-05-02 19:13 ` Duncaen
2023-05-02 19:13 ` Duncaen
2023-08-01  1:56 ` github-actions
2023-08-15 12:35 ` 2trvl
2023-08-15 12:35 ` 2trvl
2023-08-15 13:00 ` 2trvl
2023-08-15 13:00 ` [PR PATCH] [Closed]: " 2trvl

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).