From 047e7d9b79d6d9de00cb51d6025b04b2abd1b775 Mon Sep 17 00:00:00 2001 From: greyoak111 Date: Mon, 16 Nov 2026 08:47:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?devkit=EF=BC=9ARelease=20=E9=AA=8C=E7=AD=BE?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=97=B6=E6=8D=A2=E9=95=9C=E5=83=8F=E6=BA=90?= =?UTF-8?q?=E9=87=8D=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CDN 镜像在 Termux 发版窗口会把新的 Release 和旧的 Release.gpg 搭在一起 (2026-11-16 实测 packages-cf.termux.dev),loadRepo 只在 base 源验一次, 镜像滞后就直接「bad signature」整个仓库作废、组件 CI 打包全挂。 改成和设备端 pkg.mjs 一样的换源重试:Release 与 Release.gpg 从同一个源 成对取、验不过就下一个源,全挂才报错。 Co-Authored-By: Claude Code --- devkit/devkit.mjs | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/devkit/devkit.mjs b/devkit/devkit.mjs index 07beac99..8a717231 100644 --- a/devkit/devkit.mjs +++ b/devkit/devkit.mjs @@ -89,18 +89,28 @@ async function loadIndex(repos = REPOS) { } async function loadRepo(repo) { - const { base, dist, component, arch } = repo; + const { dist, component, arch } = repo; // Release 先验 Termux 自动构建钥的签名再用:清单签的是「cccodroid 打的包」,这一步保证包确实出自 Termux(审查 10-29 M4)。 - // 和设备上 pkg.mjs 用同一份钥匙与验签代码(打 APK 时 build.sh 把 pgp.mjs 拷进 app/bin);按需导入,开发端只拷了 devkit.mjs 也能加载 + // 和设备上 pkg.mjs 用同一份钥匙与验签代码(打 APK 时 build.sh 把 pgp.mjs 拷进 app/bin);按需导入,开发端只拷了 devkit.mjs 也能加载。 + // Release 和 Release.gpg 要从同一个源成对取、验不过就换下一个源:CDN 镜像在 Termux 发版窗口会 + // 把新的 Release 和旧的 Release.gpg 搭在一起(2026-11-16 实测 packages-cf.termux.dev), + // 只用一个源会把「镜像滞后」当成「上游换钥」整个仓库都用不了(pkg.mjs 里一直是换源重试的写法) const { TERMUX_KEYS, verifyDetached } = await import("./pgp.mjs"); - const relBuf = await get(`${base}dists/${dist}/Release`); - verifyDetached(relBuf, (await get(`${base}dists/${dist}/Release.gpg`)).toString(), TERMUX_KEYS); - const rel = relBuf.toString(); - const rp = `${component}/binary-${arch}/Packages.gz`; - const want = rel.split("SHA256:")[1].split("\n").find((l) => l.trim().endsWith(" " + rp)); - if (!want) throw new Error("Release 里没有 " + rp); - const gz = await get(`${base}dists/${dist}/${rp}`); - if (sha256(gz) !== want.trim().split(/\s+/)[0]) throw new Error("Packages.gz 哈希与 Release 不符"); + let relBuf = null, rel = null, gz = null, lastErr = null; + for (const base of [repo.base, ...(repo.mirrors || [])]) { + try { + const buf = await get(`${base}dists/${dist}/Release`); + verifyDetached(buf, (await get(`${base}dists/${dist}/Release.gpg`)).toString(), TERMUX_KEYS); + relBuf = buf; rel = buf.toString(); + const rp = `${component}/binary-${arch}/Packages.gz`; + want = rel.split("SHA256:")[1].split("\n").find((l) => l.trim().endsWith(" " + rp)); + if (!want) throw new Error("Release 里没有 " + rp); + gz = await get(`${base}dists/${dist}/${rp}`); + if (sha256(gz) !== want.trim().split(/\s+/)[0]) throw new Error("Packages.gz 哈希与 Release 不符"); + break; + } catch (e) { lastErr = e; } + } + if (!relBuf || !rel || !gz) throw new Error(`${repo.name || "repo"}:所有源的 Release 都没过签名校验(最后:${lastErr && lastErr.message})`); const date = (rel.match(/^Date: (.+)$/m) || [])[1]; const pkgs = new Map(), provides = new Map(); From fd69065cda541cb11a02c2e0de14232aa82e1918 Mon Sep 17 00:00:00 2001 From: greyoak111 Date: Mon, 16 Nov 2026 09:06:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?devkit=EF=BC=9A=E8=A1=A5=20want=20=E5=A3=B0?= =?UTF-8?q?=E6=98=8E=EF=BC=88ES=20=E6=A8=A1=E5=9D=97=E4=B8=A5=E6=A0=BC?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=EF=BC=8C=E6=BC=8F=E4=BA=86=E4=BC=9A=20Refere?= =?UTF-8?q?nceError=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devkit/devkit.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devkit/devkit.mjs b/devkit/devkit.mjs index 8a717231..44dcd82f 100644 --- a/devkit/devkit.mjs +++ b/devkit/devkit.mjs @@ -103,7 +103,7 @@ async function loadRepo(repo) { verifyDetached(buf, (await get(`${base}dists/${dist}/Release.gpg`)).toString(), TERMUX_KEYS); relBuf = buf; rel = buf.toString(); const rp = `${component}/binary-${arch}/Packages.gz`; - want = rel.split("SHA256:")[1].split("\n").find((l) => l.trim().endsWith(" " + rp)); + const want = rel.split("SHA256:")[1].split("\n").find((l) => l.trim().endsWith(" " + rp)); if (!want) throw new Error("Release 里没有 " + rp); gz = await get(`${base}dists/${dist}/${rp}`); if (sha256(gz) !== want.trim().split(/\s+/)[0]) throw new Error("Packages.gz 哈希与 Release 不符");