From 2ad6bb37c28aaafcd94f38d8791105b9195cf5a2 Mon Sep 17 00:00:00 2001
From: kuwoyuki <kuwoyuki@cock.li>
Date: Mon, 8 Dec 2025 01:49:18 +0600
Subject: [PATCH] +getbinpkg

---
 binhost.sh        | 21 +++++++--------------
 binhost/make.conf |  2 +-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/binhost.sh b/binhost.sh
index a627783..c359a46 100755
--- a/binhost.sh
+++ b/binhost.sh
@@ -100,24 +100,17 @@ init_container() {
 
         # import to root
         gpg --batch --import /tmp/signing.key
+        gpg --list-keys --with-colons | awk -F: '/^fpr:/ { print \$10 \":6:\" }' | gpg --import-ownertrust
 
         mkdir -p /etc/portage/gnupg
-        chmod 700 /etc/portage/gnupg # Keep strict during import operations
+        chmod 700 /etc/portage/gnupg
 
-        # import to portage
-        gpg --homedir /etc/portage/gnupg --batch --import /tmp/signing.key
+        # import our and gentoo keys to portage
+        gpg --homedir /etc/portage/gnupg --batch --import /tmp/signing.key /usr/share/openpgp-keys/gentoo-release.asc
+        gpg --homedir /etc/portage/gnupg --list-keys --with-colons | \
+            awk -F: '/^fpr:/ { print \$10 \":6:\" }' | \
+            gpg --homedir /etc/portage/gnupg --import-ownertrust
 
-        FINGERPRINT=\$(gpg --with-colons --show-keys /tmp/signing.key | awk -F: '/^fpr:/ { print \$10; exit }')
-
-        if [ -z \"\$FINGERPRINT\" ]; then
-            echo \"Error: Could not obtain fingerprint\"
-            exit 1
-        fi
-
-        # trust the key in root
-        echo \"\$FINGERPRINT:6:\" | gpg --batch --import-ownertrust
-        # trust the key in portage
-        echo \"\$FINGERPRINT:6:\" | gpg --homedir /etc/portage/gnupg --batch --import-ownertrust
         gpg --homedir /etc/portage/gnupg --check-trustdb
 
         chmod 700 /root/.gnupg
diff --git a/binhost/make.conf b/binhost/make.conf
index d1c1543..b110d41 100644
--- a/binhost/make.conf
+++ b/binhost/make.conf
@@ -23,7 +23,7 @@ VIDEO_CARDS="intel nouveau"
 
 # "buildpkg" = generate binary packages upon install
 # "binpkg-multi-instance" = keep only latest version, but support slotting
-FEATURES="${FEATURES} -getbinpkg buildpkg binpkg-multi-instance -ipc-sandbox -network-sandbox -pid-sandbox binpkg-signing"
+FEATURES="${FEATURES} getbinpkg binpkg-signing binpkg-request-signature binpkg-multi-instance buildpkg -ipc-sandbox -network-sandbox -pid-sandbox"
 ACCEPT_LICENSE="*"
 
 BINPKG_FORMAT="gpkg"