From 95a89605e9db55eeb138cfaa30f5d695999f8de6 Mon Sep 17 00:00:00 2001
From: Drtan Samos <drtan@lavabit.com>
Date: Sun, 21 Apr 2013 19:59:02 +0200
Subject: The patch appears to be already applied.

---
 configs/releng/build.sh                            |  3 --
 .../pacman-key-4.0.3_unattended-keyring-init.patch | 32 ----------------------
 2 files changed, 35 deletions(-)
 delete mode 100644 configs/releng/pacman-key-4.0.3_unattended-keyring-init.patch

diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index a310cfa..13574b8 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -78,9 +78,6 @@ make_setup_mkinitcpio() {
 # Customize installation (root-image)
 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
-
     setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r '/root/customize_root_image.sh' run
     rm ${work_dir}/${arch}/root-image/root/customize_root_image.sh
 }
diff --git a/configs/releng/pacman-key-4.0.3_unattended-keyring-init.patch b/configs/releng/pacman-key-4.0.3_unattended-keyring-init.patch
deleted file mode 100644
index 0a5117f..0000000
--- a/configs/releng/pacman-key-4.0.3_unattended-keyring-init.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Author: Pierre Schmitz <pierre@archlinux.de>
-
-* 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
-- 
cgit v1.2.2