Update to 2.11.2

Update to 2.11.1
Remove signature verification
2026-03-09 21:55:22 -04:00 · 2026-02-26 14:25:07 -05:00 · 2026-01-17 17:44:07 -05:00 · 2026-01-17 10:17:01 -05:00 · 2026-01-17 09:57:52 -05:00 · 2026-01-02 02:26:05 +01:00
8 changed files with 91 additions and 43 deletions
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,20 @@
-pkgbase = caddy
+pkgbase = caddy-balki
 	pkgdesc = Fast web server with automatic HTTPS
-	pkgver = 2.9.1
-	pkgrel = 11
+	pkgver = 2.11.2
+	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.2
+	source = caddy-dist::git+https://github.com/caddyserver/dist.git#tag=v2.11.2
 	source = caddy.service
 	source = caddy-api.service
 	source = caddy.tmpfiles
@@ -18,15 +22,14 @@ pkgbase = caddy
 	source = Caddyfile
 	source = use-data-dir-for-autosave.patch
 	source = override-main-module-version.patch
-	validpgpkeys = 29D0817A67156E4F25DC24782A349DD577D586A5
-	sha512sums = 3123d18c29df7c3dcd88dcbeb143a9fede424d385a2c48434d7ee11e6ceb40ab0764ed72ffab617e4661eef76236dcd2de5ee701432b12e9f1492b904d3850d4
-	sha512sums = f959f1486c170dad5f5efab80ca90c0e272b37e313cb47826b371854ae1937d98bdfc345fab8aac595c269bc617ed719aabdea0467d94ad88887d7449e902c09
-	sha512sums = 78b01fa7156cab0df0d5923250a0e85f6e2dddb2b01b9ea66b49d3e17b228954491922fac6339fcc2caa8342168ca138061a9c4eff41a7a5b6a86e7f9ecb885e
-	sha512sums = 164037ea69ef02e9fdc55af3760849500fd90aa6d23ca29d55cc29c758041bef7e7cf89b23c7e0870bfbd2ecbb576fa9adf33c7c45bcabe68d15be4d6fc49145
+	sha512sums = 05965d0ac5ac3eb9e9de5b1c3c95ca30ee982cae806fffc099463b5634f2eb5f52f6ae020a28c53da6556fa3a2b599dce0d0da5b00ee49a685c432f9a2e57f6a
+	sha512sums = fe9a2badd9d385aed0f5e625d99eaf4fa67862e076c4fd7b28a26984aaaae7310887759d3a4a97a128fffb7dc4b266717d902b234e19643b0c2d818849d165e3
+	sha512sums = e6cdf5f81af01d0a6290ef9503d0bd90244684a6305e5638f079c234b2bc6454688daea3ea9d1b6a6f00eeba0375e9c4372e64c5cb49b5d1206384d2a7201273
+	sha512sums = 6c9d5dce22f1f0f4e222d4adeccd93c486b3be2ac221a7f8a58933b22ce91fe3da8ad38e6db7212846e4ab6336ebc058df16215a43636b965dfed469b3aaa2f6
 	sha512sums = 55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742
 	sha512sums = c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f
-	sha512sums = 716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0
+	sha512sums = 4be1ed23e6600d8072c7f4fabd2bd926708502a55d84ae4f62aff9885c7b8e45ad0554503d0fc796338577adfca9e467c468a82ba56ffd69e4ec2778d69bc198
 	sha512sums = 563d6b45e91fc584fb5a27caaa382f59c140cb0a1b28b8d8faced4f7c7cad86d8671eb6ac10056f41518a842c8f606130d7e0c71df2b731d5eb0b4c868ea5d41
 	sha512sums = 0fedec714604566fb0da995cdfb2dd2cb8f3995bfa1d6c2e9a38ddd1da11634c3e37f2da381f715df4fc9ebd9653c3aa4806de47ae5094ea1fc19b7f5b795a30

-pkgname = caddy
+pkgname = caddy-balki
--- a/1
+++ b/1
@@ -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
--- a/12
+++ b/12
@@ -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.
--- a/LICENSES/0BSD.txt
+++ b/LICENSES/0BSD.txt
@@ -0,0 +1 @@
+../LICENSE
--- a/60
+++ b/60
@@ -6,17 +6,29 @@
 # 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.2
+pkgrel=1
 pkgdesc='Fast web server with automatic HTTPS'
 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"
+arch=(x86_64)
+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
@@ -25,27 +37,23 @@ source=("git+https://github.com/caddyserver/caddy.git#tag=v${pkgver}?signed"
        Caddyfile
        use-data-dir-for-autosave.patch
        override-main-module-version.patch)
-sha512sums=('3123d18c29df7c3dcd88dcbeb143a9fede424d385a2c48434d7ee11e6ceb40ab0764ed72ffab617e4661eef76236dcd2de5ee701432b12e9f1492b904d3850d4'
-            'f959f1486c170dad5f5efab80ca90c0e272b37e313cb47826b371854ae1937d98bdfc345fab8aac595c269bc617ed719aabdea0467d94ad88887d7449e902c09'
-            '78b01fa7156cab0df0d5923250a0e85f6e2dddb2b01b9ea66b49d3e17b228954491922fac6339fcc2caa8342168ca138061a9c4eff41a7a5b6a86e7f9ecb885e'
-            '164037ea69ef02e9fdc55af3760849500fd90aa6d23ca29d55cc29c758041bef7e7cf89b23c7e0870bfbd2ecbb576fa9adf33c7c45bcabe68d15be4d6fc49145'
+sha512sums=('05965d0ac5ac3eb9e9de5b1c3c95ca30ee982cae806fffc099463b5634f2eb5f52f6ae020a28c53da6556fa3a2b599dce0d0da5b00ee49a685c432f9a2e57f6a'
+            'fe9a2badd9d385aed0f5e625d99eaf4fa67862e076c4fd7b28a26984aaaae7310887759d3a4a97a128fffb7dc4b266717d902b234e19643b0c2d818849d165e3'
+            'e6cdf5f81af01d0a6290ef9503d0bd90244684a6305e5638f079c234b2bc6454688daea3ea9d1b6a6f00eeba0375e9c4372e64c5cb49b5d1206384d2a7201273'
+            '6c9d5dce22f1f0f4e222d4adeccd93c486b3be2ac221a7f8a58933b22ce91fe3da8ad38e6db7212846e4ab6336ebc058df16215a43636b965dfed469b3aaa2f6'
            '55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742'
            'c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f'
-            '716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0'
+            '4be1ed23e6600d8072c7f4fabd2bd926708502a55d84ae4f62aff9885c7b8e45ad0554503d0fc796338577adfca9e467c468a82ba56ffd69e4ec2778d69bc198'
            '563d6b45e91fc584fb5a27caaa382f59c140cb0a1b28b8d8faced4f7c7cad86d8671eb6ac10056f41518a842c8f606130d7e0c71df2b731d5eb0b4c868ea5d41'
            '0fedec714604566fb0da995cdfb2dd2cb8f3995bfa1d6c2e9a38ddd1da11634c3e37f2da381f715df4fc9ebd9653c3aa4806de47ae5094ea1fc19b7f5b795a30')
-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'
-#}
+# validpgpkeys=(
+#   29D0817A67156E4F25DC24782A349DD577D586A5 # Matthew Holt <mholt@users.noreply.github.com>
+# )

 prepare() {
-  cd "${pkgname}"
+  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

  # welcome page
@@ -59,7 +67,7 @@ prepare() {
 }

 build() {
-  cd "${pkgname}/cmd/caddy/"
+  cd "${_pkgname}/cmd/caddy/"
  export CGO_LDFLAGS="${LDFLAGS}"
  export CGO_CPPFLAGS="${CPPFLAGS}"
  export CGO_CFLAGS="${CFLAGS}"
@@ -74,7 +82,7 @@ build() {

 check() {
  # Disabled for now, because of failing tests
-  cd "${pkgname}"
+  cd "${_pkgname}"
  go test ./...
  version=$(./cmd/caddy/caddy version)
  echo "Caddy version: ${version}"
@@ -84,7 +92,7 @@ check() {
 }

 package() {
-  cd "${pkgname}"
+  cd "${_pkgname}"
  install -Dm 755 cmd/caddy/caddy -t "${pkgdir}/usr/bin"

  install -Dm 644 "${srcdir}/caddy.service" "${srcdir}/caddy-api.service" -t "${pkgdir}/usr/lib/systemd/system"
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -0,0 +1,25 @@
+version = 1
+
+[[annotations]]
+path = [
+    "PKGBUILD",
+    "README.md",
+    "keys/**",
+    ".SRCINFO",
+    ".nvchecker.toml",
+    "*.install",
+    "*.sysusers",
+    "*.tmpfiles",
+    "*.logrotate",
+    "*.pam",
+    "*.service",
+    "*.socket",
+    "*.timer",
+    "*.desktop",
+    "*.hook",
+    "Caddyfile",
+    "override-main-module-version.patch",
+    "use-data-dir-for-autosave.patch",
+]
+SPDX-FileCopyrightText = "Arch Linux contributors"
+SPDX-License-Identifier = "0BSD"
--- a/caddy-api.service
+++ b/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.
--- a/caddy.service
+++ b/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
Author	SHA1	Message	Date
Balakrishnan Balasubramanian	53aec3f3df	Update to 2.11.2	2026-03-09 21:55:22 -04:00
Balakrishnan Balasubramanian	f8cea4a9fe	Update to 2.11.1 Remove signature verification	2026-02-26 14:25:07 -05:00
Balakrishnan Balasubramanian	9d61bdb9bb	rename package	2026-01-17 17:44:07 -05:00
Balakrishnan Balasubramanian	28b5fbe4c5	Add wol, update shasums	2026-01-17 10:17:01 -05:00
Balakrishnan Balasubramanian	7bebdd9c24	Merge remote-tracking branch 'aur/main'	2026-01-17 09:57:52 -05:00
Balakrishnan Balasubramanian	ac90dad217	Remove `--environ` flag in caddy.service	2026-01-02 02:26:05 +01:00
andrin.geiger	4a9dad0116	Make package reproducible by disabling LTO	2026-01-02 02:18:21 +01:00
Levente Polyak	5e718b7b6a	reuse: add files to license declaration	2025-12-14 20:16:49 +01:00
Balakrishnan Balasubramanian	a8cf5f52db	Merge remote-tracking branch 'aur/main'	2025-11-02 11:51:48 -05:00
T.J. Townsend	a4aa0558e5	upgpkg: 2.10.2-1: update to 2.10.2	2025-10-08 09:41:09 -04:00
Balakrishnan Balasubramanian	0b4de56e2c	Merge remote-tracking branch 'aur/main'	2025-09-06 16:40:36 -04:00
Sven-Hendrik Haase	897cb3ba89	License package as 0BSD This implements RFC40 and RFC52. https://lists.archlinux.org/archives/list/arch-dev-public@lists.archlinux.org/thread/XR3VAUWC5LNMTVOCKFOHYYEGUQ4ZFCNG/	2025-07-26 05:24:53 +02:00
Balakrishnan Balasubramanian	69eaa41413	Merge remote-tracking branch 'aur/main'	2025-06-04 15:08:15 -04:00
Balakrishnan Balasubramanian	5bd5e71794	Merge remote-tracking branch 'aur/main'	2025-06-04 15:06:29 -04:00
Levente Polyak	2d9db1c1c7	upgpkg: 2.10.0-3: add mailcap dependency	2025-06-03 20:34:43 +02:00
nl6720	03383ef4a1	Add mailcap to dependencies Without `/etc/mime.types` (from mailcap) or alternatively `/usr/share/mime/globs2` (created by the pacman hook of shared-mime-info), Caddy will not set a `Content-Type` header for the files it serves. See https://wiki.archlinux.org/title/Caddy#Missing_Content-Type	2025-05-27 15:58:23 +03:00
Levente Polyak	26a66c5bf5	chore: reformat for easiler diffs and conflict resolution	2025-05-25 14:33:26 +02:00
Levente Polyak	7f459138a3	use SPDX license identifier	2025-05-25 14:25:24 +02:00
Levente Polyak	d34b34bf20	upgpkg: 2.10.0-2: fix config formatting warning	2025-05-25 14:22:56 +02:00
Dan Andresan	0fd3e1d543	Correct Caddyfile formatting Running 'caddy validate' on included Caddyfile triggered the warning: Caddyfile input is not formatted; run 'caddy fmt --overwrite' to fix inconsistencies {"adapter": "caddyfile", "file": "Caddyfile", "line": 12} This fix removes the empty line (at line 12) and the validation will no longer complain. Fixing https://gitlab.archlinux.org/archlinux/packaging/packages/caddy/-/issues/5	2025-05-22 12:55:56 +02:00
Christian Rebischke	773d290185	upgpkg: 2.10.0-1	2025-05-17 22:30:40 +02:00
Balakrishnan Balasubramanian	aed177d94b	Merge remote-tracking branch 'origin/main'	2025-04-08 00:13:32 -04:00
Christian Rebischke	fdad981001	upgpkg: 2.9.1-1	2025-03-07 00:26:29 +01:00