From a867157978f1854fe9b1054690aa4bc1bfd9107b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?=
 <zhangyanghaha0407@outlook.com>
Date: Mon, 24 Aug 2026 19:00:28 -0400
Subject: [PATCH] Add omarchycn-keyring package and container build script

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QKxGW1raAWaqeU8WdHsMsp
---
 cn/keys/omarchycn-registry.asc                | 32 +++++++++++++++++++
 packages/build-keyring.sh                     | 19 +++++++++++
 packages/omarchycn-keyring/PKGBUILD           | 20 ++++++++++++
 .../omarchycn-keyring.install                 |  7 ++++
 packages/omarchycn-keyring/omarchycn-trusted  |  2 ++
 5 files changed, 80 insertions(+)
 create mode 100644 cn/keys/omarchycn-registry.asc
 create mode 100755 packages/build-keyring.sh
 create mode 100644 packages/omarchycn-keyring/PKGBUILD
 create mode 100644 packages/omarchycn-keyring/omarchycn-keyring.install
 create mode 100644 packages/omarchycn-keyring/omarchycn-trusted

diff --git a/cn/keys/omarchycn-registry.asc b/cn/keys/omarchycn-registry.asc
new file mode 100644
index 00000000..36ced964
--- /dev/null
+++ b/cn/keys/omarchycn-registry.asc
@@ -0,0 +1,32 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsBNBGqMzPYBCADOcNGiPxC8AgP1kG1s6obLZi5NzfkVzlqkWH9/7JgSokRr//IO
+L8L2eMQ5bvEou4Mc+eujPI+5Tm8TwfECkjhKWbEOk09yn9kUXVlc/+iROJXF9z4u
+Cp6BIiZ5YzoadZysCqSLlYXejp38LGXdi4xyh5SfXII/VD/036MBwvwZkb6qoFsp
+1AS4BRLcE0BgD2QjL5MIFU+yVblUZl8ss1r9AVNNgAllGzFpYHFt+PknnPDldj/j
+dv5vihekC1Wy+w46w15vdBM04i6t1h72N3naFfuPkMJFuXo0NLWMNLOeDp+bsej8
+Kwf31yn6Vz0XLw8wCmLBwUtBaahvE/TqYUJPABEBAAHNDyhBcmNoIFJlZ2lzdHJ5
+KcLAuwQTAQgAbwWCaozM9gILBwkQvThgSIZ7M7Q1FAAAAAAAHAAQc2FsdEBub3Rh
+dGlvbnMub3BlbnBncGpzLm9yZwbZDf7U+gBf+H+EPPm1SmYCFQgCFgACGQECmwMC
+HgEWIQR03PV6zYErJNlZ8Ua9OGBIhnsztAAATuEH/2LQxWP9JXXjloS2HwsD/jBb
+OX/LPP4inkbUmkxaPx9hzecKPIZttzRoIXK8FxviPxwifQYPRShD5t1UwI1vwTnY
+BCWs4VUf+vMlcaKrmMhgL4z3Wfi1Cpn7GcEYaCB+9BPbNlVTy4KzQJKXk8RkrOPz
++r2YynBH2PynjoqVqVvgAnU1vc5gdRUdZIBQIt8RqpwF/Sc0+WwWf9bdW1VzB0Pc
+QTvuCaNzQOtSTYgDko9XJSa5VNQJrYuwYg97DmTfx+PYm2dFBTeR8Ut9wWiynItZ
+4ywSm6qE9w1OuBknUx80jev2LGlNNCD0/xBTWPokLf0ZsgLG9f302raZ+WY78GzO
+wE0EaozM9gEIAN8JV920AR4+TY1v1FVenZbSq74nCe2UNtEHWf97cwZye8ivUbg2
+mbDEJp+09asoLWRGwzDvD6rUicqihvTgAOB5cZQU1D9wxXfowfG5aB/czVA0MzPU
+bj5BXS8lA0pN4zcTamCHnrfoQpCGk+eB48xwBPLfxxVtwttaBtvG2YAPdiwultJu
+13IX4lsK/LS425NYwzuGw5m7Amy/rzamAUZiymIiG45RQ8y3/1UYRMW4yXOVMrtV
+fmtaL/hzsG0sGVEyiuseR/ZPqZKZrveYeqzy3fCOyCGsPwWH9rtfDekGBGbJLoiY
+wwA3ikMifFYPr1A1PMOBR5jAXYV/VG/pQQkAEQEAAcLArAQYAQgAYAWCaozM9gkQ
+vThgSIZ7M7Q1FAAAAAAAHAAQc2FsdEBub3RhdGlvbnMub3BlbnBncGpzLm9yZyFs
+5xT4PpfIzf6Y7ke/Br8CmwwWIQR03PV6zYErJNlZ8Ua9OGBIhnsztAAATqIH/26g
+dx2lJNHIYXlS/Ld8JXCC42IctWPeESegQPmJp96GbvF4Z7dVB0e+kqy7YgNYY8dv
+ibc7GicmQrAtsNDmm+fB1nmd316HxrtiVsBKgeNWTh7EN8cH79lNB4IqwWf6zkny
+1A1Ntbtqv0tERg/fXEuY6y+9f67JBM5P20iWRij3NNODPHpy5Vr7Ftm7pQ7FgDSj
+tntrOKMvAwKsWA+avGt55eQe9kbbFhbOqQEXfiqIgIQki0yg8o5VrIz5ZEQm7AXU
+fYr6IxJPrD7KhBeXO2Z0/TdKjZ5c1kpWEC2W0x8TUH9s2v5q4UeTlyHg5fyFzte6
+oAEZesYWyQ10m7ewZTg=
+=9OK8
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/packages/build-keyring.sh b/packages/build-keyring.sh
new file mode 100755
index 00000000..df047bd2
--- /dev/null
+++ b/packages/build-keyring.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Builds omarchycn-keyring in a clean archlinux container; output to packages/out/
+
+set -euo pipefail
+
+ROOT=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)
+
+docker run --rm -v "$ROOT:/src:ro" -v "$ROOT/packages/out:/out" archlinux/archlinux:latest bash -c '
+set -euo pipefail
+pacman -Sy --noconfirm --quiet base-devel > /dev/null
+useradd -m builder
+cp -r /src/packages/omarchycn-keyring /home/builder/pkg
+cp /src/cn/keys/omarchycn-registry.asc /src/cn/keys/omarchycn-release.asc /home/builder/pkg/
+chown -R builder /home/builder/pkg
+cd /home/builder/pkg
+sudo -u builder makepkg --noconfirm
+install -m644 omarchycn-keyring-*.pkg.tar.zst /out/
+'
+echo "Built: $(ls "$ROOT"/packages/out/omarchycn-keyring-*.pkg.tar.zst)"
diff --git a/packages/omarchycn-keyring/PKGBUILD b/packages/omarchycn-keyring/PKGBUILD
new file mode 100644
index 00000000..b988e22d
--- /dev/null
+++ b/packages/omarchycn-keyring/PKGBUILD
@@ -0,0 +1,20 @@
+pkgname=omarchycn-keyring
+pkgver=20260824
+pkgrel=1
+pkgdesc="OmarchyCN PGP keyring: package registry and release signing keys"
+arch=(any)
+url="https://git.zacharyzhang.com/ZacharyZhang-NY/omarchycn"
+license=(MIT)
+install=omarchycn-keyring.install
+source=(omarchycn-registry.asc omarchycn-release.asc omarchycn-trusted)
+sha256sums=(SKIP SKIP SKIP)
+
+build() {
+  cat omarchycn-registry.asc omarchycn-release.asc | gpg --dearmor > omarchycn.gpg
+}
+
+package() {
+  install -Dm644 omarchycn.gpg "$pkgdir/usr/share/pacman/keyrings/omarchycn.gpg"
+  install -Dm644 omarchycn-trusted "$pkgdir/usr/share/pacman/keyrings/omarchycn-trusted"
+  install -Dm644 /dev/null "$pkgdir/usr/share/pacman/keyrings/omarchycn-revoked"
+}
diff --git a/packages/omarchycn-keyring/omarchycn-keyring.install b/packages/omarchycn-keyring/omarchycn-keyring.install
new file mode 100644
index 00000000..ee8f7429
--- /dev/null
+++ b/packages/omarchycn-keyring/omarchycn-keyring.install
@@ -0,0 +1,7 @@
+post_install() {
+  usr/bin/pacman-key --populate omarchycn
+}
+
+post_upgrade() {
+  usr/bin/pacman-key --populate omarchycn
+}
diff --git a/packages/omarchycn-keyring/omarchycn-trusted b/packages/omarchycn-keyring/omarchycn-trusted
new file mode 100644
index 00000000..99a3470e
--- /dev/null
+++ b/packages/omarchycn-keyring/omarchycn-trusted
@@ -0,0 +1,2 @@
+74DCF57ACD812B24D959F146BD386048867B33B4:4:
+04490F065F6ADD262A7243506EDF7B8603B5D247:4: