September 2011 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/3] make compute_download_size consider .part files
by Dave Reisner 08 Sep '11

08 Sep '11

Check for the existance of a partial download of a package file before jumping to delta calculations. Currently, if there were 10MiB remaining in a 100MiB the values passed to the front end do not reflect this. The frontend accounts for this change in the verbose target display by using alpm_pkg_download_size() instead of alpm_pkg_get_size(). We also change the label in the final column from a vague "Size" to a more descriptive "Download Size" Refactored from an old patch originally by Dan. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/sync.c | 29 ++++++++++++++++++++++++----- src/pacman/util.c | 4 ++-- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index e2562c0..471bbe7 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -284,7 +284,8 @@ alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs, */ static int compute_download_size(alpm_pkg_t *newpkg) { - char *fpath; + const char *fname; + char *fpath, *fnamepart = NULL; off_t size = 0; alpm_handle_t *handle = newpkg->handle; @@ -295,11 +296,26 @@ static int compute_download_size(alpm_pkg_t *newpkg) } ASSERT(newpkg->filename != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1)); - fpath = _alpm_filecache_find(handle, newpkg->filename); + fname = newpkg->filename; + fpath = _alpm_filecache_find(handle, fname); + /* downloaded file exists, so there's nothing to grab */ if(fpath) { - FREE(fpath); size = 0; + goto finish; + } + + CALLOC(fnamepart, strlen(fname) + 6, sizeof(char), return -1); + sprintf(fnamepart, "%s.part", fname); + fpath = _alpm_filecache_find(handle, fnamepart); + if(fpath) { + struct stat st; + if(stat(fpath, &st) == 0) { + /* subtract the size of the .part file */ + _alpm_log(handle, ALPM_LOG_DEBUG, "using (package - .part) size\n"); + size = newpkg->size - st.st_size; + size = size < 0 ? 0 : size; + } } else if(handle->usedelta) { off_t dltsize; @@ -315,15 +331,18 @@ static int compute_download_size(alpm_pkg_t *newpkg) alpm_list_free(newpkg->delta_path); newpkg->delta_path = NULL; } - } else { - size = newpkg->size; } +finish: _alpm_log(handle, ALPM_LOG_DEBUG, "setting download size %jd for pkg %s\n", (intmax_t)size, newpkg->name); newpkg->infolevel |= INFRQ_DSIZE; newpkg->download_size = size; + + FREE(fpath); + FREE(fnamepart); + return 0; } diff --git a/src/pacman/util.c b/src/pacman/util.c index 594186f..6963afb 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -748,7 +748,7 @@ static alpm_list_t *create_verbose_header(int install) pm_asprintf(&str, "%s", _("New Version")); res = alpm_list_add(res, str); } - pm_asprintf(&str, "%s", _("Size")); + pm_asprintf(&str, "%s", _("Download Size")); res = alpm_list_add(res, str); return res; @@ -779,7 +779,7 @@ static alpm_list_t *create_verbose_row(alpm_pkg_t *pkg, int install) ret = alpm_list_add(ret, str); /* and size */ - size = humanize_size(alpm_pkg_get_size(pkg), 'M', &label); + size = humanize_size(alpm_pkg_download_size(pkg), 'M', &label); pm_asprintf(&str, "%.2f %s", size, label); ret = alpm_list_add(ret, str); -- 1.7.6.1

2 3

[pacman-dev] [PATCH] Ensure PackageRequired works as expected
by Dan McGee 07 Sep '11

07 Sep '11

Changes in commit dc3336c277 caused this to stop working as expected for sync packages, due to the way the logic is structured. Ensure we always enter the signature code if the bitflag is flipped on to check signatures for packages. Rename 'use_sig' to 'has_sig' for clarity. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_package.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 98a1240..8b035ca 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -286,7 +286,7 @@ static alpm_file_t *files_msort(alpm_file_t *files, size_t n) alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, alpm_pkg_t *syncpkg, int full, alpm_siglevel_t level) { - int ret, use_sig, config = 0; + int ret, has_sig, config = 0; struct archive *archive; struct archive_entry *entry; alpm_pkg_t *newpkg = NULL; @@ -312,20 +312,20 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, } /* can we get away with skipping checksums? */ - use_sig = 0; + has_sig = 0; if(level & ALPM_SIG_PACKAGE) { if(syncpkg && syncpkg->base64_sig) { - use_sig = 1; + has_sig = 1; } else { char *sigpath = _alpm_sigpath(handle, pkgfile); if(sigpath && !_alpm_access(handle, NULL, sigpath, R_OK)) { - use_sig = 1; + has_sig = 1; } free(sigpath); } } - if(syncpkg && !use_sig) { + if(syncpkg && !has_sig) { if(syncpkg->md5sum && !syncpkg->sha256sum) { _alpm_log(handle, ALPM_LOG_DEBUG, "md5sum: %s\n", syncpkg->md5sum); _alpm_log(handle, ALPM_LOG_DEBUG, "checking md5sum for %s\n", pkgfile); @@ -345,7 +345,8 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, } } - if(use_sig) { + /* even if we don't have a sig, run the check code if level tells us to */ + if(has_sig || level & ALPM_SIG_PACKAGE) { const char *sig = syncpkg ? syncpkg->base64_sig : NULL; _alpm_log(handle, ALPM_LOG_DEBUG, "sig data: %s\n", sig ? sig : "<from .sig>"); if(_alpm_check_pgp_helper(handle, pkgfile, sig, -- 1.7.6.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-165-g0e79802
by dan＠archlinux.org 06 Sep '11

06 Sep '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 0e79802c0ac8453376d8c0f99629f5a3b499f571 (commit) via 8d0ff3d7dc4ea925a1fd94ae022a16a14945aa3f (commit) from 29ad9e0a0a93a60a1118eb0e8cb6a14df147320f (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 0e79802c0ac8453376d8c0f99629f5a3b499f571 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Sep 3 22:24:27 2011 -0400 makepkg: use globs in place of regex We seem to enjoy using bash regex capabilities, but never referencing the result with BASH_REMATCH. Replace almost all regexes with equivalent globs which are faster and functionally equivalent in these cases. This enables the extglob shopt. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8d0ff3d7dc4ea925a1fd94ae022a16a14945aa3f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 6 11:44:29 2011 -0500 dload: use intmax_t when printing off_t This works for both 32-bit and 64-bit platforms. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/dload.c | 6 ++++-- scripts/makepkg.sh.in | 16 +++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-163-g29ad9e0
by dan＠archlinux.org 06 Sep '11

06 Sep '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 29ad9e0a0a93a60a1118eb0e8cb6a14df147320f (commit) via 7ed54a99401f7a16edcba27725e92fb7474be240 (commit) via a4e0d3e9302aa16b966ea5d84926664748ba9ae2 (commit) via 6c236277a3d5b444a30790702b8114b6658696a2 (commit) via 7054e37126cc476b88da7b57a6efa658d4765cf0 (commit) via 400942fedf35d4fc6b584b8f1552f1ec649136fe (commit) via 7ea1ea88bbca64514d5aad64fe199191f0f2eea1 (commit) from 7c956d5d4bdf89bfece1244baa56a92f83bd9161 (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 29ad9e0a0a93a60a1118eb0e8cb6a14df147320f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 6 09:29:52 2011 -0400 makepkg: unset variables as per !{make,build}flags Don't just set the flag variables to zero length strings, actually unset them from the environment. This fixes issues with broken gnu Makefies that use ?= for assigment, where the presence of a var is enough to make this condition avoid assignment. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7ed54a99401f7a16edcba27725e92fb7474be240 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Sep 3 22:23:21 2011 -0400 rankmirrors: properly sort resulting times - Properly read each sorted line into a new array, instead of breaking on every word. - LC_COLLATE should apply to the sort portion of the pipeline, not the printing. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit a4e0d3e9302aa16b966ea5d84926664748ba9ae2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 4 11:58:45 2011 -0400 dload: abstract dload_interrupted reasons This gives us some amount of room to grow in case we ever find another reason that we might return with an error from the progress callback. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6c236277a3d5b444a30790702b8114b6658696a2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 4 11:47:40 2011 -0400 dload: improve debug output We lost some of this output in the fetch->curl conversion, but I also noticed in FS#25852 that we just lack some of this useful information along the way. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 7054e37126cc476b88da7b57a6efa658d4765cf0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 5 13:16:07 2011 -0400 sync: add missing newline in warning message Dan: fix the other missing one too. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 400942fedf35d4fc6b584b8f1552f1ec649136fe Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 4 14:59:17 2011 -0400 avoid blowing out the filecache list when using tmpdir _alpm_filecache_setup() destroys the list of cachedirs when it finds no writeable directories in the config. This put us in an awkward situation where _alpm_filecache_find() would locate a downloaded file in a r/o cachedir, but then fail to install it after _alpm_filecache_setup() is called (with a NULL argument). Change this behavior to merely prepend the temporary directory to the list of available cachedirs. Dan exposed it in e07547ee4ed4, as now a package can be found in a directory we may not be able to actually store packages in. Reported-by: Rémy Oudompheng <remy(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7ea1ea88bbca64514d5aad64fe199191f0f2eea1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Sep 2 22:07:06 2011 -0500 More package operations cleanup Neither deltas nor filename attributes are ever present in the local database, so we can remove all of the indirection for accessing these attributes. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_local.c | 14 -------------- lib/libalpm/delta.c | 5 +---- lib/libalpm/dload.c | 27 ++++++++++++++++++++++----- lib/libalpm/package.c | 11 ++++------- lib/libalpm/package.h | 7 ------- lib/libalpm/signing.c | 2 +- lib/libalpm/sync.c | 18 ++++++------------ lib/libalpm/util.c | 6 ++---- scripts/makepkg.sh.in | 6 ++---- scripts/rankmirrors.sh.in | 3 ++- src/pacman/query.c | 2 +- src/pacman/sync.c | 2 +- 12 files changed, 42 insertions(+), 61 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/3] rankmirrors: properly sort resulting times
by Dave Reisner 06 Sep '11

06 Sep '11

- Properly read each sorted line into a new array, instead of breaking on every word. - LC_COLLATE should apply to the sort portion of the pipeline, not the printing. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/rankmirrors.sh.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index a0ff6d5..875a143 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -92,7 +92,8 @@ getfetchurl() { # This exists to remove the need for a separate interrupt function finaloutput() { - IFS=$'\n' sortedarray=( $(LC_COLLATE=C printf "%s\n" "${timesarray[@]}" | sort) ) + IFS=$'\n' read -r -d '' -a sortedarray < \ + <(printf '%s\n' "${timesarray[@]}" | LC_COLLATE=C sort) # Final output for mirrorfile numiterator="0" -- 1.7.6.1

2 8

[pacman-dev] [PATCH] avoid blowing out the filecache list when using tmpdir
by Dave Reisner 04 Sep '11

04 Sep '11

_alpm_filecache_setup() destroys the list of cachedirs when it finds no writeable directories in the config. This put us in an awkward situation where _alpm_filecache_find() would locate a downloaded file in a r/o cachedir, but then fail to install it after _alpm_filecache_setup() is called (with a NULL argument). Change this behavior to merely prepend the temporary directory to the list of available cachedirs. Dan broke it in e07547ee4ed4. Reported-by: Rémy Oudompheng <remy(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/util.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 44dead8..58274ed 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -699,10 +699,8 @@ const char *_alpm_filecache_setup(alpm_handle_t *handle) } else { tmpdir = "/tmp"; } - i = alpm_list_add(NULL, tmpdir); - alpm_option_set_cachedirs(handle, i); - alpm_list_free(i); - cachedir = handle->cachedirs->data; + alpm_option_add_cachedir(handle, tmpdir); + cachedir = handle->cachedirs->prev->data; _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); _alpm_log(handle, ALPM_LOG_WARNING, _("couldn't find or create package cache, using %s instead\n"), cachedir); -- 1.7.6.1

1 0

[pacman-dev] [PATCH] More package operations cleanup
by Dan McGee 03 Sep '11

03 Sep '11

Neither deltas nor filename attributes are ever present in the local database, so we can remove all of the indirection for accessing these attributes. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 14 -------------- lib/libalpm/delta.c | 5 +---- lib/libalpm/package.c | 11 ++++------- lib/libalpm/package.h | 7 ------- lib/libalpm/signing.c | 2 +- lib/libalpm/sync.c | 18 ++++++------------ 6 files changed, 12 insertions(+), 45 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index ba41544..80711df 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -57,12 +57,6 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq); * initialized. */ -static const char *_cache_get_filename(alpm_pkg_t *pkg) -{ - LAZY_LOAD(INFRQ_DESC, NULL); - return pkg->filename; -} - static const char *_cache_get_desc(alpm_pkg_t *pkg) { LAZY_LOAD(INFRQ_DESC, NULL); @@ -159,12 +153,6 @@ static alpm_list_t *_cache_get_replaces(alpm_pkg_t *pkg) return pkg->replaces; } -/* local packages can not have deltas */ -static alpm_list_t *_cache_get_deltas(alpm_pkg_t UNUSED *pkg) -{ - return NULL; -} - static alpm_filelist_t *_cache_get_files(alpm_pkg_t *pkg) { LAZY_LOAD(INFRQ_FILES, NULL); @@ -230,7 +218,6 @@ static int _cache_force_load(alpm_pkg_t *pkg) * logic. */ static struct pkg_operations local_pkg_ops = { - .get_filename = _cache_get_filename, .get_desc = _cache_get_desc, .get_url = _cache_get_url, .get_builddate = _cache_get_builddate, @@ -247,7 +234,6 @@ static struct pkg_operations local_pkg_ops = { .get_conflicts = _cache_get_conflicts, .get_provides = _cache_get_provides, .get_replaces = _cache_get_replaces, - .get_deltas = _cache_get_deltas, .get_files = _cache_get_files, .get_backup = _cache_get_backup, diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 1dd2bf4..1ff4fde 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -250,10 +250,7 @@ static alpm_list_t *find_unused(alpm_list_t *deltas, const char *to, off_t quota alpm_list_t SYMEXPORT *alpm_pkg_unused_deltas(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); - return find_unused( - alpm_pkg_get_deltas(pkg), - alpm_pkg_get_filename(pkg), - pkg->size * MAX_DELTA_RATIO); + return find_unused(pkg->deltas, pkg->filename, pkg->size * MAX_DELTA_RATIO); } /** @} */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 5678880..3045857 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -67,7 +67,7 @@ int SYMEXPORT alpm_pkg_checkmd5sum(alpm_pkg_t *pkg) ASSERT(pkg->origin == PKG_FROM_SYNCDB, RET_ERR(pkg->handle, ALPM_ERR_WRONG_ARGS, -1)); - fpath = _alpm_filecache_find(pkg->handle, alpm_pkg_get_filename(pkg)); + fpath = _alpm_filecache_find(pkg->handle, pkg->filename); retval = _alpm_test_checksum(fpath, pkg->md5sum, ALPM_CSUM_MD5); @@ -85,7 +85,6 @@ int SYMEXPORT alpm_pkg_checkmd5sum(alpm_pkg_t *pkg) * backend logic that needs lazy access, such as the local database through * a lazy-load cache. However, the defaults will work just fine for fully- * populated package structures. */ -static const char *_pkg_get_filename(alpm_pkg_t *pkg) { return pkg->filename; } static const char *_pkg_get_desc(alpm_pkg_t *pkg) { return pkg->desc; } static const char *_pkg_get_url(alpm_pkg_t *pkg) { return pkg->url; } static time_t _pkg_get_builddate(alpm_pkg_t *pkg) { return pkg->builddate; } @@ -103,7 +102,6 @@ static alpm_list_t *_pkg_get_optdepends(alpm_pkg_t *pkg) { return pkg->optdepend static alpm_list_t *_pkg_get_conflicts(alpm_pkg_t *pkg) { return pkg->conflicts; } static alpm_list_t *_pkg_get_provides(alpm_pkg_t *pkg) { return pkg->provides; } static alpm_list_t *_pkg_get_replaces(alpm_pkg_t *pkg) { return pkg->replaces; } -static alpm_list_t *_pkg_get_deltas(alpm_pkg_t *pkg) { return pkg->deltas; } static alpm_filelist_t *_pkg_get_files(alpm_pkg_t *pkg) { return &(pkg->files); } static alpm_list_t *_pkg_get_backup(alpm_pkg_t *pkg) { return pkg->backup; } @@ -130,7 +128,6 @@ static int _pkg_force_load(alpm_pkg_t UNUSED *pkg) { return 0; } * struct itself with no abstraction layer or any type of lazy loading. */ struct pkg_operations default_pkg_ops = { - .get_filename = _pkg_get_filename, .get_desc = _pkg_get_desc, .get_url = _pkg_get_url, .get_builddate = _pkg_get_builddate, @@ -148,7 +145,6 @@ struct pkg_operations default_pkg_ops = { .get_conflicts = _pkg_get_conflicts, .get_provides = _pkg_get_provides, .get_replaces = _pkg_get_replaces, - .get_deltas = _pkg_get_deltas, .get_files = _pkg_get_files, .get_backup = _pkg_get_backup, @@ -166,7 +162,7 @@ const char SYMEXPORT *alpm_pkg_get_filename(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); pkg->handle->pm_errno = 0; - return pkg->ops->get_filename(pkg); + return pkg->filename; } const char SYMEXPORT *alpm_pkg_get_name(alpm_pkg_t *pkg) @@ -256,6 +252,7 @@ const char SYMEXPORT *alpm_pkg_get_arch(alpm_pkg_t *pkg) off_t SYMEXPORT alpm_pkg_get_size(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return -1); + pkg->handle->pm_errno = 0; return pkg->size; } @@ -326,7 +323,7 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_deltas(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); pkg->handle->pm_errno = 0; - return pkg->ops->get_deltas(pkg); + return pkg->deltas; } alpm_filelist_t SYMEXPORT *alpm_pkg_get_files(alpm_pkg_t *pkg) diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 4680375..41dd84b 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -42,7 +42,6 @@ * defined default_pkg_ops struct to work just fine for their needs. */ struct pkg_operations { - const char *(*get_filename) (alpm_pkg_t *); const char *(*get_desc) (alpm_pkg_t *); const char *(*get_url) (alpm_pkg_t *); time_t (*get_builddate) (alpm_pkg_t *); @@ -60,7 +59,6 @@ struct pkg_operations { alpm_list_t *(*get_conflicts) (alpm_pkg_t *); alpm_list_t *(*get_provides) (alpm_pkg_t *); alpm_list_t *(*get_replaces) (alpm_pkg_t *); - alpm_list_t *(*get_deltas) (alpm_pkg_t *); alpm_filelist_t *(*get_files) (alpm_pkg_t *); alpm_list_t *(*get_backup) (alpm_pkg_t *); @@ -69,11 +67,6 @@ struct pkg_operations { int (*changelog_close) (const alpm_pkg_t *, void *); int (*force_load) (alpm_pkg_t *); - - /* still to add: - * checkmd5sum() ? - * compute_requiredby() - */ }; /** The standard package operations struct. get fields directly from the diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 349de49..b7e8c9a 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -511,7 +511,7 @@ int SYMEXPORT alpm_pkg_check_pgp_signature(alpm_pkg_t *pkg, ASSERT(siglist != NULL, RET_ERR(pkg->handle, ALPM_ERR_WRONG_ARGS, -1)); pkg->handle->pm_errno = 0; - return _alpm_gpgme_checksig(pkg->handle, alpm_pkg_get_filename(pkg), + return _alpm_gpgme_checksig(pkg->handle, pkg->filename, pkg->base64_sig, siglist); } diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index d50ae84..e2562c0 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -284,7 +284,6 @@ alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs, */ static int compute_download_size(alpm_pkg_t *newpkg) { - const char *fname; char *fpath; off_t size = 0; alpm_handle_t *handle = newpkg->handle; @@ -295,9 +294,8 @@ static int compute_download_size(alpm_pkg_t *newpkg) return 0; } - fname = alpm_pkg_get_filename(newpkg); - ASSERT(fname != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1)); - fpath = _alpm_filecache_find(handle, fname); + ASSERT(newpkg->filename != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1)); + fpath = _alpm_filecache_find(handle, newpkg->filename); if(fpath) { FREE(fpath); @@ -305,10 +303,8 @@ static int compute_download_size(alpm_pkg_t *newpkg) } else if(handle->usedelta) { off_t dltsize; - dltsize = _alpm_shortest_delta_path(handle, - alpm_pkg_get_deltas(newpkg), - alpm_pkg_get_filename(newpkg), - &newpkg->delta_path); + dltsize = _alpm_shortest_delta_path(handle, newpkg->deltas, + newpkg->filename, &newpkg->delta_path); if(newpkg->delta_path && (dltsize < newpkg->size * MAX_DELTA_RATIO)) { _alpm_log(handle, ALPM_LOG_DEBUG, "using delta size\n"); @@ -934,7 +930,6 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) for(i = trans->add; i; i = i->next, current++) { alpm_pkg_t *spkg = i->data; - const char *filename; char *filepath; alpm_siglevel_t level; int percent = (int)(((double)current_bytes / total_bytes) * 100); @@ -946,8 +941,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) } current_bytes += spkg->size; - filename = alpm_pkg_get_filename(spkg); - filepath = _alpm_filecache_find(handle, filename); + filepath = _alpm_filecache_find(handle, spkg->filename); alpm_db_t *sdb = alpm_pkg_get_db(spkg); level = alpm_db_get_siglevel(sdb); @@ -960,7 +954,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) if(!pkgfile) { prompt_to_delete(handle, filepath, handle->pm_errno); errors++; - *data = alpm_list_add(*data, strdup(filename)); + *data = alpm_list_add(*data, strdup(spkg->filename)); FREE(filepath); continue; } -- 1.7.6

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-156-g7c956d5
by dan＠archlinux.org 03 Sep '11

03 Sep '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 7c956d5d4bdf89bfece1244baa56a92f83bd9161 (commit) via 98fdfa1968f81596acd25ed5b77cc968dcd97ead (commit) via 37da18aee8d925ee5cd9f526f2c61d07e9db5b66 (commit) via d88e524e7c6e902dcf1c0afed52def0d8b430b25 (commit) via 062c391919e93f1d669deb3ffec60457d57e7d27 (commit) via 16fd66f879abd52a636ba00cd782b37b1fcf8a65 (commit) via d9545103b9a9517cb8996562d990431094027663 (commit) via 5a9b07b0e7fc73dc85f07bbab5cba007efe8d8aa (commit) via 24f4f9822fe8c6758e72577173495705cfcc6713 (commit) via 3c3ee6796a417cdd06be5639989a570b22318a20 (commit) via 83a1e4fee39321358858841069e1fe36d44edefc (commit) via c51b9ca0ad897428a008701e35f8f11fa0ad9046 (commit) from ad051f7328cb8fed19070651aac314d64de1b815 (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 7c956d5d4bdf89bfece1244baa56a92f83bd9161 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 18:01:33 2011 -0500 Add -p/--print tip for -Q operations on filepath Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 98fdfa1968f81596acd25ed5b77cc968dcd97ead Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 17:35:50 2011 -0500 Former transaction callback rename refactor Put all the callback stuff in alpm.h in one spot, and make the following renames for clarity with the new structure: ALPM_TRANS_EVT_* --> ALPM_EVENT_* ALPM_TRANS_CONV_* --> ALPM_QUESTION_* ALPM_TRANS_PROGRESS_* --> ALPM_PROGRESS_* alpm_option_get_convcb() --> alpm_option_get_questioncb() alpm_option_set_convcb() --> alpm_option_set_questioncb() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 37da18aee8d925ee5cd9f526f2c61d07e9db5b66 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 17:16:56 2011 -0500 Move all callbacks up to the handle level This was just disgusting before, unnecessary to limit these to only usage in a transaction. Still a lot of more room for cleanup but we'll start by attaching them to the handle rather than the transaction we may or may not even want to use these callbacks. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d88e524e7c6e902dcf1c0afed52def0d8b430b25 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 17:13:13 2011 -0500 Be fully silent on any -Sp operation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 062c391919e93f1d669deb3ffec60457d57e7d27 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 16:00:48 2011 -0500 Make delta validation/application more logical The call to apply was tucked inside validate, and the EVENT callbacks were done outside the function rather than inside. Reorganize things a bit to make more sense. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 16fd66f879abd52a636ba00cd782b37b1fcf8a65 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 15:29:25 2011 -0500 pacman-key: add --refresh-keys operation This allows new signatures to be pulled, revocations to be found, etc. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d9545103b9a9517cb8996562d990431094027663 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 15:20:53 2011 -0500 pacman-key: split keyserver to a separate option This also renames '--receive' to '-recv-keys' to match the wrapped gpg option name, rather than invent a new one, now that the calling convention is the same. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5a9b07b0e7fc73dc85f07bbab5cba007efe8d8aa Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 15:04:28 2011 -0500 pacman-key help and documentation cleanup We were using the mystical [<foobar>] options which is some sort of cross between a <required> argument and an [optional] one. Remove this madness and do some other general cleanup/consistency work in the manpage. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 24f4f9822fe8c6758e72577173495705cfcc6713 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 15:03:39 2011 -0500 doc: consistency when referencing other options Use '\--option' rather than `--option` everywhere. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3c3ee6796a417cdd06be5639989a570b22318a20 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 14:47:33 2011 -0500 pacman-key: document --lsign-key Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 83a1e4fee39321358858841069e1fe36d44edefc Author: Dan McGee <dan(a)archlinux.org> Date: Fri Sep 2 19:26:07 2011 -0500 Clean up handling of size fields We currently have csize, isize, and size concepts, and sometimes the difference isn't clear. Ensure the following holds: * size (aka csize): always the compressed size of the package; available for everything except local packages (where it will return 0) * isize: always the installed size of the package; available for all three package types Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c51b9ca0ad897428a008701e35f8f11fa0ad9046 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 13:30:03 2011 -0500 pactest: remove PACMAN_OUTPUT from ldconfig tests This removes the last usages of this rule that aren't explicitly looking at real output from pacman. Notably, these tests depended on one particular debug logger not ever being changed, which is too fragile, not to mention doesn't work at all with --nolog. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 7 +- doc/index.txt | 6 +- doc/makepkg.8.txt | 2 +- doc/makepkg.conf.5.txt | 4 +- doc/pacman-key.8.txt | 39 ++++-- lib/libalpm/add.c | 20 ++-- lib/libalpm/alpm.h | 246 ++++++++++++++++++++------------------ lib/libalpm/be_local.c | 16 +--- lib/libalpm/be_sync.c | 8 -- lib/libalpm/conflict.c | 5 +- lib/libalpm/delta.c | 7 +- lib/libalpm/deps.c | 6 +- lib/libalpm/diskspace.c | 6 +- lib/libalpm/handle.c | 39 ++++++ lib/libalpm/handle.h | 24 ++++- lib/libalpm/package.c | 5 +- lib/libalpm/package.h | 1 - lib/libalpm/remove.c | 14 +- lib/libalpm/sync.c | 103 ++++++++-------- lib/libalpm/trans.c | 7 +- lib/libalpm/trans.h | 26 +---- lib/libalpm/util.c | 2 +- scripts/pacman-key.sh.in | 53 +++++---- src/pacman/callback.c | 92 ++++++++------- src/pacman/callback.h | 12 +- src/pacman/conf.c | 3 + src/pacman/query.c | 6 + src/pacman/sync.c | 4 +- src/pacman/util.c | 8 +- test/pacman/ldconfig.stub | 4 + test/pacman/pmtest.py | 7 +- test/pacman/tests/ldconfig001.py | 9 +- test/pacman/tests/ldconfig002.py | 7 +- test/pacman/tests/ldconfig003.py | 7 +- test/pacman/util.py | 1 + 35 files changed, 429 insertions(+), 377 deletions(-) create mode 100755 test/pacman/ldconfig.stub hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Clean up handling of size fields
by Dan McGee 03 Sep '11

03 Sep '11

We currently have csize, isize, and size concepts, and sometimes the difference isn't clear. Ensure the following holds: * size (aka csize): always the compressed size of the package; available for everything except local packages (where it will return 0) * isize: always the installed size of the package; available for all three package types Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.h | 3 ++- lib/libalpm/be_local.c | 16 +--------------- lib/libalpm/be_sync.c | 8 -------- lib/libalpm/delta.c | 7 +++---- lib/libalpm/package.c | 5 +---- lib/libalpm/package.h | 1 - lib/libalpm/sync.c | 13 ++++++------- 7 files changed, 13 insertions(+), 40 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 42e6038..cfc2a10 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -653,7 +653,8 @@ const char *alpm_pkg_get_sha256sum(alpm_pkg_t *pkg); */ const char *alpm_pkg_get_arch(alpm_pkg_t *pkg); -/** Returns the size of the package. +/** Returns the size of the package. This is only available for sync database + * packages and package files, not those loaded from the local database. * @param pkg a pointer to package * @return the size of the package in bytes. */ diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index dc9e361..ba41544 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -99,12 +99,6 @@ static const char *_cache_get_arch(alpm_pkg_t *pkg) return pkg->arch; } -static off_t _cache_get_size(alpm_pkg_t *pkg) -{ - LAZY_LOAD(INFRQ_DESC, -1); - return pkg->size; -} - static off_t _cache_get_isize(alpm_pkg_t *pkg) { LAZY_LOAD(INFRQ_DESC, -1); @@ -243,7 +237,6 @@ static struct pkg_operations local_pkg_ops = { .get_installdate = _cache_get_installdate, .get_packager = _cache_get_packager, .get_arch = _cache_get_arch, - .get_size = _cache_get_size, .get_isize = _cache_get_isize, .get_reason = _cache_get_reason, .has_scriptlet = _cache_has_scriptlet, @@ -621,15 +614,8 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) READ_NEXT(); info->reason = (alpm_pkgreason_t)atoi(line); } else if(strcmp(line, "%SIZE%") == 0) { - /* NOTE: the CSIZE and SIZE fields both share the "size" field - * in the pkginfo_t struct. This can be done b/c CSIZE - * is currently only used in sync databases, and SIZE is - * only used in local databases. - */ READ_NEXT(); - info->size = _alpm_strtoofft(line); - /* also store this value to isize */ - info->isize = info->size; + info->isize = _alpm_strtoofft(line); } else if(strcmp(line, "%REPLACES%") == 0) { READ_AND_SPLITDEP(info->replaces); } else if(strcmp(line, "%DEPENDS%") == 0) { diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 982d355..7eb2539 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -561,16 +561,8 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, } else if(strcmp(line, "%PACKAGER%") == 0) { READ_AND_STORE(pkg->packager); } else if(strcmp(line, "%CSIZE%") == 0) { - /* Note: the CSIZE and SIZE fields both share the "size" field in the - * pkginfo_t struct. This can be done b/c CSIZE is currently only used - * in sync databases, and SIZE is only used in local databases. - */ READ_NEXT(); pkg->size = _alpm_strtoofft(line); - /* also store this value to isize if isize is unset */ - if(pkg->isize == 0) { - pkg->isize = pkg->size; - } } else if(strcmp(line, "%ISIZE%") == 0) { READ_NEXT(); pkg->isize = _alpm_strtoofft(line); diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index c88955f..1dd2bf4 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -249,12 +249,11 @@ static alpm_list_t *find_unused(alpm_list_t *deltas, const char *to, off_t quota alpm_list_t SYMEXPORT *alpm_pkg_unused_deltas(alpm_pkg_t *pkg) { - off_t pkgsize = alpm_pkg_get_size(pkg); - alpm_list_t *unused = find_unused( + ASSERT(pkg != NULL, return NULL); + return find_unused( alpm_pkg_get_deltas(pkg), alpm_pkg_get_filename(pkg), - pkgsize * MAX_DELTA_RATIO); - return unused; + pkg->size * MAX_DELTA_RATIO); } /** @} */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 487b56d..5678880 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -92,7 +92,6 @@ static time_t _pkg_get_builddate(alpm_pkg_t *pkg) { return pkg->builddate static time_t _pkg_get_installdate(alpm_pkg_t *pkg) { return pkg->installdate; } static const char *_pkg_get_packager(alpm_pkg_t *pkg) { return pkg->packager; } static const char *_pkg_get_arch(alpm_pkg_t *pkg) { return pkg->arch; } -static off_t _pkg_get_size(alpm_pkg_t *pkg) { return pkg->size; } static off_t _pkg_get_isize(alpm_pkg_t *pkg) { return pkg->isize; } static alpm_pkgreason_t _pkg_get_reason(alpm_pkg_t *pkg) { return pkg->reason; } static int _pkg_has_scriptlet(alpm_pkg_t *pkg) { return pkg->scriptlet; } @@ -138,7 +137,6 @@ struct pkg_operations default_pkg_ops = { .get_installdate = _pkg_get_installdate, .get_packager = _pkg_get_packager, .get_arch = _pkg_get_arch, - .get_size = _pkg_get_size, .get_isize = _pkg_get_isize, .get_reason = _pkg_get_reason, .has_scriptlet = _pkg_has_scriptlet, @@ -258,8 +256,7 @@ const char SYMEXPORT *alpm_pkg_get_arch(alpm_pkg_t *pkg) off_t SYMEXPORT alpm_pkg_get_size(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return -1); - pkg->handle->pm_errno = 0; - return pkg->ops->get_size(pkg); + return pkg->size; } off_t SYMEXPORT alpm_pkg_get_isize(alpm_pkg_t *pkg) diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 5962b1d..4680375 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -49,7 +49,6 @@ struct pkg_operations { time_t (*get_installdate) (alpm_pkg_t *); const char *(*get_packager) (alpm_pkg_t *); const char *(*get_arch) (alpm_pkg_t *); - off_t (*get_size) (alpm_pkg_t *); off_t (*get_isize) (alpm_pkg_t *); alpm_pkgreason_t (*get_reason) (alpm_pkg_t *); int (*has_scriptlet) (alpm_pkg_t *); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 023ad62..7106faf 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -304,24 +304,23 @@ static int compute_download_size(alpm_pkg_t *newpkg) size = 0; } else if(handle->usedelta) { off_t dltsize; - off_t pkgsize = alpm_pkg_get_size(newpkg); dltsize = _alpm_shortest_delta_path(handle, alpm_pkg_get_deltas(newpkg), alpm_pkg_get_filename(newpkg), &newpkg->delta_path); - if(newpkg->delta_path && (dltsize < pkgsize * MAX_DELTA_RATIO)) { + if(newpkg->delta_path && (dltsize < newpkg->size * MAX_DELTA_RATIO)) { _alpm_log(handle, ALPM_LOG_DEBUG, "using delta size\n"); size = dltsize; } else { _alpm_log(handle, ALPM_LOG_DEBUG, "using package size\n"); - size = alpm_pkg_get_size(newpkg); + size = newpkg->size; alpm_list_free(newpkg->delta_path); newpkg->delta_path = NULL; } } else { - size = alpm_pkg_get_size(newpkg); + size = newpkg->size; } _alpm_log(handle, ALPM_LOG_DEBUG, "setting download size %jd for pkg %s\n", @@ -833,7 +832,7 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas) ASSERT(spkg->filename != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1)); CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); STRDUP(payload->remote_name, spkg->filename, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - payload->max_size = alpm_pkg_get_size(spkg); + payload->max_size = spkg->size; files = alpm_list_add(files, payload); } @@ -916,7 +915,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) for(i = trans->add; i; i = i->next, current++) { alpm_pkg_t *spkg = i->data; if(spkg->origin != PKG_FROM_FILE) { - total_bytes += alpm_pkg_get_size(spkg); + total_bytes += spkg->size; } } /* this can only happen maliciously */ @@ -942,7 +941,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) continue; /* pkg_load() has been already called, this package is valid */ } - current_bytes += alpm_pkg_get_size(spkg); + current_bytes += spkg->size; filename = alpm_pkg_get_filename(spkg); filepath = _alpm_filecache_find(handle, filename); alpm_db_t *sdb = alpm_pkg_get_db(spkg); -- 1.7.6

1 0

[pacman-dev] [PATCH 1/2] pacman-key: split keyserver to a separate option
by Dan McGee 01 Sep '11

01 Sep '11

This also renames '--receive' to '-recv-keys' to match the wrapped gpg option name, rather than invent a new one, now that the calling convention is the same. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/pacman-key.8.txt | 10 ++++++++-- scripts/pacman-key.sh.in | 29 +++++++++++++++-------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 7481ce5..824f0b3 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -71,6 +71,12 @@ Options Ensure the keyring is properly initialized and has the required access permissions. +*\--keyserver* <keyserver>:: + Use the specified keyserver if the operation requires one. This will take + precedence over any keyserver option specified in a `gpg.conf` + configuration file. Running '\--init' with this option will set the default + keyserver if one was not already configured. + *-l, \--list-keys* [keyid(s)]:: Lists all or specified keys from the public keyring. @@ -81,8 +87,8 @@ Options Locally sign the given key. This is primarily used to root the web of trust in the local private key generated by '\--init'. -*-r, \--receive* <keyserver> <keyid(s)>:: - Fetch the specified keyid(s) from the specified key server URL. +*-r, \--recv-keys* <keyid(s)>:: + Equivalent to '\--recv-keys' in GnuPG. *\--populate* [keyring(s)]:: Reload the default keys from the (optionally provided) keyrings in diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 9bb8182..ce95f5d 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -35,6 +35,7 @@ FINGER=0 IMPORT=0 IMPORT_TRUSTDB=0 INIT=0 +KEYSERVER='' LISTKEYS=0 LISTSIGS=0 LSIGNKEY=0 @@ -43,6 +44,8 @@ RECEIVE=0 UPDATEDB=0 VERIFY=0 +DEFAULT_KEYSERVER='hkp://keys.gnupg.net' + m4_include(library/output_format.sh) m4_include(library/parse_options.sh) @@ -61,7 +64,7 @@ usage() { echo "$(gettext " -f, --finger [keyid(s)] List fingerprint for specified or all keyids")" echo "$(gettext " -h, --help Show this help message and exit")" echo "$(gettext " -l, --list-keys [keyid(s)] List the specified or all keys")" - echo "$(gettext " -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids")" + echo "$(gettext " -r, --recv-keys <keyid(s)> Fetch the specified keyids")" echo "$(gettext " -u, --updatedb Update the trustdb of pacman")" echo "$(gettext " -v, --verify <signature> Verify the file specified by the signature")" echo "$(gettext " -V, --version Show program version")" @@ -73,6 +76,7 @@ usage() { echo "$(gettext " --import <dir(s)> Imports pubring.gpg and trustdb.gpg from dir(s)")" echo "$(gettext " --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir(s)")" echo "$(gettext " --init Ensure the keyring is properly initialized")" + echo "$(gettext " --keyserver Specify a keyserver to use if necessary")" echo "$(gettext " --list-sigs [keyid(s)] List keys and their signatures")" echo "$(gettext " --lsign-key <keyid> Locally sign the specified keyid")" printf "$(gettext " --populate [keyring(s)] Reload the default keys from the (given) keyrings\n\ @@ -136,7 +140,7 @@ add_gpg_conf_option() { } initialize() { - local conffile + local conffile keyserv # Check for simple existence rather than for a directory as someone # may want to use a symlink here [[ -e ${PACMAN_KEYRING_DIR} ]] || mkdir -p -m 755 "${PACMAN_KEYRING_DIR}" @@ -155,7 +159,8 @@ initialize() { add_gpg_conf_option "$conffile" 'no-greeting' add_gpg_conf_option "$conffile" 'no-permission-warning' add_gpg_conf_option "$conffile" 'lock-never' - add_gpg_conf_option "$conffile" 'keyserver' 'hkp://keys.gnupg.net' + keyserv=${KEYSERVER:-$DEFAULT_KEYSERVER} + add_gpg_conf_option "$conffile" 'keyserver' "$keyserv" # set up a private signing key (if none available) if [[ $(secret_keys_available) -lt 1 ]]; then @@ -304,14 +309,6 @@ populate_keyring() { fi } -receive_keys() { - if [[ -z ${KEYIDS[@]} ]]; then - error "$(gettext "You need to specify the keyserver and at least one key identifier")" - exit 1 - fi - "${GPG_PACMAN[@]}" --keyserver "$KEYSERVER" --recv-keys "${KEYIDS[@]}" -} - edit_keys() { local errors=0; for key in ${KEYIDS[@]}; do @@ -366,7 +363,7 @@ fi OPT_SHORT="a::d:e:f::hl::r:uv:V" OPT_LONG="add::,config:,delete:,edit-key:,export::,finger::,gpgdir:" OPT_LONG+=",help,import:,import-trustdb:,init,list-keys::,list-sigs::" -OPT_LONG+=",lsign-key:,populate::,receive:,updatedb,verify:,version" +OPT_LONG+=",lsign-key:,populate::,recv-keys:,updatedb,verify:,version" if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then echo; usage; exit 1 # E_INVALID_OPTION; fi @@ -390,11 +387,12 @@ while true; do --import) IMPORT=1; shift; IMPORT_DIRS=($1); UPDATEDB=1 ;; --import-trustdb) IMPORT_TRUSTDB=1; shift; IMPORT_DIRS=($1); UPDATEDB=1 ;; --init) INIT=1 ;; + --keyserver) shift; KEYSERVER=$1 ;; -l|--list-keys) LISTKEYS=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; --list-sigs) LISTSIGS=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; --lsign-key) LSIGNKEY=1; shift; KEYIDS=($1); UPDATEDB=1 ;; --populate) POPULATE=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYRINGIDS=($1); UPDATEDB=1 ;; - -r|--receive) RECEIVE=1; shift; TMP=($1); KEYSERVER=${TMP[0]}; KEYIDS=(${TMP[@]:1}); unset TMP; UPDATEDB=1 ;; + -r|--recv-keys) RECEIVE=1; shift; KEYIDS=($1); UPDATEDB=1 ;; -u|--updatedb) UPDATEDB=1 ;; -v|--verify) VERIFY=1; shift; SIGNATURE=$1 ;; @@ -429,6 +427,9 @@ fi PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(get_from "$CONFIG" "GPGDir" || echo "@sysconfdir@/pacman.d/gnupg")} GPG_PACMAN=(gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning) +if [[ -n ${KEYSERVER} ]]; then + GPG_PACMAN+=(--keyserver ${KEYSERVER}) +fi # check only a single operation has been given # don't include UPDATEDB in here as other opts can induce it @@ -464,7 +465,7 @@ esac # TODO: we can't do --batch on lsign until we figure out --command-fd (( LSIGNKEY )) && "${GPG_PACMAN[@]}" --lsign-key "${KEYIDS[@]}" (( POPULATE )) && populate_keyring -(( RECEIVE )) && receive_keys +(( RECEIVE )) && "${GPG_PACMAN[@]}" --recv-keys "${KEYIDS[@]}" (( VERIFY )) && "${GPG_PACMAN[@]}" --verify $SIGNATURE if (( UPDATEDB )); then -- 1.7.6

3 4