Skip to content

sync: develop -> develop-v2 (util-linux acceptance, #1156) - #1158

Merged
VijitSingh97 merged 3 commits into
develop-v2from
sync/develop-v2-1156
Aug 20, 2026
Merged

sync: develop -> develop-v2 (util-linux acceptance, #1156)#1158
VijitSingh97 merged 3 commits into
develop-v2from
sync/develop-v2-1156

Conversation

@VijitSingh97

Copy link
Copy Markdown
Collaborator

Twin sync: developdevelop-v2, carrying #1157 (the util-linux acceptance for #1156).

Two commits, one file, one conflict — in .trivyignore, which both lanes edited today for different
reasons. That conflict is the whole content of this PR.

The conflict, and why neither side could win

They overlap because they are adjacent blocks in the same file, so git presented one large hunk.
Taking --ours would have silently dropped the util-linux fix and left this lane's dashboard scan
red; taking --theirs would have dropped the entire #1154 rewrite and re-added two mutes for
findings 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:

assert 'COMPOSE_GO_RAISES' survives          # the #1154 rewrite
assert 'CVE-2026-34040' survives             # the docker/docker acceptance
assert 'NOTE ON GO STDLIB' survives          # the note that stops stdlib CVEs being re-accepted
assert the stale util-linux prose is gone    # superseded by the incoming one
assert the incoming block adds exactly 53612, 53613, 53614

Result — 8 accepted ids, and zero active entries for the two #1154 fixed at the source:

CVE-2026-45447  CVE-2026-23949  CVE-2026-24049  CVE-2026-34040
CVE-2026-53612  CVE-2026-53613  CVE-2026-53614  CVE-2026-53615

CVE-2026-56852 and GHSA-hrxh-6v49-42gf appear once each, in prose, in the sentence recording
that they were deleted and why.

Verified

bash tests/stack/run.sh2722 passed, 0 failed — the same count as develop-v2 before the
merge, 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

develop still carries CVE-2026-56852 and GHSA-hrxh-6v49-42gf as active mutes; this lane no
longer does. That is correct — those findings live in the appliance rootfs binaries, which only
exist on develop-v2, so on develop they are entries for artefacts that lane does not build. But
it means .trivyignore now differs between the twins by two lines, and every future sync of this
file will conflict on the same region
. Worth cleaning up on develop (they are dead there
regardless of this change); flagged rather than folded in, since it is a separate decision about a
lane this PR is not targeting.

…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)
@VijitSingh97
VijitSingh97 merged commit 40818d2 into develop-v2 Aug 20, 2026
16 checks passed
@VijitSingh97
VijitSingh97 deleted the sync/develop-v2-1156 branch August 20, 2026 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant