- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2][RFC] pacman/util: add methods to create a divider for tables
by Dave Reisner 20 Aug '11

20 Aug '11

This creates a dashed line underneath the header for each column in the table, e.g.: Name Old Version New Version Size ----- ------------ ------------ ----- at-spi2-core 2.0.2-1 0.18 MiB dconf 0.8.0-1 0.08 MiB at-spi2-atk 2.0.2-1 0.05 MiB gsettings-desktop-schemas 3.0.1-2 0.04 MiB Inspired-by: Pat Brisbin <pbrisbin(a)gmail.com> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- I think it's a nice touch, and it's not a hugely invasive patch. src/pacman/util.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 91625a1..0c83020 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -555,6 +555,40 @@ static alpm_list_t *table_create_format(const alpm_list_t *header, return formats; } +static char *string_create_filled(const unsigned int fill, size_t len) +{ + char *filled; + + filled = malloc(len + 1); + if(!filled) { + return NULL; + } + + memset(filled, fill, len); + filled[len] = '\0'; + + return filled; +} + +static alpm_list_t *table_create_divider(const alpm_list_t *header, + const unsigned int fill) +{ + const alpm_list_t *i; + alpm_list_t *divider = NULL; + + for(i = header; i; i = alpm_list_next(i)) { + const char *header = alpm_list_getdata(i); + char *div = string_create_filled(fill, string_length(header) + 1); + if(!div) { + FREELIST(divider); + return NULL; + } + divider = alpm_list_add(divider, div); + } + + return divider; +} + /** Displays the list in table format * * @param title the tables title @@ -569,7 +603,7 @@ int table_display(const char *title, const alpm_list_t *header, const alpm_list_t *rows) { const alpm_list_t *i; - alpm_list_t *formats; + alpm_list_t *formats, *divider; if(rows == NULL || header == NULL) { return 0; @@ -580,17 +614,24 @@ int table_display(const char *title, const alpm_list_t *header, return -1; } + divider = table_create_divider(header, '-'); + if(divider == NULL) { + FREELIST(formats); + return -1; + } + if(title != NULL) { printf("%s\n\n", title); } table_print_line(header, formats); - printf("\n"); + table_print_line(divider, formats); for(i = rows; i; i = alpm_list_next(i)) { table_print_line(alpm_list_getdata(i), formats); } + FREELIST(divider); FREELIST(formats); return 0; } -- 1.7.6

1 1

[pacman-dev] [PATCH] Print callback messages to stderr
by Allan McRae 20 Aug '11

20 Aug '11

Fixes FS#25099. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 873e3fc..5ee4e5a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -690,7 +690,7 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) output = alpm_list_add(output, string); } } else { - pm_vfprintf(stdout, level, fmt, args); + pm_vfprintf(stderr, level, fmt, args); } } -- 1.7.6

3 6

[pacman-dev] Default value for SigLevel being wrongly overridden?
by Allan McRae 20 Aug '11

20 Aug '11

Is this expected behaviour for how the default value for SigLevel works? [options] # SigLevel = [repo] SigLevel = TrustAll is different from [options] SigLevel = Optional [repo] SigLevel = TrustAll and [options] # SigLevel = [repo] SigLevel = Optional TrustAll (the last two being the same) I thought if no option was specified in the [options] section, then Optional (being the default) would apply unless one of "Required" or "Never" was specified in the [repo] section to override it. It currently appears that specifying any option overrides it. Another example: [options] # SigLevel = [repo] SigLevel = DatabaseRequired is the same as [repo] SigLevel = DatabaseRequired PackageNever where I was really expecting PackageOptional through the Optional default. Allan

1 0

[pacman-dev] [PATCH] Fix formatting in pacman-key manpage
by Jakob Gruber 20 Aug '11

20 Aug '11

Signed-off-by: Jakob Gruber <jakob.gruber(a)gmail.com> --- doc/pacman-key.8.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index c8ce026..9dc175c 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -45,7 +45,7 @@ Options Export key(s) identified by the specified keyid(s) to 'stdout'. If no keyid is specified, all keys will be exported. -*\--edit-key * <keyid(s)>:: +*\--edit-key* <keyid(s)>:: Present a menu for key management task on the specified keyids. Useful for adjusting a keys trust level. @@ -86,7 +86,7 @@ Options *-u, \--updatedb*:: Equivalent to \--check-trustdb in GnuPG. -* -v, \--verify* <signature>:: +*-v, \--verify* <signature>:: Verify the given signature file. *-V, \--version*:: -- 1.7.6

1 0

[pacman-dev] [PATCH] Flush output of pacman debug times
by Allan McRae 20 Aug '11

20 Aug '11

This keeps the output going to stdout and stderr in sync fixing the pactests broken by changing the callback messages to stderr. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 91625a1..e0addc0 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1417,6 +1417,7 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list timestr[8] = '\0'; printf("[%s] ", timestr); + fflush(stdout); } #endif -- 1.7.6

1 0

[pacman-dev] [PATCH] Remove alpm_option_get_* usage from backend
by Dan McGee 20 Aug '11

20 Aug '11

These are all available directly on the handle without indirection. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 3 +-- lib/libalpm/be_sync.c | 7 +++---- lib/libalpm/db.c | 4 ++-- lib/libalpm/diskspace.c | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/trans.c | 6 +++--- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 1b48922..f53bd64 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -194,8 +194,7 @@ 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), - db->treename, pkg->name, pkg->version); + pkg->handle->dbpath, db->treename, pkg->name, pkg->version); return fopen(clfile, "r"); } diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 75f0664..6e64e5f 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -41,13 +41,12 @@ static char *get_sync_dir(alpm_handle_t *handle) { - const char *dbpath = alpm_option_get_dbpath(handle); - size_t len = strlen(dbpath) + 6; + size_t len = strlen(handle->dbpath) + 6; char *syncpath; struct stat buf; MALLOC(syncpath, len, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - sprintf(syncpath, "%s%s", dbpath, "sync/"); + sprintf(syncpath, "%s%s", handle->dbpath, "sync/"); if(stat(syncpath, &buf) != 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n", @@ -260,7 +259,7 @@ cleanup: if(_alpm_handle_unlock(handle)) { _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"), - alpm_option_get_lockfile(handle)); + handle->lockfile); } free(syncpath); umask(oldmask); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 33282b8..4b23509 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -224,7 +224,7 @@ alpm_siglevel_t SYMEXPORT alpm_db_get_siglevel(alpm_db_t *db) { ASSERT(db != NULL, return -1); if(db->siglevel & ALPM_SIG_USE_DEFAULT) { - return alpm_option_get_default_siglevel(db->handle); + return db->handle->siglevel; } else { return db->siglevel; } @@ -357,7 +357,7 @@ const char *_alpm_db_path(alpm_db_t *db) const char *dbpath; size_t pathsize; - dbpath = alpm_option_get_dbpath(db->handle); + dbpath = db->handle->dbpath; if(!dbpath) { _alpm_log(db->handle, ALPM_LOG_ERROR, _("database path is undefined\n")); RET_ERR(db->handle, ALPM_ERR_DB_OPEN, NULL); diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 1e2fa14..ad80304 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -211,7 +211,7 @@ static int calculate_installed_size(alpm_handle_t *handle, /* approximate space requirements for db entries */ if(filename[0] == '.') { - filename = alpm_option_get_dbpath(handle); + filename = handle->dbpath; } snprintf(path, PATH_MAX, "%s%s", handle->root, filename); diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 28ce620..4428b54 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -116,7 +116,7 @@ static int init_gpgme(alpm_handle_t *handle) return 0; } - sigdir = alpm_option_get_gpgdir(handle); + sigdir = handle->gpgdir; if (_alpm_access(handle, sigdir, "pubring.gpg", R_OK) || _alpm_access(handle, sigdir, "trustdb.gpg", R_OK)) { diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 3f59596..c594520 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -82,7 +82,7 @@ static alpm_list_t *check_arch(alpm_handle_t *handle, alpm_list_t *pkgs) alpm_list_t *i; alpm_list_t *invalid = NULL; - const char *arch = alpm_option_get_arch(handle); + const char *arch = handle->arch; if(!arch) { return NULL; } @@ -224,9 +224,9 @@ int SYMEXPORT alpm_trans_release(alpm_handle_t *handle) if(!nolock_flag) { if(_alpm_handle_unlock(handle)) { _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"), - alpm_option_get_lockfile(handle)); + handle->lockfile); alpm_logaction(handle, "warning: could not remove lock file %s\n", - alpm_option_get_lockfile(handle)); + handle->lockfile); } } -- 1.7.6

1 0

[pacman-dev] [PATCH] Rework finding a writable cache directory
by Dan McGee 19 Aug '11

19 Aug '11

This is a refactor and refresh of the code used to find where we should download packages. * Incorporate suggestions from FS#25435 to use TMPDIR from the environment if set, otherwise fall back to /tmp as before. * Make the writability tests a bit more in depth. We now do a three part check consisting of: - S_ISDIR(): is this even a directory - access(W_OK): is this directory writable by the current user. Unfortunately for root, this almost always returns that it is, but in the case of a RO mount or NFS share inaccessible to root, this check will exclude the directory. - mode & (any write bit): is there a writable bit set on this directory. This makes it possible to enforce a read-only cache directory by setting permissions to 0555, for example. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 44 +++++++++++++++++++++++++++++--------------- 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 27709c6..7e3bc37 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -638,7 +638,7 @@ char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename) struct stat buf; /* Loop through the cache dirs until we find a matching file */ - for(i = alpm_option_get_cachedirs(handle); i; i = i->next) { + for(i = handle->cachedirs; i; i = i->next) { snprintf(path, PATH_MAX, "%s%s", (char *)alpm_list_getdata(i), filename); if(stat(path, &buf) == 0 && S_ISREG(buf.st_mode)) { @@ -659,11 +659,11 @@ char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename) const char *_alpm_filecache_setup(alpm_handle_t *handle) { struct stat buf; - alpm_list_t *i, *tmp; - char *cachedir; + alpm_list_t *i; + char *cachedir, *tmpdir; - /* Loop through the cache dirs until we find a writeable dir */ - for(i = alpm_option_get_cachedirs(handle); i; i = i->next) { + /* Loop through the cache dirs until we find a usable directory */ + for(i = handle->cachedirs; i; i = i->next) { cachedir = alpm_list_getdata(i); if(stat(cachedir, &buf) != 0) { /* cache directory does not exist.... try creating it */ @@ -673,21 +673,35 @@ const char *_alpm_filecache_setup(alpm_handle_t *handle) _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); return cachedir; } - } else if(S_ISDIR(buf.st_mode) && (buf.st_mode & S_IWUSR)) { + } else if(!S_ISDIR(buf.st_mode)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "skipping cachedir, not a directory: %s\n", cachedir); + } else if(access(cachedir, W_OK) != 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "skipping cachedir, not writable: %s\n", cachedir); + } else if(!(buf.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "skipping cachedir, no write bits set: %s\n", cachedir); + } else { _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); return cachedir; - } else { - _alpm_log(handle, ALPM_LOG_DEBUG, "skipping cachedir: %s\n", cachedir); } } - /* we didn't find a valid cache directory. use /tmp. */ - tmp = alpm_list_add(NULL, "/tmp/"); - alpm_option_set_cachedirs(handle, tmp); - alpm_list_free(tmp); - _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", "/tmp/"); - _alpm_log(handle, ALPM_LOG_WARNING, _("couldn't create package cache, using /tmp instead\n")); - return "/tmp/"; + /* we didn't find a valid cache directory. use TMPDIR or /tmp. */ + if((tmpdir = getenv("TMPDIR")) && stat(tmpdir, &buf) && S_ISDIR(buf.st_mode)) { + /* TMPDIR was good, we can use it */ + } else { + tmpdir = "/tmp"; + } + i = alpm_list_add(NULL, tmpdir); + alpm_option_set_cachedirs(handle, i); + alpm_list_free(i); + cachedir = handle->cachedirs->data; + _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); + _alpm_log(handle, ALPM_LOG_WARNING, + _("couldn't find or create package cache, using %s instead\n"), cachedir); + return cachedir; } /** lstat wrapper that treats /path/dirsymlink/ the same as /path/dirsymlink. -- 1.7.6

1 0

[pacman-dev] [PATCH] Be more robust when copying package data
by Dan McGee 19 Aug '11

19 Aug '11

This changes the signature of _alpm_pkg_dup() to return an integer error code and provide the new package in a passed pointer argument. All callers are now more robust with checking the return value of this function to ensure a fatal error did not occur. We allow load failures to proceed as otherwise we have a chicken and egg problem- if a 'desc' local database entry is missing, the best way of restoring said file is `pacman -Sf --dbonly packagename`. This patch fixes a segfault that was occurring in this case. Fixes the segfault reported in FS#25667. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 11 +++++++---- lib/libalpm/db.c | 3 +-- lib/libalpm/deps.c | 12 +++++++++--- lib/libalpm/deps.h | 2 +- lib/libalpm/package.c | 28 ++++++++++++++++++++++++---- lib/libalpm/package.h | 2 +- lib/libalpm/remove.c | 35 ++++++++++++++++++++++++++--------- lib/libalpm/sync.c | 6 +++++- 8 files changed, 74 insertions(+), 25 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 8bbf157..cb8551e 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -468,19 +468,22 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, is_upgrade = 1; /* we'll need to save some record for backup checks later */ - oldpkg = _alpm_pkg_dup(local); + if(_alpm_pkg_dup(local, &oldpkg) == -1) { + ret = -1; + goto cleanup; + } - EVENT(trans, ALPM_TRANS_EVT_UPGRADE_START, newpkg, oldpkg); + EVENT(trans, ALPM_TRANS_EVT_UPGRADE_START, newpkg, local); _alpm_log(handle, ALPM_LOG_DEBUG, "upgrading package %s-%s\n", newpkg->name, newpkg->version); /* copy over the install reason */ - newpkg->reason = alpm_pkg_get_reason(oldpkg); + newpkg->reason = alpm_pkg_get_reason(local); /* pre_upgrade scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { _alpm_runscriptlet(handle, newpkg->origin_data.file, - "pre_upgrade", newpkg->version, oldpkg->version); + "pre_upgrade", newpkg->version, local->version); } } else { is_upgrade = 0; diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 77bdf98..33282b8 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -553,8 +553,7 @@ int _alpm_db_add_pkgincache(alpm_db_t *db, alpm_pkg_t *pkg) return -1; } - newpkg = _alpm_pkg_dup(pkg); - if(newpkg == NULL) { + if(_alpm_pkg_dup(pkg, &newpkg)) { return -1; } diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 704a904..47b7637 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -512,13 +512,14 @@ static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg, * @param db package database to do dependency tracing in * @param *targs pointer to a list of packages * @param include_explicit if 0, explicitly installed packages are not included + * @return 0 on success, -1 on errors */ -void _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit) +int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit) { alpm_list_t *i, *j; if(db == NULL || targs == NULL) { - return; + return -1; } for(i = targs; i; i = i->next) { @@ -527,13 +528,18 @@ void _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit) alpm_pkg_t *deppkg = j->data; if(_alpm_dep_edge(pkg, deppkg) && can_remove_package(db, deppkg, targs, include_explicit)) { + alpm_pkg_t *copy; _alpm_log(db->handle, ALPM_LOG_DEBUG, "adding '%s' to the targets\n", deppkg->name); /* add it to the target list */ - targs = alpm_list_add(targs, _alpm_pkg_dup(deppkg)); + if(_alpm_pkg_dup(deppkg, &copy)) { + return -1; + } + targs = alpm_list_add(targs, copy); } } } + return 0; } /** diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 29e69eb..ce25bda 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -31,7 +31,7 @@ void _alpm_dep_free(alpm_depend_t *dep); alpm_depend_t *_alpm_dep_dup(const alpm_depend_t *dep); void _alpm_depmiss_free(alpm_depmissing_t *miss); alpm_list_t *_alpm_sortbydeps(alpm_handle_t *handle, alpm_list_t *targets, int reverse); -void _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit); +int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit); int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_pkg_t *pkg, alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove, alpm_list_t **data); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index d865ac9..3d73a43 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -467,13 +467,32 @@ alpm_pkg_t *_alpm_pkg_new(void) return pkg; } -alpm_pkg_t *_alpm_pkg_dup(alpm_pkg_t *pkg) +/** + * Duplicate a package data struct. + * @param pkg the package to duplicate + * @param new_ptr location to store duplicated package pointer + * @return 0 on success, -1 on fatal error, 1 on non-fatal error + */ +int _alpm_pkg_dup(alpm_pkg_t *pkg, alpm_pkg_t **new_ptr) { alpm_pkg_t *newpkg; alpm_list_t *i; + int ret = 0; + + if(!pkg || !pkg->handle) { + return -1; + } + + if(!new_ptr) { + RET_ERR(pkg->handle, ALPM_ERR_WRONG_ARGS, -1); + } if(pkg->ops->force_load(pkg)) { - return NULL; + _alpm_log(pkg->handle, ALPM_LOG_WARNING, + _("could not fully load metadata for package %s-%s\n"), + pkg->name, pkg->version); + ret = 1; + pkg->handle->pm_errno = ALPM_ERR_PKG_INVALID; } CALLOC(newpkg, 1, sizeof(alpm_pkg_t), goto cleanup); @@ -540,11 +559,12 @@ alpm_pkg_t *_alpm_pkg_dup(alpm_pkg_t *pkg) newpkg->ops = pkg->ops; newpkg->handle = pkg->handle; - return newpkg; + *new_ptr = newpkg; + return ret; cleanup: _alpm_pkg_free(newpkg); - return NULL; + RET_ERR(pkg->handle, ALPM_ERR_MEMORY, -1); } void _alpm_pkg_free(alpm_pkg_t *pkg) diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index bb92ddc..25d1b1a 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -144,7 +144,7 @@ alpm_file_t *_alpm_file_copy(alpm_file_t *dest, const alpm_file_t *src); int _alpm_files_cmp(const void *f1, const void *f2); alpm_pkg_t* _alpm_pkg_new(void); -alpm_pkg_t *_alpm_pkg_dup(alpm_pkg_t *pkg); +int _alpm_pkg_dup(alpm_pkg_t *pkg, alpm_pkg_t **new_ptr); void _alpm_pkg_free(alpm_pkg_t *pkg); void _alpm_pkg_free_trans(alpm_pkg_t *pkg); diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index c6886c6..7903a0f 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -49,6 +49,7 @@ int SYMEXPORT alpm_remove_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) { const char *pkgname; alpm_trans_t *trans; + alpm_pkg_t *copy; /* Sanity checks */ CHECK_HANDLE(handle, return -1); @@ -67,11 +68,14 @@ int SYMEXPORT alpm_remove_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) _alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s to the transaction remove list\n", pkgname); - trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(pkg)); + if(_alpm_pkg_dup(pkg, &copy) == -1) { + return -1; + } + trans->remove = alpm_list_add(trans->remove, copy); return 0; } -static void remove_prepare_cascade(alpm_handle_t *handle, alpm_list_t *lp) +static int remove_prepare_cascade(alpm_handle_t *handle, alpm_list_t *lp) { alpm_trans_t *trans = handle->trans; @@ -81,14 +85,18 @@ 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) { + alpm_pkg_t *copy; if(!_alpm_pkg_find(trans->remove, info->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "pulling %s in target list\n", info->name); - trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(info)); + if(_alpm_pkg_dup(info, &copy) == -1) { + return -1; + } + trans->remove = alpm_list_add(trans->remove, copy); } } else { - _alpm_log(handle, ALPM_LOG_ERROR, _("could not find %s in database -- skipping\n"), - miss->target); + _alpm_log(handle, ALPM_LOG_ERROR, + _("could not find %s in database -- skipping\n"), miss->target); } } alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free); @@ -96,6 +104,7 @@ static void remove_prepare_cascade(alpm_handle_t *handle, alpm_list_t *lp) lp = alpm_checkdeps(handle, _alpm_db_get_pkgcache(handle->db_local), trans->remove, NULL, 1); } + return 0; } static void remove_prepare_keep_needed(alpm_handle_t *handle, alpm_list_t *lp) @@ -134,6 +143,7 @@ static void remove_prepare_keep_needed(alpm_handle_t *handle, alpm_list_t *lp) * the packages blocking the transaction. * @param handle the context handle * @param data a pointer to an alpm_list_t* to fill + * @return 0 on success, -1 on error */ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) { @@ -144,8 +154,10 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) if((trans->flags & ALPM_TRANS_FLAG_RECURSE) && !(trans->flags & ALPM_TRANS_FLAG_CASCADE)) { _alpm_log(handle, ALPM_LOG_DEBUG, "finding removable dependencies\n"); - _alpm_recursedeps(db, trans->remove, - trans->flags & ALPM_TRANS_FLAG_RECURSEALL); + if(_alpm_recursedeps(db, trans->remove, + trans->flags & ALPM_TRANS_FLAG_RECURSEALL)) { + return -1; + } } if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { @@ -156,7 +168,9 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) if(lp != NULL) { if(trans->flags & ALPM_TRANS_FLAG_CASCADE) { - remove_prepare_cascade(handle, lp); + if(remove_prepare_cascade(handle, lp)) { + return -1; + } } else if(trans->flags & ALPM_TRANS_FLAG_UNNEEDED) { /* Remove needed packages (which would break dependencies) * from target list */ @@ -184,7 +198,10 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) if((trans->flags & ALPM_TRANS_FLAG_CASCADE) && (trans->flags & ALPM_TRANS_FLAG_RECURSE)) { _alpm_log(handle, ALPM_LOG_DEBUG, "finding removable dependencies\n"); - _alpm_recursedeps(db, trans->remove, trans->flags & ALPM_TRANS_FLAG_RECURSEALL); + if(_alpm_recursedeps(db, trans->remove, + trans->flags & ALPM_TRANS_FLAG_RECURSEALL)) { + return -1; + } } if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 6c30c94..e3e7fa9 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -558,8 +558,12 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) for(j = spkg->removes; j; j = j->next) { alpm_pkg_t *rpkg = j->data; if(!_alpm_pkg_find(trans->remove, rpkg->name)) { + alpm_pkg_t *copy; _alpm_log(handle, ALPM_LOG_DEBUG, "adding '%s' to remove list\n", rpkg->name); - trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(rpkg)); + if(_alpm_pkg_dup(rpkg, &copy) == -1) { + return -1; + } + trans->remove = alpm_list_add(trans->remove, copy); } } } -- 1.7.6

1 0

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

19 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 9934b3bd345011eef6a96249d8d90de594c04cd0 (commit) via 24824b54ce6ce3f62417be493d1e29eeb2cc8f53 (commit) via 2ca27ab3a14c106a7153dda337a61c79db7a6de0 (commit) via 1723e6dc4f8eff8aaa1e0f7560800c76e85f3009 (commit) via 16334f778b59ebf831c15640db2fe9706e7c9615 (commit) from c28052e45b94437d8c476c648ad6c9f9b8c04f36 (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 9934b3bd345011eef6a96249d8d90de594c04cd0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 18 15:21:58 2011 -0400 lib/dload: unlink on response code >=400 ftp and http both define >=400 as being "something bad happened" Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 24824b54ce6ce3f62417be493d1e29eeb2cc8f53 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 18 14:17:30 2011 -0400 dload: add 'unlink_on_fail' to payload struct Let callers of _alpm_download state whether we should delete on fail, rather than inferring it from context. We still override this decision and always unlink when a temp file is used. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2ca27ab3a14c106a7153dda337a61c79db7a6de0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 18 12:27:12 2011 -0400 makepkg: quote re-evaluation of simple vars This is a safety measure to prevent simple code injection. $ i="foo bar" $ eval i="$i" bash: bar: command not found $ eval i=\"$i\" $ echo "|$i|" |foo bar| Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1723e6dc4f8eff8aaa1e0f7560800c76e85f3009 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 18 12:18:39 2011 -0400 lib/dload: prevent possible NULL dereference Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 16334f778b59ebf831c15640db2fe9706e7c9615 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 02:17:04 2011 -0400 sync: fix garbled output in conflict prompt $ pacman -S cronie resolving dependencies... looking for inter-conflicts... :: cronie and fcron are in conflict (@.). Remove fcron? [y/N] n $ sudo pacman -S pacman resolving dependencies... looking for inter-conflicts... :: pacman and pacman-git are in conflict (pKÈ). Remove pacman-git? [y/N] Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_sync.c | 1 + lib/libalpm/dload.c | 16 ++++++++++------ lib/libalpm/dload.h | 1 + lib/libalpm/sync.c | 2 +- scripts/makepkg.sh.in | 12 ++++++------ 5 files changed, 19 insertions(+), 13 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/6] dload: move curl option setting to static func
by Dave Reisner 19 Aug '11

19 Aug '11

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/dload.c | 112 ++++++++++++++++++++++++++++----------------------- 1 files changed, 62 insertions(+), 50 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 2a1fb41..16b2206 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -177,18 +177,74 @@ static size_t parse_headers(void *ptr, size_t size, size_t nmemb, void *user) return realsize; } +static int curl_set_handle_opts(struct dload_payload *payload, + const char *destfile, const char *tempfile, FILE **localf, + const char **open_mode, char *error_buffer) +{ + char *useragent = getenv("HTTP_USER_AGENT"); + alpm_handle_t *handle = payload->handle; + struct stat st; + + /* the curl_easy handle is initialized with the alpm handle, so we only need + * to reset the curl handle set parameters for each time it's used. */ + curl_easy_reset(handle->curl); + curl_easy_setopt(handle->curl, CURLOPT_URL, payload->fileurl); + curl_easy_setopt(handle->curl, CURLOPT_FAILONERROR, 1L); + curl_easy_setopt(handle->curl, CURLOPT_ERRORBUFFER, error_buffer); + curl_easy_setopt(handle->curl, CURLOPT_CONNECTTIMEOUT, 10L); + curl_easy_setopt(handle->curl, CURLOPT_FILETIME, 1L); + curl_easy_setopt(handle->curl, CURLOPT_NOPROGRESS, 0L); + curl_easy_setopt(handle->curl, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt(handle->curl, CURLOPT_PROGRESSFUNCTION, curl_progress); + curl_easy_setopt(handle->curl, CURLOPT_PROGRESSDATA, (void *)payload); + curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_LIMIT, 1024L); + curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_TIME, 10L); + curl_easy_setopt(handle->curl, CURLOPT_HEADERFUNCTION, parse_headers); + curl_easy_setopt(handle->curl, CURLOPT_WRITEHEADER, (void *)payload); + + if(payload->max_size) { + curl_easy_setopt(handle->curl, CURLOPT_MAXFILESIZE, payload->max_size); + } + + if(useragent != NULL) { + curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, useragent); + } + + 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); + } else if(stat(tempfile, &st) == 0 && payload->allow_resume) { + /* a previous partial download exists, resume from end of file. */ + *open_mode = "ab"; + curl_easy_setopt(handle->curl, CURLOPT_RESUME_FROM, (long)st.st_size); + _alpm_log(handle, ALPM_LOG_DEBUG, "tempfile found, attempting continuation\n"); + payload->initial_size = (double)st.st_size; + } + + if(*localf == NULL) { + *localf = fopen(tempfile, *open_mode); + if(*localf == NULL) { + return 1; + } + } + + curl_easy_setopt(handle->curl, CURLOPT_WRITEDATA, *localf); + + return 0; +} + + static int curl_download_internal(struct dload_payload *payload, const char *localpath, char **final_file) { int ret = -1; FILE *localf = NULL; - const char *useragent; const char *open_mode = "wb"; char *destfile = NULL, *tempfile = NULL, *effective_url; /* RFC1123 states applications should support this length */ char hostname[256]; - char error_buffer[CURL_ERROR_SIZE]; - struct stat st; + char error_buffer[CURL_ERROR_SIZE] = { 0 }; long timecond, remote_time = -1; double remote_size, bytes_dl; struct sigaction sig_pipe[2], sig_int[2]; @@ -233,55 +289,11 @@ static int curl_download_internal(struct dload_payload *payload, payload->filename = strrchr(randpath, '/') + 1; } - error_buffer[0] = '\0'; - - /* the curl_easy handle is initialized with the alpm handle, so we only need - * to reset the curl handle set parameters for each time it's used. */ - curl_easy_reset(handle->curl); - curl_easy_setopt(handle->curl, CURLOPT_URL, payload->fileurl); - curl_easy_setopt(handle->curl, CURLOPT_FAILONERROR, 1L); - curl_easy_setopt(handle->curl, CURLOPT_ERRORBUFFER, error_buffer); - curl_easy_setopt(handle->curl, CURLOPT_CONNECTTIMEOUT, 10L); - curl_easy_setopt(handle->curl, CURLOPT_FILETIME, 1L); - curl_easy_setopt(handle->curl, CURLOPT_NOPROGRESS, 0L); - curl_easy_setopt(handle->curl, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(handle->curl, CURLOPT_PROGRESSFUNCTION, curl_progress); - curl_easy_setopt(handle->curl, CURLOPT_PROGRESSDATA, (void *)payload); - curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_LIMIT, 1024L); - curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_TIME, 10L); - curl_easy_setopt(handle->curl, CURLOPT_HEADERFUNCTION, parse_headers); - curl_easy_setopt(handle->curl, CURLOPT_WRITEHEADER, (void *)payload); - - if(payload->max_size) { - curl_easy_setopt(handle->curl, CURLOPT_MAXFILESIZE, payload->max_size); - } - - useragent = getenv("HTTP_USER_AGENT"); - if(useragent != NULL) { - curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, useragent); - } - - 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); - } else if(stat(tempfile, &st) == 0 && payload->allow_resume) { - /* a previous partial download exists, resume from end of file. */ - open_mode = "ab"; - curl_easy_setopt(handle->curl, CURLOPT_RESUME_FROM, (long)st.st_size); - _alpm_log(handle, ALPM_LOG_DEBUG, "tempfile found, attempting continuation\n"); - payload->initial_size = (double)st.st_size; - } - - if(localf == NULL) { - localf = fopen(tempfile, open_mode); - if(localf == NULL) { - goto cleanup; - } + if(curl_set_handle_opts(payload, destfile, tempfile, &localf, &open_mode, + error_buffer) != 0) { + goto cleanup; } - curl_easy_setopt(handle->curl, CURLOPT_WRITEDATA, localf); - /* ignore any SIGPIPE signals- these may occur if our FTP socket dies or * something along those lines. Store the old signal handler first. */ sig_pipe[NEW].sa_handler = SIG_IGN; -- 1.7.6

2 10