diff options
| author | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
|---|---|---|
| committer | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
| commit | e2b054c74fd0c1852f94d9af80f44297125742f4 (patch) | |
| tree | f7c978cdf3458758f838d60edbb6a54f20f34ea9 /configs/profile/pacman-key-4.0.3_unattended-keyring-init.patch | |
| parent | 04d8551cb78ff9a691fd4ead51e4f8f27c5b851e (diff) | |
| parent | 17803d20925a72d31dbdbacf56cb0a7d2db6efcb (diff) | |
Merge branch 'rebrand/releng'
Conflicts:
Makefile
configs/profile/build.sh
configs/profile/mkinitcpio.conf
configs/profile/pacman-key-4.0.3_unattended-keyring-init.patch
configs/profile/root-image/root/customize_root_image.sh
configs/profile/root-image/root/install.txt
configs/profile/syslinux/splash.png
Diffstat (limited to 'configs/profile/pacman-key-4.0.3_unattended-keyring-init.patch')
| -rw-r--r-- | configs/profile/pacman-key-4.0.3_unattended-keyring-init.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/configs/profile/pacman-key-4.0.3_unattended-keyring-init.patch b/configs/profile/pacman-key-4.0.3_unattended-keyring-init.patch deleted file mode 100644 index 0a5117f..0000000 --- a/configs/profile/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 |