Move signing out

This commit is contained in:
Ryan Hughes committed 2025-10-27 00:15:27 -04:00
1 parent ffbde7cde9
commit 212d4687d2
3 files changed
+137 -123

No files matched your search

+4 -56
View File
@@ -1,57 +1,7 @@
#!/bin/bash
# Import GPG keys for package verification and signing
# Import GPG keys for package verification
echo "==> Importing GPG keys..."
# Check if signing is enabled
if [[ "$SKIP_SIGNING" == true ]]; then
echo " -> Skipping signing key import (--skip-signing enabled)"
else
# Import signing key (required for signing)
echo " -> Importing signing key..."
# Import with batch mode and no tty for automated signing
echo "$GPG_PRIVATE_KEY" | gpg --batch --import || {
echo " -> ERROR: Failed to import signing key"
exit 1
}
# Configure GPG for automated signing with passphrase
echo "allow-loopback-pinentry" >>~/.gnupg/gpg-agent.conf
echo "pinentry-mode loopback" >>~/.gnupg/gpg.conf
gpg-connect-agent reloadagent /bye 2>/dev/null || true
# Extract key ID and configure
KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep "sec" | head -1 | awk '{print $2}' | cut -d'/' -f2)
if [[ -n "$KEY_ID" ]]; then
# Trust the key using fingerprint
FINGERPRINT=$(gpg --list-secret-keys --with-colons | grep "^fpr" | head -1 | cut -d':' -f10)
echo "$FINGERPRINT:6:" | gpg --import-ownertrust
# Set as default key in makepkg.conf
echo "GPGKEY=\"$KEY_ID\"" >>~/.makepkg.conf
echo " -> Signing key configured: $KEY_ID"
# Test signing with the key and passphrase
echo " -> Testing GPG signing capability..."
echo "test" | gpg --batch --yes --pinentry-mode loopback --passphrase "$GPG_PASSPHRASE" --sign --local-user "$KEY_ID" >/dev/null 2>&1
if [[ $? -ne 0 ]]; then
echo " -> ERROR: Failed to sign with the provided passphrase"
echo " -> Please check your passphrase and try again"
exit 1
fi
echo " -> GPG signing test successful"
# Import public signing key into pacman's keyring for local package verification
echo " -> Adding signing key to pacman keyring..."
sudo pacman-key --init || exit 1
gpg --armor --export "$KEY_ID" > /tmp/signing-key.asc || exit 1
sudo pacman-key --add /tmp/signing-key.asc || exit 1
rm -f /tmp/signing-key.asc
sudo pacman-key --lsign-key "$KEY_ID" || exit 1
else
echo " -> ERROR: Could not extract key ID"
exit 1
fi
fi
echo "==> Importing GPG verification keys..."
# Read the gpg-keys.txt file for verification keys
if [[ -f /build/gpg-keys.txt ]]; then
@@ -75,9 +25,7 @@ if [[ -f /build/gpg-keys.txt ]]; then
}
fi
done </build/gpg-keys.txt
echo " -> Verification key import complete"
echo " ✓ Verification key import complete"
else
echo " -> No gpg-keys.txt file found, skipping verification key import"
echo " -> No gpg-keys.txt file found, skipping"
fi
echo " -> GPG setup complete"
Executable
+91
View File
@@ -0,0 +1,91 @@
#!/bin/bash
# Sign packages in build-output (runs inside Docker)
set -e
ARCH=${ARCH:-x86_64}
BUILD_OUTPUT_DIR="/build-output/$ARCH"
echo "==> Package Signing"
echo "==> Target architecture: $ARCH"
echo "==> Build output: $BUILD_OUTPUT_DIR"
# Check if GPG key and passphrase are provided
if [[ -z "$GPG_PRIVATE_KEY" ]]; then
echo "ERROR: GPG_PRIVATE_KEY environment variable not set"
exit 1
fi
if [[ -z "$GPG_PASSPHRASE" ]]; then
echo "ERROR: GPG_PASSPHRASE environment variable not set"
exit 1
fi
# Import GPG key
echo "==> Importing GPG signing key..."
echo "$GPG_PRIVATE_KEY" | gpg --batch --import 2>/dev/null || {
echo "ERROR: Failed to import signing key"
exit 1
}
# Get key ID
KEY_ID=$(gpg --list-secret-keys --keyid-format LONG 2>/dev/null | grep "sec" | head -1 | awk '{print $2}' | cut -d'/' -f2)
if [[ -z "$KEY_ID" ]]; then
echo "ERROR: Could not extract key ID"
exit 1
fi
echo " ✓ GPG signing key loaded: $KEY_ID"
# Check if build output exists and has packages
if [[ ! -d "$BUILD_OUTPUT_DIR" ]]; then
echo "ERROR: Build output directory not found: $BUILD_OUTPUT_DIR"
exit 1
fi
cd "$BUILD_OUTPUT_DIR"
# Find all unsigned package files
PACKAGE_FILES=$(ls -1 *.pkg.tar.zst 2>/dev/null || true)
if [[ -z "$PACKAGE_FILES" ]]; then
echo "==> No packages found to sign"
exit 0
fi
PACKAGE_COUNT=$(echo "$PACKAGE_FILES" | wc -l)
echo "==> Found $PACKAGE_COUNT package(s) to sign"
echo ""
# Sign all packages
SIGNED_COUNT=0
FAILED_COUNT=0
for pkg_file in $PACKAGE_FILES; do
echo -n " -> $pkg_file ... "
# Remove existing signature if present
rm -f "$pkg_file.sig"
# Sign the package
if gpg --batch --yes --pinentry-mode loopback --passphrase "$GPG_PASSPHRASE" \
--detach-sign --use-agent --no-armor --local-user "$KEY_ID" "$pkg_file" 2>/dev/null; then
echo "✓"
((SIGNED_COUNT++))
else
echo "✗"
((FAILED_COUNT++))
fi
done
echo ""
# Summary
if [[ $FAILED_COUNT -eq 0 ]]; then
echo "==> Successfully signed all $SIGNED_COUNT package(s)"
exit 0
else
echo "==> Signed $SIGNED_COUNT package(s), failed $FAILED_COUNT"
exit 1
fi