merge aur

https://github.com/caddyserver/caddy/releases/tag/v2.11.4

.SRCINFO

@@ -1,32 +1,36 @@
-pkgbase = caddy
+pkgbase = caddy-balki
 	pkgdesc = Fast web server with automatic HTTPS
-	pkgver = 2.9.1
-	pkgrel = 11
+	pkgver = 2.11.4
+	pkgrel = 1
 	url = https://github.com/caddyserver/caddy
 	arch = x86_64
-	license = Apache
-	makedepends = go
+	license = Apache-2.0
 	makedepends = git
+	makedepends = go
 	depends = glibc
+	depends = mailcap
+	provides = caddy
+	conflicts = caddy
+	options = !lto
 	backup = etc/caddy/Caddyfile
-	source = git+https://github.com/caddyserver/caddy.git#tag=v2.9.1?signed
-	source = caddy-dist::git+https://github.com/caddyserver/dist.git#tag=v2.9.1
+	source = git+https://github.com/caddyserver/caddy.git#tag=v2.11.4
+	source = caddy-dist::git+https://github.com/caddyserver/dist.git#tag=v2.11.4
 	source = caddy.service
 	source = caddy-api.service
 	source = caddy.tmpfiles
 	source = caddy.sysusers
 	source = Caddyfile
 	source = use-data-dir-for-autosave.patch
-	source = override-main-module-version.patch
+	source = caddy-disable-executable-altering-commands.patch::https://src.fedoraproject.org/rpms/caddy/raw/rawhide/f/0001-Disable-commands-that-can-alter-the-binary.patch
 	validpgpkeys = 29D0817A67156E4F25DC24782A349DD577D586A5
-	sha512sums = 3123d18c29df7c3dcd88dcbeb143a9fede424d385a2c48434d7ee11e6ceb40ab0764ed72ffab617e4661eef76236dcd2de5ee701432b12e9f1492b904d3850d4
-	sha512sums = f959f1486c170dad5f5efab80ca90c0e272b37e313cb47826b371854ae1937d98bdfc345fab8aac595c269bc617ed719aabdea0467d94ad88887d7449e902c09
-	sha512sums = 78b01fa7156cab0df0d5923250a0e85f6e2dddb2b01b9ea66b49d3e17b228954491922fac6339fcc2caa8342168ca138061a9c4eff41a7a5b6a86e7f9ecb885e
-	sha512sums = 164037ea69ef02e9fdc55af3760849500fd90aa6d23ca29d55cc29c758041bef7e7cf89b23c7e0870bfbd2ecbb576fa9adf33c7c45bcabe68d15be4d6fc49145
+	sha512sums = 43f5f0a48ec97be1a4ab7a1f0beca32c373134066611d2caacb935dd6865f3c367b0092a90021ca8d6c6629baab5b3d7c21898a6772573e30c52621310ba586c
+	sha512sums = 053b0a8d5311c8e0c6e40786b87e73e2e1205757cff3aa8aff6d22fad8cceb4f9acff7b66e5a29ab1ea624085dd41140c92693b887fd9a890e97a479e1f846fb
+	sha512sums = e6cdf5f81af01d0a6290ef9503d0bd90244684a6305e5638f079c234b2bc6454688daea3ea9d1b6a6f00eeba0375e9c4372e64c5cb49b5d1206384d2a7201273
+	sha512sums = 6c9d5dce22f1f0f4e222d4adeccd93c486b3be2ac221a7f8a58933b22ce91fe3da8ad38e6db7212846e4ab6336ebc058df16215a43636b965dfed469b3aaa2f6
 	sha512sums = 55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742
-	sha512sums = c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f
-	sha512sums = 716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0
+	sha512sums = b24ff0fc8df05ac92ba6860ce1b9975ecce48492b08c1b03545e7b20d2956f130cdee215fc78c751f9ab4869008e2b9bf7f861311fe16c8f5a85a42e347337c6
+	sha512sums = 4be1ed23e6600d8072c7f4fabd2bd926708502a55d84ae4f62aff9885c7b8e45ad0554503d0fc796338577adfca9e467c468a82ba56ffd69e4ec2778d69bc198
 	sha512sums = 563d6b45e91fc584fb5a27caaa382f59c140cb0a1b28b8d8faced4f7c7cad86d8671eb6ac10056f41518a842c8f606130d7e0c71df2b731d5eb0b4c868ea5d41
-	sha512sums = 0fedec714604566fb0da995cdfb2dd2cb8f3995bfa1d6c2e9a38ddd1da11634c3e37f2da381f715df4fc9ebd9653c3aa4806de47ae5094ea1fc19b7f5b795a30
+	sha512sums = 42384fa3314e367c4d7ac3e07af66cf7000f68b6d6354183c5ee1579bd46ea6a29edfa84f9cdf5084d99d74af50ea5b14e3979d38ff806232756991bcac2e8db
 
-pkgname = caddy
+pkgname = caddy-balki

Caddyfile

@@ -9,7 +9,6 @@
 # domain name.
 #
 # https://caddyserver.com/docs/caddyfile/concepts#addresses
-
 {
 	# Restrict the admin interface to a local unix file socket whose directory
 	# is restricted to caddy:caddy. By default the TCP socket allows arbitrary

LICENSE

@@ -0,0 +1,12 @@
+Copyright Arch Linux Contributors
+
+Permission to use, copy, modify, and/or distribute this software for
+any purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

LICENSES/0BSD.txt

@@ -0,0 +1 @@
+../LICENSE

PKGBUILD

@@ -1,82 +1,97 @@
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 # Maintainer: Christian Rebischke <chris.rebischke@archlinux.org>
+# Maintainer: Carl Smedstad <carsme@archlinux.org>
 # Contributor: Wei Congrui < crvv.mail at gmail dot com >
 # Contributor: Carl George < arch at cgtx dot us >
 # Contributor: Eric Engeström <eric at engestrom dot ch>
 # Contributor: Andreas Linz <klingt.net at gmail dot com>
 # Contributor: Akshay S Dinesh <asdofindia at gmail dot com>
 
-pkgname=caddy
-pkgver=2.9.1
-pkgrel=11
+pkgname=caddy-balki
+_pkgname=caddy
+provides=(caddy)
+conflicts=(caddy)
+pkgver=2.11.4
+pkgrel=1
 pkgdesc='Fast web server with automatic HTTPS'
+arch=(x86_64)
 url='https://github.com/caddyserver/caddy'
-arch=('x86_64')
-license=('Apache')
-depends=('glibc')
-makedepends=('go' 'git')
-backup=('etc/caddy/Caddyfile')
-source=("git+https://github.com/caddyserver/caddy.git#tag=v${pkgver}?signed"
-        caddy-dist::"git+https://github.com/caddyserver/dist.git#tag=v${pkgver}"
-        caddy.service
-        caddy-api.service
-        caddy.tmpfiles
-        caddy.sysusers
-        Caddyfile
-        use-data-dir-for-autosave.patch
-        override-main-module-version.patch)
-sha512sums=('3123d18c29df7c3dcd88dcbeb143a9fede424d385a2c48434d7ee11e6ceb40ab0764ed72ffab617e4661eef76236dcd2de5ee701432b12e9f1492b904d3850d4'
-            'f959f1486c170dad5f5efab80ca90c0e272b37e313cb47826b371854ae1937d98bdfc345fab8aac595c269bc617ed719aabdea0467d94ad88887d7449e902c09'
-            '78b01fa7156cab0df0d5923250a0e85f6e2dddb2b01b9ea66b49d3e17b228954491922fac6339fcc2caa8342168ca138061a9c4eff41a7a5b6a86e7f9ecb885e'
-            '164037ea69ef02e9fdc55af3760849500fd90aa6d23ca29d55cc29c758041bef7e7cf89b23c7e0870bfbd2ecbb576fa9adf33c7c45bcabe68d15be4d6fc49145'
+license=(Apache-2.0)
+depends=(
+  glibc
+  mailcap
+)
+makedepends=(
+  git
+  go
+)
+backup=(etc/caddy/Caddyfile)
+options=(!lto)
+source=(
+  "git+https://github.com/caddyserver/caddy.git#tag=v${pkgver}"
+  "caddy-dist::git+https://github.com/caddyserver/dist.git#tag=v${pkgver}"
+  caddy.service
+  caddy-api.service
+  caddy.tmpfiles
+  caddy.sysusers
+  Caddyfile
+  use-data-dir-for-autosave.patch
+  "$_pkgname-disable-executable-altering-commands.patch::https://src.fedoraproject.org/rpms/caddy/raw/rawhide/f/0001-Disable-commands-that-can-alter-the-binary.patch"
+)
+sha512sums=('43f5f0a48ec97be1a4ab7a1f0beca32c373134066611d2caacb935dd6865f3c367b0092a90021ca8d6c6629baab5b3d7c21898a6772573e30c52621310ba586c'
+            '053b0a8d5311c8e0c6e40786b87e73e2e1205757cff3aa8aff6d22fad8cceb4f9acff7b66e5a29ab1ea624085dd41140c92693b887fd9a890e97a479e1f846fb'
+            'e6cdf5f81af01d0a6290ef9503d0bd90244684a6305e5638f079c234b2bc6454688daea3ea9d1b6a6f00eeba0375e9c4372e64c5cb49b5d1206384d2a7201273'
+            '6c9d5dce22f1f0f4e222d4adeccd93c486b3be2ac221a7f8a58933b22ce91fe3da8ad38e6db7212846e4ab6336ebc058df16215a43636b965dfed469b3aaa2f6'
             '55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742'
-            'c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f'
-            '716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0'
+            'b24ff0fc8df05ac92ba6860ce1b9975ecce48492b08c1b03545e7b20d2956f130cdee215fc78c751f9ab4869008e2b9bf7f861311fe16c8f5a85a42e347337c6'
+            '4be1ed23e6600d8072c7f4fabd2bd926708502a55d84ae4f62aff9885c7b8e45ad0554503d0fc796338577adfca9e467c468a82ba56ffd69e4ec2778d69bc198'
             '563d6b45e91fc584fb5a27caaa382f59c140cb0a1b28b8d8faced4f7c7cad86d8671eb6ac10056f41518a842c8f606130d7e0c71df2b731d5eb0b4c868ea5d41'
-            '0fedec714604566fb0da995cdfb2dd2cb8f3995bfa1d6c2e9a38ddd1da11634c3e37f2da381f715df4fc9ebd9653c3aa4806de47ae5094ea1fc19b7f5b795a30')
+            '42384fa3314e367c4d7ac3e07af66cf7000f68b6d6354183c5ee1579bd46ea6a29edfa84f9cdf5084d99d74af50ea5b14e3979d38ff806232756991bcac2e8db')
 validpgpkeys=(
   29D0817A67156E4F25DC24782A349DD577D586A5 # Matthew Holt <mholt@users.noreply.github.com>
 )
 
-#pkgver() {
-#  cd ${pkgname}
-#  git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-#}
-
 prepare() {
-  cd "${pkgname}"
-  sed -i '/plug in Caddy modules here/a _ "github.com/caddy-dns/cloudflare"' cmd/caddy/main.go
-  go mod tidy
-
   # welcome page
-  cp ../caddy-dist/welcome/index.html .
-  sed 's|/var/www/html|/srv/http|g' -i index.html
+  sed 's|/var/www/html|/srv/http|g' -i caddy-dist/welcome/index.html
+
+  cd ${_pkgname}
+  sed -i '/plug in Caddy modules here/a _ "github.com/caddy-dns/cloudflare"' cmd/caddy/main.go
+  sed -i '/plug in Caddy modules here/a _ "github.com/dulli/caddy-wol"' cmd/caddy/main.go
+  go mod tidy
   # do not write in /etc
-  patch -Np1 < "${srcdir}/use-data-dir-for-autosave.patch"
-  # fix version identifier if not built from a module
-  patch -Np1 < "${srcdir}/override-main-module-version.patch"
-  sed 's|"unknown"|"v'"${pkgver}"'"|g' -i caddy.go
+  patch -Np1 < ../use-data-dir-for-autosave.patch
+  # disable commands that bypass the package manager
+  patch -Np1 < ../$_pkgname-disable-executable-altering-commands.patch
+
+  GOFLAGS="-mod=readonly" go mod vendor -v
 }
 
 build() {
-  cd "${pkgname}/cmd/caddy/"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
-  go build .
+  cd ${_pkgname}
+  export CGO_LDFLAGS=${LDFLAGS}
+  export CGO_CPPFLAGS=${CPPFLAGS}
+  export CGO_CFLAGS=${CFLAGS}
+  export CGO_CXXFLAGS=${CXXFLAGS}
+  export GOFLAGS="-buildmode=pie -mod=vendor -modcacherw -buildvcs=false"
+  export GOPATH="$srcdir"
+
+  local ld_flags=" \
+    -X github.com/caddyserver/caddy/v2.CustomVersion=v${pkgver} \
+    -compressdwarf=false \
+    -linkmode=external \
+  "
+  go build -v -ldflags "$ld_flags" -o build/caddy ./cmd/caddy
 
   for i in zsh bash fish; do
-    ./caddy completion $i >caddy.$i
+    ./build/caddy completion $i > caddy.$i
   done
 }
 
 check() {
-  # Disabled for now, because of failing tests
-  cd "${pkgname}"
-  go test ./...
-  version=$(./cmd/caddy/caddy version)
+  cd ${_pkgname}
+  go test -short ./...
+  version=$(./build/caddy version)
   echo "Caddy version: ${version}"
   if [[ $version != v$pkgver ]]; then
     exit 1
@@ -84,21 +99,20 @@ check() {
 }
 
 package() {
-  cd "${pkgname}"
-  install -Dm 755 cmd/caddy/caddy -t "${pkgdir}/usr/bin"
+  install -vDm 644 -t "${pkgdir}/usr/share/caddy" caddy-dist/welcome/index.html
 
-  install -Dm 644 "${srcdir}/caddy.service" "${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 -vDm 644 -t "${pkgdir}/usr/lib/systemd/system" caddy.service caddy-api.service
+  install -vDm 644 caddy.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/caddy.conf"
+  install -vDm 644 caddy.sysusers "${pkgdir}/usr/lib/sysusers.d/caddy.conf"
 
-  install -Dm 644 "${srcdir}/Caddyfile" -t "${pkgdir}/etc/caddy"
-  install -d "${pkgdir}/etc/caddy/conf.d"
+  install -vDm 644 -t "${pkgdir}/etc/caddy" Caddyfile
+  install -vd "${pkgdir}/etc/caddy/conf.d"
 
-  install -Dm 644 index.html "${pkgdir}/usr/share/caddy/index.html"
+  install -vDm 644 caddy/caddy.zsh "${pkgdir}/usr/share/zsh/site-functions/_caddy"
+  install -vDm 644 caddy/caddy.bash "${pkgdir}/usr/share/bash-completion/completions/caddy"
+  install -vDm 644 caddy/caddy.fish "${pkgdir}/usr/share/fish/vendor_completions.d/caddy.fish"
 
-  install -Dm 644 "${srcdir}/caddy/cmd/caddy/caddy.zsh" "${pkgdir}/usr/share/zsh/site-functions/_caddy"
-  install -Dm 644 "${srcdir}/caddy/cmd/caddy/caddy.bash" "${pkgdir}/usr/share/bash-completion/completions/caddy"
-  install -Dm 644 "${srcdir}/caddy/cmd/caddy/caddy.fish" -t "${pkgdir}/usr/share/fish/vendor_completions.d"
+  install -vDm 755 -t "${pkgdir}/usr/bin" ${_pkgname}/build/caddy
 }
 
 # vim: ts=2 sw=2 et:

REUSE.toml

@@ -0,0 +1,24 @@
+version = 1
+
+[[annotations]]
+path = [
+    "PKGBUILD",
+    "README.md",
+    "keys/**",
+    ".SRCINFO",
+    ".nvchecker.toml",
+    "*.install",
+    "*.sysusers",
+    "*.tmpfiles",
+    "*.logrotate",
+    "*.pam",
+    "*.service",
+    "*.socket",
+    "*.timer",
+    "*.desktop",
+    "*.hook",
+    "Caddyfile",
+    "use-data-dir-for-autosave.patch",
+]
+SPDX-FileCopyrightText = "Arch Linux contributors"
+SPDX-License-Identifier = "0BSD"

caddy-api.service

@@ -21,7 +21,7 @@ User=caddy
 Group=caddy
 Environment=XDG_DATA_HOME=/var/lib
 Environment=XDG_CONFIG_HOME=/var/lib
-ExecStart=/usr/bin/caddy run --environ --resume
+ExecStart=/usr/bin/caddy run --resume
 
 # Do not allow the process to be restarted in a tight loop. If the
 # process fails to start, something critical needs to be fixed.

caddy.service

@@ -28,7 +28,7 @@ Group=caddy
 Environment=XDG_DATA_HOME=/var/lib
 Environment=XDG_CONFIG_HOME=/etc
 ExecStartPre=/usr/bin/caddy validate --config /etc/caddy/Caddyfile
-ExecStart=/usr/bin/caddy run --environ --config /etc/caddy/Caddyfile
+ExecStart=/usr/bin/caddy run --config /etc/caddy/Caddyfile
 ExecReload=/usr/bin/caddy reload --config /etc/caddy/Caddyfile --force
 ExecStopPost=/usr/bin/rm -f /run/caddy/admin.socket
 

caddy.sysusers

@@ -1 +1 @@
-u caddy - "caddy daemon" /var/lib/caddy
+u! caddy - "Caddy web server" /var/lib/caddy

override-main-module-version.patch

@@ -1,43 +0,0 @@
---- a/caddy.go~	2022-10-02 18:58:35.059343203 +0200
-+++ b/caddy.go	2022-10-02 18:58:21.125992368 +0200
-@@ -875,39 +875,7 @@
- 	}
- 
- 	if full == "" {
--		var vcsRevision string
--		var vcsTime time.Time
--		var vcsModified bool
--		for _, setting := range bi.Settings {
--			switch setting.Key {
--			case "vcs.revision":
--				vcsRevision = setting.Value
--			case "vcs.time":
--				vcsTime, _ = time.Parse(time.RFC3339, setting.Value)
--			case "vcs.modified":
--				vcsModified, _ = strconv.ParseBool(setting.Value)
--			}
--		}
--
--		if vcsRevision != "" {
--			var modified string
--			if vcsModified {
--				modified = "+modified"
--			}
--			full = fmt.Sprintf("%s%s (%s)", vcsRevision, modified, vcsTime.Format(time.RFC822))
--			simple = vcsRevision
--
--			// use short checksum for simple, if hex-only
--			if _, err := hex.DecodeString(simple); err == nil {
--				simple = simple[:8]
--			}
--
--			// append date to simple since it can be convenient
--			// to know the commit date as part of the version
--			if !vcsTime.IsZero() {
--				simple += "-" + vcsTime.Format("20060102")
--			}
--		}
-+		full = "unknown"
- 	}
- 
- 	if simple == "" || simple == "(devel)" {