summaryrefslogtreecommitdiff
path: root/www/xcaddy
diff options
context:
space:
mode:
Diffstat (limited to 'www/xcaddy')
-rw-r--r--www/xcaddy/Makefile23
-rw-r--r--www/xcaddy/distinfo16
-rw-r--r--www/xcaddy/files/pkg-message.in30
3 files changed, 45 insertions, 24 deletions
diff --git a/www/xcaddy/Makefile b/www/xcaddy/Makefile
index b8e7d1abeb54..187f164624d7 100644
--- a/www/xcaddy/Makefile
+++ b/www/xcaddy/Makefile
@@ -1,7 +1,7 @@
PORTNAME= xcaddy
DISTVERSIONPREFIX= v
-DISTVERSION= 0.4.2
-PORTREVISION= 5
+DISTVERSION= 0.4.5
+PORTREVISION= 2
CATEGORIES= www
DIST_SUBDIR= xcaddy
@@ -12,20 +12,17 @@ WWW= https://github.com/caddyserver/xcaddy
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-# xcaddy actually needs to run the go command to perform builds
-RUN_DEPENDS= go:lang/go
-
-USES= go:modules
-
-USE_GITHUB= yes
-GH_ACCOUNT= caddyserver
-GH_TUPLE= Masterminds:semver:v3.2.1:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \
- akavel:rsrc:v0.10.2:akavel_rsrc/vendor/github.com/akavel/rsrc \
- google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex \
- josephspurrier:goversioninfo:v1.4.0:josephspurrier_goversioninfo/vendor/github.com/josephspurrier/goversioninfo
+USES= go:modules,run
+GO_MODULE= github.com/caddyserver/xcaddy
GO_TARGET= ./cmd/xcaddy
+SUB_FILES= pkg-message
+
PLIST_FILES= bin/${PORTNAME}
+post-patch:
+ ${REINPLACE_CMD} 's,return "go",return "${GO_CMD}",g' \
+ ${WRKSRC}/internal/utils/environment.go
+
.include <bsd.port.mk>
diff --git a/www/xcaddy/distinfo b/www/xcaddy/distinfo
index 13c369f585d4..e441d37a946b 100644
--- a/www/xcaddy/distinfo
+++ b/www/xcaddy/distinfo
@@ -1,11 +1,5 @@
-TIMESTAMP = 1717604060
-SHA256 (xcaddy/caddyserver-xcaddy-v0.4.2_GH0.tar.gz) = 02e685227fdddd2756993ca019cbe120da61833df070ccf23f250c122c13d554
-SIZE (xcaddy/caddyserver-xcaddy-v0.4.2_GH0.tar.gz) = 66798
-SHA256 (xcaddy/Masterminds-semver-v3.2.1_GH0.tar.gz) = 9c84cd0ae71ec40ae85b07110d6d7cfbb46085d3310378ccd89f2f87e77716d2
-SIZE (xcaddy/Masterminds-semver-v3.2.1_GH0.tar.gz) = 27011
-SHA256 (xcaddy/akavel-rsrc-v0.10.2_GH0.tar.gz) = 439ef04fcd896b278b99de793c5b7bab02e13b628bc50df01cb22990c8587b40
-SIZE (xcaddy/akavel-rsrc-v0.10.2_GH0.tar.gz) = 64417
-SHA256 (xcaddy/google-shlex-e7afc7fbc510_GH0.tar.gz) = 87f77e98720add261add169e386cbdcc894e2635dca299bc4119dc417ea321ca
-SIZE (xcaddy/google-shlex-e7afc7fbc510_GH0.tar.gz) = 7342
-SHA256 (xcaddy/josephspurrier-goversioninfo-v1.4.0_GH0.tar.gz) = afe8fb048ee7076599d7b520251dec97fa3d3fd852bdfe52cb535505160bad8d
-SIZE (xcaddy/josephspurrier-goversioninfo-v1.4.0_GH0.tar.gz) = 55672
+TIMESTAMP = 1753865060
+SHA256 (go/www_xcaddy/xcaddy-v0.4.5/v0.4.5.mod) = c81e7d27db214122fd6def2eaa90b00102d01e1c780573ef79cebd1909228cf1
+SIZE (go/www_xcaddy/xcaddy-v0.4.5/v0.4.5.mod) = 416
+SHA256 (go/www_xcaddy/xcaddy-v0.4.5/v0.4.5.zip) = 93e392727719a1716973aa05408ce38aa256dcb078af4de32d89ca84a85082c5
+SIZE (go/www_xcaddy/xcaddy-v0.4.5/v0.4.5.zip) = 82260
diff --git a/www/xcaddy/files/pkg-message.in b/www/xcaddy/files/pkg-message.in
new file mode 100644
index 000000000000..38ca8ae86831
--- /dev/null
+++ b/www/xcaddy/files/pkg-message.in
@@ -0,0 +1,30 @@
+[
+{
+ type: install
+ message: <<INSTALL
+xcaddy is a tool to build custom Caddy web servers with plugins.
+
+SECURITY NOTICE:
+When building and running Caddy servers created with xcaddy, it is strongly
+recommended to run the resulting Caddy binary as an unprivileged user, such as
+www:www, rather than as root.
+
+For secure deployment of Caddy servers built with xcaddy:
+
+- Use security/portacl-rc to enable privileged port binding:
+
+ # pkg install security/portacl-rc
+ # sysrc portacl_users+=www
+ # sysrc portacl_user_www_tcp="http https"
+ # sysrc portacl_user_www_udp="https"
+ # service portacl enable
+ # service portacl start
+
+- Run your custom Caddy binary as www:www instead of root
+
+See https://caddyserver.com/docs/ for Caddy configuration documentation.
+See https://github.com/caddyserver/xcaddy for xcaddy usage instructions.
+
+INSTALL
+}
+]