From aec7ddac4689cc715f45e3d1a973406e1303aef4 Mon Sep 17 00:00:00 2001 From: Feng Ruohang Date: Sun, 25 Oct 2026 21:33:40 +0800 Subject: [PATCH] deps: integrate Console repairs and the released SILO libraries Signed-off-by: Feng Ruohang --- CHANGELOG.md | 15 +++++++++++++-- CREDITS | 12 ++++++++++++ README.md | 6 ++++++ README_ZH.md | 5 +++++ go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 6 files changed, 48 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be2e2747c..184d44394 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,19 @@ Thanks to [@910patin](https://github.com/910patin) for the original fix and reproduction in [#250](https://github.com/pgsty/silo/pull/250). - Build the server and standalone debugging tools with Go 1.27.3 and refresh - Go dependencies, including silo-pkg v3.15.0. Keep the published Console - and mcli references. + Go dependencies, including silo-pkg v3.15.1, the published mcli 20261025 + source and upstream minio-go `ab93db7ba435` for multipart, read/seek and + batch-delete fixes. Retain output-format and NetBSD compatibility selections. +- Embed the unreleased Console 2.5.0 candidate `abc1729b5a23`, including its + GUI update, diagnostic WebSocket closing handshake and complete health-report + decoding. This selects a source commit, not a new Console release. +- Read current bucket inventory in account-info responses so Console refreshes + immediately reflect successful creation and deletion. This management endpoint + now performs a live list instead of returning a cached inventory. +- Restore the native built-in policy immediately after resetting an override. + Peer and etcd notifications reload committed state, so delayed delete events + preserve subsequent edits. Keep deletion revisions, policy-in-use checks and + custom-policy deletion behavior; storage failures retain the previous policy. - Preserve Kafka's default broker protocol 2.1 and terminal-width behavior; fix legacy DARE v1 key unsealing and verify DARE v1/v2 and MinKMS TLS compatibility. - Update bundled curl to 8.23.0 and require patched static libraries. Apply diff --git a/CREDITS b/CREDITS index ea7129b5e..37e996c5b 100644 --- a/CREDITS +++ b/CREDITS @@ -18146,6 +18146,18 @@ The licenses and notices of every third-party component linked into the binary or bundled into the web application are collected in the CREDITS file next to this notice (`console credits`, or /legal/CREDITS on a running server). +The in-tree MinIO Design System (MDS) in web-app/packages/mds is derived from +https://github.com/georgmangold/mds, revision +b66d0b06272ae88e3975248691799a1cb0b4d6de (v1.1.5.9), and is licensed under +AGPL-3.0-or-later. Copyright remains with MinIO, Inc. and its contributors. +Its unchanged LICENSE and vendoring history are in web-app/packages/mds; +local modifications are documented in UPSTREAM.md there. + +The surface/shadow token recipes adapt Fluid Functionalism by Micka Touillaud, +https://github.com/mickadesign/fluid-functionalism, under the MIT License. +Copyright (c) 2026 Micka Touillaud. The full MIT notice is retained in +web-app/licenses/fluid-functionalism-MIT.txt and generated into CREDITS. + ================================================================ github.com/minio/crc64nvme diff --git a/README.md b/README.md index a38d661ac..38c9d3677 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,12 @@ This release strengthens Object Lock and IAM authorization, makes scoped STS rev Read the [release notes](https://github.com/pgsty/silo/releases/tag/RELEASE.2026-10-18T00-00-00Z) before upgrading, especially the removal of strict multipart listing, coordinated server upgrades, and measured performance costs. See [CONTRIBUTORS.md](CONTRIBUTORS.md) for the people behind the code, reports, and documentation. +Current source is unreleased: Go 1.27.3, silo-pkg v3.15.1, mcli 20261025, +upstream minio-go `ab93db7ba435`, and the Console 2.5.0 candidate `abc1729b5a23`. +It includes the Server IAM cache repair needed by Console's **Reset to default** +action. See [CHANGELOG.md](CHANGELOG.md#unreleased); the published artifacts above +retain their original component versions. + ## Overview PGSTY SILO keeps one maintained release line of the open-source MinIO server alive after upstream ended community distribution: builds, packages, multi-arch images, security fixes, and the full web console. Pigsty runs it in production as its PostgreSQL backup repository. diff --git a/README_ZH.md b/README_ZH.md index c6377785c..f3f7839cd 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -43,6 +43,11 @@ 升级前请阅读[发行说明](https://github.com/pgsty/silo/releases/tag/RELEASE.2026-10-18T00-00-00Z),特别是 strict 分片列表的移除、服务端协调升级要求与实测性能成本。代码、问题报告和文档贡献者见 [CONTRIBUTORS.md](CONTRIBUTORS.md)。 +当前源码尚未发布:使用 Go 1.27.3、silo-pkg v3.15.1、mcli 20261025、上游 +minio-go `ab93db7ba435`,并内嵌 Console 2.5.0 候选提交 `abc1729b5a23`。 +其中包含 Console **Reset to default(恢复默认)** 所需的 Server IAM 缓存修复。 +详见 [CHANGELOG.md](CHANGELOG.md#unreleased);上述已发布制品仍保留原有组件版本。 + ## 概述 上游停止社区发行后,Silo 为开源 MinIO 服务端维护一条持续可用的版本线:构建、软件包、多架构镜像、安全修复与完整 Web 控制台。Pigsty 在生产环境中用它承载 PostgreSQL 备份存储。 diff --git a/go.mod b/go.mod index 27d308672..00417d09f 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.27.3 // Console and MC retain their historical module paths for best-effort upstream // compatibility. Pin the maintained PGSTY implementations used by SILO. -replace github.com/minio/console => github.com/pgsty/silo-console v0.0.0-20261017112417-ef2dd2c41d21 +replace github.com/minio/console => github.com/pgsty/silo-console v0.0.0-20261025133048-abc1729b5a23 -replace github.com/minio/mc => github.com/pgsty/mc v0.0.0-20261017101407-fa3b8bf72458 +replace github.com/minio/mc => github.com/pgsty/mc v0.0.0-20261025104502-dcc78d506f94 // v22.7.0 does not compile on NetBSD because its unix implementation uses // CLOCK_MONOTONIC, which is unavailable there. Keep the last portable release @@ -68,7 +68,7 @@ require ( github.com/minio/kms-go/kes v0.3.1 github.com/minio/kms-go/kms v0.7.0 github.com/minio/madmin-go/v3 v3.0.110 - github.com/minio/minio-go/v7 v7.4.1 + github.com/minio/minio-go/v7 v7.4.2-0.20261020194015-ab93db7ba435 github.com/minio/mux v1.10.1 github.com/minio/selfupdate v0.6.0 github.com/minio/simdjson-go v0.4.5 @@ -81,7 +81,7 @@ require ( github.com/nats-io/stan.go v0.10.4 github.com/ncw/directio v1.0.5 github.com/nsqio/go-nsq v1.1.0 - github.com/pgsty/silo-pkg/v3 v3.15.0 + github.com/pgsty/silo-pkg/v3 v3.15.1 github.com/philhofer/fwd v1.2.1 github.com/pierrec/lz4/v4 v4.1.33 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 070d02110..61f6ff306 100644 --- a/go.sum +++ b/go.sum @@ -442,8 +442,8 @@ github.com/minio/madmin-go/v3 v3.0.110 h1:FIYekj7YPc430ffpXFWiUtyut3qBt/unIAcDzJ github.com/minio/madmin-go/v3 v3.0.110/go.mod h1:WOe2kYmYl1OIlY2DSRHVQ8j1v4OItARQ6jGyQqcCud8= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= -github.com/minio/minio-go/v7 v7.4.1 h1:PtU/zIOfQRWZ+QydXAZysc+xZYHdG+BBR4Z6TUvy73w= -github.com/minio/minio-go/v7 v7.4.1/go.mod h1:nQnQi7zTfXR4lREtYXZQWqo5aw0Rqv+ZqCGrTORygRk= +github.com/minio/minio-go/v7 v7.4.2-0.20261020194015-ab93db7ba435 h1:BIn1BJi2zZ+z5BIMsr02USFB+Wmipc4SrIAA8nksNH0= +github.com/minio/minio-go/v7 v7.4.2-0.20261020194015-ab93db7ba435/go.mod h1:nQnQi7zTfXR4lREtYXZQWqo5aw0Rqv+ZqCGrTORygRk= github.com/minio/mux v1.10.1 h1:grrK8SwRKbkNFE6qG7WAvFGH09bB46d5teOOtKfQ14s= github.com/minio/mux v1.10.1/go.mod h1:INYT4sMSTJy0QWUEA/E2DZNxJ5sAxIwbnyZjkzNFRfE= github.com/minio/pkg/v3 v3.11.0 h1:WjzWGP7lyuupJgUSRim1RDtNujHtESyMQF7qSR4r5Dg= @@ -506,12 +506,12 @@ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pgsty/mc v0.0.0-20261017101407-fa3b8bf72458 h1:f3kbkjtjj6D7PXmsIeKrv8phXncq1OVrxKM2e4I6rVk= -github.com/pgsty/mc v0.0.0-20261017101407-fa3b8bf72458/go.mod h1:n8NDi0J3hPUGCIM9tOxlhYXkYS9xiTVIxlxa3Rwx1cw= -github.com/pgsty/silo-console v0.0.0-20261017112417-ef2dd2c41d21 h1:PHxPswGiEwU9MVisu0/Ab7AcNX4IveiX1thQzUXOsM4= -github.com/pgsty/silo-console v0.0.0-20261017112417-ef2dd2c41d21/go.mod h1:HFNaafu5iCO9bWS86PIyTbgF+yPD4phFt+gxML/1jJU= -github.com/pgsty/silo-pkg/v3 v3.15.0 h1:T4Zg7sEzbG9i5Zh/W1qjJhng5SOBztRs7syTAaRVy0g= -github.com/pgsty/silo-pkg/v3 v3.15.0/go.mod h1:sMDSBNxJGdSZprPGQDbH/KcKrWf1KjNzR8hQurNlyOA= +github.com/pgsty/mc v0.0.0-20261025104502-dcc78d506f94 h1:M5n0rCPOTyo3RiQBeSCQW/klx08efFpiVYmPq6eoM3w= +github.com/pgsty/mc v0.0.0-20261025104502-dcc78d506f94/go.mod h1:H3Uwlm1Qj3kPsbmojhNnv3aj5a+QdjdTKwv4w4gMSF8= +github.com/pgsty/silo-console v0.0.0-20261025133048-abc1729b5a23 h1:VwIfjyv4L3YgOSu9loimfUhV3mm3D3iQibJZpzTaD8o= +github.com/pgsty/silo-console v0.0.0-20261025133048-abc1729b5a23/go.mod h1:fMxNcVxan3mu9mc7HCRiczSyQoFrbZEGumEmpatxtds= +github.com/pgsty/silo-pkg/v3 v3.15.1 h1:T5rqY3HR1WGybcjnx/ghBvliEgo7yNCA7JAC3f1LpTk= +github.com/pgsty/silo-pkg/v3 v3.15.1/go.mod h1:GmTF6fIEkTrzgM+ysWWfDZIlVRD2DYAJkKjA5bjiWpQ= github.com/philhofer/fwd v1.2.1 h1:UtpS73q8bFgy/yH3gCq8LSNvj5gv/FowNOiWZa7uKwQ= github.com/philhofer/fwd v1.2.1/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= github.com/pierrec/lz4/v4 v4.1.33 h1:GjG1TJ1V4IzKP8L96muuuDNpTwd7D+l2ccXrjAbe014=