CondorCORE/condorcore-keyring
CondorCORE/condorcore-keyring
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update-keys: move export-clean to gpg.conf instead of cleaning the keyring before export

Browse Source 
This has the same effect, but causes only the exported version of the
key to be cleaned. Cleaning the internal copy doesn't matter.

Signed-off-by: Christian Hesse <mail@eworm.de>
This commit is contained in:
Eli Schwartz 2019-08-05 17:25:45 -04:00 committed by Christian Hesse
parent 44f69d009f
commit cca61ee733
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
update-keys
View File

@ -15,7 +15,7 @@ quiet
batch batch
no-tty no-tty
no-permission-warning no-permission-warning
export-options no-export-attributes export-options no-export-attributes,export-clean
keyserver ${KEYSERVER} keyserver ${KEYSERVER}
__EOF__ __EOF__
@ -65,7 +65,6 @@ done < master-keyids
while read -ra data; do while read -ra data; do
keyid="${data[0]}" keyid="${data[0]}"
username="${data[1]}" username="${data[1]}"
printf 'clean\nquit\ny\n' | "${GPG[@]}" --command-fd 0 --edit-key ${keyid}
"${GPG[@]}" --armor --no-emit-version --export-options export-minimal --export ${keyid} >> master-revoked/${username}.asc "${GPG[@]}" --armor --no-emit-version --export-options export-minimal --export ${keyid} >> master-revoked/${username}.asc
echo "${keyid}" >> archlinux-revoked echo "${keyid}" >> archlinux-revoked
done < master-revoked-keyids done < master-revoked-keyids
@ -74,7 +73,6 @@ done < master-revoked-keyids
while read -ra data; do while read -ra data; do
keyid="${data[0]}" keyid="${data[0]}"
username="${data[@]:1}" username="${data[@]:1}"
printf 'clean\nquit\ny\n' | "${GPG[@]}" --command-fd 0 --edit-key ${keyid}
if ! "${GPG[@]}" --list-keys --with-colons ${keyid} 2>/dev/null | grep -q '^pub:f:'; then if ! "${GPG[@]}" --list-keys --with-colons ${keyid} 2>/dev/null | grep -q '^pub:f:'; then
echo "key is not fully trusted: ${keyid} ${username}" echo "key is not fully trusted: ${keyid} ${username}"
else else
@ -86,7 +84,6 @@ done < packager-keyids
while read -ra data; do while read -ra data; do
keyid="${data[0]}" keyid="${data[0]}"
username="${data[1]}" username="${data[1]}"
printf 'clean\nquit\ny\n' | "${GPG[@]}" --command-fd 0 --edit-key ${keyid}
"${GPG[@]}" --armor --no-emit-version --export-options export-minimal --export ${keyid} >> packager-revoked/${username}.asc "${GPG[@]}" --armor --no-emit-version --export-options export-minimal --export ${keyid} >> packager-revoked/${username}.asc
echo "${keyid}" >> archlinux-revoked echo "${keyid}" >> archlinux-revoked
done < packager-revoked-keyids done < packager-revoked-keyids