balki-aur/caddy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Compare commits

base: balki-aur:v2.9.1-11
Branches Tags
balki-aur:main
balki-aur:v2.9.1-11
..
compare: balki-aur:main
Branches Tags
balki-aur:main
balki-aur:v2.9.1-11

11 Commits
v2.9.1-11 ... main

Author SHA1 Message Date
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
3 changed files with 28 additions and 25 deletions
Expand all files Collapse all files

19
.SRCINFO
View File

@ -1,16 +1,17 @@
pkgbase = caddy pkgbase = caddy
pkgdesc = Fast web server with automatic HTTPS pkgdesc = Fast web server with automatic HTTPS
pkgver = 2.9.1 pkgver = 2.10.0
pkgrel = 11 pkgrel = 13
url = https://github.com/caddyserver/caddy url = https://github.com/caddyserver/caddy
arch = x86_64 arch = x86_64
license = Apache license = Apache-2.0
makedepends = go
makedepends = git makedepends = git
makedepends = go
depends = glibc depends = glibc
depends = mailcap
backup = etc/caddy/Caddyfile backup = etc/caddy/Caddyfile
source = git+https://github.com/caddyserver/caddy.git#tag=v2.9.1?signed 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.9.1 source = caddy-dist::git+https://github.com/caddyserver/dist.git#tag=v2.10.0
source = caddy.service source = caddy.service
source = caddy-api.service source = caddy-api.service
source = caddy.tmpfiles source = caddy.tmpfiles
@ -19,13 +20,13 @@ pkgbase = caddy
source = use-data-dir-for-autosave.patch source = use-data-dir-for-autosave.patch
source = override-main-module-version.patch source = override-main-module-version.patch
validpgpkeys = 29D0817A67156E4F25DC24782A349DD577D586A5 validpgpkeys = 29D0817A67156E4F25DC24782A349DD577D586A5
sha512sums = 3123d18c29df7c3dcd88dcbeb143a9fede424d385a2c48434d7ee11e6ceb40ab0764ed72ffab617e4661eef76236dcd2de5ee701432b12e9f1492b904d3850d4 sha512sums = 7539d0095ae5e18eb58d108970df24137b329b8a7d209a87a378e2dd039afed49e335a20032734d26a7d69add9273f672a7adfe314f0d3783528395e1a6955c8
sha512sums = f959f1486c170dad5f5efab80ca90c0e272b37e313cb47826b371854ae1937d98bdfc345fab8aac595c269bc617ed719aabdea0467d94ad88887d7449e902c09 sha512sums = 4cf1acc1ab4643bcd0b639c82959a94a5e26d8ff92a1fcdfa572da18a7d0e99f9ac925a3d17a7e7fa63af29f1316b1d70eb51c2e5099e686be67b6d9f9b24822
sha512sums = 78b01fa7156cab0df0d5923250a0e85f6e2dddb2b01b9ea66b49d3e17b228954491922fac6339fcc2caa8342168ca138061a9c4eff41a7a5b6a86e7f9ecb885e sha512sums = 78b01fa7156cab0df0d5923250a0e85f6e2dddb2b01b9ea66b49d3e17b228954491922fac6339fcc2caa8342168ca138061a9c4eff41a7a5b6a86e7f9ecb885e
sha512sums = 164037ea69ef02e9fdc55af3760849500fd90aa6d23ca29d55cc29c758041bef7e7cf89b23c7e0870bfbd2ecbb576fa9adf33c7c45bcabe68d15be4d6fc49145 sha512sums = 164037ea69ef02e9fdc55af3760849500fd90aa6d23ca29d55cc29c758041bef7e7cf89b23c7e0870bfbd2ecbb576fa9adf33c7c45bcabe68d15be4d6fc49145
sha512sums = 55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742 sha512sums = 55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742
sha512sums = c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f sha512sums = c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f
sha512sums = 716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0 sha512sums = 4be1ed23e6600d8072c7f4fabd2bd926708502a55d84ae4f62aff9885c7b8e45ad0554503d0fc796338577adfca9e467c468a82ba56ffd69e4ec2778d69bc198
sha512sums = 563d6b45e91fc584fb5a27caaa382f59c140cb0a1b28b8d8faced4f7c7cad86d8671eb6ac10056f41518a842c8f606130d7e0c71df2b731d5eb0b4c868ea5d41 sha512sums = 563d6b45e91fc584fb5a27caaa382f59c140cb0a1b28b8d8faced4f7c7cad86d8671eb6ac10056f41518a842c8f606130d7e0c71df2b731d5eb0b4c868ea5d41
sha512sums = 0fedec714604566fb0da995cdfb2dd2cb8f3995bfa1d6c2e9a38ddd1da11634c3e37f2da381f715df4fc9ebd9653c3aa4806de47ae5094ea1fc19b7f5b795a30 sha512sums = 0fedec714604566fb0da995cdfb2dd2cb8f3995bfa1d6c2e9a38ddd1da11634c3e37f2da381f715df4fc9ebd9653c3aa4806de47ae5094ea1fc19b7f5b795a30

1
Caddyfile
View File

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

33
PKGBUILD
View File

@ -7,15 +7,23 @@
# Contributor: Akshay S Dinesh <asdofindia at gmail dot com> # Contributor: Akshay S Dinesh <asdofindia at gmail dot com>
pkgname=caddy pkgname=caddy
pkgver=2.9.1 pkgver=2.10.0
pkgrel=11 pkgrel=13
pkgdesc='Fast web server with automatic HTTPS' pkgdesc='Fast web server with automatic HTTPS'
url='https://github.com/caddyserver/caddy' url='https://github.com/caddyserver/caddy'
arch=('x86_64') arch=(x86_64)
license=('Apache') license=(Apache-2.0)
depends=('glibc') depends=(
makedepends=('go' 'git') glibc
backup=('etc/caddy/Caddyfile') mailcap
)
makedepends=(
git
go
)
backup=(
etc/caddy/Caddyfile
)
source=("git+https://github.com/caddyserver/caddy.git#tag=v${pkgver}?signed" 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-dist::"git+https://github.com/caddyserver/dist.git#tag=v${pkgver}"
caddy.service caddy.service
@ -25,24 +33,19 @@ source=("git+https://github.com/caddyserver/caddy.git#tag=v${pkgver}?signed"
Caddyfile Caddyfile
use-data-dir-for-autosave.patch use-data-dir-for-autosave.patch
override-main-module-version.patch) override-main-module-version.patch)
sha512sums=('3123d18c29df7c3dcd88dcbeb143a9fede424d385a2c48434d7ee11e6ceb40ab0764ed72ffab617e4661eef76236dcd2de5ee701432b12e9f1492b904d3850d4' sha512sums=('7539d0095ae5e18eb58d108970df24137b329b8a7d209a87a378e2dd039afed49e335a20032734d26a7d69add9273f672a7adfe314f0d3783528395e1a6955c8'
'f959f1486c170dad5f5efab80ca90c0e272b37e313cb47826b371854ae1937d98bdfc345fab8aac595c269bc617ed719aabdea0467d94ad88887d7449e902c09' '4cf1acc1ab4643bcd0b639c82959a94a5e26d8ff92a1fcdfa572da18a7d0e99f9ac925a3d17a7e7fa63af29f1316b1d70eb51c2e5099e686be67b6d9f9b24822'
'78b01fa7156cab0df0d5923250a0e85f6e2dddb2b01b9ea66b49d3e17b228954491922fac6339fcc2caa8342168ca138061a9c4eff41a7a5b6a86e7f9ecb885e' '78b01fa7156cab0df0d5923250a0e85f6e2dddb2b01b9ea66b49d3e17b228954491922fac6339fcc2caa8342168ca138061a9c4eff41a7a5b6a86e7f9ecb885e'
'164037ea69ef02e9fdc55af3760849500fd90aa6d23ca29d55cc29c758041bef7e7cf89b23c7e0870bfbd2ecbb576fa9adf33c7c45bcabe68d15be4d6fc49145' '164037ea69ef02e9fdc55af3760849500fd90aa6d23ca29d55cc29c758041bef7e7cf89b23c7e0870bfbd2ecbb576fa9adf33c7c45bcabe68d15be4d6fc49145'
'55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742' '55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742'
'c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f' 'c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f'
'716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0' '4be1ed23e6600d8072c7f4fabd2bd926708502a55d84ae4f62aff9885c7b8e45ad0554503d0fc796338577adfca9e467c468a82ba56ffd69e4ec2778d69bc198'
'563d6b45e91fc584fb5a27caaa382f59c140cb0a1b28b8d8faced4f7c7cad86d8671eb6ac10056f41518a842c8f606130d7e0c71df2b731d5eb0b4c868ea5d41' '563d6b45e91fc584fb5a27caaa382f59c140cb0a1b28b8d8faced4f7c7cad86d8671eb6ac10056f41518a842c8f606130d7e0c71df2b731d5eb0b4c868ea5d41'
'0fedec714604566fb0da995cdfb2dd2cb8f3995bfa1d6c2e9a38ddd1da11634c3e37f2da381f715df4fc9ebd9653c3aa4806de47ae5094ea1fc19b7f5b795a30') '0fedec714604566fb0da995cdfb2dd2cb8f3995bfa1d6c2e9a38ddd1da11634c3e37f2da381f715df4fc9ebd9653c3aa4806de47ae5094ea1fc19b7f5b795a30')
validpgpkeys=( validpgpkeys=(
29D0817A67156E4F25DC24782A349DD577D586A5 # Matthew Holt <mholt@users.noreply.github.com> 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() { 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/caddy-dns/cloudflare"' cmd/caddy/main.go