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 | a5139a6e4ed897d59c900d8ea991c60a19d01862 (patch) | |
| tree | f82a2c95fe0f34ddf5e7e4d88bfa33548e8269a8 /configs/releng/pacman-key-4.0.3_unattended-keyring-init.patch | |
| parent | 2ad1f4471698f00cc3985437f461e2e17aeccfa3 (diff) | |
| parent | 491b627eb4b6af909ba8e19751378672930328eb (diff) | |
Merge branch 'master' of archiso into helper/rebrandhelper/rebrand
Conflicts:
Makefile
configs/releng/build.sh
configs/releng/mkinitcpio.conf
configs/releng/root-image/root/customize_root_image.sh
configs/releng/syslinux/parabolaiso_pxe32.cfg
configs/releng/syslinux/parabolaiso_pxe64.cfg
configs/releng/syslinux/parabolaiso_sys32.cfg
configs/releng/syslinux/parabolaiso_sys64.cfg
docs/README.build
parabolaiso/mkparabolaiso
Diffstat (limited to 'configs/releng/pacman-key-4.0.3_unattended-keyring-init.patch')
| -rw-r--r-- | configs/releng/pacman-key-4.0.3_unattended-keyring-init.patch | 32 |
1 files changed, 0 insertions, 32 deletions
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 |