diff -Naur releng/build.sh releng-4.1/build.sh --- releng/build.sh 2013-03-30 23:30:07.000000000 +0000 +++ releng-4.1/build.sh 2013-04-10 19:59:22.674302430 +0000 @@ -79,7 +79,7 @@ make_customize_root_image() { cp -af ${script_path}/root-image ${work_dir}/${arch} - patch ${work_dir}/${arch}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.0.3_unattended-keyring-init.patch + patch ${work_dir}/${arch}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.1.0_unattended-keyring-init.patch curl -o ${work_dir}/${arch}/root-image/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on' lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/root-image/root/install.txt diff -Naur releng/pacman-key-4.0.3_unattended-keyring-init.patch releng-4.1/pacman-key-4.0.3_unattended-keyring-init.patch --- releng/pacman-key-4.0.3_unattended-keyring-init.patch 2013-03-30 23:30:07.000000000 +0000 +++ releng-4.1/pacman-key-4.0.3_unattended-keyring-init.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Author: Pierre Schmitz - -* pacman-key: Use lsign_keys function in --populate -* pacman-key: reduce verbosity of --populate - ---- pacman-key 2012-07-10 18:45:32.000000000 -0300 -+++ pacman-key 2012-07-18 16:38:18.264110004 -0300 -@@ -376,7 +376,7 @@ - # Add keys from requested keyrings - for keyring in "${KEYRINGIDS[@]}"; do - msg "$(gettext "Appending keys from %s.gpg...")" "$keyring" -- "${GPG_PACMAN[@]}" --import "${KEYRING_IMPORT_DIR}/${keyring}.gpg" -+ "${GPG_PACMAN[@]}" --quiet --import "${KEYRING_IMPORT_DIR}/${keyring}.gpg" - done - - # Read the trusted key IDs to an array. Because this is an ownertrust -@@ -403,12 +403,13 @@ - msg "$(gettext "Locally signing trusted keys in keyring...")" - for key_id in "${!trusted_ids[@]}"; do - msg2 "$(gettext "Locally signing key %s...")" "${key_id}" -- "${GPG_PACMAN[@]}" --quiet --lsign-key "${key_id}" -+ KEYIDS=("${key_id}") -+ lsign_keys - done - msg "$(gettext "Importing owner trust values...")" - for keyring in "${KEYRINGIDS[@]}"; do - if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then -- "${GPG_PACMAN[@]}" --import-ownertrust "${KEYRING_IMPORT_DIR}/${keyring}-trusted" -+ "${GPG_PACMAN[@]}" --import-ownertrust "${KEYRING_IMPORT_DIR}/${keyring}-trusted" 2>/dev/null - fi - done - fi diff -Naur releng/pacman-key-4.1.0_unattended-keyring-init.patch releng-4.1/pacman-key-4.1.0_unattended-keyring-init.patch --- releng/pacman-key-4.1.0_unattended-keyring-init.patch 1970-01-01 00:00:00.000000000 +0000 +++ releng-4.1/pacman-key-4.1.0_unattended-keyring-init.patch 2013-04-10 19:57:59.955931432 +0000 @@ -0,0 +1,11 @@ +--- pacman-key 2013-04-04 14:26:50.000000000 +0200 ++++ pacman-key 2013-04-10 20:09:32.598863049 +0200 +@@ -474,7 +474,7 @@ + msg "$(gettext "Importing owner trust values...")" + for keyring in "${KEYRINGIDS[@]}"; do + if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then +- "${GPG_PACMAN[@]}" --import-ownertrust "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ++ "${GPG_PACMAN[@]}" --import-ownertrust "${KEYRING_IMPORT_DIR}/${keyring}-trusted" 2>/dev/null + fi + done + fi