[pacman-dev] [PATCH 2/6] Update pacman manpage and pacman.conf for gpgdir

[Dan McGee]

On Sat, May 28, 2011 at 9:37 AM, Pang Yan Han <pangyanhan at gmail.com> wrote:
> pacman.8.txt --gpgdir section is updated based on the pacman.conf manpage
>
> pacman.conf is updated to include the default GPGDir
>
> Signed-off-by: Pang Yan Han <pangyanhan at gmail.com>
> ---
>  doc/pacman.8.txt   |   11 ++++++-----
>  etc/pacman.conf.in |    1 +
>  2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
> index 6270dbd..aec7fd1 100644
> --- a/doc/pacman.8.txt
> +++ b/doc/pacman.8.txt
> @@ -150,11 +150,12 @@ Options
>        to be used.
>
>  *\--gpgdir* <dir>::
> -       Specify a directory of files used by GnuPG to verify package signatures.
> -       This directory should contain two files: `pubring.gpg` and `trustdb.gpg`.
> -       `pubring.gpg` holds the public keys of all packagers. `trustdb.gpg`
> -       contains a so-called trust database, which specifies that the keys are
> -       authentic and trusted.
> +       Specify a directory of files used by GnuPG to verify package signatures (a
> +       typical default is `{sysconfdir}/pacman.d/gnupg`). This directory should contain
> +       two files: `pubring.gpg` and `trustdb.gpg`. `pubring.gpg` holds the public keys
> +       of all packagers. `trustdb.gpg` contains a so-called trust database, which
> +       specifies that the keys are authentic and trusted. *NOTE*: this is an absolute
> +       path, the root path is not automatically prepended.

Looks good; of course this unearths another bug where we aren't
properly substituting variables anymore (obvious online, but also in
generated manpages too):
http://www.archlinux.org/pacman/pacman.conf.5.html#_options

>
>  *\--logfile* <file>::
>        Specify an alternate log file. This is an absolute path, regardless of
> diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
> index 7b8501c..1d49fd7 100644
> --- a/etc/pacman.conf.in
> +++ b/etc/pacman.conf.in
> @@ -13,6 +13,7 @@
>  #DBPath      = @localstatedir@/lib/pacman/
>  #CacheDir    = @localstatedir@/cache/pacman/pkg/
>  #LogFile     = @localstatedir@/log/pacman.log
> +#GPGDir      = @sysconfdir@/pacman.d/gnupg/
I think I'll move it above LogFile only to keep the Dir configs
together, but this works.

>  HoldPkg     = pacman glibc
>  # If upgrades are available for these packages they will be asked for first
>  SyncFirst   = pacman
> --
> 1.7.5.rc0.101.g3d23c
>
>
>