diff options
| author | Allan McRae <allan@archlinux.org> | 2011-08-15 14:51:58 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-08-29 03:55:22 +0200 |
| commit | d1240f67eab6dfa7e3344cd84dd8849b38ce337c (patch) | |
| tree | 41a795de5a8968a88a2f0ec74b95903bd13743a1 /scripts/Makefile.am | |
| parent | 2cfcc874b9332ad207398b9e20dc8880d93e8ae4 (diff) | |
| download | pacman-d1240f67eab6dfa7e3344cd84dd8849b38ce337c.tar.gz pacman-d1240f67eab6dfa7e3344cd84dd8849b38ce337c.tar.xz | |
pacman-key: rework importing distro/repo provided keyrings
The current --reload option, apart from being non-clear in its naming,
is very limited in that only one keyring can be provided. A distribution
may want to provide multiple keyrings for various subsets of its
organisation or custom repo providers may also want to provide a keyring.
This patch adds a --populate option that reads keyrings from (by default)
/usr/share/pacman/keyrings. A keyring is named foo.gpg, with optional
foo-revoked file providing a list of revoked key ids. These files are
required to be signed (detached) by a key trusted by pacman-key, in
practice probably by the key that signed the package providing these
files. The --populate flag either updates the pacman keyring using all
keyrings in the directory or individual keyrings can be specified.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 802b8f4e..52a784ab 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -44,6 +44,7 @@ edit = sed \ -e 's|@localedir[@]|$(localedir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ -e '1s|!/bin/bash|!$(BASH_SHELL)|g' \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ |