Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: caddy2-2.1.1
@ 2020-09-09  8:19 Hexdiract
  2020-09-09  8:24 ` [PR PATCH] [Updated] " Hexdiract
                   ` (12 more replies)
  0 siblings, 13 replies; 14+ messages in thread
From: Hexdiract @ 2020-09-09  8:19 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Hexdiract/void-packages master
https://github.com/void-linux/void-packages/pull/24778

New package: caddy2-2.1.1
Fix #22092


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

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

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] 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
+}
+

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] New package: caddy2-2.1.1
  2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
@ 2020-09-09  8:24 ` Hexdiract
  2020-09-09  8:27 ` Hexdiract
                   ` (11 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hexdiract @ 2020-09-09  8:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Hexdiract/void-packages master
https://github.com/void-linux/void-packages/pull/24778

New package: caddy2-2.1.1
Fix #22092


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

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

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
 }
-

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] New package: caddy2-2.1.1
  2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
  2020-09-09  8:24 ` [PR PATCH] [Updated] " Hexdiract
@ 2020-09-09  8:27 ` Hexdiract
  2020-09-09  9:57 ` Anachron
                   ` (10 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hexdiract @ 2020-09-09  8:27 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Hexdiract/void-packages master
https://github.com/void-linux/void-packages/pull/24778

New package: caddy2-2.1.1
Fix #22092


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

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

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/3] 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/3] 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
 }
-

From 1267c34ab03ef336e9bc0307ce1daec044746089 Mon Sep 17 00:00:00 2001
From: roger <octeep@pm.me>
Date: Wed, 9 Sep 2020 04:27:26 -0400
Subject: [PATCH 3/3] removed tabs

---
 srcpkgs/caddy2/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/caddy2/template b/srcpkgs/caddy2/template
index c36bd26e4b6..30626c7f097 100644
--- a/srcpkgs/caddy2/template
+++ b/srcpkgs/caddy2/template
@@ -16,16 +16,16 @@ conflicts="caddy"
 
 system_accounts="caddy"
 make_dirs="
-	/etc/caddy 0700 caddy caddy
-	/var/lib/caddy 0700 caddy caddy"
+    /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
+    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
+    vsv caddy
 }

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: New package: caddy2-2.1.1
  2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
  2020-09-09  8:24 ` [PR PATCH] [Updated] " Hexdiract
  2020-09-09  8:27 ` Hexdiract
@ 2020-09-09  9:57 ` Anachron
  2020-09-09 22:42 ` [PR PATCH] [Updated] " Hexdiract
                   ` (9 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Anachron @ 2020-09-09  9:57 UTC (permalink / raw)
  To: ml

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

New comment by Anachron on void-packages repository

https://github.com/void-linux/void-packages/pull/24778#issuecomment-689459232

Comment:
Please fix tabs: https://travis-ci.org/github/void-linux/void-packages/jobs/725509935#L163
And squash all commits into one and force-push.

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] New package: caddy2-2.1.1
  2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
                   ` (2 preceding siblings ...)
  2020-09-09  9:57 ` Anachron
@ 2020-09-09 22:42 ` Hexdiract
  2020-09-09 22:45 ` Hexdiract
                   ` (8 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hexdiract @ 2020-09-09 22:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Hexdiract/void-packages master
https://github.com/void-linux/void-packages/pull/24778

New package: caddy2-2.1.1
Fix #22092


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

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

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/4] 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/4] 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
 }
-

From 1267c34ab03ef336e9bc0307ce1daec044746089 Mon Sep 17 00:00:00 2001
From: roger <octeep@pm.me>
Date: Wed, 9 Sep 2020 04:27:26 -0400
Subject: [PATCH 3/4] removed tabs

---
 srcpkgs/caddy2/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/caddy2/template b/srcpkgs/caddy2/template
index c36bd26e4b6..30626c7f097 100644
--- a/srcpkgs/caddy2/template
+++ b/srcpkgs/caddy2/template
@@ -16,16 +16,16 @@ conflicts="caddy"
 
 system_accounts="caddy"
 make_dirs="
-	/etc/caddy 0700 caddy caddy
-	/var/lib/caddy 0700 caddy caddy"
+    /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
+    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
+    vsv caddy
 }

From 13c373f16632547bcfb9916ee35729cd495e84f8 Mon Sep 17 00:00:00 2001
From: roger <octeep@pm.me>
Date: Wed, 9 Sep 2020 18:42:03 -0400
Subject: [PATCH 4/4] rewrote the entire template

---
 srcpkgs/caddy2/files/caddy/run |  4 ++--
 srcpkgs/caddy2/template        | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/caddy2/files/caddy/run b/srcpkgs/caddy2/files/caddy/run
index ff0cc9c8030..a00f364e8d4 100644
--- a/srcpkgs/caddy2/files/caddy/run
+++ b/srcpkgs/caddy2/files/caddy/run
@@ -2,7 +2,7 @@
 
 [ -r ./conf ] && . ./conf
 
-export CADDYPATH=/var/lib/caddy
+export HOME=/var/lib/caddy
 ulimit -n ${MAX_OPEN_FILES:-8192}
 cd /etc/caddy
-exec chpst -u caddy caddy
+exec chpst -u caddy caddy run
diff --git a/srcpkgs/caddy2/template b/srcpkgs/caddy2/template
index 30626c7f097..ffca2e1b7d4 100644
--- a/srcpkgs/caddy2/template
+++ b/srcpkgs/caddy2/template
@@ -3,8 +3,8 @@ pkgname=caddy2
 version=2.1.1
 revision=1
 build_style=go
-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}/modules/standard"
 hostmakedepends="git"
 short_desc="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
@@ -16,16 +16,14 @@ conflicts="caddy"
 
 system_accounts="caddy"
 make_dirs="
-    /etc/caddy 0700 caddy caddy
-    /var/lib/caddy 0700 caddy caddy"
+	/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
+	mv $XBPS_BUILDDIR/caddy-${version} ${wrksrc}
+	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
+	vsv caddy
 }

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] New package: caddy2-2.1.1
  2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
                   ` (3 preceding siblings ...)
  2020-09-09 22:42 ` [PR PATCH] [Updated] " Hexdiract
@ 2020-09-09 22:45 ` Hexdiract
  2020-09-09 23:05 ` Hexdiract
                   ` (7 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hexdiract @ 2020-09-09 22:45 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Hexdiract/void-packages master
https://github.com/void-linux/void-packages/pull/24778

New package: caddy2-2.1.1
Fix #22092


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

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

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/5] 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/5] 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
 }
-

From 1267c34ab03ef336e9bc0307ce1daec044746089 Mon Sep 17 00:00:00 2001
From: roger <octeep@pm.me>
Date: Wed, 9 Sep 2020 04:27:26 -0400
Subject: [PATCH 3/5] removed tabs

---
 srcpkgs/caddy2/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/caddy2/template b/srcpkgs/caddy2/template
index c36bd26e4b6..30626c7f097 100644
--- a/srcpkgs/caddy2/template
+++ b/srcpkgs/caddy2/template
@@ -16,16 +16,16 @@ conflicts="caddy"
 
 system_accounts="caddy"
 make_dirs="
-	/etc/caddy 0700 caddy caddy
-	/var/lib/caddy 0700 caddy caddy"
+    /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
+    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
+    vsv caddy
 }

From 13c373f16632547bcfb9916ee35729cd495e84f8 Mon Sep 17 00:00:00 2001
From: roger <octeep@pm.me>
Date: Wed, 9 Sep 2020 18:42:03 -0400
Subject: [PATCH 4/5] rewrote the entire template

---
 srcpkgs/caddy2/files/caddy/run |  4 ++--
 srcpkgs/caddy2/template        | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/caddy2/files/caddy/run b/srcpkgs/caddy2/files/caddy/run
index ff0cc9c8030..a00f364e8d4 100644
--- a/srcpkgs/caddy2/files/caddy/run
+++ b/srcpkgs/caddy2/files/caddy/run
@@ -2,7 +2,7 @@
 
 [ -r ./conf ] && . ./conf
 
-export CADDYPATH=/var/lib/caddy
+export HOME=/var/lib/caddy
 ulimit -n ${MAX_OPEN_FILES:-8192}
 cd /etc/caddy
-exec chpst -u caddy caddy
+exec chpst -u caddy caddy run
diff --git a/srcpkgs/caddy2/template b/srcpkgs/caddy2/template
index 30626c7f097..ffca2e1b7d4 100644
--- a/srcpkgs/caddy2/template
+++ b/srcpkgs/caddy2/template
@@ -3,8 +3,8 @@ pkgname=caddy2
 version=2.1.1
 revision=1
 build_style=go
-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}/modules/standard"
 hostmakedepends="git"
 short_desc="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
@@ -16,16 +16,14 @@ conflicts="caddy"
 
 system_accounts="caddy"
 make_dirs="
-    /etc/caddy 0700 caddy caddy
-    /var/lib/caddy 0700 caddy caddy"
+	/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
+	mv $XBPS_BUILDDIR/caddy-${version} ${wrksrc}
+	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
+	vsv caddy
 }

From 7f554850e96d45454b1e43713a683361218acf10 Mon Sep 17 00:00:00 2001
From: roger <octeep@pm.me>
Date: Wed, 9 Sep 2020 18:45:15 -0400
Subject: [PATCH 5/5] fixed indent

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

diff --git a/srcpkgs/caddy2/template b/srcpkgs/caddy2/template
index ffca2e1b7d4..ab57b6b7dbf 100644
--- a/srcpkgs/caddy2/template
+++ b/srcpkgs/caddy2/template
@@ -16,14 +16,14 @@ conflicts="caddy"
 
 system_accounts="caddy"
 make_dirs="
-	/etc/caddy 0700 caddy caddy
-	/var/lib/caddy 0700 caddy caddy"
+        /etc/caddy 0700 caddy caddy
+        /var/lib/caddy 0700 caddy caddy"
 
 post_extract() {
-	mv $XBPS_BUILDDIR/caddy-${version} ${wrksrc}
-	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
+        mv $XBPS_BUILDDIR/caddy-${version} ${wrksrc}
+        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
+        vsv caddy
 }

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] New package: caddy2-2.1.1
  2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
                   ` (4 preceding siblings ...)
  2020-09-09 22:45 ` Hexdiract
@ 2020-09-09 23:05 ` Hexdiract
  2020-09-09 23:19 ` Hexdiract
                   ` (6 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hexdiract @ 2020-09-09 23:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Hexdiract/void-packages master
https://github.com/void-linux/void-packages/pull/24778

New package: caddy2-2.1.1
Fix #22092


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

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

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/4] 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/4] 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
 }
-

From 1267c34ab03ef336e9bc0307ce1daec044746089 Mon Sep 17 00:00:00 2001
From: roger <octeep@pm.me>
Date: Wed, 9 Sep 2020 04:27:26 -0400
Subject: [PATCH 3/4] removed tabs

---
 srcpkgs/caddy2/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/caddy2/template b/srcpkgs/caddy2/template
index c36bd26e4b6..30626c7f097 100644
--- a/srcpkgs/caddy2/template
+++ b/srcpkgs/caddy2/template
@@ -16,16 +16,16 @@ conflicts="caddy"
 
 system_accounts="caddy"
 make_dirs="
-	/etc/caddy 0700 caddy caddy
-	/var/lib/caddy 0700 caddy caddy"
+    /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
+    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
+    vsv caddy
 }

From 13c373f16632547bcfb9916ee35729cd495e84f8 Mon Sep 17 00:00:00 2001
From: roger <octeep@pm.me>
Date: Wed, 9 Sep 2020 18:42:03 -0400
Subject: [PATCH 4/4] rewrote the entire template

---
 srcpkgs/caddy2/files/caddy/run |  4 ++--
 srcpkgs/caddy2/template        | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/caddy2/files/caddy/run b/srcpkgs/caddy2/files/caddy/run
index ff0cc9c8030..a00f364e8d4 100644
--- a/srcpkgs/caddy2/files/caddy/run
+++ b/srcpkgs/caddy2/files/caddy/run
@@ -2,7 +2,7 @@
 
 [ -r ./conf ] && . ./conf
 
-export CADDYPATH=/var/lib/caddy
+export HOME=/var/lib/caddy
 ulimit -n ${MAX_OPEN_FILES:-8192}
 cd /etc/caddy
-exec chpst -u caddy caddy
+exec chpst -u caddy caddy run
diff --git a/srcpkgs/caddy2/template b/srcpkgs/caddy2/template
index 30626c7f097..ffca2e1b7d4 100644
--- a/srcpkgs/caddy2/template
+++ b/srcpkgs/caddy2/template
@@ -3,8 +3,8 @@ pkgname=caddy2
 version=2.1.1
 revision=1
 build_style=go
-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}/modules/standard"
 hostmakedepends="git"
 short_desc="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
@@ -16,16 +16,14 @@ conflicts="caddy"
 
 system_accounts="caddy"
 make_dirs="
-    /etc/caddy 0700 caddy caddy
-    /var/lib/caddy 0700 caddy caddy"
+	/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
+	mv $XBPS_BUILDDIR/caddy-${version} ${wrksrc}
+	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
+	vsv caddy
 }

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] New package: caddy2-2.1.1
  2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
                   ` (5 preceding siblings ...)
  2020-09-09 23:05 ` Hexdiract
@ 2020-09-09 23:19 ` Hexdiract
  2020-09-10  1:15 ` fosslinux
                   ` (5 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hexdiract @ 2020-09-09 23:19 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Hexdiract/void-packages master
https://github.com/void-linux/void-packages/pull/24778

New package: caddy2-2.1.1
Fix #22092


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

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

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

fixed formatting

removed tabs

rewrote the entire template
---
 srcpkgs/caddy2/INSTALL             |  6 ++++++
 srcpkgs/caddy2/files/caddy/log/run |  1 +
 srcpkgs/caddy2/files/caddy/run     |  8 ++++++++
 srcpkgs/caddy2/template            | 29 +++++++++++++++++++++++++++++
 4 files changed, 44 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..a00f364e8d4
--- /dev/null
+++ b/srcpkgs/caddy2/files/caddy/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+export HOME=/var/lib/caddy
+ulimit -n ${MAX_OPEN_FILES:-8192}
+cd /etc/caddy
+exec chpst -u caddy caddy run
diff --git a/srcpkgs/caddy2/template b/srcpkgs/caddy2/template
new file mode 100644
index 00000000000..ffca2e1b7d4
--- /dev/null
+++ b/srcpkgs/caddy2/template
@@ -0,0 +1,29 @@
+# Template file for 'caddy2'
+pkgname=caddy2
+version=2.1.1
+revision=1
+build_style=go
+go_import_path=github.com/caddyserver/caddy/v2
+go_package="${go_import_path}/modules/standard"
+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
+conflicts="caddy"
+
+system_accounts="caddy"
+make_dirs="
+	/etc/caddy 0700 caddy caddy
+	/var/lib/caddy 0700 caddy caddy"
+
+post_extract() {
+	mv $XBPS_BUILDDIR/caddy-${version} ${wrksrc}
+	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
+}

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: New package: caddy2-2.1.1
  2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
                   ` (6 preceding siblings ...)
  2020-09-09 23:19 ` Hexdiract
@ 2020-09-10  1:15 ` fosslinux
  2020-09-10  2:23 ` [PR PATCH] [Updated] " Hexdiract
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: fosslinux @ 2020-09-10  1:15 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/24778#issuecomment-689911665

Comment:
Please use the proper commit naming format : `New package: caddy2-2.1.1`.

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] New package: caddy2-2.1.1
  2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
                   ` (7 preceding siblings ...)
  2020-09-10  1:15 ` fosslinux
@ 2020-09-10  2:23 ` Hexdiract
  2020-09-10  2:24 ` Hexdiract
                   ` (3 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hexdiract @ 2020-09-10  2:23 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Hexdiract/void-packages master
https://github.com/void-linux/void-packages/pull/24778

New package: caddy2-2.1.1
Fix #22092


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

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

From e4a8a62ea705ff4703fb6d60bff65f4e4d596445 Mon Sep 17 00:00:00 2001
From: roger <octeep@pm.me>
Date: Wed, 9 Sep 2020 04:11:54 -0400
Subject: [PATCH] New package: caddy2-2.1.1

---
 srcpkgs/caddy2/INSTALL             |  6 ++++++
 srcpkgs/caddy2/files/caddy/log/run |  1 +
 srcpkgs/caddy2/files/caddy/run     |  8 ++++++++
 srcpkgs/caddy2/template            | 29 +++++++++++++++++++++++++++++
 4 files changed, 44 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..a00f364e8d4
--- /dev/null
+++ b/srcpkgs/caddy2/files/caddy/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+export HOME=/var/lib/caddy
+ulimit -n ${MAX_OPEN_FILES:-8192}
+cd /etc/caddy
+exec chpst -u caddy caddy run
diff --git a/srcpkgs/caddy2/template b/srcpkgs/caddy2/template
new file mode 100644
index 00000000000..ffca2e1b7d4
--- /dev/null
+++ b/srcpkgs/caddy2/template
@@ -0,0 +1,29 @@
+# Template file for 'caddy2'
+pkgname=caddy2
+version=2.1.1
+revision=1
+build_style=go
+go_import_path=github.com/caddyserver/caddy/v2
+go_package="${go_import_path}/modules/standard"
+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
+conflicts="caddy"
+
+system_accounts="caddy"
+make_dirs="
+	/etc/caddy 0700 caddy caddy
+	/var/lib/caddy 0700 caddy caddy"
+
+post_extract() {
+	mv $XBPS_BUILDDIR/caddy-${version} ${wrksrc}
+	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
+}

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: New package: caddy2-2.1.1
  2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
                   ` (8 preceding siblings ...)
  2020-09-10  2:23 ` [PR PATCH] [Updated] " Hexdiract
@ 2020-09-10  2:24 ` Hexdiract
  2020-10-10 12:59 ` daniel-eys
                   ` (2 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hexdiract @ 2020-09-10  2:24 UTC (permalink / raw)
  To: ml

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

New comment by Hexdiract on void-packages repository

https://github.com/void-linux/void-packages/pull/24778#issuecomment-689934204

Comment:
> Please use the proper commit naming format : `New package: caddy2-2.1.1`.

Sorry about that, I renamed it

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: New package: caddy2-2.1.1
  2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
                   ` (9 preceding siblings ...)
  2020-09-10  2:24 ` Hexdiract
@ 2020-10-10 12:59 ` daniel-eys
  2021-03-01 19:55 ` ericonr
  2021-03-01 19:55 ` [PR PATCH] [Closed]: " ericonr
  12 siblings, 0 replies; 14+ messages in thread
From: daniel-eys @ 2020-10-10 12:59 UTC (permalink / raw)
  To: ml

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

New comment by daniel-eys on void-packages repository

https://github.com/void-linux/void-packages/pull/24778#issuecomment-706545842

Comment:
Caddy1 is EOL since 1 Oct 2020 and now unsupported: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions
We should update the `caddy` template to 2.x and not introduce a separate `caddy2` template.



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: New package: caddy2-2.1.1
  2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
                   ` (10 preceding siblings ...)
  2020-10-10 12:59 ` daniel-eys
@ 2021-03-01 19:55 ` ericonr
  2021-03-01 19:55 ` [PR PATCH] [Closed]: " ericonr
  12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-03-01 19:55 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24778#issuecomment-788227325

Comment:
Closing as superseded and abandoned by user.

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Closed]: New package: caddy2-2.1.1
  2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
                   ` (11 preceding siblings ...)
  2021-03-01 19:55 ` ericonr
@ 2021-03-01 19:55 ` ericonr
  12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-03-01 19:55 UTC (permalink / raw)
  To: ml

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

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

New package: caddy2-2.1.1
https://github.com/void-linux/void-packages/pull/24778

Description:
Fix #22092


^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2021-03-01 19:55 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-09  8:19 [PR PATCH] New package: caddy2-2.1.1 Hexdiract
2020-09-09  8:24 ` [PR PATCH] [Updated] " Hexdiract
2020-09-09  8:27 ` Hexdiract
2020-09-09  9:57 ` Anachron
2020-09-09 22:42 ` [PR PATCH] [Updated] " Hexdiract
2020-09-09 22:45 ` Hexdiract
2020-09-09 23:05 ` Hexdiract
2020-09-09 23:19 ` Hexdiract
2020-09-10  1:15 ` fosslinux
2020-09-10  2:23 ` [PR PATCH] [Updated] " Hexdiract
2020-09-10  2:24 ` Hexdiract
2020-10-10 12:59 ` daniel-eys
2021-03-01 19:55 ` ericonr
2021-03-01 19:55 ` [PR PATCH] [Closed]: " ericonr

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).