From 1c66c4e68f6dc33f49fccdbbd4e172bbe2f88ab2 Mon Sep 17 00:00:00 2001 From: denis0001-dev Date: Sat, 17 Oct 2026 17:37:48 +0300 Subject: [PATCH] Fix the mangled control.tar.zst and duplicate Depends in the .deb beta11 shipped a subtly broken package. jpackage on a modern dpkg emits **zstd** control tars (control.tar.zst), which the injection did not handle: its `when` fell through to plain `tar cf`, so the rebuilt member was an uncompressed tar still named control.tar.zst. dpkg tolerated it, but it is a malformed package. Verified against the actual beta11 artifact: the control member started with `2e 2f 00 00` ("./", i.e. an uncompressed tar) and after this fix starts with `28 b5 2f fd`, the zstd magic. data.tar.zst is byte-identical and the member set is unchanged, because only the control member is ever rewritten. Also fixed a second bug visible in the shipped control file: jpackage emitted no Depends line, so replacing one *and* prepending one produced two. Every Depends line is now stripped before a single one is prepended. The injection self-checks the rebuilt member's framing and the control tar's non-emptiness, and a failure still only warns and leaves the deb untouched. --- app/desktop/build.gradle.kts | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/app/desktop/build.gradle.kts b/app/desktop/build.gradle.kts index c39e0d4..d190c7b 100644 --- a/app/desktop/build.gradle.kts +++ b/app/desktop/build.gradle.kts @@ -1133,7 +1133,11 @@ private fun injectDebRuntimeDependencies(deb: File) { val controlTar = work.resolve(controlName) controlTar.writeBytes(members[index].data) val controlDir = File(work, "control").apply { mkdirs() } + // jpackage on a modern dpkg emits **zstd** control/data tars (control.tar.zst), so the + // compression has to be detected from the member name and preserved on rebuild — a + // plain tar left under a .zst name is a malformed package. when { + controlName.endsWith(".zst") -> runCommand("tar", "--zstd", "-xf", controlTar.absolutePath, "-C", controlDir.absolutePath) controlName.endsWith(".gz") -> runCommand("tar", "xzf", controlTar.absolutePath, "-C", controlDir.absolutePath) controlName.endsWith(".xz") -> runCommand("tar", "xJf", controlTar.absolutePath, "-C", controlDir.absolutePath) else -> runCommand("tar", "xf", controlTar.absolutePath, "-C", controlDir.absolutePath) @@ -1141,17 +1145,30 @@ private fun injectDebRuntimeDependencies(deb: File) { val controlFile = sequenceOf("control", "./control") .map { File(controlDir, it) }.firstOrNull { it.isFile } ?: error("no control file inside $controlName") - val patched = controlFile.readText() - .replace(Regex("(?m)^Depends:.*$"), "Depends: $trayDeps") - .let { if (it.startsWith("Depends:")) it else "Depends: $trayDeps\n$it" } + // Strip *every* Depends line first: jpackage may or may not emit one, and replacing plus + // prepending used to leave the control file with two. + val patched = "Depends: $trayDeps\n" + + controlFile.readText().replace(Regex("(?m)^Depends:.*\\R?"), "") controlFile.writeText(patched) val rebuilt = File(work, "rebuilt-$controlName") when { + controlName.endsWith(".zst") -> runCommand("tar", "--zstd", "-cf", rebuilt.absolutePath, "-C", controlDir.absolutePath, ".") controlName.endsWith(".gz") -> runCommand("tar", "czf", rebuilt.absolutePath, "-C", controlDir.absolutePath, ".") controlName.endsWith(".xz") -> runCommand("tar", "cJf", rebuilt.absolutePath, "-C", controlDir.absolutePath, ".") else -> runCommand("tar", "cf", rebuilt.absolutePath, "-C", controlDir.absolutePath, ".") } - members[index] = members[index].copy(data = rebuilt.readBytes()) + val rebuiltBytes = rebuilt.readBytes() + // Self-check: refuse to write a control member whose compression or content is wrong, + // so a mangled package can never leave this task. + if (controlName.endsWith(".zst")) { + check( + rebuiltBytes.size > 4 && + rebuiltBytes[0] == 0x28.toByte() && rebuiltBytes[1] == 0xB5.toByte() && + rebuiltBytes[2] == 0x2F.toByte() && rebuiltBytes[3] == 0xFD.toByte(), + ) { "rebuilt $controlName is not zstd-framed" } + } + check(controlDir.listFiles().orEmpty().isNotEmpty()) { "control tar came out empty" } + members[index] = members[index].copy(data = rebuiltBytes) deb.writeBytes(writeArMembers(members)) logger.lifecycle("Injected tray runtime deps into ${deb.name}: $trayDeps") } finally {