⛄ Sync 2026-06-30 01:11:33

This commit is contained in:
github-actions[bot] committed 2026-06-30 01:11:33 +08:00
1 parent fb3826f4ad
commit a09508c01e
157 files changed
+78873 -73698

No files matched your search

+8 -5
View File
@@ -6,13 +6,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=caddy
PKG_VERSION:=2.11.4
PKG_RELEASE:=6
PKG_VERSION:=2.11.4.1
PKG_RELEASE:=7
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/caddyserver/caddy.git
PKG_SOURCE_DATE:=2026-05-23
PKG_SOURCE_VERSION:=44b667a79f48e6163570cd6b32fa806e12625516
PKG_SOURCE_DATE:=2026-06-22
PKG_SOURCE_VERSION:=13a4c3f43c79ca04064457ab9cf95b376c294141
PKG_MIRROR_HASH:=skip
PKG_LICENSE:=GPL-3.0-or-later
@@ -46,7 +46,10 @@ endef
define Build/Compile
$(call GoPackage/Build/Compile)
$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/caddy
if ! grep -q "UPX!" $(GO_PKG_BUILD_BIN_DIR)/caddy; then \
$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/caddy; \
fi
endef
define Package/caddy/install
@@ -1,6 +1,6 @@
diff -rNu a/cmd/caddy/main.go b/cmd/caddy/main.go
--- a/cmd/caddy/main.go 2026-05-22 23:25:04.000000000 +0800
+++ b/cmd/caddy/main.go 2026-05-23 01:11:34.865671285 +0800
--- a/cmd/caddy/main.go 2026-06-23 00:25:43.000000000 +0800
+++ b/cmd/caddy/main.go 2026-06-29 19:43:41.213131303 +0800
@@ -35,6 +35,8 @@
// plug in Caddy modules here
@@ -11,13 +11,13 @@ diff -rNu a/cmd/caddy/main.go b/cmd/caddy/main.go
func main() {
diff -rNu a/go.mod b/go.mod
--- a/go.mod 2026-05-22 23:25:04.000000000 +0800
+++ b/go.mod 2026-05-23 01:18:14.846072312 +0800
--- a/go.mod 2026-06-23 00:25:43.000000000 +0800
+++ b/go.mod 2026-06-29 19:45:42.789025997 +0800
@@ -1,12 +1,13 @@
module github.com/caddyserver/caddy/v2
-go 1.25.1
+go 1.26.3
+go 1.26.4
require (
github.com/BurntSushi/toml v1.6.0
@@ -28,7 +28,7 @@ diff -rNu a/go.mod b/go.mod
github.com/alecthomas/chroma/v2 v2.24.1
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b
github.com/caddyserver/certmagic v0.25.3
@@ -19,6 +20,7 @@
@@ -20,6 +21,7 @@
github.com/klauspost/compress v1.18.6
github.com/klauspost/cpuid/v2 v2.3.0
github.com/mholt/acmez/v3 v3.1.6
@@ -37,8 +37,8 @@ diff -rNu a/go.mod b/go.mod
github.com/quic-go/quic-go v0.59.1
github.com/smallstep/certificates v0.30.2
diff -rNu a/go.sum b/go.sum
--- a/go.sum 2026-05-22 23:25:04.000000000 +0800
+++ b/go.sum 2026-05-23 01:18:14.846072312 +0800
--- a/go.sum 2026-06-23 00:25:43.000000000 +0800
+++ b/go.sum 2026-06-29 19:45:42.788025990 +0800
@@ -40,6 +40,8 @@
github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
@@ -48,7 +48,7 @@ diff -rNu a/go.sum b/go.sum
github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs=
@@ -242,6 +244,8 @@
@@ -247,6 +249,8 @@
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
github.com/mholt/acmez/v3 v3.1.6 h1:eGVQNObP0pBN4sxqrXeg7MYqTOWyoiYpQqITVWlrevk=
github.com/mholt/acmez/v3 v3.1.6/go.mod h1:5nTPosTGosLxF3+LU4ygbgMRFDhbAVpqMI4+a4aHLBY=