From: Hexdiract <Hexdiract@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: caddy2-2.1.1
Date: Thu, 10 Sep 2020 01:05:38 +0200 [thread overview]
Message-ID: <20200909230538.u9WbN5lEr5hUutuVSwoCyMkC1kWjN4S08loIzsao8ZA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24778@inbox.vuxu.org>
[-- 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
}
next prev parent reply other threads:[~2020-09-09 23:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-09 8:19 [PR PATCH] " 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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200909230538.u9WbN5lEr5hUutuVSwoCyMkC1kWjN4S08loIzsao8ZA@z \
--to=hexdiract@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).