Andy Dixon
4c1507c463
vault unlock --idle counts the duration from the last command that used the key rather than from the unlock: the agent resets its timer each time it hands the key out. The agent loop no longer needs its own goroutine. packaging/repo.sh builds the dixon-vault .deb, .rpm and Arch packages from a release tag (a clean git archive) with nfpm for amd64, arm64, armv7, 386 and riscv64, then publishes them to the apt, dnf and pacman repositories at repo.dixon.cx: apt-ftparchive with a signed InRelease, createrepo_c (in a Fedora container) with signed RPMs and repomd.xml, and repo-add (in an Arch container) with signed packages and database. Indexes cover every package in the repository, under a lock, so other projects publishing with their copy of the script are kept. The package is dixon-vault because vault is HashiCorp Vault in Arch's [extra] and HashiCorp's own repositories; it conflicts with vault. README, guide and CLAUDE.md point at the repository.
198 lines
7.3 KiB
Bash
Executable File
198 lines
7.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Build Linux packages (.deb, .rpm, Arch .pkg.tar.zst) for a release tag and
|
|
# publish them to the signed apt, dnf and pacman repositories served at
|
|
# https://repo.dixon.cx.
|
|
#
|
|
# packaging/repo.sh # the newest tag
|
|
# packaging/repo.sh 0.5 # a given tag
|
|
#
|
|
# Builds from a clean export of the tag, so the working tree doesn't matter.
|
|
# Every index is rebuilt over all the packages in the repository, so other
|
|
# projects publishing there with their copy of this script are kept.
|
|
#
|
|
# Needs: go, docker, gpg, apt-ftparchive (apt-utils), flock.
|
|
# REPO_DIR where the repository lives (default below)
|
|
# REPO_GNUPGHOME GnuPG home holding the signing key (default below)
|
|
# ARCHS Go architectures to package (default below)
|
|
#
|
|
# The same script, with its own project block, is in ../mapsize/packaging.
|
|
set -euo pipefail
|
|
|
|
# ---- project ---------------------------------------------------------------
|
|
NAME=vault # the command
|
|
# The package: plain "vault" is HashiCorp Vault in Arch's [extra] and in
|
|
# HashiCorp's own apt and dnf repositories, which would win upgrades. Both
|
|
# install /usr/bin/vault, so they conflict.
|
|
PACKAGE=dixon-vault
|
|
CONFLICTS=vault
|
|
SUMMARY="Post-quantum encrypted file vault with a decoy passphrase"
|
|
HOMEPAGE=https://dixon.cx/vault
|
|
LICENSE=GPL-3.0-or-later
|
|
MANPAGES=docs/*.1
|
|
DOCS="README.md LICENSE"
|
|
# build OUT: build the binary to OUT, in the source tree, with GOOS, GOARCH
|
|
# and GOARM set and VERSION the release.
|
|
build() {
|
|
CGO_ENABLED=0 go build -trimpath -buildvcs=false -ldflags='-s -w -buildid=' -o "$1" .
|
|
}
|
|
# ----------------------------------------------------------------------------
|
|
|
|
REPO_DIR=${REPO_DIR:-/home/andy/domains/repo.dixon.cx/public_html}
|
|
REPO_GNUPGHOME=${REPO_GNUPGHOME:-$HOME/.config/repo.dixon.cx/gnupg}
|
|
ARCHS=${ARCHS:-"amd64 arm64 arm 386 riscv64"}
|
|
NFPM="go run github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.41.1"
|
|
SUITE=stable
|
|
COMPONENT=main
|
|
ARCH_REPO=dixon # the pacman repository name: [dixon]
|
|
|
|
say() { echo "repo: $*" >&2; }
|
|
die() { say "$*"; exit 1; }
|
|
|
|
for tool in go docker gpg apt-ftparchive flock; do
|
|
command -v $tool >/dev/null || die "needs $tool"
|
|
done
|
|
[[ -d $REPO_DIR ]] || die "$REPO_DIR does not exist"
|
|
export GNUPGHOME=$REPO_GNUPGHOME
|
|
KEY=$(gpg --list-secret-keys --with-colons 2>/dev/null | awk -F: '/^fpr/{print $10; exit}')
|
|
[[ -n $KEY ]] || die "no signing key in $GNUPGHOME"
|
|
|
|
cd "$(git rev-parse --show-toplevel)"
|
|
TAG=${1:-$(git describe --tags --abbrev=0)}
|
|
git rev-parse -q --verify "refs/tags/$TAG" >/dev/null || die "no tag $TAG"
|
|
VERSION=${TAG#v}
|
|
export VERSION
|
|
|
|
WORK=$(mktemp -d)
|
|
trap 'rm -rf "$WORK"' EXIT
|
|
git archive "$TAG" | tar -x -C "$WORK" --one-top-level=src
|
|
gpg --batch --armor --export-secret-keys "$KEY" >"$WORK/signing.asc"
|
|
|
|
# ---- build -----------------------------------------------------------------
|
|
say "building $PACKAGE $VERSION for $ARCHS"
|
|
mkdir -p "$WORK/out"
|
|
for arch in $ARCHS; do
|
|
goarm= nfarch=$arch
|
|
[[ $arch == arm ]] && goarm=7 nfarch=arm7
|
|
(cd "$WORK/src" && GOOS=linux GOARCH=$arch GOARM=$goarm build "$WORK/bin-$arch/$NAME")
|
|
{
|
|
cat <<-EOF
|
|
name: $PACKAGE
|
|
arch: $nfarch
|
|
platform: linux
|
|
version: $VERSION
|
|
release: 1
|
|
maintainer: Andy Dixon <andy@dixon.cx>
|
|
description: $SUMMARY
|
|
homepage: $HOMEPAGE
|
|
license: $LICENSE
|
|
conflicts: [${CONFLICTS:-}]
|
|
contents:
|
|
- src: $WORK/bin-$arch/$NAME
|
|
dst: /usr/bin/$NAME
|
|
file_info: {mode: 0755}
|
|
EOF
|
|
for m in $(cd "$WORK/src" && ls $MANPAGES); do
|
|
printf ' - src: %s\n dst: /usr/share/man/man1/%s\n file_info: {mode: 0644}\n' \
|
|
"$WORK/src/$m" "$(basename "$m")"
|
|
done
|
|
for d in $DOCS; do
|
|
printf ' - src: %s\n dst: /usr/share/doc/%s/%s\n file_info: {mode: 0644}\n' \
|
|
"$WORK/src/$d" "$PACKAGE" "$d"
|
|
done
|
|
printf 'rpm:\n signature:\n key_file: %s\n' "$WORK/signing.asc"
|
|
} >"$WORK/nfpm-$arch.yaml"
|
|
for fmt in deb rpm archlinux; do
|
|
$NFPM pkg -f "$WORK/nfpm-$arch.yaml" -p $fmt -t "$WORK/out/" >/dev/null
|
|
done
|
|
done
|
|
|
|
# ---- publish ---------------------------------------------------------------
|
|
# One publisher at a time: the indexes cover every project's packages.
|
|
exec 9>"$REPO_DIR/../.publish.lock"
|
|
flock 9
|
|
say "publishing to $REPO_DIR"
|
|
gpg --batch --armor --export "$KEY" >"$REPO_DIR/dixon.asc"
|
|
gpg --batch --export "$KEY" >"$REPO_DIR/dixon.gpg"
|
|
sign() { gpg --batch --yes --local-user "$KEY" "$@"; }
|
|
|
|
# apt: pool/main/<letter>/<name>/, indexed by apt-ftparchive.
|
|
pool=$REPO_DIR/apt/pool/$COMPONENT/${PACKAGE:0:1}/$PACKAGE
|
|
mkdir -p "$pool"
|
|
cp "$WORK"/out/*.deb "$pool/"
|
|
(
|
|
cd "$REPO_DIR/apt"
|
|
# Built beside the live suite and swapped in, so clients never see half.
|
|
dists=dists/.$SUITE.new
|
|
rm -rf "$dists"
|
|
debarchs=$(find pool -name '*.deb' | sed -E 's/.*_([^_]+)\.deb$/\1/' | sort -u | tr '\n' ' ')
|
|
for a in $debarchs; do
|
|
d=$dists/$COMPONENT/binary-$a
|
|
mkdir -p "$d"
|
|
apt-ftparchive --arch "$a" packages pool >"$d/Packages"
|
|
gzip -9kn "$d/Packages"
|
|
done
|
|
apt-ftparchive \
|
|
-o APT::FTPArchive::Release::Origin=repo.dixon.cx \
|
|
-o APT::FTPArchive::Release::Label=repo.dixon.cx \
|
|
-o APT::FTPArchive::Release::Suite=$SUITE \
|
|
-o APT::FTPArchive::Release::Codename=$SUITE \
|
|
-o APT::FTPArchive::Release::Components=$COMPONENT \
|
|
-o "APT::FTPArchive::Release::Architectures=${debarchs% }" \
|
|
release "$dists" >"$WORK/Release"
|
|
mv "$WORK/Release" "$dists/Release"
|
|
sign --clearsign -o "$dists/InRelease" "$dists/Release"
|
|
sign --armor --detach-sign -o "$dists/Release.gpg" "$dists/Release"
|
|
rm -rf "dists/.$SUITE.old"
|
|
[[ -d dists/$SUITE ]] && mv "dists/$SUITE" "dists/.$SUITE.old"
|
|
mv "$dists" "dists/$SUITE"
|
|
rm -rf "dists/.$SUITE.old"
|
|
)
|
|
|
|
# dnf: every architecture in one directory; dnf picks its own.
|
|
mkdir -p "$REPO_DIR/rpm"
|
|
cp "$WORK"/out/*.rpm "$REPO_DIR/rpm/"
|
|
docker image inspect repo-tools:fedora >/dev/null 2>&1 ||
|
|
docker build -q -t repo-tools:fedora - >/dev/null <<-'EOF'
|
|
FROM fedora:42
|
|
RUN dnf -y install createrepo_c && dnf clean all
|
|
EOF
|
|
docker run --rm --user "$(id -u):$(id -g)" -v "$REPO_DIR/rpm:/repo" repo-tools:fedora \
|
|
createrepo_c --quiet --update --general-compress-type=gz /repo
|
|
sign --armor --detach-sign -o "$REPO_DIR/rpm/repodata/repomd.xml.asc" "$REPO_DIR/rpm/repodata/repomd.xml"
|
|
cat >"$REPO_DIR/rpm/dixon.repo" <<EOF
|
|
[dixon]
|
|
name=repo.dixon.cx
|
|
baseurl=https://repo.dixon.cx/rpm
|
|
enabled=1
|
|
gpgcheck=1
|
|
repo_gpgcheck=1
|
|
gpgkey=https://repo.dixon.cx/dixon.asc
|
|
EOF
|
|
|
|
# pacman: one directory per architecture, each package signed, then
|
|
# repo-add (from an Arch container) and a signed database.
|
|
added=
|
|
for pkg in "$WORK"/out/*.pkg.tar.zst; do
|
|
a=$(basename "$pkg" .pkg.tar.zst)
|
|
a=${a##*-}
|
|
mkdir -p "$REPO_DIR/arch/$a"
|
|
cp "$pkg" "$REPO_DIR/arch/$a/"
|
|
sign --detach-sign -o "$REPO_DIR/arch/$a/$(basename "$pkg").sig" "$pkg"
|
|
added+=" $a"
|
|
done
|
|
for a in $(tr ' ' '\n' <<<"$added" | sort -u); do
|
|
dir=$REPO_DIR/arch/$a
|
|
# A fresh database of every package here; -p keeps the newest version.
|
|
rm -f "$dir/$ARCH_REPO".{db,files}{,.tar.gz}{,.sig}
|
|
docker run --rm --user "$(id -u):$(id -g)" -e HOME=/tmp -v "$dir:/repo" -w /repo archlinux:latest \
|
|
sh -c "repo-add --quiet --prevent-downgrade $ARCH_REPO.db.tar.gz *.pkg.tar.zst" 2>&1 |
|
|
{ grep -v "newer version\|^$" >&2 || true; }
|
|
for db in $ARCH_REPO.db $ARCH_REPO.files; do
|
|
sign --detach-sign -o "$dir/$db.tar.gz.sig" "$dir/$db.tar.gz"
|
|
ln -sfn "$db.tar.gz.sig" "$dir/$db.sig"
|
|
done
|
|
rm -f "$dir"/*.old "$dir"/*.old.sig
|
|
done
|
|
|
|
say "published $PACKAGE $VERSION: $(cd "$WORK/out" && ls | wc -l) packages"
|