From cb0f60b289c8ffd10625f700a9a579d65d365589 Mon Sep 17 00:00:00 2001 From: paspo Date: Fri, 28 Sep 2018 14:52:24 +0200 Subject: [PATCH 1/3] fix gpg path --- run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/run.sh b/run.sh index 59a944f..b0d0be8 100755 --- a/run.sh +++ b/run.sh @@ -22,8 +22,8 @@ echo "${PLUGIN_GPG_KEY}" > /key.asc eval $(gpg-agent --daemon --allow-preset-passphrase) # retrieving key ID and GRIP -ID=$(gpg --with-colons /key.asc 2>/dev/null | grep "^sec" | head -n 1 | cut -d\: -f 5 ) -GRIP=$(gpg --with-colons --import-options show-only --import /key.asc 2>/dev/null | grep '^grp' | head -n 1 | cut -d\: -f 10 ) +ID=$(gpg2 --with-colons /key.asc 2>/dev/null | grep "^pub" | head -n 1 | cut -d\: -f 5 ) +GRIP=$(gpg2 --with-colons --import-options show-only --import /key.asc 2>/dev/null | grep '^grp' | head -n 1 | cut -d\: -f 10 ) echo Using GPG key with ID: ${ID} GRIP: ${GRIP} # inject the passphrase @@ -34,7 +34,7 @@ gpg2 --batch --yes --import /key.asc rpm --import /key.asc # get key CN -NAME=$(gpg --with-colons /key.asc 2>/dev/null | grep "^uid" | head -n 1 | cut -d\: -f 10) +NAME=$(gpg2 --with-colons /key.asc 2>/dev/null | grep "^uid" | head -n 1 | cut -d\: -f 10) # and output it to rpmmacros cat <~/.rpmmacros From fbb1f10f08eb258d224b47e901aa39a140c3858f Mon Sep 17 00:00:00 2001 From: paspo Date: Fri, 28 Sep 2018 15:04:33 +0200 Subject: [PATCH 2/3] fix gpg import --- run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run.sh b/run.sh index b0d0be8..aee41be 100755 --- a/run.sh +++ b/run.sh @@ -31,7 +31,8 @@ echo "${PLUGIN_PASSPHRASE}" | /usr/libexec/gpg-preset-passphrase --preset ${GRIP # import the key gpg2 --batch --yes --import /key.asc -rpm --import /key.asc +gpg2 --armor --export ${ID} >/key.pub.asc +rpm --import /key.pub.asc # get key CN NAME=$(gpg2 --with-colons /key.asc 2>/dev/null | grep "^uid" | head -n 1 | cut -d\: -f 10) From 1200ccac72db9996d67e571370b0bc72d9ce69ec Mon Sep 17 00:00:00 2001 From: paspo Date: Fri, 28 Sep 2018 15:43:21 +0200 Subject: [PATCH 3/3] fix gpg sign loop --- run.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/run.sh b/run.sh index aee41be..2ac6d7a 100755 --- a/run.sh +++ b/run.sh @@ -30,7 +30,7 @@ echo Using GPG key with ID: ${ID} GRIP: ${GRIP} echo "${PLUGIN_PASSPHRASE}" | /usr/libexec/gpg-preset-passphrase --preset ${GRIP} # import the key -gpg2 --batch --yes --import /key.asc +gpg2 --batch --yes --import /key.asc gpg2 --armor --export ${ID} >/key.pub.asc rpm --import /key.pub.asc @@ -43,12 +43,6 @@ cat <~/.rpmmacros EOF # parse required files -for f in ${PLUGIN_FILES} ; do - echo -n "Checking: $f - " - S=$(rpm -K $f | grep '\:.*signatures.*OK$') - if [ "a$S" = "a" ] ; then - rpmsign --addsign $f 2>&1 >/dev/null && echo "SIGNED SUCCESSFULLY" || echo "SIGNING FAILED" - else - echo "ALREADY SIGNED" - fi +for f in ${PLUGIN_FILES} ; do + rpm -K $f | grep "\:.*signatures.*OK$" || rpmsign -v --addsign $f || exit 1 done