[PR PATCH] caddy: update to 2.3.0.

[PR PATCH] caddy: update to 2.3.0.

[mobinmob]

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

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

https://github.com/mobinmob/void-packages caddy
https://github.com/void-linux/void-packages/pull/30071

caddy: update to 2.3.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] 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.)
- [ ] 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/30071.patch is attached

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

From bd615e659fad6b0bf788a25593e2624c444f9a15 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 7 Apr 2021 20:11:12 +0300
Subject: [PATCH] caddy: update to 2.3.0.

---
 srcpkgs/caddy/files/caddy/run |  6 ++----
 srcpkgs/caddy/template        | 15 +++++----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/caddy/files/caddy/run b/srcpkgs/caddy/files/caddy/run
index ff0cc9c80306..eda151fbc287 100644
--- a/srcpkgs/caddy/files/caddy/run
+++ b/srcpkgs/caddy/files/caddy/run
@@ -2,7 +2,5 @@
 
 [ -r ./conf ] && . ./conf
 
-export CADDYPATH=/var/lib/caddy
-ulimit -n ${MAX_OPEN_FILES:-8192}
-cd /etc/caddy
-exec chpst -u caddy caddy
+limit -n ${MAX_OPEN_FILES:-8192}
+exec chpst -u caddy caddy run
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 6fe986419c94..1c42dc41b9be 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,28 +1,23 @@
 # Template file for 'caddy'
 pkgname=caddy
-version=1.0.5
+version=2.3.0
 revision=1
 build_style=go
-# XXX: use caddy/v2 when updating
-go_import_path=github.com/caddyserver/caddy
-go_package="${go_import_path}/caddy"
+go_import_path=github.com/caddyserver/caddy/v2
+go_package="${go_import_path}/cmd/caddy/"
 hostmakedepends="git"
 short_desc="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
-distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
-checksum=0e7dc07e4f61f9a00a4c962755098e19ebf8c8a8e0d72e311597ce021b7a2a5e
+distfiles="https://github.com/caddyserver/caddy/archive/refs/tags/v${version}.tar.gz"
+checksum=4688b122ac05be39622aa81324d1635f1642e4a66d731e82d210aef78cf2766a
 
 system_accounts="caddy"
 make_dirs="
 	/etc/caddy 0700 caddy caddy
 	/var/lib/caddy 0700 caddy caddy"
 
-pre_build() {
-	vsed -e 's,var EnableTelemetry = true,var EnableTelemetry = false,g' -i caddy/caddymain/run.go
-}
-
 post_install() {
 	vsv caddy
 }

Re: caddy: update to 2.3.0.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30071#issuecomment-815103325

Comment:
Duplicate #29128, please leave any comments there if you think something should be changed.

Re: [PR PATCH] [Closed]: caddy: update to 2.3.0.

[ericonr]

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

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

caddy: update to 2.3.0.
https://github.com/void-linux/void-packages/pull/30071

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

#### General
- [ ] 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?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] 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.)
- [ ] 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
-->