- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 0/2] --verify option for sig levels
by Pang Yan Han 02 Jun '11

02 Jun '11

This is a 2nd reroll of a series to introduce the --verify option for the user to change pacman's default signature verification level on the command line. Patch 1/2 changes option_verifysig to accept non-capitalized versions of "Always", "Optional" and "Never". Patch 2/2 introduces the --verify option itself Pang Yan Han (2): option_verifysig: Accept non-caps sig levels Add --verify option for signature level doc/pacman.8.txt | 5 +++++ src/pacman/conf.c | 20 +++++++++++++++++--- src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 5 +++++ 4 files changed, 30 insertions(+), 4 deletions(-) -- 1.7.5.rc0.101.g3d23c

2 3

[pacman-dev] [PATCH] Show net upgrade size on -U/-S operations
by Dan McGee 01 Jun '11

01 Jun '11

If it is different than the raw installed size metric we already show, compute the net upgrade size. For some sync operations, this can even be negative if newer packages are smaller than the ones they replace locally. Implements FS#12566. Example: Targets (1): telepathy-glib-0.14.7-1 Total Download Size: 1.07 MiB Total Installed Size: 15.72 MiB Net Upgrade Size: -0.29 MiB Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/remove.c | 2 +- src/pacman/util.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 58e6edd..094a43b 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -31,7 +31,7 @@ #include "util.h" #include "conf.h" -static int remove_target(char *target) +static int remove_target(const char *target) { pmpkg_t *info; pmdb_t *db_local = alpm_option_get_localdb(); diff --git a/src/pacman/util.c b/src/pacman/util.c index 8631075..bfc707c 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -688,8 +688,9 @@ void display_targets(const alpm_list_t *pkgs, int install) const char *title, *label; double size; const alpm_list_t *i; - off_t isize = 0, dlsize = 0; + off_t isize = 0, rsize = 0, dlsize = 0; alpm_list_t *j, *lp, *header = NULL, *targets = NULL; + pmdb_t *db_local = alpm_option_get_localdb(); if(!pkgs) { return; @@ -700,7 +701,12 @@ void display_targets(const alpm_list_t *pkgs, int install) pmpkg_t *pkg = alpm_list_getdata(i); if(install) { + pmpkg_t *lpkg = alpm_db_get_pkg(db_local, alpm_pkg_get_name(pkg)); dlsize += alpm_pkg_download_size(pkg); + if(lpkg) { + /* add up size of all removed packages */ + rsize += alpm_pkg_get_isize(lpkg); + } } isize += alpm_pkg_get_isize(pkg); @@ -736,6 +742,11 @@ void display_targets(const alpm_list_t *pkgs, int install) if(!(config->flags & PM_TRANS_FLAG_DOWNLOADONLY)) { size = humanize_size(isize, 'M', 1, &label); printf(_("Total Installed Size: %.2f %s\n"), size, label); + /* only show this net value if different from raw installed size */ + if(rsize > 0) { + size = humanize_size(isize - rsize, 'M', 1, &label); + printf(_("Net Upgrade Size: %.2f %s\n"), size, label); + } } } else { size = humanize_size(isize, 'M', 1, &label); -- 1.7.5.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-197-g0d1fcd3
by dan＠archlinux.org 01 Jun '11

01 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 0d1fcd329fac091568ad7ad3978771a534e7e09e (commit) via 8807cac100acb2d368232833b2478e96a1806fa9 (commit) from 8f1c873b5f07f42a8bdc65bb03097790135a9c94 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0d1fcd329fac091568ad7ad3978771a534e7e09e Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 1 14:39:20 2011 -0400 lib/dload.c: remove assumption in continuation logic Callers to curl_download_internal now tell us if its okay to continue a transfer, so obey this instead of using a heuristic. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8807cac100acb2d368232833b2478e96a1806fa9 Author: Dave Reisner <d(a)falconindy.com> Date: Thu May 26 19:32:45 2011 -0400 dload: abort transfer on CURLOPT_LOW_SPEED_LIMIT If a connection drops below 1kb/s for 10s, curl will kill the transfer and we'll report failure. This is the average transfer speed over the delta defined by CURLOPT_LOW_SPEED_TIME, so setting a low value here shouldn't bother folks using 14.4k dial-up. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/dload.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Finishing off the package signing issue -- Update
by Kerrick Staley 01 Jun '11

01 Jun '11

All, I examined the code in pacman's git master branch, and I found that it appears nearly finished. There are some issues, both blocking and non-blocking. Note that the following statements are to be interpreted as suggestions and may be revised if anyone has objections; if there are no objections, then this is the course of action that should be taken. Blocking: 1) The option/function naming conventions need to be unified, per https://wiki.archlinux.org/index.php/User:Allan/Package_Signing . This will be significantly harder to fix once the signing feature is shipped. 2) A means of initially installing keys and of updating the list of keys must be created. This will be implemented as a package called pacman-keys. [1] 3) The Arch Developers must create keys. The page https://wiki.archlinux.org/index.php/DeveloperWiki:Signing_Packages must be finalized, and then an informational email can be posted to arch-general. 4) The Arch Developers must place their keys into the pacman-keys package. The developers that can access the central repository can update the package directly. The developers that lack this access (if any) can generate a fingerprint, email their key to a developer with access, and use Skype to verify the fingerprint. If this is a problem, other arrangements can be made. 5) The existing packages and databases on the central repository need to be signed. A single developer can do this. 6) The entire signing process needs to be tested, and pactest tests should be written for it. 7) The pacman manpage should be reviewed and finalized. Non-blocking: 1) Package validation without root privileges must be implemented. Fixing this issue after the signing feature is introduced will not require more work than fixing it first. Omission of this feature will not decrease security but will cause inconvenience. 2) pacman-key should be made production-ready. pacman-key is nonessential because users will typically not edit pacman's trustdb, and pacman-key's functionality is available via sudo GNUPGHOME=/etc/pacman.d/gnupg gpg --options although this usage is cumbersome since it is not tailored for pacman usage. pacman-key should be renamed to pacman-manage-keys to avoid confusion with the pacman-keys package. 3) The documentation for developer tools (makepkg, repo-add) should be reviewed and finalized. 3) The page http://www.archlinux.org/download/ needs to be made to use HTTPS. This can be done independently of package signing implementation, but is necessary for complete security. 4) The output of tar -cf - /etc/pacman.d/gnupg/pacman_{valid,revoked}_keys | sha256sum as executed on an up-to-date system should be posted on an HTTPS page somewhere on archlinux.org and updated upon updates to the pacman-keys package. 5) Further issues are given at https://wiki.archlinux.org/index.php/User:Allan/Package_Signing . I have not had a chance to investigate these issues, but they appear to be non-blocking. Questions: 1) I am unsure as to who has access to the central repository regarding blocking issue 4, so if someone could clarify, I would appreciate it. 2) pacman-key should be updated after pacman but before any other packages. I am not sure if the SyncFirst field in /etc/pacman.conf supports this behavior. If not, the two packages will be both placed in this field and will be designed to install properly in either order until the SyncFirst functionality can be improved. 3) I don't know how quickly validated signatures from every single developer can be gathered, so maybe this will be an issue; I'm not sure. 4) I haven't yet had a chance to see how the documentation is, but pacman's manpage should be reviewed before shipping; manpages for developer-side tools can be reviewed after shipping. 5) I'm not sure what "output when downloading signature file - name when downloaded" from https://wiki.archlinux.org/index.php/User:Allan/Package_Signing means. I think it means that there is no indication when a database signature is being downloaded. I realize this message was rather long and does not have any patches attached to it. I apologize, but I felt that these basic points should be straightened out as development work continues. Tomorrow, I will transcribe some of the information in this email to https://wiki.archlinux.org/index.php?title=Pacman_package_signing, with expanded information on outstanding issues. If you are interested, please adopt an issue and also inform others so that work is not duplicated. If you have information that may be useful to others working on package signing, please place it on this page. I am working on blocking issue 1 and will be done fairly soon. I will then start to work on 2 and 3. 6 and 7 are big issues, so if anyone wants to help out, that'd be a good place. 4 and 5 require action of the Arch Developers; I only list them for completion. [1] This package will place keys (as generated by gpg --export) into the /etc/pacman.d/gnupg/pacman_valid_keys and /etc/pacman.d/gnupg/pacman_revoked_keys directories. The .INSTALL file will update the /etc/pacman.d/gnupg/trustdb.gpg according to the directories' contents. The PKGBUILD for this package will download valid and revoked keys from an HTTPS page on archlinux.org. Before the package is updated, the HTTPS page will be updated, so that the package will contain the changes when built on the developer's machine. The PKGBUILD cannot just copy keys out of the trustdb (with a special option to add or revoke keys for developers) because the PKGBUILD should be able to make the package even when the package isn't already properly installed. Or maybe it can just copy them; I'm too tired right now to decide which is best. Carpe Noctem, Kerrick Staley

5 9

[pacman-dev] [PATCH] Ensure list_display works on non-TTY terminals
by Dan McGee 01 Jun '11

01 Jun '11

If getcols() returns 0, we were getting stuck before in a loop of no return. Coerce any returned value of 0 to 80 for a sane width for our list. Also make a few other cleanups while diagnosing this issue. Noticed-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/util.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 3d26803..e1bc3ed 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -209,14 +209,13 @@ void indentprint(const char *str, int indent) { wchar_t *wcstr; const wchar_t *p; - int len, cidx, cols; + int len, cidx; + const int cols = getcols(); if(!str) { return; } - cols = getcols(); - /* if we're not a tty, print without indenting */ if(cols == 0) { printf("%s", str); @@ -425,8 +424,6 @@ static int string_length(const char *s) void string_display(const char *title, const char *string) { - int len = 0; - if(title) { printf("%s ", title); } @@ -434,7 +431,7 @@ void string_display(const char *title, const char *string) printf(_("None")); } else { /* compute the length of title + a space */ - len = string_length(title) + 1; + int len = string_length(title) + 1; indentprint(string, len); } printf("\n"); @@ -443,7 +440,7 @@ void string_display(const char *title, const char *string) void list_display(const char *title, const alpm_list_t *list) { const alpm_list_t *i; - int cols, len = 0; + int len = 0; if(title) { len = string_length(title) + 1; @@ -453,11 +450,13 @@ void list_display(const char *title, const alpm_list_t *list) if(!list) { printf("%s\n", _("None")); } else { + int cols, maxcols = getcols(); + /* coerce to 80 if we couldn't determine terminal width */ + maxcols = maxcols ? maxcols : 80; for(i = list, cols = len; i; i = alpm_list_next(i)) { char *str = alpm_list_getdata(i); int s = string_length(str); - int maxcols = getcols(); - if(maxcols > 0 && (cols + s + 2) >= maxcols) { + if(cols + s + 2 >= maxcols) { int j; cols = len; printf("\n"); -- 1.7.5.2

1 1

[pacman-dev] [PATCH 0/2] Minor tweaks to download code
by Dave Reisner 01 Jun '11

01 Jun '11

Just a couple fixes for the download code. I'm not entirely convinced that the values hard coded in patch 2/2 are appropriate, so I'll say that its up for discussion. I know that we have folks who insist on using dial-up, so we need to be aware of this as well. Based on the source of curl, it seems to be a comparison of the average speed over the life of the transfer against the low speed limit, so this would actually be elongated on larger transfers. Regardless, this should address bug reports such as FS#23690 and FS#15369. dave

2 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-195-g8f1c873
by dan＠archlinux.org 01 Jun '11

01 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 8f1c873b5f07f42a8bdc65bb03097790135a9c94 (commit) via 5842dad7e7b6265067ca8f286f945b3e7e76c321 (commit) via 41da2253366b6f641fc3e986817ee617c9e18df3 (commit) via fe9804a96d9e50a44e549c7be9189152e20893c5 (commit) via aad57cc06ac60dc8fdcff9bea811e990d64f74d3 (commit) via ac1726788c4bf9ae335df9f69f14a5f80208c413 (commit) via 1855b3073a33874a80d64e40296050641d63cd63 (commit) via 7b261675801822a1c5922dd982f012f91dd737f8 (commit) via e711e5b9501adcb692c65e7d358ae5b0e5bcfb57 (commit) via 65c18807350b2bedff0546b839fd5cd0004a6d4f (commit) from 11fb9c767450dc193bbeef755c228aa620df75d9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8f1c873b5f07f42a8bdc65bb03097790135a9c94 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 1 12:56:38 2011 -0500 doc: monospace attribute escape fixes Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5842dad7e7b6265067ca8f286f945b3e7e76c321 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Sat May 28 22:37:35 2011 +0800 pacman-key: print default gpgdir in usage Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 41da2253366b6f641fc3e986817ee617c9e18df3 Merge: fe9804a aad57cc Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 1 12:13:49 2011 -0500 Merge branch 'maint' commit fe9804a96d9e50a44e549c7be9189152e20893c5 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Sat May 28 22:37:32 2011 +0800 Update pacman manpage and pacman.conf for gpgdir 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(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7b261675801822a1c5922dd982f012f91dd737f8 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Sat May 28 22:37:31 2011 +0800 Let pacman -v print GPG Dir Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 4 ++-- doc/asciidoc.conf | 4 ++++ doc/makepkg.8.txt | 2 +- doc/pacman-key.8.txt | 4 ++-- doc/pacman.8.txt | 15 ++++++++------- doc/pacman.conf.5.txt | 14 +++++++------- etc/pacman.conf.in | 1 + lib/libalpm/alpm_list.c | 2 +- lib/libalpm/handle.c | 2 -- lib/libalpm/trans.c | 3 ++- scripts/pacman-key.sh.in | 2 +- src/pacman/pacman.c | 1 + 12 files changed, 30 insertions(+), 24 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.2-20-gaad57cc
by dan＠archlinux.org 01 Jun '11

01 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via aad57cc06ac60dc8fdcff9bea811e990d64f74d3 (commit) via ac1726788c4bf9ae335df9f69f14a5f80208c413 (commit) via 1855b3073a33874a80d64e40296050641d63cd63 (commit) via e711e5b9501adcb692c65e7d358ae5b0e5bcfb57 (commit) via 65c18807350b2bedff0546b839fd5cd0004a6d4f (commit) from f2c4e7e55220addef0581d1c38cc7363b5a0884c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit aad57cc06ac60dc8fdcff9bea811e990d64f74d3 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 1 12:11:31 2011 -0500 doc: fix attribute substitution in monospaced text When I switched all paths to use `` formatting, I didn't realize substitution didn't work in these quote marks. Use ++ instead to ensure attributes are substituted where appropriate. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ac1726788c4bf9ae335df9f69f14a5f80208c413 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 1 12:10:32 2011 -0500 doc: update Makefile for new asciidoc resource location Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1855b3073a33874a80d64e40296050641d63cd63 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 1 11:46:13 2011 -0500 doc: add a few more escapes and fix usage of {} These addditional attributes come from the git asciidoc.conf file. Also, fix a place where we used {treename} without escaping the braces, causing the generated manpage to be missing text. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e711e5b9501adcb692c65e7d358ae5b0e5bcfb57 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Tue May 24 11:25:13 2011 +0800 alpm_list: fix typo in doxygen comment Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 65c18807350b2bedff0546b839fd5cd0004a6d4f Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 19 17:42:22 2011 -0500 Bail early if we don't have a valid lockfile path This addresses FS#24292. If one does the bad thing of not checking pm_errno after calling set_dbpath(), you may not realize the initialization process went wrong and calling trans_init() resulted in a segfault. If we don't have a lockfile path, bail out and have trans_init() fail. Also remove a ALPM_LOG_FUNC call that was causing pm_errno to return "no handle"; this was due to a log call in the handle setup (whereby the log attempts to use a callback attached to the handle). Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 4 ++-- doc/asciidoc.conf | 4 ++++ doc/makepkg.8.txt | 2 +- doc/pacman.8.txt | 4 ++-- doc/pacman.conf.5.txt | 12 ++++++------ lib/libalpm/alpm_list.c | 2 +- lib/libalpm/handle.c | 2 -- lib/libalpm/trans.c | 3 ++- 8 files changed, 18 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 4/6] Add --verify option for signature level
by Pang Yan Han 01 Jun '11

01 Jun '11

The --verify option allows the user to change pacman's default signature verification level. It can take in one of "Always", "Optional" or "Verify". Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- This is a reroll after Remy suggested that it's better to set the signature verification level supplied from the command line in setlibpaths(). A new field is introduced in struct config which stores what the user passes to the --verify option at the command line. Is it possible for us to change option_verifysig to compare to non-caps versions of "Always", "Optional" and "Never"? src/pacman/conf.c | 14 ++++++++++++++ src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 4 ++++ 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 370ec51..869c005 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -68,6 +68,7 @@ int config_free(config_t *oldconfig) free(oldconfig->rootdir); free(oldconfig->dbpath); free(oldconfig->logfile); + free(oldconfig->sigverify); free(oldconfig->xfercommand); free(oldconfig->print_format); free(oldconfig); @@ -474,6 +475,19 @@ static int setlibpaths(void) } } + /* Set the signature verification level to what the user requested */ + if(config->sigverify) { + pgp_verify_t verify = option_verifysig(config->sigverify); + if (verify != PM_PGP_VERIFY_UNKNOWN) { + ret = alpm_option_set_default_sigverify(verify); + if(ret != 0) { + pm_printf(PM_LOG_ERROR, _("problem setting sigverify '%s' (%s)\n"), + config->sigverify, alpm_strerrorlast()); + return ret; + } + } + } + /* add a default cachedir if one wasn't specified */ if(alpm_option_get_cachedirs() == NULL) { alpm_option_add_cachedir(CACHEDIR); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 76c76cf..d08f83c 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -41,6 +41,7 @@ typedef struct __config_t { char *dbpath; char *logfile; char *gpgdir; + char *sigverify; /* TODO how to handle cachedirs? */ unsigned short op_q_isfile; @@ -111,7 +112,8 @@ enum { OP_ASEXPLICIT, OP_ARCH, OP_PRINTFORMAT, - OP_GPGDIR + OP_GPGDIR, + OP_VERIFY }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 8458c97..1e58890 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -438,6 +438,9 @@ static int parsearg_global(int opt) config->logfile = strndup(optarg, PATH_MAX); break; case OP_NOCONFIRM: config->noconfirm = 1; break; + case OP_VERIFY: + config->sigverify = strdup(optarg); + break; case 'b': check_optarg(); config->dbpath = strdup(optarg); @@ -635,6 +638,7 @@ static int parseargs(int argc, char *argv[]) {"arch", required_argument, 0, OP_ARCH}, {"print-format", required_argument, 0, OP_PRINTFORMAT}, {"gpgdir", required_argument, 0, OP_GPGDIR}, + {"verify", required_argument, 0, OP_VERIFY}, {0, 0, 0, 0} }; -- 1.7.5.rc0.101.g3d23c

2 1

[pacman-dev] Patch: Clean up API
by Kerrick Staley 01 Jun '11

01 Jun '11

All, This patch fixes API inconsistencies: A) All references to PGP were removed within names, because such reference is unnecessary. All references to GnuPG's home directory were changed to 'gpgdir' (as opposed to e.g. 'signaturedir'), because this directory is specific to GnuPG. B) makepkg and repo-add now use -S/--sign for signing packages. I didn't find an issue with --nosign and --key. C) Config file directives were not changed because they make enough sense as-is. Unlike functions and flags, you don't have to memorize directives, because they are already given in the config file when you edit it. D) A bug was fixed: repo-add previously used the user's GPG directory when verifying the signature on an old database. It now uses pacman's directory for this purpose. I added a flag --gpgdir to allow configuration of this directory. The patch conflicts with Pang Yan Han's patches. Yan Han, could you please merge the two patch sets? Can the patch be reviewed quickly and either accepted or rejected with suggestions for correction? I realize it should be broken into smaller patches, but I'm inexperienced with git, and I didn't want to wait until tomorrow to submit the changes. The patch is signed-off by: Kerrick Staley <mail(a)kerrickstaley.com> -Kerrick Staley

4 4