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

[pacman-dev] [PATCH] Reset dload_interrupted early in curl_download_internal()
by Lukas Fleischer 18 Aug '11

18 Aug '11

Avoid invoking unlink() with a NULL path if the URL isn't to a file and we fail to create a temporary file. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- lib/libalpm/dload.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 5cbb6b4..050e719 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -195,6 +195,9 @@ static int curl_download_internal(struct dload_payload *payload, /* shortcut to our handle within the payload */ alpm_handle_t *handle = payload->handle; + /* reset dload_interrupted early to avoid erroneous unlink() on cleanup */ + dload_interrupted = 0; + if(!payload->filename) { payload->filename = get_filename(payload->fileurl); } @@ -289,7 +292,6 @@ static int curl_download_internal(struct dload_payload *payload, sigaction(SIGPIPE, NULL, &sig_pipe[OLD]); sigaction(SIGPIPE, &sig_pipe[NEW], NULL); - dload_interrupted = 0; sig_int[NEW].sa_handler = &inthandler; sigemptyset(&sig_int[NEW].sa_mask); sig_int[NEW].sa_flags = 0; -- 1.7.6

2 3

[pacman-dev] [PATCH 1/2] Remove use of no-op accessor functions in library
by Dan McGee 18 Aug '11

18 Aug '11

The functions alpm_db_get_name(), alpm_pkg_get_name(), and alpm_pkg_get_version() are not necessary at all, so remove the calling and indirection when used in the backend, which makes things slightly more efficient and reduces code size. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 34 +++++++++++++++------------------- lib/libalpm/be_local.c | 5 ++--- lib/libalpm/conflict.c | 5 ++--- lib/libalpm/db.c | 8 ++++---- lib/libalpm/package.c | 5 ++--- lib/libalpm/remove.c | 6 +++--- lib/libalpm/sync.c | 13 ++++++------- lib/libalpm/trans.c | 4 ++-- 8 files changed, 36 insertions(+), 44 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 5e1bb8d..8bbf157 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -76,8 +76,8 @@ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) local = _alpm_db_get_pkgfromcache(handle->db_local, pkgname); if(local) { - const char *localpkgname = alpm_pkg_get_name(local); - const char *localpkgver = alpm_pkg_get_version(local); + const char *localpkgname = local->name; + const char *localpkgver = local->version; int cmp = _alpm_pkg_compare_versions(pkg, local); if(cmp == 0) { @@ -460,8 +460,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, ASSERT(trans != NULL, return -1); snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", - _alpm_db_path(db), alpm_pkg_get_name(newpkg), - alpm_pkg_get_version(newpkg)); + _alpm_db_path(db), newpkg->name, newpkg->version); /* see if this is an upgrade. if so, remove the old package first */ alpm_pkg_t *local = _alpm_db_get_pkgfromcache(db, newpkg->name); @@ -517,7 +516,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, changelog/install script installation (FS#12263) */ if(_alpm_local_db_prepare(db, newpkg)) { alpm_logaction(handle, "error: could not create database entry %s-%s\n", - alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); + newpkg->name, newpkg->version); handle->pm_errno = ALPM_ERR_DB_WRITE; ret = -1; goto cleanup; @@ -566,10 +565,10 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* call PROGRESS once with 0 percent, as we sort-of skip that here */ if(is_upgrade) { PROGRESS(trans, ALPM_TRANS_PROGRESS_UPGRADE_START, - alpm_pkg_get_name(newpkg), 0, pkg_count, pkg_current); + newpkg->name, 0, pkg_count, pkg_current); } else { PROGRESS(trans, ALPM_TRANS_PROGRESS_ADD_START, - alpm_pkg_get_name(newpkg), 0, pkg_count, pkg_current); + newpkg->name, 0, pkg_count, pkg_current); } for(i = 0; archive_read_next_header(archive, &entry) == ARCHIVE_OK; i++) { @@ -593,12 +592,10 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, if(is_upgrade) { PROGRESS(trans, ALPM_TRANS_PROGRESS_UPGRADE_START, - alpm_pkg_get_name(newpkg), percent, pkg_count, - pkg_current); + newpkg->name, percent, pkg_count, pkg_current); } else { PROGRESS(trans, ALPM_TRANS_PROGRESS_ADD_START, - alpm_pkg_get_name(newpkg), percent, pkg_count, - pkg_current); + newpkg->name, percent, pkg_count, pkg_current); } /* extract the next file from the archive */ @@ -635,9 +632,9 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, if(_alpm_local_db_write(db, newpkg, INFRQ_ALL)) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not update database entry %s-%s\n"), - alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); + newpkg->name, newpkg->version); alpm_logaction(handle, "error: could not update database entry %s-%s\n", - alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); + newpkg->name, newpkg->version); handle->pm_errno = ALPM_ERR_DB_WRITE; ret = -1; goto cleanup; @@ -645,15 +642,15 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, if(_alpm_db_add_pkgincache(db, newpkg) == -1) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not add entry '%s' in cache\n"), - alpm_pkg_get_name(newpkg)); + newpkg->name); } if(is_upgrade) { PROGRESS(trans, ALPM_TRANS_PROGRESS_UPGRADE_START, - alpm_pkg_get_name(newpkg), 100, pkg_count, pkg_current); + newpkg->name, 100, pkg_count, pkg_current); } else { PROGRESS(trans, ALPM_TRANS_PROGRESS_ADD_START, - alpm_pkg_get_name(newpkg), 100, pkg_count, pkg_current); + newpkg->name, 100, pkg_count, pkg_current); } /* run the post-install script if it exists */ @@ -661,11 +658,10 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { if(is_upgrade) { _alpm_runscriptlet(handle, scriptlet, "post_upgrade", - alpm_pkg_get_version(newpkg), - oldpkg ? alpm_pkg_get_version(oldpkg) : NULL); + newpkg->version, oldpkg ? oldpkg->version : NULL); } else { _alpm_runscriptlet(handle, scriptlet, "post_install", - alpm_pkg_get_version(newpkg), NULL); + newpkg->version, NULL); } } diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 5b69f62..1b48922 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -192,11 +192,10 @@ static alpm_list_t *_cache_get_backup(alpm_pkg_t *pkg) static void *_cache_changelog_open(alpm_pkg_t *pkg) { char clfile[PATH_MAX]; + alpm_db_t *db = alpm_pkg_get_db(pkg); snprintf(clfile, PATH_MAX, "%s/%s/%s-%s/changelog", alpm_option_get_dbpath(pkg->handle), - alpm_db_get_name(alpm_pkg_get_db(pkg)), - alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); + db->treename, pkg->name, pkg->version); return fopen(clfile, "r"); } diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index fe18209..5d27953 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -409,7 +409,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, numtargs, current); /* CHECK 1: check every target against every target */ _alpm_log(handle, ALPM_LOG_DEBUG, "searching for file conflicts: %s\n", - alpm_pkg_get_name(p1)); + p1->name); for(j = i->next; j; j = j->next) { alpm_list_t *common_files; alpm_pkg_t *p2 = j->data; @@ -422,8 +422,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, for(k = common_files; k; k = k->next) { snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)k->data); conflicts = add_fileconflict(handle, conflicts, - ALPM_FILECONFLICT_TARGET, path, - alpm_pkg_get_name(p1), alpm_pkg_get_name(p2)); + ALPM_FILECONFLICT_TARGET, path, p1->name, p2->name); if(handle->pm_errno == ALPM_ERR_MEMORY) { FREELIST(conflicts); FREELIST(common_files); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 8a235e2..77bdf98 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -411,7 +411,7 @@ alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles) for(j = list; j; j = j->next) { alpm_pkg_t *pkg = j->data; const char *matched = NULL; - const char *name = alpm_pkg_get_name(pkg); + const char *name = pkg->name; const char *desc = alpm_pkg_get_desc(pkg); /* check name as regex AND as plain text */ @@ -559,7 +559,7 @@ int _alpm_db_add_pkgincache(alpm_db_t *db, alpm_pkg_t *pkg) } _alpm_log(db->handle, ALPM_LOG_DEBUG, "adding entry '%s' in '%s' cache\n", - alpm_pkg_get_name(newpkg), db->treename); + newpkg->name, db->treename); db->pkgcache = _alpm_pkghash_add_sorted(db->pkgcache, newpkg); free_groupcache(db); @@ -576,13 +576,13 @@ int _alpm_db_remove_pkgfromcache(alpm_db_t *db, alpm_pkg_t *pkg) } _alpm_log(db->handle, ALPM_LOG_DEBUG, "removing entry '%s' from '%s' cache\n", - alpm_pkg_get_name(pkg), db->treename); + pkg->name, db->treename); db->pkgcache = _alpm_pkghash_remove(db->pkgcache, pkg, &data); if(data == NULL) { /* package not found */ _alpm_log(db->handle, ALPM_LOG_DEBUG, "cannot remove entry '%s' from '%s' cache: not found\n", - alpm_pkg_get_name(pkg), db->treename); + pkg->name, db->treename); return -1; } diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index a88af5e..a31effb 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -618,8 +618,7 @@ void _alpm_pkg_free_trans(alpm_pkg_t *pkg) /* Is spkg an upgrade for localpkg? */ int _alpm_pkg_compare_versions(alpm_pkg_t *spkg, alpm_pkg_t *localpkg) { - return alpm_pkg_vercmp(alpm_pkg_get_version(spkg), - alpm_pkg_get_version(localpkg)); + return alpm_pkg_vercmp(spkg->version, localpkg->version); } /* Helper function for comparing packages @@ -677,7 +676,7 @@ int _alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg) alpm_list_t *groups = NULL; /* first see if the package is ignored */ - if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(pkg))) { + if(alpm_list_find_str(handle->ignorepkg, pkg->name)) { return 1; } diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 0afa265..c6886c6 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -81,9 +81,9 @@ static void remove_prepare_cascade(alpm_handle_t *handle, alpm_list_t *lp) alpm_depmissing_t *miss = i->data; alpm_pkg_t *info = _alpm_db_get_pkgfromcache(handle->db_local, miss->target); if(info) { - if(!_alpm_pkg_find(trans->remove, alpm_pkg_get_name(info))) { + if(!_alpm_pkg_find(trans->remove, info->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "pulling %s in target list\n", - alpm_pkg_get_name(info)); + info->name); trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(info)); } } else { @@ -117,7 +117,7 @@ static void remove_prepare_keep_needed(alpm_handle_t *handle, alpm_list_t *lp) pkg = vpkg; if(pkg) { _alpm_log(handle, ALPM_LOG_WARNING, _("removing %s from target list\n"), - alpm_pkg_get_name(pkg)); + pkg->name); _alpm_pkg_free(pkg); } } diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index a5964b9..b9cb1fb 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -62,20 +62,19 @@ alpm_pkg_t SYMEXPORT *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_syn pkg->handle->pm_errno = 0; for(i = dbs_sync; !spkg && i; i = i->next) { - spkg = _alpm_db_get_pkgfromcache(i->data, alpm_pkg_get_name(pkg)); + spkg = _alpm_db_get_pkgfromcache(i->data, pkg->name); } if(spkg == NULL) { _alpm_log(pkg->handle, ALPM_LOG_DEBUG, "'%s' not found in sync db => no upgrade\n", - alpm_pkg_get_name(pkg)); + pkg->name); return NULL; } /* compare versions and see if spkg is an upgrade */ if(_alpm_pkg_compare_versions(spkg, pkg) > 0) { _alpm_log(pkg->handle, ALPM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n", - alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg), - alpm_pkg_get_version(spkg)); + pkg->name, pkg->version, spkg->version); return spkg; } /* spkg is not an upgrade */ @@ -229,7 +228,7 @@ alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs, for(j = grp->packages; j; j = j->next) { alpm_pkg_t *pkg = j->data; - if(_alpm_pkg_find(ignorelist, alpm_pkg_get_name(pkg))) { + if(_alpm_pkg_find(ignorelist, pkg->name)) { continue; } if(_alpm_pkg_should_ignore(db->handle, pkg)) { @@ -240,7 +239,7 @@ alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs, if(!install) continue; } - if(!_alpm_pkg_find(pkgs, alpm_pkg_get_name(pkg))) { + if(!_alpm_pkg_find(pkgs, pkg->name)) { pkgs = alpm_list_add(pkgs, pkg); } } @@ -296,7 +295,7 @@ static int compute_download_size(alpm_pkg_t *newpkg) } _alpm_log(handle, ALPM_LOG_DEBUG, "setting download size %jd for pkg %s\n", - (intmax_t)size, alpm_pkg_get_name(newpkg)); + (intmax_t)size, newpkg->name); newpkg->infolevel |= INFRQ_DSIZE; newpkg->download_size = size; diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 1bab830..3f59596 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -91,8 +91,8 @@ static alpm_list_t *check_arch(alpm_handle_t *handle, alpm_list_t *pkgs) const char *pkgarch = alpm_pkg_get_arch(pkg); if(pkgarch && strcmp(pkgarch, arch) && strcmp(pkgarch, "any")) { char *string; - const char *pkgname = alpm_pkg_get_name(pkg); - const char *pkgver = alpm_pkg_get_version(pkg); + const char *pkgname = pkg->name; + const char *pkgver = pkg->version; size_t len = strlen(pkgname) + strlen(pkgver) + strlen(pkgarch) + 3; MALLOC(string, len, RET_ERR(handle, ALPM_ERR_MEMORY, invalid)); sprintf(string, "%s-%s-%s", pkgname, pkgver, pkgarch); -- 1.7.6

1 1

[pacman-dev] [PATCH 1/2] lib/libalpm/dload.c: Use STRDUP() instead of strdup()
by Lukas Fleischer 18 Aug '11

18 Aug '11

Use the STRDUP macro instead of strdup() for the sake of better error handling on memory allocation failures. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- Should we do some cleanup and free() payload if STRDUP() fails in alpm_fetch_pkgurl()? lib/libalpm/dload.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 68a68e9..a1b6364 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -387,10 +387,10 @@ cleanup: tempfile, destfile, strerror(errno)); ret = -1; } else if(final_file) { - *final_file = strdup(strrchr(destfile, '/') + 1); + STRDUP(*final_file, strrchr(destfile, '/') + 1, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); } } else if(final_file) { - *final_file = strdup(strrchr(tempfile, '/') + 1); + STRDUP(*final_file, strrchr(tempfile, '/') + 1, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); } } @@ -456,7 +456,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); payload->handle = handle; - payload->fileurl = strdup(url); + STRDUP(payload->fileurl, url, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); payload->allow_resume = 1; /* download the file */ -- 1.7.6

2 3

[pacman-dev] [PATCH 1/2] Avoid stat() on NULL path in curl_download_internal()
by Lukas Fleischer 18 Aug '11

18 Aug '11

stat()'s behaviour is undefined if the first argument is NULL and might be prone to segfault. Add an additional check to skip the stat() invocation if no destfile is used. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- lib/libalpm/dload.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 5a63e48..731d807 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -260,7 +260,7 @@ static int curl_download_internal(struct dload_payload *payload, curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, useragent); } - if(!payload->allow_resume && !payload->force && stat(destfile, &st) == 0) { + if(!payload->allow_resume && !payload->force && destfile && stat(destfile, &st) == 0) { /* start from scratch, but only download if our local is out of date. */ curl_easy_setopt(handle->curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); curl_easy_setopt(handle->curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); -- 1.7.6

2 12

[pacman-dev] [PATCH] pacman-key: rework importing distro/repo provided keyrings
by Allan McRae 18 Aug '11

18 Aug '11

The current --reload option, apart from being non-clear in its naming, is very limited in that only one keyring can be provided. A distribution may want to provide multiple keyrings for various subsets of its organisation or custom repo providers may also want to provide a keyring. This patch adds a --populate option that reads keyrings from (by default) /usr/share/pacman/keyrings. A keyring is named foo.gpg, with optional foo-revoked file providing a list of revoked key ids. These files are required to be signed (detached) by a key trusted by pacman-key, in practise probably by the key that signed the package providing these files. The --populate flag either updates the pacman keyring using all keyrings in the directory or individual keyrings can be specified. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman-key.8.txt | 8 ++- scripts/Makefile.am | 1 + scripts/pacman-key.sh.in | 149 +++++++++++++++++++++++----------------------- 3 files changed, 82 insertions(+), 76 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index c8ce026..98ee6f6 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -80,8 +80,12 @@ Options *-r, \--receive* <keyserver> <keyid(s)>:: Fetch the specified keyids from the specified key server URL. -*\--reload*:: - Reloads the keys from the keyring package. +*\--populate* [<keyring(s)>]:: + Reload the default keys from the (given) keyrings in +{pkgdatadir}/keyrings+. + Each keyring is provided in a file foo.gpg that contains the keys for the foo + keyring. Optionally the file foo-revoked contains a list of revoked key ids + for that keyring. These files are required to be signed (detached) by a + trusted PGP key. *-u, \--updatedb*:: Equivalent to \--check-trustdb in GnuPG. diff --git a/scripts/Makefile.am b/scripts/Makefile.am index adb259a..30b6ad8 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -46,6 +46,7 @@ edit = sed \ -e 's|@localedir[@]|$(localedir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ -e '1s|!/bin/bash|!$(BASH_SHELL)|g' \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 74ecfcf..c14d9bb 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -37,8 +37,8 @@ IMPORT_TRUSTDB=0 INIT=0 LISTKEYS=0 LISTSIGS=0 +POPULATE=0 RECEIVE=0 -RELOAD=0 UPDATEDB=0 VERIFY=0 @@ -73,7 +73,8 @@ usage() { 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 " --list-sigs [<keyid(s)>] List keys and their signatures")" - echo "$(gettext " --reload Reload the default keys")" + printf "$(gettext " --populate [<keyring(s)] Reload the default keys from the (given) keyrings\n\ + in '%s'")\n" "@pkgdatadir@/keyrings" } version() { @@ -139,75 +140,87 @@ check_keyring() { verify_keyring_input() { local ret=0; + local KEYRING_IMPORT_DIR='@pkgdatadir@/keyrings' - # Verify signatures of related files, if they exist - if [[ -r "${ADDED_KEYS}" ]]; then - msg "$(gettext "Verifying official keys file signature...")" - if ! "${GPG_PACMAN[@]}" --verify "${ADDED_KEYS}.sig" &>/dev/null; then + # Verify signatures of keyring files and association revocation files if they exist + msg "$(gettext "Verifying keyring file signatures...")" + local keyring + for keyring in ${KEYRINGIDS[@]}; do + if ! "${GPG_PACMAN[@]}" --verify "${KEYRING_IMPORT_DIR}/${keyring}.gpg.sig" &>/dev/null; then error "$(gettext "The signature of file %s is not valid.")" "${ADDED_KEYS}" ret=1 fi - fi - if [[ -r "${DEPRECATED_KEYS}" ]]; then - msg "$(gettext "Verifying deprecated keys file signature...")" - if ! "${GPG_PACMAN[@]}" --verify "${DEPRECATED_KEYS}.sig" &>/dev/null; then - error "$(gettext "The signature of file %s is not valid.")" "${DEPRECATED_KEYS}" - ret=1 + if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then + if ! "${GPG_PACMAN[@]}" --verify "${KEYRING_IMPORT_DIR}/${keyring}-revoked.sig" &>/dev/null; then + error "$(gettext "The signature of file %s is not valid.")" "${KEYRING_IMPORT_DIR}/${keyring}-revoked" + ret=1 + fi fi - fi + done - if [[ -r "${REMOVED_KEYS}" ]]; then - msg "$(gettext "Verifying deleted keys file signature...")" - if ! "${GPG_PACMAN[@]}" --verify "${REMOVED_KEYS}.sig" &>/dev/null; then - error "$(gettext "The signature of file %s is not valid.")" "${REMOVED_KEYS}" + return $ret +} + +populate_keyring() { + local KEYRING_IMPORT_DIR='@pkgdatadir@/keyrings' + local GPG_NOKEYRING=(gpg --batch --quiet --ignore-time-conflict --no-options --no-default-keyring --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning) + + local keyring + local ret=0 + if [[ -z ${KEYRINGIDS[@]} ]]; then + # get list of all available keyrings + shopt -s nullglob + KEYRINGIDS=("$KEYRING_IMPORT_DIR"/*.gpg) + shopt -u nullglob + KEYRINGIDS=("${KEYRINGIDS[@]##*/}") + KEYRINGIDS=("${KEYRINGIDS[(a)]%.gpg}") + if [[ -z ${KEYRINGIDS[@]} ]]; then + error "$(gettext "No keyring files exist in %s.")" "$KEYRING_IMPORT_DIR" ret=1 fi + else + # verify listed keyrings exist + for keyring in ${KEYRINGIDS[@]}; do + if [[ ! -f "$KEYRING_IMPORT_DIR/$keyring.gpg" ]]; then + error "$(gettext "The keyring file %s does not exist.")" "$KEYRING_IMPORT_DIR/$keyring.gpg" + ret=1 + fi + done fi - return $ret -} + if (( ret )); then + exit 1 + fi -reload_keyring() { - local PACMAN_SHARE_DIR='@prefix@/share/pacman' - local GPG_NOKEYRING=(gpg --batch --quiet --ignore-time-conflict --no-options --no-default-keyring --homedir ${PACMAN_KEYRING_DIR}) + verify_keyring_input || exit 1 # Variable used for iterating on keyrings local key local key_id - # Keyring with keys to be added to the keyring - local ADDED_KEYS="${PACMAN_SHARE_DIR}/addedkeys.gpg" - - # Keyring with keys that were deprecated and will eventually be deleted - local DEPRECATED_KEYS="${PACMAN_SHARE_DIR}/deprecatedkeys.gpg" - - # List of keys removed from the keyring. This file is not a keyring, unlike the others. - # It is a textual list of values that gpg recogniezes as identifiers for keys. - local REMOVED_KEYS="${PACMAN_SHARE_DIR}/removedkeys" - - verify_keyring_input || exit 1 - # Read the key ids to an array. The conversion from whatever is inside the file # to key ids is important, because key ids are the only guarantee of identification # for the keys. local -A removed_ids - if [[ -r "${REMOVED_KEYS}" ]]; then - while read key; do - local key_values name - key_values="$("${GPG_PACMAN[@]}" --quiet --with-colons --list-key "${key}" | grep ^pub | cut -d: -f5,10 --output-delimiter=' ')" - if [[ -n $key_values ]]; then - # The first word is the key_id - key_id="${key_values%% *}" - # the rest if the name of the owner - name="${key_values#* }" - if [[ -n ${key_id} ]]; then - # Mark this key to be deleted - removed_ids[$key_id]="$name" + for keyring in ${KEYRINGIDS[@]}; do + if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then + while read key; do + local key_values name + key_values="$("${GPG_PACMAN[@]}" --quiet --with-colons --list-key "${key}" 2>/dev/null | grep ^pub | cut -d: -f5,10 --output-delimiter=' ')" + if [[ -n $key_values ]]; then + # The first word is the key_id + key_id="${key_values%% *}" + # the rest if the name of the owner + name="${key_values#* }" + if [[ -n ${key_id} ]]; then + # Mark this key to be deleted + removed_ids[$key_id]="$name" + fi fi - fi - done < "${REMOVED_KEYS}" - fi + done < "${KEYRING_IMPORT_DIR}/${keyring}-revoked" + fi + done # List of keys that must be kept installed, even if in the list of keys to be removed local HOLD_KEYS="$(get_from "$CONFIG" "HoldKeys")" @@ -222,33 +235,21 @@ reload_keyring() { done fi - # Add keys from the current set of keys from pacman-keyring package. The web of trust will - # be updated automatically. - if [[ -r "${ADDED_KEYS}" ]]; then - msg "$(gettext "Appending official keys...")" - local add_keys="$("${GPG_NOKEYRING[@]}" --keyring "${ADDED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5)" - for key_id in ${add_keys}; do - # There is no point in adding a key that will be deleted right after - if [[ -z "${removed_ids[$key_id]}" ]]; then - "${GPG_NOKEYRING[@]}" --keyring "${ADDED_KEYS}" --export "${key_id}" | "${GPG_PACMAN[@]}" --import - fi - done - fi - - if [[ -r "${DEPRECATED_KEYS}" ]]; then - msg "$(gettext "Appending deprecated keys...")" - local add_keys="$("${GPG_NOKEYRING[@]}" --keyring "${DEPRECATED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5)" + # Add keys from requested keyrings + for keyring in ${KEYRINGIDS[@]}; do + msg "$(gettext "Appending keys from %s.gpg...")" "$keyring" + local add_keys="$("${GPG_NOKEYRING[@]}" --keyring "${KEYRING_IMPORT_DIR}/${keyring}.gpg" --with-colons --list-keys | grep ^pub | cut -d: -f5)" for key_id in ${add_keys}; do # There is no point in adding a key that will be deleted right after if [[ -z "${removed_ids[$key_id]}" ]]; then - "${GPG_NOKEYRING[@]}" --keyring "${DEPRECATED_KEYS}" --export "${key_id}" | "${GPG_PACMAN[@]}" --import + "${GPG_NOKEYRING[@]}" --keyring "${KEYRING_IMPORT_DIR}/${keyring}.gpg" --export "${key_id}" | "${GPG_PACMAN[@]}" --import fi done - fi + done # Remove the keys not marked to keep if (( ${#removed_ids[@]} > 0 )); then - msg "$(gettext "Removing deleted keys from keyring...")" + msg "$(gettext "Removing revoked keys from keyring...")" for key_id in "${!removed_ids[@]}"; do echo " removing key $key_id - ${removed_ids[$key_id]}" "${GPG_PACMAN[@]}" --quiet --batch --yes --delete-key "${key_id}" @@ -321,8 +322,8 @@ 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::,,receive:" -OPT_LONG+=",reload,updatedb,verify:,version" +OPT_LONG+=",help,import:,import-trustdb:,init,list-keys::,list-sigs::" +OPT_LONG+=",populate::,receive:,updatedb,verify:,version" if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then echo; usage; exit 1 # E_INVALID_OPTION; fi @@ -348,8 +349,8 @@ while true; do --init) INIT=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) ;; + --populate) POPULATE=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYRINGIDS=($1) ;; -r|--receive) RECEIVE=1; shift; TMP=($1); KEYSERVER=${TMP[0]}; KEYIDS=(${TMP[@]:1}); unset TMP;; - --reload) RELOAD=1 ;; -u|--updatedb) UPDATEDB=1 ;; -v|--verify) VERIFY=1; shift; SIGNATURE=$1 ;; @@ -368,7 +369,7 @@ if ! type -p gpg >/dev/null; then exit 1 fi -if (( (ADD || DELETE || EDITKEY || IMPORT || IMPORT_TRUSTDB || INIT || RECEIVE || RELOAD || UPDATEDB) && EUID != 0 )); then +if (( (ADD || DELETE || EDITKEY || IMPORT || IMPORT_TRUSTDB || INIT || POPULATE || RECEIVE || UPDATEDB) && EUID != 0 )); then error "$(gettext "%s needs to be run as root for this operation.")" "pacman-key" exit 1 fi @@ -387,7 +388,7 @@ GPG_PACMAN=(gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning) # check only a single operation has been given numopt=$(( ADD + DELETE + EDITKEY + EXPORT + FINGER + IMPORT + IMPORT_TRUSTDB + - INIT + LISTKEYS + LISTSIGS + RECEIVE + RELOAD + UPDATEDB + VERIFY )) + INIT + LISTKEYS + LISTSIGS + POPULATE + RECEIVE + UPDATEDB + VERIFY )) case $numopt in 0) @@ -413,8 +414,8 @@ esac (( INIT )) && initialize (( LISTKEYS )) && "${GPG_PACMAN[@]}" --batch --list-keys "${KEYIDS[@]}" (( LISTSIGS )) && "${GPG_PACMAN[@]}" --batch --list-sigs "${KEYIDS[@]}" +(( POPULATE )) && populate_keyring (( RECEIVE )) && receive_keys -(( RELOAD )) && reload_keyring (( UPDATEDB )) && "${GPG_PACMAN[@]}" --batch --check-trustdb (( VERIFY )) && "${GPG_PACMAN[@]}" --verify $SIGNATURE -- 1.7.6

3 4

[pacman-dev] Fun output when repo db is missing
by Allan McRae 18 Aug '11

18 Aug '11

I just saw this: allan@mugen ~ > sudo mv /var/lib/pacman/sync/allanbrokeit.db{,.bak} allan@mugen ~ > pacman -Su | wc -l Proceed with installation? [Y/n] n 1148 That is a lot of copies of: error: could not open file /var/lib/pacman/sync/allanbrokeit.db: Failed to open '/var/lib/pacman/sync/allanbrokeit.db' Allan

3 2

[pacman-dev] [PATCH] scripts/library: rewrite parse_options
by Dave Reisner 18 Aug '11

18 Aug '11

In addition to being what I feel is a cleaner and faster implementation, we avoid the use of eval by normalizing option arguments into a global array which is then set after a successful call to parse_options. This trims out the idea of having multiple arguments to a single option, making our parsing algorithm a little more sane. We never took advantage of this in makepkg (for the one option that feasibly supports it), and I think we've overlooked a much simpler solution in pacman-key. Since actions are limited to 1 at a time the leftover positional parameters become the keys or keyfiles which are acted upon. Also added is a new test directory test/scripts with a harness for parse_options, run as part of make check. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Thoughts? I know Allan wasn't quite sold on this, as the downside is that we sort of pigeonhole ourselves into using the non-optional parameter as arguments to our action. This has zero effect on makepkg. I've also thought to add --option=arg syntax parsing, but I'm not sure we need this. Makefile.am | 6 +- configure.ac | 1 + scripts/library/parse_options.sh | 195 +++++++++++++++++------------------- scripts/makepkg.sh.in | 13 +-- scripts/pacman-key.sh.in | 59 ++++++------ test/scripts/Makefile.am | 9 ++ test/scripts/parse_options_test.sh | 103 +++++++++++++++++++ 7 files changed, 242 insertions(+), 144 deletions(-) rewrite scripts/library/parse_options.sh (89%) create mode 100644 test/scripts/Makefile.am create mode 100755 test/scripts/parse_options_test.sh diff --git a/Makefile.am b/Makefile.am index 286e6ae..f88b6d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = lib/libalpm src/util src/pacman scripts etc test/pacman test/util contrib +SUBDIRS = lib/libalpm src/util src/pacman scripts etc test/pacman test/scripts test/util contrib if WANT_DOC SUBDIRS += doc endif @@ -21,12 +21,14 @@ dist_pkgdata_DATA = \ proto/ChangeLog.proto # run the pactest test suite and vercmp tests -check-local: test/pacman test/util src/pacman src/util +check-local: test/pacman test/scripts test/util src/pacman src/util $(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \ --test $(top_srcdir)/test/pacman/tests/*.py \ -p $(top_builddir)/src/pacman/pacman $(SH) $(top_srcdir)/test/util/vercmptest.sh \ $(top_builddir)/src/util/vercmp + $(BASH_SHELL) $(top_srcdir)/test/scripts/parse_options_test.sh \ + $(top_builddir)/scripts/library/parse_options.sh # create the pacman DB and cache directories upon install install-data-local: diff --git a/configure.ac b/configure.ac index 6ad5be5..a553176 100644 --- a/configure.ac +++ b/configure.ac @@ -381,6 +381,7 @@ doc/Makefile etc/Makefile test/pacman/Makefile test/pacman/tests/Makefile +test/scripts/Makefile test/util/Makefile contrib/Makefile Makefile diff --git a/scripts/library/parse_options.sh b/scripts/library/parse_options.sh dissimilarity index 89% index 48fd42c..215059f 100644 --- a/scripts/library/parse_options.sh +++ b/scripts/library/parse_options.sh @@ -1,105 +1,90 @@ -# getopt like parser -parse_options() { - local short_options=$1; shift; - local long_options=$1; shift; - local ret=0; - local unused_options="" - local i - - while [[ -n $1 ]]; do - if [[ ${1:0:2} = '--' ]]; then - if [[ -n ${1:2} ]]; then - local match="" - for i in ${long_options//,/ }; do - if [[ ${1:2} = ${i//:} ]]; then - match=$i - break - fi - done - if [[ -n $match ]]; then - local needsargument=0 - - [[ ${match} = ${1:2}: ]] && needsargument=1 - [[ ${match} = ${1:2}:: && -n $2 && ${2:0:1} != "-" ]] && needsargument=1 - - if (( ! needsargument )); then - printf ' %s' "$1" - else - if [[ -n $2 ]]; then - printf ' %s ' "$1" - shift - printf "'%q" "$1" - while [[ -n $2 && ${2:0:1} != "-" ]]; do - shift - printf " %q" "$1" - done - printf "'" - else - printf "@SCRIPTNAME@: $(gettext "option %s requires an argument\n")" "'$1'" >&2 - ret=1 - fi - fi - else - echo "@SCRIPTNAME@: $(gettext "unrecognized option") '$1'" >&2 - ret=1 - fi - else - shift - break - fi - elif [[ ${1:0:1} = '-' ]]; then - for ((i=1; i<${#1}; i++)); do - if [[ $short_options =~ ${1:i:1} ]]; then - local needsargument=0 - - [[ $short_options =~ ${1:i:1}: && ! $short_options =~ ${1:i:1}:: ]] && needsargument=1 - [[ $short_options =~ ${1:i:1}:: && \ - ( -n ${1:$i+1} || ( -n $2 && ${2:0:1} != "-" ) ) ]] && needsargument=1 - - if (( ! needsargument )); then - printf ' -%s' "${1:i:1}" - else - if [[ -n ${1:$i+1} ]]; then - printf ' -%s ' "${1:i:1}" - printf "'%q" "${1:$i+1}" - while [[ -n $2 && ${2:0:1} != "-" ]]; do - shift - printf " %q" "$1" - done - printf "'" - else - if [[ -n $2 ]]; then - printf ' -%s ' "${1:i:1}" - shift - printf "'%q" "$1" - while [[ -n $2 && ${2:0:1} != "-" ]]; do - shift - printf " %q" "$1" - done - printf "'" - - else - printf "@SCRIPTNAME@: $(gettext "option %s requires an argument\n")" "'-${1:i:1}'" >&2 - ret=1 - fi - fi - break - fi - else - echo "@SCRIPTNAME@: $(gettext "unrecognized option") '-${1:i:1}'" >&2 - ret=1 - fi - done - else - unused_options="${unused_options} '$1'" - fi - shift - done - - printf " --" - [[ $unused_options ]] && printf ' %s' "${unused_options[@]}" - [[ $1 ]] && printf " '%s'" "$@" - printf "\n" - - return $ret -}\ No newline at end of file +# getopt-like parser +parse_options () { + local opt= i= shortopts=$1 + local -a longopts param + + # split the longopt array on commas + IFS=, read -r -a longopts <<< "$2" + shift 2 + + while (( $# )); do + case $1 in + --) # explicit end of options + shift + break + ;; + -[!-]*) # short option + for (( i = 1; i < ${#1}; i++ )); do + opt=${1:i:1} + + # option doesn't exist + if [[ $shortopts != *$opt* ]]; then + echo "@SCRIPTNAME@: $(gettext "unrecognized option") '-$opt'" >&2 + OPTRET=(--) + return 1 + fi + + OPTRET+=("-$opt") + # option requires optarg + if [[ $shortopts = *$opt:* ]]; then + # if we're not at the end of the option chunk, the rest is the optarg + if (( i < ${#1} - 1 )); then + OPTRET+=("${1:i+1}") + break + + # if we're at the end, grab the the next positional, if it exists + elif (( i == ${#1} - 1 )) && [[ $2 ]]; then + OPTRET+=("$2") + shift + break + + # parse failure + else + printf "@SCRIPTNAME@: $(gettext "option %s requires an argument\n")" "'-$opt'" >&2 + OPTRET=(--) + return 1 + fi + fi + + done + ;; + --?*) # long option + opt=${1#--} + OPTRET+=("$1") + + for longopt in "${longopts[@]}"; do + if [[ $longopt =~ ^($opt)(:?)$ ]]; then + # option requires optarg + if [[ -n ${BASH_REMATCH[2]} ]]; then + if [[ -z $2 ]]; then + printf "@SCRIPTNAME@: $(gettext "option %s requires an argument\n")" "'--$opt'" >&2 + OPTRET=(--) + return 1 + fi + OPTRET+=("$2") + shift 2 + continue 2 + + # simple longopt + elif [[ -n ${BASH_REMATCH[1]} ]]; then + shift + continue 2 + fi + fi + done + echo "@SCRIPTNAME@: $(gettext "unrecognized option") '--$opt'" >&2 + OPTRET=(--) + return 1 + ;; + *) # non-option arg encountered, add it as a parameter + param+=("$1") + ;; + esac + shift + done + + # add end-of-opt terminator and any leftover positional parameters + OPTRET+=('--' "${param[@]}" "$@") + + return 0 +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a4e7156..b6ab2ee 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1755,14 +1755,14 @@ OPT_LONG+=",install,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" OPT_LONG+=",repackage,skipinteg,sign,source,syncdeps,version,config:" # Pacman Options OPT_LONG+=",noconfirm,noprogressbar" -if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then +if ! parse_options "$OPT_SHORT" "$OPT_LONG" "$@"; then echo; usage; exit 1 # E_INVALID_OPTION; fi -eval set -- "$OPT_TEMP" -unset OPT_SHORT OPT_LONG OPT_TEMP +set -- "${OPTRET[@]}" +unset OPT_SHORT OPT_LONG OPTRET -while true; do - case "$1" in +while (( $# )); do + case $1 in # Pacman Options --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; --noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; @@ -1801,8 +1801,7 @@ while true; do -h|--help) usage; exit 0 ;; # E_OK -V|--version) version; exit 0 ;; # E_OK - --) OPT_IND=0; shift; break;; - *) usage; exit 1 ;; # E_INVALID_OPTION + --) shift; break;; esac shift done diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 5cb5bd5..d0fb0ef 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -255,16 +255,16 @@ reload_keyring() { } receive_keys() { - if [[ -z ${KEYIDS[@]} ]]; then + if [[ -z $1 ]]; 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[@]}" + ${GPG_PACMAN} --keyserver "$KEYSERVER" --recv-keys "$@" } edit_keys() { local errors=0; - for key in ${KEYIDS[@]}; do + for key; do # Verify if the key exists in pacman's keyring if ! ${GPG_PACMAN} --list-keys "$key" &>/dev/null; then error "$(gettext "The key identified by %s does not exist")" "$key" @@ -273,7 +273,7 @@ edit_keys() { done (( errors )) && exit 1; - for key in ${KEYIDS[@]}; do + for key; do ${GPG_PACMAN} --edit-key "$key" done } @@ -285,32 +285,33 @@ if ! type gettext &>/dev/null; then } fi -OPT_SHORT="a::d:e:f::hlr:uv:V" -OPT_LONG="add::,config:,delete:,edit-key:,export::,finger::,gpgdir:" +declare -a OPTRET +OPT_SHORT="ade:fhlr:uv:V" +OPT_LONG="add,config:,delete,edit-key,export,finger,gpgdir:" OPT_LONG+=",help,init,list,receive:,reload,updatedb,verify:,version" -if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then +if ! parse_options "$OPT_SHORT" "$OPT_LONG" "$@"; then echo; usage; exit 1 # E_INVALID_OPTION; fi -eval set -- "$OPT_TEMP" -unset OPT_SHORT OPT_LONG OPT_TEMP +set -- "${OPTRET[@]}" +unset OPT_SHORT OPT_LONG OPTRET -if [[ $1 == "--" ]]; then - usage; - exit 0; +if [[ -z $1 ]]; then + usage + exit 0 fi -while true; do - case "$1" in - -a|--add) ADD=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYFILES=($1) ;; +while (( $# )); do + case $1 in + -a|--add) ADD=1 ;; --config) shift; CONFIG=$1 ;; - -d|--delete) DELETE=1; shift; KEYIDS=($1) ;; - --edit-key) EDITKEY=1; shift; KEYIDS=($1) ;; - -e|--export) EXPORT=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; - -f|--finger) FINGER=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; + -d|--delete) DELETE=1 ;; + --edit-key) EDITKEY=1 ;; + -e|--export) EXPORT=1 ;; + -f|--finger) FINGER=1 ;; --gpgdir) shift; PACMAN_KEYRING_DIR=$1 ;; --init) INIT=1 ;; -l|--list) LIST=1 ;; - -r|--receive) RECEIVE=1; shift; KEYSERVER=$1; KEYIDS=("${@:1}") ;; + -r|--receive) RECEIVE=1; shift; KEYSERVER=$1 ;; --reload) RELOAD=1 ;; -u|--updatedb) UPDATEDB=1 ;; -v|--verify) VERIFY=1; shift; SIGNATURE=$1 ;; @@ -318,13 +319,11 @@ while true; do -h|--help) usage; exit 0 ;; -V|--version) version; exit 0 ;; - --) OPT_IND=0; shift; break;; - *) usage; exit 1 ;; + --) shift; break ;; esac shift done - if ! type -p gpg >/dev/null; then error "$(gettext "Cannot find the %s binary required for all %s operations.")" "gpg" "pacman-key" exit 1 @@ -364,14 +363,14 @@ esac (( ! INIT )) && check_keyring -(( ADD )) && ${GPG_PACMAN} --quiet --batch --import "${KEYFILES[@]}" -(( DELETE )) && ${GPG_PACMAN} --quiet --batch --delete-key --yes "${KEYIDS[@]}" -(( EDITKEY )) && edit_keys -(( EXPORT )) && ${GPG_PACMAN} --armor --export "${KEYIDS[@]}" -(( FINGER )) && ${GPG_PACMAN} --batch --fingerprint "${KEYIDS[@]}" +(( ADD )) && ${GPG_PACMAN} --quiet --batch --import "$@" +(( DELETE )) && ${GPG_PACMAN} --quiet --batch --delete-key --yes "$@" +(( EDITKEY )) && edit_keys "$@" +(( EXPORT )) && ${GPG_PACMAN} --armor --export "$@" +(( FINGER )) && ${GPG_PACMAN} --batch --fingerprint "$@" (( INIT )) && initialize -(( LIST )) && ${GPG_PACMAN} --batch --list-sigs "${KEYIDS[@]}" -(( RECEIVE )) && receive_keys +(( LIST )) && ${GPG_PACMAN} --batch --list-sigs "$@" +(( RECEIVE )) && receive_keys "$@" (( RELOAD )) && reload_keyring (( UPDATEDB )) && ${GPG_PACMAN} --batch --check-trustdb (( VERIFY )) && ${GPG_PACMAN} --verify $SIGNATURE diff --git a/test/scripts/Makefile.am b/test/scripts/Makefile.am new file mode 100644 index 0000000..caa9ab1 --- /dev/null +++ b/test/scripts/Makefile.am @@ -0,0 +1,9 @@ +check_SCRIPTS = \ + parse_options_test.sh + +noinst_SCRIPTS = $(check_SCRIPTS) + +EXTRA_DIST = \ + $(check_SCRIPTS) + +# vim:set ts=2 sw=2 noet: diff --git a/test/scripts/parse_options_test.sh b/test/scripts/parse_options_test.sh new file mode 100755 index 0000000..85981e1 --- /dev/null +++ b/test/scripts/parse_options_test.sh @@ -0,0 +1,103 @@ +#!/bin/bash + +declare -i testcount=0 pass=0 fail=0 + +# source the library function +if [[ -z $1 || ! -f $1 ]]; then + printf "error: path to parse_option library not provided or does not exist\n" + exit 1 +fi +. "$1" + +if ! type -t parse_options >/dev/null; then + printf 'parse_options function not found\n' + exit 1 +fi + +# borrow opts from makepkg +OPT_SHORT="AcdefFghiLmop:rRsV" +OPT_LONG="allsource,asroot,ignorearch,check,clean,nodeps" +OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" +OPT_LONG+=",install,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" +OPT_LONG+=",repackage,skipinteg,sign,source,syncdeps,version,config:" +OPT_LONG+=",noconfirm,noprogressbar" + +parse() { + local result=$1 tokencount=$2; shift 2 + + (( ++testcount )) + #printf '[TEST %2s]: ' "$testcount" + parse_options "$OPT_SHORT" "$OPT_LONG" "$@" 2>/dev/null + test_result "$result" "$tokencount" "$*" "${OPTRET[@]}" + unset OPTRET +} + +test_result() { + local result=$1 tokencount=$2 input=$3; shift 3 + + if { [[ $result = "$*" ]] || [[ $2 = NULL && -z $1 ]]; } && (( tokencount == $# )); then + (( ++pass )) + else + printf '[TEST %3s]: FAIL\n' "$testcount" + printf ' input: %s\n' "$input" + printf ' output: %s (%s tokens)\n' "$*" "$#" + printf ' expected: %s (%s tokens)\n' "$result" "$tokencount" + echo + (( ++fail )) + fi +} + +summarize() { + if (( !fail )); then + printf 'All %s tests successful\n' "$testcount" + exit 0 + else + printf '%s of %s tests failed\n' "$fail" "$testcount" + exit 1 + fi +} +trap 'summarize' EXIT + +printf 'Beginning parse_options tests\n' + +# usage: parse <expected result> <token count> test-params... +# a failed parse will match only the end of options marker '--' + +# no options +parse '--' 1 + +# short options +parse '-s -r --' 3 -s -r + +# short options, no spaces +parse '-s -r --' 3 -sr + +# short opt missing an opt arg +parse '--' 1 -s -p + +# short opt with an opt arg +parse '-p PKGBUILD -L --' 4 -p PKGBUILD -L + +# short opt with an opt arg, no space +parse '-p PKGBUILD --' 3 -pPKGBUILD + +# valid shortopts as a long opt +parse '--' 1 --sir + +# long opt with missing optarg +parse '--' 1 -sr --pkg + +# long opt with optarg +parse '--pkg foo --' 3 --pkg foo + +# explicit end of options with options after +parse '-s -r -- foo bar baz' 6 -s -r -- foo bar baz + +# non-option parameters mixed in with options +parse '-s -r -- foo baz' 5 -s foo baz -r + +# optarg with whitespace +parse '-p foo bar -s --' 4 -p'foo bar' -s + +# non-option parameter with whitespace +parse '-i -- foo bar' 3 -i 'foo bar' -- 1.7.6

3 7

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-44-g9f13955
by dan＠archlinux.org 18 Aug '11

18 Aug '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 9f139550f815e2970b8929094e50acfd8b4cc2b7 (commit) via 2dbdfe078847dc1247db77580655b387f746ba28 (commit) via b9833838c673b2c86a7073e50522af483d7f01dd (commit) via 9cddc4ad80dbb52e30cdbcd168a4c19b73e30bbe (commit) via 3ceef97799da9ec938dbade9e08e624ebb5fcea7 (commit) via b2688e95590a5f98ff3ed4d9561b4e3d4c203d1a (commit) via b952a3b08c778e1505032b55476e8956c38aead8 (commit) via c5c1a1349af5fc98766771cc1d9e61df50b8a44d (commit) via b008193c1255639f724e3f6c62e50e6f2619e3c2 (commit) via cea6d7eb13e548cd148e42faebd81f6f219b0fb0 (commit) via 70db02720424a6b674f39115cc0b1c22975a7491 (commit) from f41dc7e8fac63dfb0b201e2aecec4b5bcc66749f (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 9f139550f815e2970b8929094e50acfd8b4cc2b7 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Aug 17 19:45:57 2011 -0400 lib/dload: refactor deletion on failure This moves all the delete-on-fail logic to under cleanup label. This also implies should_unlink when a payload is received that doesn't allow resuming. Fixes .db.sig.part files leftover in the sync dir. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2dbdfe078847dc1247db77580655b387f746ba28 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Aug 17 17:57:47 2011 -0400 lib/dload: avoid renaming download to 0 length destfile This leverages earlier work that avoids a rename when destfile is unset. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b9833838c673b2c86a7073e50522af483d7f01dd Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Wed Aug 17 10:15:16 2011 +0200 Avoid stat() on NULL path in curl_download_internal() stat()'s behaviour is undefined if the first argument is NULL and might be prone to segfault. Add an additional check to skip the stat() invocation if no destfile is used. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9cddc4ad80dbb52e30cdbcd168a4c19b73e30bbe Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Wed Aug 17 16:45:35 2011 +0200 Skip rename() on NULL destfile in curl_download_internal() Avoid a potential segfault that may occur if we use a temporary file and fail to build the destination file name from the effective URL. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3ceef97799da9ec938dbade9e08e624ebb5fcea7 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 17 16:56:07 2011 -0500 Fix trailing whitespace in whole codebase Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b2688e95590a5f98ff3ed4d9561b4e3d4c203d1a Author: Sebastien Luttringer <seblu(a)seblu.net> Date: Tue Aug 16 09:21:56 2011 +0200 Update PKGBUILD manpage about startdir deprecation Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b952a3b08c778e1505032b55476e8956c38aead8 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 16 19:51:21 2011 -0500 Fix compilation using --without-gpgme This function is used regardless of whether gpgme support is enabled, so make sure it is always accessible. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c5c1a1349af5fc98766771cc1d9e61df50b8a44d Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 17 09:54:35 2011 +1000 configure.ac: add checks for more types, functions and headers This covers most types, functions and headers that we use in the code base. Currently we do not use any of these checks, but it is useful to have the configure output when looking at build issues on other peoples systems. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b008193c1255639f724e3f6c62e50e6f2619e3c2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 16 20:10:22 2011 -0400 dload: zero out pm_errno in curl_download_internal This reverts some hacky behavior from 5fc3ec and resets the handle's pm_errno where it should be reset -- prior to each download. This prevents a transaction with a download from being aborted when a package is successfully grabbed from a secondary server. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cea6d7eb13e548cd148e42faebd81f6f219b0fb0 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 16 11:33:24 2011 -0500 doc/PKGBUILD: fix Asciidoc formatting issues We had this gem: ⇐ (less than or equal to) Due to not ensuring we did literal printing of things like this. Fix it and a few other problems noticed scanning through both the HTML and manpage generated files. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 70db02720424a6b674f39115cc0b1c22975a7491 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 16 11:40:16 2011 -0500 Update authors and contributors * .mailmap: add mapping for Dave's two email addresses. * AUTHORS: clear out file, tell people to use `git shortlog -s` instead. * doc/footer.txt: "promote" Dave, put Xavier and Nagy in past contributors. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .mailmap | 1 + AUTHORS | 17 +--------------- NEWS | 6 ++-- README | 2 +- configure.ac | 22 ++++++++++++++------ contrib/zsh_completion.in | 8 +++--- doc/PKGBUILD.5.txt | 13 ++++++----- doc/footer.txt | 9 +++++-- lib/libalpm/dload.c | 27 +++++++++++++------------ lib/libalpm/signing.c | 43 ++++++++++++++++++++--------------------- lib/libalpm/sync.c | 13 ++--------- scripts/makepkg.sh.in | 6 ++-- test/pacman/pactest.py | 6 ++-- test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 2 +- test/pacman/pmfile.py | 2 +- test/pacman/pmpkg.py | 10 ++++---- test/pacman/pmrule.py | 2 +- test/pacman/pmtest.py | 4 +- test/pacman/tests/epoch005.py | 2 +- test/pacman/tests/sync135.py | 2 +- test/pacman/util.py | 2 +- 22 files changed, 96 insertions(+), 105 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] let cache cleanup scripts be called through -Sc but keep KeepCurrent and KeepInstalled as valid options
by Martti Kühne 17 Aug '11

17 Aug '11

I have a suggestion to make, concerning that cache cleaning topic of [1]. Pacman itself seems to cover some cache cleaning functionality with -Sc (I noticed when updating the config file). Would it not make sense to move that out into little scripts which in turn are called by pacman internally through the CleaningMethod (and transform that one into a shell command)? Another way would be adding the options CleaningMethod = CleanupScript CleanupScript = /path/to/my/cache_vacuum_cleaner Letting CleaningMethod = CleanupScript accept a second parameter, like CleaningMethod = CleanupScript <file> would look even nicer, but might break pacman's coding guidelines. That way everyone could staple his own cache cleaning script to pacman. If the idea is sort of accepted, I could look into the issue myself, even. mar77i [1] http://mailman.archlinux.org/pipermail/pacman-dev/2011-July/013928.html

2 1

[pacman-dev] [PATCH 1/4] Add makepkg -S which is and alias to makepkg --source
by Sebastien Luttringer 17 Aug '11

17 Aug '11

makepkg --source is a often used go make source package like for AUR. Have a -S shortcut will save the world. Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- contrib/bash_completion.in | 2 +- scripts/makepkg.sh.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index af5de17..8fa3da6 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -35,7 +35,7 @@ _makepkg() { opts=('allsource asroot check clean config force geninteg help holdver ignorearch install log nobuild nocheck nocolor noconfirm nodeps noextract noprogressbar nosign pkg repackage rmdeps sign skipinteg source syncdeps' - 'A L R c d e f g h i m o p r s') + 'A L R S c d e f g h i m o p r s') _arch_ptr2comp opts fi true diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f464014..3bbbf7c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1844,6 +1844,7 @@ usage() { echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" echo "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")" printf "$(gettext " -s, --syncdeps Install missing dependencies with %s")\n" "pacman" + echo "$(gettext " -S, --source Generate a source-only tarball without downloaded sources")" echo "$(gettext " --allsource Generate a source-only tarball including downloaded sources")" printf "$(gettext " --asroot Allow %s to run as root user")\n" "makepkg" printf "$(gettext " --check Run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" @@ -1857,7 +1858,6 @@ usage() { echo "$(gettext " --skipchecksums Do not verify checksums of the source files")" echo "$(gettext " --skipinteg Do not perform any verification checks on source files")" echo "$(gettext " --skippgpcheck Do not verify source files with PGP signatures")" - echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" echo printf "$(gettext "These options can be passed to %s:")\n" "pacman" echo @@ -1889,7 +1889,7 @@ fi ARGLIST=("$@") # Parse Command Line Options. -OPT_SHORT="AcdefFghiLmop:rRsV" +OPT_SHORT="AcdefFghiLmop:rRsSV" OPT_LONG="allsource,asroot,ignorearch,check,clean,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver,skippgpcheck" OPT_LONG+=",install,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" @@ -1940,8 +1940,8 @@ while true; do --skipinteg) SKIPCHECKSUMS=1; SKIPPGPCHECK=1 ;; --skippgpcheck) SKIPPGPCHECK=1;; --sign) SIGNPKG='y' ;; - --source) SOURCEONLY=1 ;; -s|--syncdeps) DEP_BIN=1 ;; + -S|--source) SOURCEONLY=1 ;; -h|--help) usage; exit 0 ;; # E_OK -V|--version) version; exit 0 ;; # E_OK -- Sebastien "Seblu" Luttringer

2 5