From c2d66ab11f5c99576585a0b760185b8de908c112 Mon Sep 17 00:00:00 2001
From: roger <octeep@pm.me>
Date: Wed, 9 Sep 2020 04:11:54 -0400
Subject: [PATCH 1/2] added caddy2

---
 srcpkgs/caddy2/INSTALL             |  6 ++++++
 srcpkgs/caddy2/files/caddy/log/run |  1 +
 srcpkgs/caddy2/files/caddy/run     |  8 ++++++++
 srcpkgs/caddy2/template            | 32 ++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 srcpkgs/caddy2/INSTALL
 create mode 120000 srcpkgs/caddy2/files/caddy/log/run
 create mode 100644 srcpkgs/caddy2/files/caddy/run
 create mode 100644 srcpkgs/caddy2/template

diff --git a/srcpkgs/caddy2/INSTALL b/srcpkgs/caddy2/INSTALL
new file mode 100644
index 00000000000..db063595f43
--- /dev/null
+++ b/srcpkgs/caddy2/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	setcap CAP_NET_BIND_SERVICE=+ep usr/bin/caddy
+	chown -R caddy:caddy etc/caddy
+	;;
+esac
diff --git a/srcpkgs/caddy2/files/caddy/log/run b/srcpkgs/caddy2/files/caddy/log/run
new file mode 120000
index 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/caddy2/files/caddy/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/caddy2/files/caddy/run b/srcpkgs/caddy2/files/caddy/run
new file mode 100644
index 00000000000..ff0cc9c8030
--- /dev/null
+++ b/srcpkgs/caddy2/files/caddy/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+export CADDYPATH=/var/lib/caddy
+ulimit -n ${MAX_OPEN_FILES:-8192}
+cd /etc/caddy
+exec chpst -u caddy caddy
diff --git a/srcpkgs/caddy2/template b/srcpkgs/caddy2/template
new file mode 100644
index 00000000000..e909553f230
--- /dev/null
+++ b/srcpkgs/caddy2/template
@@ -0,0 +1,32 @@
+# Template file for 'caddy2'
+pkgname=caddy2
+version="2.1.1"
+revision=1
+conflicts="caddy"
+build_style=go
+go_import_path=github.com/caddyserver/caddy
+go_package="${go_import_path}/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=77beb13b39b670bfe9e0cc1c71b720d5b037cca60e1426a9a485bbfae34ba8d2
+
+system_accounts="caddy"
+make_dirs="
+	/etc/caddy 0700 caddy caddy
+	/var/lib/caddy 0700 caddy caddy"
+
+post_extract() {
+	mv $XBPS_BUILDDIR/caddy-${version} $XBPS_BUILDDIR/caddy2-${version}
+	# Update quic-go to fix compiling in go 1.15,
+	# this can be removed when Caddy 2.2.0 is out
+        vsed -e 's,github.com/lucas-clemente/quic-go v0.17.1,github.com/lucas-clemente/quic-go v0.18.0,g' -i ${wrksrc}/go.mod
+}
+
+post_install() {
+	vsv caddy
+}
+

From e1242441daf490b5984f7a901a23f00cc8777bd9 Mon Sep 17 00:00:00 2001
From: roger <octeep@pm.me>
Date: Wed, 9 Sep 2020 04:24:19 -0400
Subject: [PATCH 2/2] fixed formatting

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

diff --git a/srcpkgs/caddy2/template b/srcpkgs/caddy2/template
index e909553f230..c36bd26e4b6 100644
--- a/srcpkgs/caddy2/template
+++ b/srcpkgs/caddy2/template
@@ -1,8 +1,7 @@
 # Template file for 'caddy2'
 pkgname=caddy2
-version="2.1.1"
+version=2.1.1
 revision=1
-conflicts="caddy"
 build_style=go
 go_import_path=github.com/caddyserver/caddy
 go_package="${go_import_path}/caddy"
@@ -13,6 +12,7 @@ license="Apache-2.0"
 homepage="https://caddyserver.com"
 distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
 checksum=77beb13b39b670bfe9e0cc1c71b720d5b037cca60e1426a9a485bbfae34ba8d2
+conflicts="caddy"
 
 system_accounts="caddy"
 make_dirs="
@@ -29,4 +29,3 @@ post_extract() {
 post_install() {
 	vsv caddy
 }
-