sync: develop -> develop-v2 (util-linux acceptance, #1156) - #1158
Merged
Conversation
…1156) `Build image (dashboard)` fails the CVE gate on `develop` right now. Its CI has not run since 2026-08-19 17:58, so the branch only looks green — reproduced directly by building the image and scanning it with the gate's own flags: 27 HIGH, exit 1. CVE-2026-53612, CVE-2026-53613 and CVE-2026-53614 are three more advisories in the util-linux family that CVE-2026-53615 already represents, with the same affected packages, the same fix and the same clearing condition. They joined the same entry rather than getting one of their own. A base bump cannot clear them, and that was checked rather than assumed: `docker pull python:3.11-slim` returns the exact digest build/dashboard/Dockerfile already pins, and `dpkg-query` in it reports util-linux 2.41-5 — not the 2.41.5-0+deb13u1 the advisories name. There is nothing newer to move to, so this closes only when upstream rebuilds the image on the fixed Debian packages. Verified by scanning the real image with the gate's exact settings, before and after: exit 1 with 27 debian findings, exit 0 with 0.
…-cves fix(ci): accept the three new util-linux advisories alongside 53615 (#1156)
# Conflicts: # .trivyignore
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Twin sync:
develop→develop-v2, carrying #1157 (the util-linux acceptance for #1156).Two commits, one file, one conflict — in
.trivyignore, which both lanes edited today for differentreasons. That conflict is the whole content of this PR.
The conflict, and why neither side could win
develop-v2had fix(os): clear the appliance rootfs CVE gate at the source (#1153) #1154: the Go-binaries block rewritten, two mutes deleted (x/text and grpc,now fixed at the source by the
GO_RAISESentries), andCVE-2026-34040kept with new reasoning.develophad fix(ci): accept the three new util-linux advisories alongside 53615 (#1156) #1157: the util-linux entry rewritten to hold four advisories instead of one.They overlap because they are adjacent blocks in the same file, so git presented one large hunk.
Taking
--ourswould have silently dropped the util-linux fix and left this lane's dashboard scanred; taking
--theirswould have dropped the entire #1154 rewrite and re-added two mutes forfindings that are now fixed at the source — the exact thing #1154 argues against, since a mute
over a fixed finding destroys the evidence the fix landed.
Resolved hunk-by-hunk, keeping this lane's Go-binaries block and the incoming util-linux entry, with
the resolution asserted rather than eyeballed:
Result — 8 accepted ids, and zero active entries for the two #1154 fixed at the source:
CVE-2026-56852andGHSA-hrxh-6v49-42gfappear once each, in prose, in the sentence recordingthat they were deleted and why.
Verified
bash tests/stack/run.sh→ 2722 passed, 0 failed — the same count asdevelop-v2before themerge, which is what a docs-and-config-only sync should produce. Run because a twin sync is a
coverage event, not because this one changed code.
A standing difference this creates
developstill carriesCVE-2026-56852andGHSA-hrxh-6v49-42gfas active mutes; this lane nolonger does. That is correct — those findings live in the appliance rootfs binaries, which only
exist on
develop-v2, so ondevelopthey are entries for artefacts that lane does not build. Butit means
.trivyignorenow differs between the twins by two lines, and every future sync of thisfile will conflict on the same region. Worth cleaning up on
develop(they are dead thereregardless of this change); flagged rather than folded in, since it is a separate decision about a
lane this PR is not targeting.