From 9e2078b1796dbc8dee201710b4680fb79114cbf3 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 2 Feb 2012 08:29:50 -0600
Subject: pacman-key: clarify messages, s/keychain/keyring/

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 scripts/pacman-key.sh.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'scripts/pacman-key.sh.in')

diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index 87d7658f..7d6f3875 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -116,11 +116,11 @@ get_from() {
 generate_master_key() {
 	# Generate the master key, which will be in both pubring and secring
 	"${GPG_PACMAN[@]}" --gen-key --batch <<EOF
-%echo Generating pacman keychain master key...
+%echo Generating pacman keyring master key...
 Key-Type: RSA
 Key-Length: 2048
 Key-Usage: sign
-Name-Real: Pacman Keychain Master Key
+Name-Real: Pacman Keyring Master Key
 Name-Email: pacman@localhost
 Expire-Date: 0
 %commit
@@ -315,7 +315,7 @@ populate_keyring() {
 
 add_keys() {
 	if ! "${GPG_PACMAN[@]}" --quiet --batch --import "${KEYFILES[@]}" ; then
-		error "$(gettext "A specified keyfile could not be added to the gpg keychain.")"
+		error "$(gettext "A specified keyfile could not be added to the keyring.")"
 		exit 1
 	fi
 }
@@ -323,7 +323,7 @@ add_keys() {
 delete_keys() {
 	check_keyids_exist
 	if ! "${GPG_PACMAN[@]}" --quiet --batch --delete-key --yes "${KEYIDS[@]}" ; then
-		error "$(gettext "A specified key could not be removed from the gpg keychain.")"
+		error "$(gettext "A specified key could not be removed from the keyring.")"
 		exit 1
 	fi
 }
@@ -345,7 +345,7 @@ edit_keys() {
 export_keys() {
 	check_keyids_exist
 	if ! "${GPG_PACMAN[@]}" --armor --export "${KEYIDS[@]}" ; then
-		error "$(gettext "A specified key could not be exported from the gpg keychain.")"
+		error "$(gettext "A specified key could not be exported from the keyring.")"
 		exit 1
 	fi
 }
-- 
cgit v1.2.3


From 5de465d63efbb82da6127ac927ad29b9c8b1b542 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Sun, 13 May 2012 13:05:58 -0400
Subject: pacman-key: test for content in keyring files

Test for file content (-s) rather than just existance (-f). This fixes a
bug that manifests itself in the case of an empty -revoked file. A zero
element 'keys' array would be passed to gpg, forcing it to list and,
subsequently, revoke all known keys.

Bug introduced in d1240f67eab6.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
---
 scripts/pacman-key.sh.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/pacman-key.sh.in')

diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index 7d6f3875..948c8d52 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -261,7 +261,7 @@ populate_keyring() {
 	#  40CHARFINGERPRINTXXXXXXXXXXXXXXXXXXXXXXX:5:
 	local -A trusted_ids
 	for keyring in "${KEYRINGIDS[@]}"; do
-		if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then
+		if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then
 			while read key; do
 				# skip comments; these are valid in this file
 				[[ $key = \#* ]] && continue
@@ -282,7 +282,7 @@ populate_keyring() {
 		done
 		msg "$(gettext "Importing owner trust values...")"
 		for keyring in "${KEYRINGIDS[@]}"; do
-			if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then
+			if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then
 				"${GPG_PACMAN[@]}" --import-ownertrust "${KEYRING_IMPORT_DIR}/${keyring}-trusted"
 			fi
 		done
@@ -293,7 +293,7 @@ populate_keyring() {
 	# guarantee of identification for the keys.
 	local -A revoked_ids
 	for keyring in "${KEYRINGIDS[@]}"; do
-		if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then
+		if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then
 			while read key; do
 				key_id="$("${GPG_PACMAN[@]}" --quiet --with-colons --list-key "${key}" 2>/dev/null | grep ^pub | cut -d: -f5)"
 				if [[ -n ${key_id} ]]; then
-- 
cgit v1.2.3