From 675f554066ea794a018535af315a5602065d0e0a Mon Sep 17 00:00:00 2001
From: Levente Polyak <anthraxx@archlinux.org>
Date: Thu, 11 Feb 2021 19:38:27 +0000
Subject: [PATCH] update GOFLAGS and bump version to v2.3.0

---
 next/{caddy.conf => Caddyfile} |  0
 next/PKGBUILD                  | 13 ++++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)
 rename next/{caddy.conf => Caddyfile} (100%)

diff --git a/next/caddy.conf b/next/Caddyfile
similarity index 100%
rename from next/caddy.conf
rename to next/Caddyfile
diff --git a/next/PKGBUILD b/next/PKGBUILD
index 5219a9a..8a0ecb9 100644
--- a/next/PKGBUILD
+++ b/next/PKGBUILD
@@ -7,8 +7,8 @@
 # Contributor: Akshay S Dinesh <asdofindia at gmail dot com>
 
 pkgname=caddy
-pkgver=2.0.0
-_gitcommit=1b0ed34f8117a6a1ccd769636f95ae84f4d1b9ab
+pkgver=2.3.0
+_gitcommit=b4989773ebb2dff21283ee50ec667f9138bdd292
 pkgrel=1
 pkgdesc='Fast web server with automatic HTTPS'
 url='https://caddyserver.com'
@@ -16,14 +16,14 @@ arch=('x86_64')
 license=('Apache')
 depends=('glibc')
 makedepends=('go' 'git')
-backup=('etc/caddy/caddy.conf')
+backup=('etc/caddy/Caddyfile')
 source=("git+https://github.com/caddyserver/caddy#tag=${_gitcommit}?signed"
         index.html
         caddy.service
         caddy-api.service
         caddy.tmpfiles
         caddy.sysusers
-        caddy.conf)
+        Caddyfile)
 sha512sums=('SKIP'
             '2abccd41f770daebf61285dc017249f20c707877ea3c870f4a2375bbbd2bf481a8652d1fd3c7afd7d6b5c54838e9d8474a33e2c9790ef67dcf9d79c4e52953b4'
             '8a9cf23bbc3ea34a5b163804cba6d7485040cc68b562cab29383680aa8c885d85ad14fa516b581a7d16443a2debb5005f92c3f27a1b21a53f8063ed9636de822'
@@ -42,7 +42,6 @@ pkgver() {
 
 prepare() {
   sed 's|/var/www/html|/srv/http|g' -i "${srcdir}/index.html"
-  sed 's|/etc/caddy/Caddyfile|/etc/caddy/caddy.conf|g' -i "${srcdir}/index.html"
 }
 
 build() {
@@ -51,7 +50,7 @@ build() {
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
   go build .
 }
 
@@ -67,7 +66,7 @@ package() {
   install -Dm 644 "${srcdir}/caddy-api.service" -t "${pkgdir}/usr/lib/systemd/system"
   install -Dm 644 "${srcdir}/caddy.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/caddy.conf"
   install -Dm 644 "${srcdir}/caddy.sysusers" "${pkgdir}/usr/lib/sysusers.d/caddy.conf"
-  install -Dm 644 "${srcdir}/caddy.conf" "${pkgdir}/etc/caddy/caddy.conf"
+  install -Dm 644 "${srcdir}/Caddyfile" -t "${pkgdir}/etc/caddy"
   install -d "${pkgdir}/etc/caddy/conf.d"
   install -Dm 644 "${srcdir}/index.html" "${pkgdir}/usr/share/caddy/index.html"
 }