From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2568F138334 for ; Sat, 4 May 2019 03:37:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3462E083D; Sat, 4 May 2019 03:37:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1D1EE083D for ; Sat, 4 May 2019 03:37:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EFEEA343456 for ; Sat, 4 May 2019 03:37:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2DC0E57F for ; Sat, 4 May 2019 03:37:49 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1556941066.9700d70efd5e5a1fc5d4f6e67978871e511242f3.robbat2@gentoo> Subject: [gentoo-commits] proj/qa-scripts:master commit in: / X-VCS-Repository: proj/qa-scripts X-VCS-Files: keyrings-export.bash keyrings-recv-keys.gentoo.org.bash keyrings-recv-sks.bash keyrings-send-keys.gentoo.org.bash keyrings.inc.bash X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 9700d70efd5e5a1fc5d4f6e67978871e511242f3 X-VCS-Branch: master Date: Sat, 4 May 2019 03:37:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e28a8ba7-ebf1-44dd-b526-fe3cfcb2fc55 X-Archives-Hash: 065bac7319eaa7d0fb09a8f4dfba97d7 commit: 9700d70efd5e5a1fc5d4f6e67978871e511242f3 Author: Robin H. Johnson gentoo org> AuthorDate: Sat May 4 03:37:46 2019 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat May 4 03:37:46 2019 +0000 URL: https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=9700d70e keyrings: workaround export bug for now Signed-off-by: Robin H. Johnson gentoo.org> keyrings-export.bash | 4 ++++ keyrings-recv-keys.gentoo.org.bash | 4 ++++ keyrings-recv-sks.bash | 6 +++++- keyrings-send-keys.gentoo.org.bash | 4 ++++ keyrings.inc.bash | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/keyrings-export.bash b/keyrings-export.bash index e2bbb14..143cda2 100755 --- a/keyrings-export.bash +++ b/keyrings-export.bash @@ -12,6 +12,10 @@ source "${BASEDIR}"/keyrings.inc.bash set -e export_ldap_data_to_env +export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${COMMIT_RULE}") ) +export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${NONCOMMIT_RULE}") ) +export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${RETIRED_RULE}") ) +export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" "${NONCOMMIT_RULE}") ) export_keys "${OUTPUT_DIR}"/service-keys.gpg \ "${SYSTEM_KEYS[@]}" diff --git a/keyrings-recv-keys.gentoo.org.bash b/keyrings-recv-keys.gentoo.org.bash index ee8feeb..846d242 100755 --- a/keyrings-recv-keys.gentoo.org.bash +++ b/keyrings-recv-keys.gentoo.org.bash @@ -10,6 +10,10 @@ source "${BASEDIR}"/keyrings.inc.bash set -e export_ldap_data_to_env +export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${COMMIT_RULE}") ) +export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${NONCOMMIT_RULE}") ) +export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${RETIRED_RULE}") ) +export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" "${NONCOMMIT_RULE}") ) export KEYSERVERS=( "${KS_GENTOO}" ) export KEYSERVER_TIMEOUT=5m diff --git a/keyrings-recv-sks.bash b/keyrings-recv-sks.bash index c5e1d1c..4e613b8 100755 --- a/keyrings-recv-sks.bash +++ b/keyrings-recv-sks.bash @@ -10,8 +10,12 @@ source "${BASEDIR}"/keyrings.inc.bash set -e export_ldap_data_to_env +export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${COMMIT_RULE}") ) +export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${NONCOMMIT_RULE}") ) +export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${RETIRED_RULE}") ) +export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" "${NONCOMMIT_RULE}") ) -export KEYSERVER=( ${KS_SKS} ) +export KEYSERVERS=( "${KS_SKS}" ) export KEYSERVER_TIMEOUT=20m grab_keys "${SYSTEM_KEYS[@]}" diff --git a/keyrings-send-keys.gentoo.org.bash b/keyrings-send-keys.gentoo.org.bash index 7e16267..ae67acf 100755 --- a/keyrings-send-keys.gentoo.org.bash +++ b/keyrings-send-keys.gentoo.org.bash @@ -7,6 +7,10 @@ source "${BASEDIR}"/keyrings.inc.bash set -e export_ldap_data_to_env +export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${COMMIT_RULE}") ) +export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${NONCOMMIT_RULE}") ) +export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${RETIRED_RULE}") ) +export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" "${NONCOMMIT_RULE}") ) export KEYSERVERS=( "${KS_GENTOO}" ) export KEYSERVER_TIMEOUT=5m diff --git a/keyrings.inc.bash b/keyrings.inc.bash index c885e8d..0c45e68 100644 --- a/keyrings.inc.bash +++ b/keyrings.inc.bash @@ -93,6 +93,7 @@ export_keys() { } # populate common variables +# TODO: for unclear reason this does not populate correctly inside a function export_ldap_data_to_env() { export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${COMMIT_RULE}") ) export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${NONCOMMIT_RULE}") )