From 0fd3e1d543adf3bdb121149afea76749096a589f Mon Sep 17 00:00:00 2001 From: Dan Andresan Date: Thu, 22 May 2025 12:39:22 +0200 Subject: [PATCH 1/6] 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 --- .SRCINFO | 2 +- Caddyfile | 1 - PKGBUILD | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8eb3bea..a18d3fa 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -25,7 +25,7 @@ pkgbase = caddy sha512sums = 164037ea69ef02e9fdc55af3760849500fd90aa6d23ca29d55cc29c758041bef7e7cf89b23c7e0870bfbd2ecbb576fa9adf33c7c45bcabe68d15be4d6fc49145 sha512sums = 55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742 sha512sums = c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f - sha512sums = 716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0 + sha512sums = 4be1ed23e6600d8072c7f4fabd2bd926708502a55d84ae4f62aff9885c7b8e45ad0554503d0fc796338577adfca9e467c468a82ba56ffd69e4ec2778d69bc198 sha512sums = 563d6b45e91fc584fb5a27caaa382f59c140cb0a1b28b8d8faced4f7c7cad86d8671eb6ac10056f41518a842c8f606130d7e0c71df2b731d5eb0b4c868ea5d41 sha512sums = 0fedec714604566fb0da995cdfb2dd2cb8f3995bfa1d6c2e9a38ddd1da11634c3e37f2da381f715df4fc9ebd9653c3aa4806de47ae5094ea1fc19b7f5b795a30 diff --git a/Caddyfile b/Caddyfile index e8dda50..7170955 100644 --- a/Caddyfile +++ b/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 diff --git a/PKGBUILD b/PKGBUILD index 7d2445b..5ec632d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -31,7 +31,7 @@ sha512sums=('7539d0095ae5e18eb58d108970df24137b329b8a7d209a87a378e2dd039afed49e3 '164037ea69ef02e9fdc55af3760849500fd90aa6d23ca29d55cc29c758041bef7e7cf89b23c7e0870bfbd2ecbb576fa9adf33c7c45bcabe68d15be4d6fc49145' '55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742' 'c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f' - '716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0' + '4be1ed23e6600d8072c7f4fabd2bd926708502a55d84ae4f62aff9885c7b8e45ad0554503d0fc796338577adfca9e467c468a82ba56ffd69e4ec2778d69bc198' '563d6b45e91fc584fb5a27caaa382f59c140cb0a1b28b8d8faced4f7c7cad86d8671eb6ac10056f41518a842c8f606130d7e0c71df2b731d5eb0b4c868ea5d41' '0fedec714604566fb0da995cdfb2dd2cb8f3995bfa1d6c2e9a38ddd1da11634c3e37f2da381f715df4fc9ebd9653c3aa4806de47ae5094ea1fc19b7f5b795a30') validpgpkeys=( From d34b34bf20ccb851443b0d99c065ade13d0aa56d Mon Sep 17 00:00:00 2001 From: Levente Polyak Date: Sun, 25 May 2025 14:22:56 +0200 Subject: [PATCH 2/6] upgpkg: 2.10.0-2: fix config formatting warning --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a18d3fa..161fbaa 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = caddy pkgdesc = Fast web server with automatic HTTPS pkgver = 2.10.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/caddyserver/caddy arch = x86_64 license = Apache diff --git a/PKGBUILD b/PKGBUILD index 5ec632d..93a027f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ pkgname=caddy pkgver=2.10.0 -pkgrel=1 +pkgrel=2 pkgdesc='Fast web server with automatic HTTPS' url='https://github.com/caddyserver/caddy' arch=('x86_64') From 7f459138a3249fb350e8c654a49883097beeb7e7 Mon Sep 17 00:00:00 2001 From: Levente Polyak Date: Sun, 25 May 2025 14:25:24 +0200 Subject: [PATCH 3/6] use SPDX license identifier --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 161fbaa..d09b2a7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -4,7 +4,7 @@ pkgbase = caddy pkgrel = 2 url = https://github.com/caddyserver/caddy arch = x86_64 - license = Apache + license = Apache-2.0 makedepends = go makedepends = git depends = glibc diff --git a/PKGBUILD b/PKGBUILD index 93a027f..f38409c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgrel=2 pkgdesc='Fast web server with automatic HTTPS' url='https://github.com/caddyserver/caddy' arch=('x86_64') -license=('Apache') +license=(Apache-2.0) depends=('glibc') makedepends=('go' 'git') backup=('etc/caddy/Caddyfile') From 26a66c5bf5969ddd033d8b6c3542586a954991be Mon Sep 17 00:00:00 2001 From: Levente Polyak Date: Sun, 25 May 2025 14:33:26 +0200 Subject: [PATCH 4/6] chore: reformat for easiler diffs and conflict resolution --- .SRCINFO | 2 +- PKGBUILD | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d09b2a7..884dfc5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -5,8 +5,8 @@ pkgbase = caddy url = https://github.com/caddyserver/caddy arch = x86_64 license = Apache-2.0 - makedepends = go makedepends = git + makedepends = go depends = glibc backup = etc/caddy/Caddyfile source = git+https://github.com/caddyserver/caddy.git#tag=v2.10.0?signed diff --git a/PKGBUILD b/PKGBUILD index f38409c..c91c6b6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,11 +11,18 @@ pkgver=2.10.0 pkgrel=2 pkgdesc='Fast web server with automatic HTTPS' url='https://github.com/caddyserver/caddy' -arch=('x86_64') +arch=(x86_64) license=(Apache-2.0) -depends=('glibc') -makedepends=('go' 'git') -backup=('etc/caddy/Caddyfile') +depends=( + glibc +) +makedepends=( + git + go +) +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 @@ -38,11 +45,6 @@ validpgpkeys=( 29D0817A67156E4F25DC24782A349DD577D586A5 # Matthew Holt ) -#pkgver() { -# cd ${pkgname} -# git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' -#} - prepare() { cd "${pkgname}" # welcome page From 03383ef4a15aa10c048ead0e4e510e28507ef909 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Tue, 27 May 2025 15:50:05 +0300 Subject: [PATCH 5/6] 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 --- .SRCINFO | 1 + PKGBUILD | 1 + 2 files changed, 2 insertions(+) diff --git a/.SRCINFO b/.SRCINFO index 884dfc5..968afff 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -8,6 +8,7 @@ pkgbase = caddy makedepends = git makedepends = go depends = glibc + depends = mailcap backup = etc/caddy/Caddyfile source = git+https://github.com/caddyserver/caddy.git#tag=v2.10.0?signed source = caddy-dist::git+https://github.com/caddyserver/dist.git#tag=v2.10.0 diff --git a/PKGBUILD b/PKGBUILD index c91c6b6..4d697b7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,6 +15,7 @@ arch=(x86_64) license=(Apache-2.0) depends=( glibc + mailcap ) makedepends=( git From 2d9db1c1c7a2579d3a8076ddc34aef6a4ecda3e1 Mon Sep 17 00:00:00 2001 From: Levente Polyak Date: Tue, 3 Jun 2025 20:34:43 +0200 Subject: [PATCH 6/6] upgpkg: 2.10.0-3: add mailcap dependency --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 968afff..aa3a930 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = caddy pkgdesc = Fast web server with automatic HTTPS pkgver = 2.10.0 - pkgrel = 2 + pkgrel = 3 url = https://github.com/caddyserver/caddy arch = x86_64 license = Apache-2.0 diff --git a/PKGBUILD b/PKGBUILD index 4d697b7..f918f86 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ pkgname=caddy pkgver=2.10.0 -pkgrel=2 +pkgrel=3 pkgdesc='Fast web server with automatic HTTPS' url='https://github.com/caddyserver/caddy' arch=(x86_64)