- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] Combine add and removal package list display
by Dan McGee 30 Jul '11

30 Jul '11

There was no real reason for these to be done separately. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- A bit of WIP here. Try it out to see what it does, but it addresses Allan's issue with upgrade size being all whacky when replaces are involved, among other things. http://paste.pocoo.org/show/444372/ for some example output with VerbosePkgLists on, http://paste.pocoo.org/show/444368/ with them off. Not sure what to do with the corny '[removal]' tag bit though. Notes: * The size column is now net changed size per package, so only new packages or totally removed packages will usually have big values (wireshark-cli is buggy in the package itself, as noticed by Dave and I). * Packages are now always sorted in alpha order, rather than the half-sorted, dep resolved mess we had before. * -R ops will show the same format as -U, even though the new version column will now always be blank. I think the consistency win is worth it. They will also always show the '[removal]' tag bit, so suggestions for that are welcome. * Yes, you get 4 different totals now on -S operations, but since the damn package list is so long anyway, who cares. Feedback/thoughts definitely welcome. I'll improve the commit message too before any final version goes live. -Dan src/pacman/remove.c | 2 +- src/pacman/sync.c | 3 +- src/pacman/upgrade.c | 3 +- src/pacman/util.c | 163 +++++++++++++++++++++++++++++++------------------ src/pacman/util.h | 7 ++- 5 files changed, 112 insertions(+), 66 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index f0ac04e..95a728e 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -156,7 +156,7 @@ int pacman_remove(alpm_list_t *targets) } /* print targets and ask user confirmation */ - display_targets(pkglist, 0); + display_targets(); printf("\n"); if(yesno(_("Do you want to remove these packages?")) == 0) { retval = 1; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 5e1643e..0facd6c 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -795,8 +795,7 @@ static int sync_trans(alpm_list_t *targets) goto cleanup; } - display_targets(alpm_trans_get_remove(config->handle), 0); - display_targets(alpm_trans_get_add(config->handle), 1); + display_targets(); printf("\n"); int confirm; diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index a99b137..55b5fa9 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -152,8 +152,7 @@ int pacman_upgrade(alpm_list_t *targets) trans_release(); return retval; } - display_targets(alpm_trans_get_remove(config->handle), 0); - display_targets(alpm_trans_get_add(config->handle), 1); + display_targets(); printf("\n"); int confirm = yesno(_("Proceed with installation?")); if(!confirm) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 7065abd..a300f14 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -711,7 +711,7 @@ void signature_display(const char *title, alpm_sigresult_t *result) } /* creates a header row for use with table_display */ -static alpm_list_t *create_verbose_header(int install) +static alpm_list_t *create_verbose_header(void) { alpm_list_t *res = NULL; char *str; @@ -720,10 +720,8 @@ static alpm_list_t *create_verbose_header(int install) res = alpm_list_add(res, str); pm_asprintf(&str, "%s", _("Old Version")); res = alpm_list_add(res, str); - if(install) { - pm_asprintf(&str, "%s", _("New Version")); - res = alpm_list_add(res, str); - } + pm_asprintf(&str, "%s", _("New Version")); + res = alpm_list_add(res, str); pm_asprintf(&str, "%s", _("Size")); res = alpm_list_add(res, str); @@ -731,125 +729,170 @@ static alpm_list_t *create_verbose_header(int install) } /* returns package info as list of strings */ -static alpm_list_t *create_verbose_row(alpm_pkg_t *pkg, int install) +static alpm_list_t *create_verbose_row(pm_target_t *target) { char *str; - double size; + off_t size = 0; + double human_size; const char *label; alpm_list_t *ret = NULL; - alpm_db_t *ldb = alpm_option_get_localdb(config->handle); /* a row consists of the package name, */ - pm_asprintf(&str, "%s", alpm_pkg_get_name(pkg)); + if(target->install) { + pm_asprintf(&str, "%s", alpm_pkg_get_name(target->install)); + } else { + pm_asprintf(&str, "%s", alpm_pkg_get_name(target->remove)); + } ret = alpm_list_add(ret, str); /* old and new versions */ - if(install) { - alpm_pkg_t *oldpkg = alpm_db_get_pkg(ldb, alpm_pkg_get_name(pkg)); - pm_asprintf(&str, "%s", - oldpkg != NULL ? alpm_pkg_get_version(oldpkg) : ""); - ret = alpm_list_add(ret, str); - } + pm_asprintf(&str, "%s", + target->remove != NULL ? alpm_pkg_get_version(target->remove) : ""); + ret = alpm_list_add(ret, str); - pm_asprintf(&str, "%s", alpm_pkg_get_version(pkg)); + pm_asprintf(&str, "%s", + target->install != NULL ? alpm_pkg_get_version(target->install) : ""); ret = alpm_list_add(ret, str); /* and size */ - size = humanize_size(alpm_pkg_get_size(pkg), 'M', 1, &label); - pm_asprintf(&str, "%.2f %s", size, label); + size -= target->remove ? alpm_pkg_get_isize(target->remove) : 0; + size += target->install ? alpm_pkg_get_isize(target->install) : 0; + human_size = humanize_size(size, 'M', 1, &label); + pm_asprintf(&str, "%.2f %s", human_size, label); ret = alpm_list_add(ret, str); return ret; } /* prepare a list of pkgs to display */ -void display_targets(const alpm_list_t *pkgs, int install) +static void _display_targets(alpm_list_t *targets) { char *str; - const char *title, *label; + const char *label; double size; - const alpm_list_t *i; off_t isize = 0, rsize = 0, dlsize = 0; - alpm_list_t *j, *lp, *header = NULL, *targets = NULL; - alpm_db_t *db_local = alpm_option_get_localdb(config->handle); + alpm_list_t *i, *header = NULL, *rows = NULL; - if(!pkgs) { + if(!targets) { return; } - /* gather pkg infos */ - for(i = pkgs; i; i = alpm_list_next(i)) { - alpm_pkg_t *pkg = alpm_list_getdata(i); + /* gather package info */ + for(i = targets; i; i = alpm_list_next(i)) { + pm_target_t *target = alpm_list_getdata(i); - if(install) { - alpm_pkg_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); - } + if(target->install) { + dlsize += alpm_pkg_download_size(target->install); + isize += alpm_pkg_get_isize(target->install); + } + if(target->remove) { + /* add up size of all removed packages */ + rsize += alpm_pkg_get_isize(target->remove); } - isize += alpm_pkg_get_isize(pkg); if(config->verbosepkglists) { - targets = alpm_list_add(targets, create_verbose_row(pkg, install)); + rows = alpm_list_add(rows, create_verbose_row(target)); } else { - pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); - targets = alpm_list_add(targets, str); + if(target->install) { + pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), + alpm_pkg_get_version(target->install)); + } else { + pm_asprintf(&str, "%s-%s [removal]", alpm_pkg_get_name(target->remove), + alpm_pkg_get_version(target->remove)); + } + rows = alpm_list_add(rows, str); } } /* print to screen */ - title = install ? _("Targets (%d):") : _("Remove (%d):"); - pm_asprintf(&str, title, alpm_list_count(pkgs)); + pm_asprintf(&str, _("Targets (%d):"), alpm_list_count(targets)); printf("\n"); if(config->verbosepkglists) { - header = create_verbose_header(install); - if(table_display(str, header, targets) != 0) { + header = create_verbose_header(); + if(table_display(str, header, rows) != 0) { config->verbosepkglists = 0; - display_targets(pkgs, install); + _display_targets(targets); goto out; } } else { - list_display(str, targets); + list_display(str, rows); } printf("\n"); - if(install) { + if(dlsize > 0) { size = humanize_size(dlsize, 'M', 1, &label); printf(_("Total Download Size: %.2f %s\n"), size, label); - if(!(config->flags & ALPM_TRANS_FLAG_DOWNLOADONLY)) { + } + if(!(config->flags & ALPM_TRANS_FLAG_DOWNLOADONLY)) { + if(isize > 0) { 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); - printf(_("Total Removed Size: %.2f %s\n"), size, label); + if(rsize > 0) { + size = humanize_size(rsize, 'M', 1, &label); + printf(_("Total Removed Size: %.2f %s\n"), size, label); + } + /* only show this net value if different from raw installed size */ + if(isize > 0 && rsize > 0) { + size = humanize_size(isize - rsize, 'M', 1, &label); + printf(_("Net Upgrade Size: %.2f %s\n"), size, label); + } } out: /* cleanup */ if(config->verbosepkglists) { - /* targets is a list of lists of strings, free inner lists here */ - for(j = targets; j; j = alpm_list_next(j)) { - lp = alpm_list_getdata(j); + /* rows is a list of lists of strings, free inner lists here */ + for(i = rows; i; i = alpm_list_next(i)) { + alpm_list_t *lp = alpm_list_getdata(i); FREELIST(lp); } - alpm_list_free(targets); + alpm_list_free(rows); FREELIST(header); } else { - FREELIST(targets); + FREELIST(rows); } free(str); } +static int target_cmp(const void *p1, const void *p2) +{ + const pm_target_t *targ1 = p1; + const pm_target_t *targ2 = p2; + const char *name1 = targ1->install ? + alpm_pkg_get_name(targ1->install) : alpm_pkg_get_name(targ1->remove); + const char *name2 = targ2->install ? + alpm_pkg_get_name(targ2->install) : alpm_pkg_get_name(targ2->remove); + return strcmp(name1, name2); +} + +void display_targets(void) +{ + alpm_list_t *i, *targets = NULL; + alpm_db_t *db_local = alpm_option_get_localdb(config->handle); + + for(i = alpm_trans_get_add(config->handle); i; i = alpm_list_next(i)) { + alpm_pkg_t *pkg = alpm_list_getdata(i); + pm_target_t *targ = calloc(1, sizeof(pm_target_t)); + if(!targ) return; + targ->install = pkg; + targ->remove = alpm_db_get_pkg(db_local, alpm_pkg_get_name(pkg)); + targets = alpm_list_add(targets, targ); + } + for(i = alpm_trans_get_remove(config->handle); i; i = alpm_list_next(i)) { + alpm_pkg_t *pkg = alpm_list_getdata(i); + pm_target_t *targ = calloc(1, sizeof(pm_target_t)); + if(!targ) return; + targ->remove = pkg; + targets = alpm_list_add(targets, targ); + } + + targets = alpm_list_msort(targets, alpm_list_count(targets), target_cmp); + _display_targets(targets); + FREELIST(targets); +} + static off_t pkg_get_size(alpm_pkg_t *pkg) { switch(config->op) { diff --git a/src/pacman/util.h b/src/pacman/util.h index ee3dbd1..54c941d 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -39,6 +39,11 @@ /* update speed for the fill_progress based functions */ #define UPDATE_SPEED_SEC 0.2f +typedef struct _pm_target_t { + alpm_pkg_t *remove; + alpm_pkg_t *install; +} pm_target_t; + int trans_init(alpm_transflag_t flags, int check_valid); int trans_release(void); int needs_root(void); @@ -58,7 +63,7 @@ int table_display(const char *title, const alpm_list_t *header, const alpm_list_ void list_display(const char *title, const alpm_list_t *list); void list_display_linebreak(const char *title, const alpm_list_t *list); void signature_display(const char *title, alpm_sigresult_t *result); -void display_targets(const alpm_list_t *pkgs, int install); +void display_targets(void); int str_cmp(const void *s1, const void *s2); void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg); void display_optdepends(alpm_pkg_t *pkg); -- 1.7.6

4 7

[pacman-dev] Scripts bombing with no args
by Dan McGee 30 Jul '11

30 Jul '11

Allan or Dave, mind taking a look at this? We should show usage info, as rankmirrors and pacman-key do without args, instead of this silly behavior. -Dan dmcgee@galway ~/projects/pacman (master) $ ./scripts/repo-add ==> ERROR: '' does not have a valid archive extension. dmcgee@galway ~/projects/pacman (master) $ ./scripts/pkgdelta ./scripts/pkgdelta: line 147: $1: unbound variable

3 6

[pacman-dev] [PATCH 1/3] Revamp signing checks
by Dan McGee 30 Jul '11

30 Jul '11

This ensures we are actually making correct use of the information gpgme is returning to us. Marginal being allowed was obvious before, but Unknown should deal with trust level, and not the presence or lack thereof of a public key to validate the signature with. Return status and validity information in two separate values so check methods and the frontend can use them independently. For now, we treat expired keys as valid, while expired signatures are invalid. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.h | 22 +++++++-- lib/libalpm/signing.c | 122 +++++++++++++++++++++++++++++++----------------- src/pacman/util.c | 42 ++++++++++++---- 3 files changed, 127 insertions(+), 59 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index d9f3504..a91b00f 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -104,15 +104,26 @@ typedef enum _alpm_siglevel_t { } alpm_siglevel_t; /** - * PGP signature verification return codes + * PGP signature verification status return codes */ typedef enum _alpm_sigstatus_t { - ALPM_SIGSTATUS_VALID = 0, - ALPM_SIGSTATUS_MARGINAL, - ALPM_SIGSTATUS_UNKNOWN, - ALPM_SIGSTATUS_BAD + ALPM_SIGSTATUS_VALID, + ALPM_SIGSTATUS_KEY_EXPIRED, + ALPM_SIGSTATUS_SIG_EXPIRED, + ALPM_SIGSTATUS_KEY_UNKNOWN, + ALPM_SIGSTATUS_INVALID } alpm_sigstatus_t; +/** + * PGP signature verification status return codes + */ +typedef enum _alpm_sigvalidity_t { + ALPM_SIGVALIDITY_FULL, + ALPM_SIGVALIDITY_MARGINAL, + ALPM_SIGVALIDITY_NEVER, + ALPM_SIGVALIDITY_UNKNOWN +} alpm_sigvalidity_t; + /* * Structures */ @@ -202,6 +213,7 @@ typedef struct _alpm_backup_t { typedef struct _alpm_sigresult_t { int count; alpm_sigstatus_t *status; + alpm_sigvalidity_t *validity; char **uid; } alpm_sigresult_t; diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 275851c..78e6264 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -305,8 +305,9 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, _alpm_log(handle, ALPM_LOG_DEBUG, "%d signatures returned\n", sigcount); result->status = calloc(sigcount, sizeof(alpm_sigstatus_t)); + result->validity = calloc(sigcount, sizeof(alpm_sigvalidity_t)); result->uid = calloc(sigcount, sizeof(char*)); - if(!result->status || !result->uid) { + if(!result->status || !result->validity || !result->uid) { handle->pm_errno = ALPM_ERR_MEMORY; goto error; } @@ -316,6 +317,7 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, gpgsig = gpgsig->next, sigcount++) { alpm_list_t *summary_list, *summary; alpm_sigstatus_t status; + alpm_sigvalidity_t validity; gpgme_key_t key; _alpm_log(handle, ALPM_LOG_DEBUG, "fingerprint: %s\n", gpgsig->fpr); @@ -335,6 +337,8 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, if(gpg_err_code(err) == GPG_ERR_EOF) { _alpm_log(handle, ALPM_LOG_DEBUG, "key lookup failed, unknown key\n"); err = GPG_ERR_NO_ERROR; + STRDUP(result->uid[sigcount], gpgsig->fpr, + handle->pm_errno = ALPM_ERR_MEMORY; goto error); } else { CHECK_ERR(); if(key->uids) { @@ -346,34 +350,52 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, gpgme_key_unref(key); } - if(gpgsig->summary & GPGME_SIGSUM_VALID) { - /* definite good signature */ - _alpm_log(handle, ALPM_LOG_DEBUG, "result: valid signature\n"); - status = ALPM_SIGSTATUS_VALID; - } else if(gpgsig->summary & GPGME_SIGSUM_GREEN) { - /* good signature */ - _alpm_log(handle, ALPM_LOG_DEBUG, "result: green signature\n"); - status = ALPM_SIGSTATUS_VALID; - } else if(gpgsig->summary & GPGME_SIGSUM_RED) { - /* definite bad signature, error */ - _alpm_log(handle, ALPM_LOG_DEBUG, "result: red signature\n"); - status = ALPM_SIGSTATUS_BAD; - } else if(gpgsig->summary & GPGME_SIGSUM_KEY_MISSING) { - _alpm_log(handle, ALPM_LOG_DEBUG, "result: signature from unknown key\n"); - status = ALPM_SIGSTATUS_UNKNOWN; - } else if(gpgsig->summary & GPGME_SIGSUM_KEY_EXPIRED) { - _alpm_log(handle, ALPM_LOG_DEBUG, "result: key expired\n"); - status = ALPM_SIGSTATUS_BAD; - } else if(gpgsig->summary & GPGME_SIGSUM_SIG_EXPIRED) { - _alpm_log(handle, ALPM_LOG_DEBUG, "result: signature expired\n"); - status = ALPM_SIGSTATUS_BAD; + switch(gpg_err_code(gpgsig->status)) { + /* good cases */ + case GPG_ERR_NO_ERROR: + status = ALPM_SIGSTATUS_VALID; + break; + case GPG_ERR_KEY_EXPIRED: + status = ALPM_SIGSTATUS_KEY_EXPIRED; + break; + /* bad cases */ + case GPG_ERR_SIG_EXPIRED: + status = ALPM_SIGSTATUS_SIG_EXPIRED; + break; + case GPG_ERR_NO_PUBKEY: + status = ALPM_SIGSTATUS_KEY_UNKNOWN; + break; + case GPG_ERR_BAD_SIGNATURE: + default: + status = ALPM_SIGSTATUS_INVALID; + break; + } + + if(status == ALPM_SIGSTATUS_VALID + || status == ALPM_SIGSTATUS_KEY_EXPIRED) { + switch(gpgsig->validity) { + case GPGME_VALIDITY_ULTIMATE: + case GPGME_VALIDITY_FULL: + validity = ALPM_SIGVALIDITY_FULL; + break; + case GPGME_VALIDITY_MARGINAL: + validity = ALPM_SIGVALIDITY_MARGINAL; + break; + case GPGME_VALIDITY_NEVER: + validity = ALPM_SIGVALIDITY_NEVER; + break; + case GPGME_VALIDITY_UNKNOWN: + case GPGME_VALIDITY_UNDEFINED: + default: + validity = ALPM_SIGVALIDITY_UNKNOWN; + break; + } } else { - /* we'll capture everything else here */ - _alpm_log(handle, ALPM_LOG_DEBUG, "result: invalid signature\n"); - status = ALPM_SIGSTATUS_BAD; + validity = ALPM_SIGVALIDITY_NEVER; } result->status[sigcount] = status; + result->validity[sigcount] = validity; } ret = 0; @@ -429,31 +451,45 @@ int _alpm_check_pgp_helper(alpm_handle_t *handle, const char *path, /* ret will already be -1 */ } else { int num; - for(num = 0; num < result.count; num++) { - /* fallthrough in this case block is on purpose. if one allows unknown - * signatures, then a marginal signature should be allowed as well, and - * if neither of these are allowed we fall all the way through to bad. */ + for(num = 0; !ret && num < result.count; num++) { switch(result.status[num]) { case ALPM_SIGSTATUS_VALID: + case ALPM_SIGSTATUS_KEY_EXPIRED: _alpm_log(handle, ALPM_LOG_DEBUG, "signature is valid\n"); - break; - case ALPM_SIGSTATUS_MARGINAL: - if(marginal) { - _alpm_log(handle, ALPM_LOG_DEBUG, "allowing marginal signature\n"); - break; - } - case ALPM_SIGSTATUS_UNKNOWN: - if(unknown) { - _alpm_log(handle, ALPM_LOG_DEBUG, "allowing unknown signature\n"); - break; + switch(result.validity[num]) { + case ALPM_SIGVALIDITY_FULL: + _alpm_log(handle, ALPM_LOG_DEBUG, "signature is fully trusted\n"); + break; + case ALPM_SIGVALIDITY_MARGINAL: + _alpm_log(handle, ALPM_LOG_DEBUG, "signature is marginal trust\n"); + if(!marginal) { + ret = -1; + } + break; + case ALPM_SIGVALIDITY_UNKNOWN: + _alpm_log(handle, ALPM_LOG_DEBUG, "signature is unknown trust\n"); + if(!unknown) { + ret = -1; + } + break; + case ALPM_SIGVALIDITY_NEVER: + _alpm_log(handle, ALPM_LOG_DEBUG, "signature should never be trusted\n"); + ret = -1; + break; } - case ALPM_SIGSTATUS_BAD: - default: - _alpm_log(handle, ALPM_LOG_DEBUG, "signature is invalid\n"); - handle->pm_errno = invalid_err; + break; + case ALPM_SIGSTATUS_SIG_EXPIRED: + case ALPM_SIGSTATUS_KEY_UNKNOWN: + case ALPM_SIGSTATUS_INVALID: + _alpm_log(handle, ALPM_LOG_DEBUG, "signature is not valid\n"); ret = -1; + break; } } + + if(ret) { + handle->pm_errno = invalid_err; + } } alpm_sigresult_cleanup(&result); diff --git a/src/pacman/util.c b/src/pacman/util.c index 7065abd..8765da7 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -678,7 +678,7 @@ void signature_display(const char *title, alpm_sigresult_t *result) int i; for(i = 0; i < result->count; i++) { char sigline[PATH_MAX]; - const char *validity, *name; + const char *status, *validity, *name; /* Don't re-indent the first result */ if(i != 0) { int j; @@ -688,22 +688,42 @@ void signature_display(const char *title, alpm_sigresult_t *result) } switch(result->status[i]) { case ALPM_SIGSTATUS_VALID: - validity = _("Valid signature"); + status = _("Valid"); break; - case ALPM_SIGSTATUS_MARGINAL: - validity = _("Marginal signature"); + case ALPM_SIGSTATUS_KEY_EXPIRED: + status = _("Key expired"); break; - case ALPM_SIGSTATUS_UNKNOWN: - validity = _("Unknown signature"); + case ALPM_SIGSTATUS_SIG_EXPIRED: + status = _("Expired"); break; - case ALPM_SIGSTATUS_BAD: - validity = _("Invalid signature"); + case ALPM_SIGSTATUS_INVALID: + status = _("Invalid"); break; + case ALPM_SIGSTATUS_KEY_UNKNOWN: + status = _("Key unknown"); + break; + default: + status = _("Signature error"); + break; + } + switch(result->validity[i]) { + case ALPM_SIGVALIDITY_FULL: + validity = _("fully trusted"); + break; + case ALPM_SIGVALIDITY_MARGINAL: + validity = _("marginal trusted"); + break; + case ALPM_SIGVALIDITY_NEVER: + validity = _("never trusted"); + break; + case ALPM_SIGVALIDITY_UNKNOWN: default: - validity = _("Signature error"); + validity = _("unknown trust"); + break; } - name = result->uid[i] ? result->uid[i] : _("<Key Unknown>"); - snprintf(sigline, PATH_MAX, _("%s from \"%s\""), validity, name); + name = result->uid[i] ? result->uid[i] : _("{Key Unknown}"); + snprintf(sigline, PATH_MAX, _("%s, %s from \"%s\""), + status, validity, name); indentprint(sigline, len); printf("\n"); } -- 1.7.6

2 4

[pacman-dev] [PATCH 1/3] Store a package info level flag if we fail to load data
by Dan McGee 29 Jul '11

29 Jul '11

If we are missing a local database file, we get repeated messages over and over telling us the same thing, rather than being sane and erroring only once. This package adds an INFRQ_ERROR level that is added to the mask if we encounter any errors on a local_db_read() operation, and short circuits future calls if found in the value. This fixes FS#25313. Note that this does not make any behavior changes other than suppressing error messages and repeated code calls to failure cases; we still have more to do in the "local database is hosed" department. Also make a small update to the wrong but unused flags set in be_package; using INFRQ_ALL there was not totally correct. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 14 +++++++++++--- lib/libalpm/be_package.c | 4 ++-- lib/libalpm/db.h | 3 ++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 261ad87..73b533f 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -533,6 +533,13 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) /* already loaded all of this info, do nothing */ return 0; } + + if(info->infolevel & INFRQ_ERROR) { + /* We've encountered an error loading this package before. Don't attempt + * repeated reloads, just give up. */ + return -1; + } + _alpm_log(db->handle, ALPM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n", info->name, inforeq); @@ -619,6 +626,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) } fclose(fp); fp = NULL; + info->infolevel |= INFRQ_DESC; } /* FILES */ @@ -673,6 +681,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) } fclose(fp); fp = NULL; + info->infolevel |= INFRQ_FILES; } /* INSTALL */ @@ -681,15 +690,14 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) if(access(path, F_OK) == 0) { info->scriptlet = 1; } + info->infolevel |= INFRQ_SCRIPTLET; } - /* internal */ - info->infolevel |= inforeq; - free(pkgpath); return 0; error: + info->infolevel |= INFRQ_ERROR; free(pkgpath); if(fp) { fclose(fp); diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 0edaa5a..550f303 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -437,9 +437,9 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, _alpm_log(handle, ALPM_LOG_DEBUG, "sorting package filelist for %s\n", pkgfile); newpkg->files.files = files_msort(files, files_count); newpkg->files.count = files_count; - newpkg->infolevel = INFRQ_ALL; + newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_FILES | INFRQ_SCRIPTLET; } else { - newpkg->infolevel = INFRQ_BASE | INFRQ_DESC; + newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_SCRIPTLET; } return newpkg; diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 5c7988b..a09c7e2 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -40,7 +40,8 @@ typedef enum _alpm_dbinfrq_t { INFRQ_SCRIPTLET = (1 << 3), INFRQ_DSIZE = (1 << 4), /* ALL should be info stored in the package or database */ - INFRQ_ALL = 0x1F + INFRQ_ALL = 0x1F, + INFRQ_ERROR = (1 << 31) } alpm_dbinfrq_t; /** Database status. Bitflags. */ -- 1.7.6

1 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-518-g804e250
by dan＠archlinux.org 27 Jul '11

27 Jul '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 804e2505cf4474791537a9f0ae8e9b6c274cb0c2 (commit) via c5d4c92ad411998b9d47d7bf89d84af547117be4 (commit) via d9875c5e6cbc0b59a4ba7c56e974da3d138f235d (commit) via 49d9426b6a3e6a019a0973ec73b0ff6cf402fa89 (commit) via 2b3405e01ba756a48ff374bf632f525ad44c47c1 (commit) via 94f61c5b29274df164b01105165945e445289ae7 (commit) via 9929a34a6d493c94bd176b66198bdbd734678043 (commit) via ccdb2fa800f3e89641d371056961fa1d654f363d (commit) via 03447ce39cd6a3adb7a56bb978368a5f11659374 (commit) via a7940e7419a6fb39eeafb0bfd053b90a64946d5c (commit) via 819f6750047cbdb7ecb7fa4724f90e532cd73446 (commit) via 00949db191d0f31add4919ae56ebdfef9813a90e (commit) via 06974ebf2f6674baf01da79be9658277cbf2650e (commit) from 98073afe5527aa8a08c7119b61d0251250168e82 (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 804e2505cf4474791537a9f0ae8e9b6c274cb0c2 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Tue Jul 19 20:52:07 2011 +0800 pacman-key: Add --import and --import-trustdb Currently, pacman-key allows the user to import their keys using the --add option. However, no similar functionality exists for importing ownertrust values. The --import-trustdb option takes a list of directories and imports ownertrust values if the directories have a trustdb.gpg database. The --import option takes a list of directories and imports keys from pubring.gpg and ownertrust values from trustdb.gpg. Think of it as a combination of --add and --import-trustdb 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> commit c5d4c92ad411998b9d47d7bf89d84af547117be4 Author: DJ Mills <danielmills1(a)gmail.com> Date: Wed Jul 20 14:28:39 2011 +1000 pacman-key: change GPG_PACMAN and GPG_NOKEYRING to arrays Allows the commands to safely handle any possible arguments Signed-off-by: DJ Mills <danielmills1(a)gmail.com> Allan: rebase patch Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d9875c5e6cbc0b59a4ba7c56e974da3d138f235d Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 20 14:19:53 2011 +1000 pacman-key: fix syntax error in -r arg parsing Previous fix did not work... Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 49d9426b6a3e6a019a0973ec73b0ff6cf402fa89 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 18 19:58:54 2011 +1000 makepkg: refactor checking source integrity Move the source integrity checking into its own function as the code was duplicated and is now more complicated with the separation of the two checks types. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2b3405e01ba756a48ff374bf632f525ad44c47c1 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 16 22:42:32 2011 +1000 makepkg: more control of skipping integrity checks Allows the skipping of all integrity checks (checksum and PGP) or either the checksum or PGP checks individually. Original-patch-by: Wieland Hoffman <theminew(a)googlemail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 94f61c5b29274df164b01105165945e445289ae7 Author: Wieland Hoffmann <themineo(a)googlemail.com> Date: Wed Jul 6 13:02:19 2011 +0200 makepkg: Add support for verifying pgp signatures Many projects provide signature files along with the source code archives. It's good to check these, too, when verifying the integrity of source code archives. Not everybody is using gpg so the verification can be disabled with --skippgpcheck. Additionally, only a warning is displayed when the key that signed the source file is unknown. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9929a34a6d493c94bd176b66198bdbd734678043 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 22 12:12:18 2011 -0500 Remove duplicate code shared between sync and upgrade Pacman did a great job of having almost (but not quite) duplicate code paths through the sync and upgrade code. We can use the same logic in both upgrade in sync once the targets are resolved, so extract a function and delete a bunch of code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ccdb2fa800f3e89641d371056961fa1d654f363d Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 22 21:42:53 2011 +1000 makepkg: get package version with overrides When epoch, pkgver and/or pkgrel were overridden in a split package function, makepkg failed hard finding the real version for checking if packages were already built or trying to install packages. Fix the get_full_version function to deal with overrides and return the actual package version. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 03447ce39cd6a3adb7a56bb978368a5f11659374 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 22 20:08:39 2011 +1000 makepkg: allow epoch to be overridden We can override pkgver and pkgrel so it is only logical to add epoch to that list Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a7940e7419a6fb39eeafb0bfd053b90a64946d5c Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 22 19:47:07 2011 +1000 makepkg: check arch overrides for required architecture Check any overrides of the "arch" variable contain the required architecture. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 819f6750047cbdb7ecb7fa4724f90e532cd73446 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 22 16:30:41 2011 +1000 makepkg: check overrides for pkgrel and pkgver Enforce syntax checking for pkgrel and pkgver overrides in package functions. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 00949db191d0f31add4919ae56ebdfef9813a90e Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 22 12:37:25 2011 +1000 makepkg: pkgver and pkgrel can not have whitespace There is always someone who tries to break things (cough *Dave* cough...) Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 06974ebf2f6674baf01da79be9658277cbf2650e Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 27 12:44:17 2011 -0500 contrib/pacsearch: skip non-matching lines This prevents some perl errors from popping up when pacman prints error or warning messages. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacsearch.in | 2 + doc/PKGBUILD.5.txt | 2 +- doc/makepkg.8.txt | 8 ++- doc/pacman-key.8.txt | 7 ++ proto/PKGBUILD-split.proto | 1 + scripts/makepkg.sh.in | 239 ++++++++++++++++++++++++++++++++++---------- scripts/pacman-key.sh.in | 93 ++++++++++++----- src/pacman/pacman.h | 1 + src/pacman/sync.c | 19 ++-- src/pacman/upgrade.c | 114 +-------------------- 10 files changed, 287 insertions(+), 199 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix group selection entry for large inputs
by Dan McGee 25 Jul '11

25 Jul '11

Hardcoding anything always ends up burning you, and the arbitrary length of 64 here did just that. Add the ability to reallocate the readline buffer for longer inputs if necessary, and add other error checking as approprate. This also plugs one small memory leak of the group processing code selection array. Addresses FS#24253. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/sync.c | 11 ++++++++++- src/pacman/util.c | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index c56934b..6962306 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -644,7 +644,15 @@ static int process_group(alpm_list_t *dbs, char *group) group); select_display(pkgs); char *array = malloc(count); - multiselect_question(array, count); + if(!array) { + ret = 1; + goto cleanup; + } + if(multiselect_question(array, count)) { + ret = 1; + free(array); + goto cleanup; + } int n = 0; for(i = pkgs; i; i = alpm_list_next(i)) { if(array[n++] == 0) @@ -657,6 +665,7 @@ static int process_group(alpm_list_t *dbs, char *group) goto cleanup; } } + free(array); } else { for(i = pkgs; i; i = alpm_list_next(i)) { pmpkg_t *pkg = alpm_list_getdata(i); diff --git a/src/pacman/util.c b/src/pacman/util.c index f695ffb..53dbd63 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -796,8 +796,9 @@ static int multiselect_parse(char *array, int count, char *response) int multiselect_question(char *array, int count) { - char response[64]; + char *response, *lastchar; FILE *stream; + size_t response_len = 64; if(config->noconfirm) { stream = stdout; @@ -806,19 +807,45 @@ int multiselect_question(char *array, int count) stream = stderr; } + response = malloc(response_len); + if(!response) { + return -1; + } + lastchar = response + response_len - 1; + /* sentinel byte to later see if we filled up the entire string */ + *lastchar = 1; + while(1) { memset(array, 1, count); fprintf(stream, "\n"); fprintf(stream, _("Enter a selection (default=all)")); fprintf(stream, ": "); + fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); break; } - if(fgets(response, sizeof(response), stdin)) { + if(fgets(response, response_len, stdin)) { + const size_t response_incr = 64; + /* handle buffer not being large enough to read full line case */ + while(*lastchar == '\0' && lastchar[-1] != '\n') { + response_len += response_incr; + response = realloc(response, response_len); + if(!response) { + return -1; + } + lastchar = response + response_len - 1; + /* sentinel byte */ + *lastchar = 1; + if(fgets(response + response_len - response_incr - 1, + response_incr + 1, stdin) == 0) { + free(response); + return -1; + } + } strtrim(response); if(strlen(response) > 0) { if(multiselect_parse(array, count, response) == -1) { @@ -826,9 +853,14 @@ int multiselect_question(char *array, int count) continue; } } + break; + } else { + free(response); + return -1; } - break; } + + free(response); return(0); } -- 1.7.6

1 0

[pacman-dev] [PATCH] libalpm: Set ret correctly in download_internal()
by Lukas Fleischer 25 Jul '11

25 Jul '11

Immediately jump to the cleanup code after setting the return code to -1 in case rename() fails. Otherwise, it will be reset to 0 right after we leave the if branch. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- Just spotted this one in maint. I realized the download_internal() code was completely refactored in master; the only reason I submit this is to fix this minor issue in case there will be another maintenance release before pacman hits the big 4.0.0. If there isn't going to be such a thing, you might ignore this or not. lib/libalpm/dload.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index a98d84a..e3d30f2 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -308,6 +308,7 @@ static int download_internal(const char *url, const char *localpath, _alpm_log(PM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), tempfile, destfile, strerror(errno)); ret = -1; + goto cleanup; } ret = 0; -- 1.7.6

2 1

[pacman-dev] package signing for pacman
by Shaun Kluzek 25 Jul '11

25 Jul '11

Hi, my name is Shaun Kluzek. I have been using linux now for about a decade and have spent the last two years using arch linux and previously using gentoo. I studied computer science in Melbourne Australia at RMIT University and program well in C. After reading "The real story behind Arch Linux package signing" by Dan Mcgee, I headed over to Alan McRae's TODO list for package signing, and spotted the pacman signature verification, acting upon this I built the gpgme documentation from the texi files and have spent the last two days reading and understanding it( gnu don't make this very easy ). As a result, I have successfully written a small C program that verifies a detached ascii armored signature with its accompanying file against users in your keyring. The code at this stage is test code and very messy, however, it loads in a detached sig say signed.asc, then loads in the signed file somefile and then verifies it, giving the validation back in a bit vector. The code needs to be rewritten and split into some nice funtions. I have obtained the pacman source code from git and had a brief look through it just prior to writing the libgpgme stuff. Once tidied up ( into funtions and descriptive error output ) I dont think it would be much problem adding it into pacman. How should I proceed ? Shaun Kluzek

2 1

[pacman-dev] [PATCH] makepkg: allow epoch to be overridden
by Allan McRae 22 Jul '11

22 Jul '11

We can override pkgver and pkgrel so it is only logical to add epoch to that list Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4b8f167..88afe7b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,9 +44,9 @@ startdir="$PWD" packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') -splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ - 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ - 'backup' 'options' 'install' 'changelog') +splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'license' \ + 'groups' 'depends' 'optdepends' 'provides' 'conflicts' \ + 'replaces' 'backup' 'options' 'install' 'changelog') readonly -a packaging_options other_options splitpkg_overrides # Options @@ -1455,10 +1455,13 @@ check_sanity() { fi done || ret=1 - if [[ ! $epoch =~ ^[0-9]*$ ]]; then - error "$(gettext "%s must be an integer.")" "epoch" - ret=1 - fi + awk -F'=' '/^[[:space:]]*epoch=/ { $1=""; print $0 }' "$BUILDFILE" | + while read i; do + if [[ ! $i =~ ^[0-9]*$ ]]; then + error "$(gettext "%s must be an integer.")" "epoch" + return 1 + fi + done || ret=1 if [[ $arch != 'any' ]]; then if ! in_array $CARCH ${arch[@]}; then -- 1.7.6

2 7

[pacman-dev] [PATCH] makepkg: pkgver and pkgrel can not have whitespace
by Allan McRae 22 Jul '11

22 Jul '11

There is always someone who tries to break things (cough *Dave* cough...) Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0682e4f..ec5b388 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1438,12 +1438,14 @@ check_sanity() { error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgbase" ret=1 fi - if [[ $pkgver =~ [:-] ]]; then - error "$(gettext "%s is not allowed to contain colons or hyphens.")" "pkgver" + + if [[ $pkgver =~ [[:space:]:-] ]]; then + error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" ret=1 fi - if [[ $pkgrel != ${pkgrel//-/} ]]; then - error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" + + if [[ $pkgrel =~ [[:space:]-] ]]; then + error "$(gettext "%s is not allowed to contain hyphens or whitespace.")" "pkgrel" ret=1 fi -- 1.7.6

2 3