Simplified build-time PGP keys management

enter

@@ -79,7 +79,7 @@ else
     fi
 
     mkdir -p -m 755 ${LIVECD}/usr/local/addons
-    ${RSYNC} --chmod=u=rwX,go=rX -i --delete-excluded -C ${LIVECD}/../mirror/keys ${LIVECD}/usr/local/addons
+    ${RSYNC} --chmod=u=rwX,go=rX -i --delete-excluded -C ${SRC}/../conf/certs ${LIVECD}/usr/local/addons
 
     # rwX------
     ${RSYNC} --chmod=u=rwX,go=   -i --delete \

mkroot

@@ -36,7 +36,7 @@ fi
 
 # Extract stage3 + portage snapshot to fresh directory
 # Download stage3 + portage snapshot
-mkdir -p ${LIVECD}/mirror/stage3 ${LIVECD}/mirror/portage ${LIVECD}/mirror/keys
+mkdir -p ${LIVECD}/mirror/stage3 ${LIVECD}/mirror/portage
 mkdir -p -m 700 ${LIVECD}/mirror/gnupg
 
 sinfo "Testing for required utilities"
@@ -79,18 +79,14 @@ sinfo "Downloading portage-latest.tar.bz2"
 wget -N -nv -P ${LIVECD}/mirror/portage ${portage}.gpgsig ${portage}
 
 
-sinfo "Copying certificates and PGP keys"
-cp ${FROM}/conf/certs/mfpl.crt ${LIVECD}/mirror/keys
-
+sinfo "Verifying PGP keys fingerprints"
 for key in ${gpg_keys}; do
     org=`echo ${key} | cut -d: -f1`
     fpr=`echo ${key} | cut -d: -f2`
     keyid=`echo -n ${fpr} | tail -c -8`
 
-    cp ${FROM}/conf/certs/${org}-${keyid}.asc ${LIVECD}/mirror/keys
-
     gpg -q --homedir ${LIVECD}/mirror/gnupg --no-default-keyring \
-        --keyring ${org}.gpg --import ${LIVECD}/mirror/keys/${org}-${keyid}.asc
+        --keyring ${org}.gpg --import ${FROM}/conf/certs/${org}-${keyid}.asc
 
     fpr2=`gpg -q --homedir ${LIVECD}/mirror/gnupg --keyring ${org}.gpg \
               --fingerprint --with-colons 0x${fpr} | sed -n '/^fpr:/p' | cut -d: -f10`
@@ -100,8 +96,6 @@ for key in ${gpg_keys}; do
     fi
 done
 
-
-sinfo "Verifying keyrings"
 for keyring in `echo "${gpg_keys}" | cut -d: -f1 | sort -u`; do
     keyids=`gpg -q -k --homedir ${LIVECD}/mirror/gnupg --keyring ${keyring}.gpg \
                 --fingerprint --with-colons | sed -n '/^fpr:/p' | cut -d: -f10 | sort`

src/root/setup

@@ -74,7 +74,7 @@ rm -f /etc/portage/savedconfig/*/*-[0-9]*
 if [ -x /usr/bin/gpg  -a  -x /usr/bin/eix ]; then
     sinfo "Updating portage"
 
-    gpg -q --homedir /etc/portage/gnupg --import /usr/local/addons/keys/gentoo-*.asc
+    gpg -q --homedir /etc/portage/gnupg --import /usr/local/addons/certs/gentoo-*.asc
     eix-sync -qw -C -q
 fi
 
@@ -462,9 +462,9 @@ done
 
 sinfo "Initializing a secondary PGP keyring"
 sudo -n -u anon gpg -q --homedir /home/anon/persist/security/pgp --no-default-keyring \
-    --keyring liberte.gpg --import /usr/local/addons/keys/liberte-*.asc
+    --keyring liberte.gpg --import /usr/local/addons/certs/liberte-*.asc
 install -p -o anon -g legion -m 600 -t /home/anon/persist/security/pgp \
-    /usr/local/addons/keys/mfpl.crt
+    /usr/local/addons/certs/mfpl.crt
 
 # clear pam_mktemp's append-only attribute to allow later livecd directory removal
 chattr -f -a /tmp/.private || :