- Pacman-dev - lists.archlinux.org

[pacman-dev] Fwd: PATCH: fixed set -e hack in makepkg
by DJ Mills 08 Jul '11

08 Jul '11

Instead of using || echo, which IMO is a silly hack, the only proper way to check the exit status of a command substitution is: if ! var=$(command); then commands fi This patch changes that in makepkg, and gets rid of a pre-optimization that served no purpose in in_array(). Thanks.

2 1

[pacman-dev] [PATCH 1/3] add _alpm_access() wrapper
by Florian Pritz 06 Jul '11

06 Jul '11

This is a wrapper function for access() which logs some debug information and eases handling in case of split directory and filename. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- lib/libalpm/util.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/util.h | 1 + 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index cd7f19c..332f917 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -917,6 +917,55 @@ long _alpm_parsedate(const char *line) return atol(line); } +/** + * Wrapper around access() which takes a dir and file argument + * separately and generates an appropriate error message. + * If dir is NULL file will be treated as the whole path. + * @param handle an alpm handle + * @param dir directory path ending with and slash + * @param file filename + * @param amode access mode as describe in access() + * @return int value returned by access() + */ + +int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int amode) +{ + char *check_path = NULL; + size_t len = 0; + int ret = 0; + + if (dir == NULL) { + len = strlen(file) + 1; + CALLOC(check_path, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(check_path, len, "%s", file); + } else { + len = strlen(dir) + strlen(file) + 1; + CALLOC(check_path, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(check_path, len, "%s%s", dir, file); + } + + ret = access(check_path, amode); + + if(ret != 0) { + switch(amode) { + case R_OK: + _alpm_log(handle, ALPM_LOG_DEBUG, _("\"%s\" is not readable: %s\n"), check_path, strerror(errno)); + break; + case W_OK: + _alpm_log(handle, ALPM_LOG_DEBUG, _("\"%s\" is not writeable: %s\n"), check_path, strerror(errno)); + break; + case X_OK: + _alpm_log(handle, ALPM_LOG_DEBUG, _("\"%s\" is not executable: %s\n"), check_path, strerror(errno)); + break; + case F_OK: + _alpm_log(handle, ALPM_LOG_DEBUG, _("\"%s\" does not exist: %s\n"), check_path, strerror(errno)); + break; + } + } + free(check_path); + return ret; +} + #ifndef HAVE_STRNDUP /* A quick and dirty implementation derived from glibc */ static size_t strnlen(const char *s, size_t max) diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 450dac9..015ed5a 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -115,6 +115,7 @@ unsigned long _alpm_hash_sdbm(const char *str); long _alpm_parsedate(const char *line); int _alpm_raw_cmp(const char *first, const char *second); int _alpm_raw_ncmp(const char *first, const char *second, size_t max); +int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int amode); #ifndef HAVE_STRSEP char *strsep(char **, const char *); -- 1.7.6

2 4

[pacman-dev] [PATCH] Unify package removal code
by Dan McGee 06 Jul '11

06 Jul '11

This code duplication has always been a rather clumsy casuality of fixing some past upgrade issues. Unify the removal code across upgrade and remove operations into a new _alpm_remove_single_package() method wihch makes it very clear how we handle upgrade and remove differently, via several conditionals on newpkg. This commit highlights interesting behavior such as the fact that the implicit removal in every package upgrade never gets transaction events or progress callbacks. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 2 +- lib/libalpm/remove.c | 198 ++++++++++++++++++++++++-------------------------- lib/libalpm/remove.h | 5 +- 3 files changed, 98 insertions(+), 107 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 9ed4d81..e182746 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -506,7 +506,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, if(oldpkg) { /* set up fake remove transaction */ - if(_alpm_upgraderemove_package(handle, oldpkg, newpkg) == -1) { + if(_alpm_remove_single_package(handle, oldpkg, newpkg, 0, 0) == -1) { handle->pm_errno = ALPM_ERR_TRANS_ABORT; ret = -1; goto cleanup; diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 9b8517c..08b441e 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -283,40 +283,62 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, } } -int _alpm_upgraderemove_package(alpm_handle_t *handle, - alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg) +int _alpm_remove_single_package(alpm_handle_t *handle, + alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg, + size_t targ_count, size_t pkg_count) { - alpm_list_t *skip_remove, *b, *lp; - size_t filenum = 0; - alpm_list_t *files = alpm_pkg_get_files(oldpkg); - const char *pkgname = alpm_pkg_get_name(oldpkg); + alpm_list_t *files, *skip_remove, *lp; + size_t filenum = 0, position = 0; + const char *pkgname = oldpkg->name; + const char *pkgver = oldpkg->version; + char scriptlet[PATH_MAX]; + + if(newpkg) { + _alpm_log(handle, ALPM_LOG_DEBUG, "removing old package first (%s-%s)\n", + pkgname, oldpkg->version); + } else { + EVENT(handle->trans, ALPM_TRANS_EVT_REMOVE_START, oldpkg, NULL); + _alpm_log(handle, ALPM_LOG_DEBUG, "removing package %s-%s\n", + pkgname, oldpkg->version); + + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", + _alpm_db_path(handle->db_local), pkgname, pkgver); - _alpm_log(handle, ALPM_LOG_DEBUG, "removing old package first (%s-%s)\n", - oldpkg->name, oldpkg->version); + /* run the pre-remove scriptlet if it exists */ + if(alpm_pkg_has_scriptlet(oldpkg) && + !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { + _alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL); + } + } if(handle->trans->flags & ALPM_TRANS_FLAG_DBONLY) { goto db; } - /* copy the remove skiplist over */ - skip_remove = alpm_list_join( - alpm_list_strdup(handle->trans->skip_remove), - alpm_list_strdup(handle->noupgrade)); - /* Add files in the NEW backup array to the skip_remove array - * so this removal operation doesn't kill them */ - /* old package backup list */ - alpm_list_t *filelist = alpm_pkg_get_files(newpkg); - for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) { - const alpm_backup_t *backup = b->data; - /* safety check (fix the upgrade026 pactest) */ - if(!_alpm_filelist_contains(filelist, backup->name)) { - continue; + if(newpkg) { + alpm_list_t *newfiles, *b; + skip_remove = alpm_list_join( + alpm_list_strdup(handle->trans->skip_remove), + alpm_list_strdup(handle->noupgrade)); + /* Add files in the NEW backup array to the skip_remove array + * so this removal operation doesn't kill them */ + /* old package backup list */ + newfiles = alpm_pkg_get_files(newpkg); + for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) { + const alpm_backup_t *backup = b->data; + /* safety check (fix the upgrade026 pactest) */ + if(!_alpm_filelist_contains(newfiles, backup->name)) { + continue; + } + _alpm_log(handle, ALPM_LOG_DEBUG, "adding %s to the skip_remove array\n", + backup->name); + skip_remove = alpm_list_add(skip_remove, strdup(backup->name)); } - _alpm_log(handle, ALPM_LOG_DEBUG, "adding %s to the skip_remove array\n", - backup->name); - skip_remove = alpm_list_add(skip_remove, strdup(backup->name)); + } else { + skip_remove = alpm_list_strdup(handle->trans->skip_remove); } + files = alpm_pkg_get_files(oldpkg); for(lp = files; lp; lp = lp->next) { if(!can_remove_file(handle, lp->data, skip_remove)) { _alpm_log(handle, ALPM_LOG_DEBUG, @@ -328,19 +350,47 @@ int _alpm_upgraderemove_package(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum); + if(!newpkg) { + /* init progress bar, but only on true remove transactions */ + PROGRESS(handle->trans, ALPM_TRANS_PROGRESS_REMOVE_START, pkgname, 0, + pkg_count, targ_count); + } + /* iterate through the list backwards, unlinking files */ for(lp = alpm_list_last(files); lp; lp = alpm_list_previous(lp)) { - unlink_file(handle, oldpkg, lp->data, skip_remove, 0); + int percent; + unlink_file(handle, oldpkg, lp->data, skip_remove, + handle->trans->flags & ALPM_TRANS_FLAG_NOSAVE); + + if(!newpkg) { + /* update progress bar after each file */ + percent = (position * 100) / filenum; + PROGRESS(handle->trans, ALPM_TRANS_PROGRESS_REMOVE_START, pkgname, + percent, pkg_count, targ_count); + } + position++; } FREELIST(skip_remove); + if(!newpkg) { + /* set progress to 100% after we finish unlinking files */ + PROGRESS(handle->trans, ALPM_TRANS_PROGRESS_REMOVE_START, pkgname, 100, + pkg_count, targ_count); + + /* run the post-remove script if it exists */ + if(alpm_pkg_has_scriptlet(oldpkg) && + !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { + _alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL); + } + } + db: /* remove the package from the database */ _alpm_log(handle, ALPM_LOG_DEBUG, "updating database\n"); _alpm_log(handle, ALPM_LOG_DEBUG, "removing database entry '%s'\n", pkgname); if(_alpm_local_db_remove(handle->db_local, oldpkg) == -1) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not remove database entry %s-%s\n"), - pkgname, alpm_pkg_get_version(oldpkg)); + pkgname, pkgver); } /* remove the package from the cache */ if(_alpm_db_remove_pkgfromcache(handle->db_local, oldpkg) == -1) { @@ -348,106 +398,46 @@ db: pkgname); } + if(!newpkg) { + /* TODO: awesome! we're passing invalid pointers. */ + EVENT(handle->trans, ALPM_TRANS_EVT_REMOVE_DONE, oldpkg, NULL); + } + return 0; } int _alpm_remove_packages(alpm_handle_t *handle) { - alpm_pkg_t *info; - alpm_list_t *targ, *lp; - size_t pkg_count; + alpm_list_t *targ; + size_t pkg_count, targ_count; alpm_trans_t *trans = handle->trans; + int ret = 0; pkg_count = alpm_list_count(trans->remove); + targ_count = 1; for(targ = trans->remove; targ; targ = targ->next) { - int position = 0; - char scriptlet[PATH_MAX]; - info = (alpm_pkg_t *)targ->data; - const char *pkgname = NULL; - size_t targcount = alpm_list_count(targ); + alpm_pkg_t *pkg = targ->data; if(trans->state == STATE_INTERRUPTED) { return 0; } - /* get the name now so we can use it after package is removed */ - pkgname = alpm_pkg_get_name(info); - snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", - _alpm_db_path(handle->db_local), pkgname, alpm_pkg_get_version(info)); - - EVENT(trans, ALPM_TRANS_EVT_REMOVE_START, info, NULL); - _alpm_log(handle, ALPM_LOG_DEBUG, "removing package %s-%s\n", - pkgname, alpm_pkg_get_version(info)); - - /* run the pre-remove scriptlet if it exists */ - if(alpm_pkg_has_scriptlet(info) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, scriptlet, "pre_remove", - alpm_pkg_get_version(info), NULL); - } - - if(!(trans->flags & ALPM_TRANS_FLAG_DBONLY)) { - alpm_list_t *files = alpm_pkg_get_files(info); - size_t filenum = 0; - - for(lp = files; lp; lp = lp->next) { - if(!can_remove_file(handle, lp->data, NULL)) { - _alpm_log(handle, ALPM_LOG_DEBUG, "not removing package '%s', can't remove all files\n", - pkgname); - RET_ERR(handle, ALPM_ERR_PKG_CANT_REMOVE, -1); - } - filenum++; - } - - _alpm_log(handle, ALPM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum); - - /* init progress bar */ - PROGRESS(trans, ALPM_TRANS_PROGRESS_REMOVE_START, info->name, 0, - pkg_count, (pkg_count - targcount + 1)); - - /* iterate through the list backwards, unlinking files */ - for(lp = alpm_list_last(files); lp; lp = alpm_list_previous(lp)) { - int percent; - unlink_file(handle, info, lp->data, NULL, trans->flags & ALPM_TRANS_FLAG_NOSAVE); - - /* update progress bar after each file */ - percent = (position * 100) / filenum; - PROGRESS(trans, ALPM_TRANS_PROGRESS_REMOVE_START, info->name, - percent, pkg_count, (pkg_count - targcount + 1)); - position++; - } + if(_alpm_remove_single_package(handle, pkg, NULL, + targ_count, pkg_count) == -1) { + handle->pm_errno = ALPM_ERR_TRANS_ABORT; + ret = -1; + goto cleanup; } - /* set progress to 100% after we finish unlinking files */ - PROGRESS(trans, ALPM_TRANS_PROGRESS_REMOVE_START, pkgname, 100, - pkg_count, (pkg_count - targcount + 1)); - - /* run the post-remove script if it exists */ - if(alpm_pkg_has_scriptlet(info) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, scriptlet, "post_remove", - alpm_pkg_get_version(info), NULL); - } - - /* remove the package from the database */ - _alpm_log(handle, ALPM_LOG_DEBUG, "updating database\n"); - _alpm_log(handle, ALPM_LOG_DEBUG, "removing database entry '%s'\n", pkgname); - if(_alpm_local_db_remove(handle->db_local, info) == -1) { - _alpm_log(handle, ALPM_LOG_ERROR, _("could not remove database entry %s-%s\n"), - pkgname, alpm_pkg_get_version(info)); - } - /* remove the package from the cache */ - if(_alpm_db_remove_pkgfromcache(handle->db_local, info) == -1) { - _alpm_log(handle, ALPM_LOG_ERROR, _("could not remove entry '%s' from cache\n"), - pkgname); - } - - EVENT(trans, ALPM_TRANS_EVT_REMOVE_DONE, info, NULL); + targ_count++; } /* run ldconfig if it exists */ _alpm_ldconfig(handle); - return 0; +cleanup: + return ret; } /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/remove.h b/lib/libalpm/remove.h index 48dc2e9..5da645b 100644 --- a/lib/libalpm/remove.h +++ b/lib/libalpm/remove.h @@ -27,8 +27,9 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data); int _alpm_remove_packages(alpm_handle_t *handle); -int _alpm_upgraderemove_package(alpm_handle_t *handle, - alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg); +int _alpm_remove_single_package(alpm_handle_t *handle, + alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg, + size_t targ_count, size_t pkg_count); #endif /* _ALPM_REMOVE_H */ -- 1.7.6

1 0

[pacman-dev] Download sources from git/hg/etc
by seblu＠seblu.net 06 Jul '11

06 Jul '11

Hello, I would add a new feature in makepkg, which allow downloading of git/hg/cvs/etc content directly by makepkg. This feature can be great for packages in AUR. We have a lot of -git packages which can use this to escape to do it manually each time. I looked over the code and there is a design choice to make. Currently sources url is [filename::]http://toto. If we want to know which kind of url is (regular / git / hg) we need to have this information in PKGBUILD because git can download from http/ftp/git protocol. We can have many array in PKGBUILD as source=("http://toto") gitsouce=("git://toto.git) hgsource=("http://otot.hg) or have a more complex url syntax like [type:::][filename::]http://toto where type can be git/hg/cvs/etc. What do you think? -- Sébastien Luttringer www.seblu.net

7 7

[pacman-dev] [PATCH] doc/PKGBUILD: clarify scriptlet version arguments
by Dan McGee 06 Jul '11

06 Jul '11

It was a bit unclear that both pkgver and pkgrel were included in the passed version strings; clarify this fact in the manpage. Also make two other minor consistency touchups to code-print variables in text. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- On maint, not that I think we will be doing another release. doc/PKGBUILD.5.txt | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index c0fa594..0ead546 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -99,7 +99,7 @@ similar to `$_basekernver`. An array of source files required to build the package. Source files must either reside in the same directory as the PKGBUILD file, or be a fully-qualified URL that makepkg will use to download the file. In order - to make the PKGBUILD as useful as possible, use the $pkgname and $pkgver + to make the PKGBUILD as useful as possible, use the `$pkgname` and `$pkgver` variables if possible when specifying the download location. Any files that are compressed will automatically be extracted, unless found in the noextract array listed below. @@ -255,7 +255,7 @@ use here. The function is run in `bash -e` mode, meaning any command that exits with a non-zero status will cause the function to exit. Be sure any exotic commands used are covered by `makedepends`. -All of the above variables such as `pkgname` and `pkgver` are available for use +All of the above variables such as `$pkgname` and `$pkgver` are available for use in the build function. In addition, makepkg defines three variables for your use during the build and install process. These three variables are as follows: @@ -325,27 +325,27 @@ The exact time the script is run varies with each operation: *pre_install*:: script is run right before files are extracted. One argument is passed: - new package version. + new package 'pkgver-pkgrel'. *post_install*:: script is run right after files are extracted. One argument is passed: - new package version. + new package 'pkgver-pkgrel'. *pre_upgrade*:: script is run right before files are extracted. Two arguments are passed - in the following order: new package version, old package version. + in this order: new package 'pkgver-pkgrel', old package 'pkgver-pkgrel'. *post_upgrade*:: script is run after files are extracted. Two arguments are passed - in the following order: new package version, old package version. + in this order: new package 'pkgver-pkgrel', old package 'pkgver-pkgrel'. *pre_remove*:: script is run right before files are removed. One argument is passed: - old package version. + old package 'pkgver-pkgrel'. *post_remove*:: script is run right after files are removed. One argument is passed: - old package version. + old package 'pkgver-pkgrel'. To use this feature, create a file such as 'pkgname.install' and put it in the same directory as the PKGBUILD script. Then use the install directive: -- 1.7.6

1 1

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

06 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 b678e002714b732d7ea6a48029ac1a5b285d04e5 (commit) via 57eac093c40b0a54ab5d9f14519b9e44140e0c3d (commit) via 3eec745910bb908717a8b4ed7f5b630a92a5c9eb (commit) via 6dc71926f9b16ebcf11b924941092d6eab204224 (commit) via 6c9b82e72ac067207b1d66a3112485ad8d690f32 (commit) via eda741ae93519bea80af45e01ba7417cc50a4e1b (commit) via 043931ca452f6b231eb5b9b0863329843677bd2a (commit) via e2f00abe26c530a380ef687e50d91e07c6ba57c4 (commit) via 62880d7568649a54b4af1ffd8a61b488cbacdfd3 (commit) via 36474af463d0d8ce758f827d31a378624062b955 (commit) via ae7139adcfa65991c71616e8de7910ff722d4166 (commit) via 44889da5b704483b7ee013ec828ff64b64980de8 (commit) via 6cce517f1a78df885a1574252b3db9886185159d (commit) from dfc532668d4a4182ce196a895fdd5b017b505c6f (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 b678e002714b732d7ea6a48029ac1a5b285d04e5 Merge: eda741a 57eac09 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 5 22:01:29 2011 -0500 Merge remote-tracking branch 'dave/download' commit 57eac093c40b0a54ab5d9f14519b9e44140e0c3d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 22:00:07 2011 -0400 absorb fileinfo struct into dload_payload This transitional struct becomes delicious noms for dload_payload. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 3eec745910bb908717a8b4ed7f5b630a92a5c9eb Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 21:19:25 2011 -0400 absorb some _alpm_download params into payload struct Restore some sanity to the number of arguments passed to _alpm_download and curl_download_internal. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6dc71926f9b16ebcf11b924941092d6eab204224 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Jun 24 00:18:01 2011 -0400 lib/dload: prevent large file attacks This means creating a new struct which can pass more descriptive data from the back end sync functions to the downloader. In particular, we're interested in the download size read from the sync DB. When the remote server reports a size larger than this (via a content-length header), abort the transfer. In cases where the size is unknown, we set a hard upper limit of: * 25MiB for a sync DB * 16KiB for a signature For reference, 25MiB is more than twice the size of all of the current binary repos (with files) combined, and 16KiB is a truly gargantuan signature. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6c9b82e72ac067207b1d66a3112485ad8d690f32 Author: Dave Reisner <d(a)falconindy.com> Date: Sat Jun 11 12:50:15 2011 -0400 dload: handle irregular URLs URLs might end with a slash and follow redirects, or could be a generated by a script such as /getpkg.php?id=12345. In both cases, we may have a better filename that we can write to, taken from either content-disposition header, or the effective URL. Specific to the first case, we write to a temporary file of the format 'alpmtmp.XXXXXX', where XXXXXX is randomized by mkstemp(3). Since this is a randomly generated file, we cannot support resuming and the file is unlinked in the event of an interrupt. We also run into the possibility of changing out the filename from under alpm on a -U operation, so callers of _alpm_download can optionally pass a pointer to a *char to be filled in by curl_download_internal with the actual filename we wrote to. Any sync operation will pass a NULL pointer here, as we rely on specific names for packages from a mirror. Fixes FS#22645. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit eda741ae93519bea80af45e01ba7417cc50a4e1b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 5 01:28:27 2011 +1000 repo-add: backup old database signature too If you are keeping a copy of the old database, you probably want to keep a copy of its signature too. Also, delete the previously backed-up database signature if no new one is being copied. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 043931ca452f6b231eb5b9b0863329843677bd2a Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 5 14:18:16 2011 -0500 Rework -Si display logic We did some funny stuff here before to allow specifying fully-qualified package names, such as 'testing/gcc' or 'core/gcc'. However, it was done by duplicating code, not to mention an early escape if a repository could not be found for an early target. Something like `pacman -Si foo/bar core/gcc' would not give expected results, although `pacman -Si bar gcc' would. Clean up the code, remove strncpy() usage, and clarify the error messages a bit. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e2f00abe26c530a380ef687e50d91e07c6ba57c4 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 6 04:01:14 2011 +1000 pacman-key: fix syntax highlighting The lone quotation mark in "pacman's" causes issues for some syntax highlighting. Change the printing of the nessage from echo to printf so we can invisibly escape it. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 62880d7568649a54b4af1ffd8a61b488cbacdfd3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jun 29 12:59:07 2011 -0400 contrib/paclist: rewrite in bash The original concept for this script was a bash implementation, but turned out to be unreasonable at the time due to the efficiencies of the database format. Since those have been resolved, we can rewrite this in bash as a much simpler script. All the action happens in a single line, but we add extend this a little, binding to gettext to keep our pacman translations intact. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 36474af463d0d8ce758f827d31a378624062b955 Author: Florian Pritz <bluewind(a)xinu.at> Date: Tue Jul 5 23:30:54 2011 +0200 fix segfault if pacman.conf can't be read Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ae7139adcfa65991c71616e8de7910ff722d4166 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 5 14:16:17 2011 -0500 Remove most usages of strncmp() The supposed safety blanket of this function is better handled by explicit length checking and usages of strlen() on known NULL-terminated strings rather than hoping things fit in a buffer. We also have no need to fully fill a PATH_MAX length variable with NULLs every time as long as a single terminating byte is there. Remove usages of it by using strcpy() or memcpy() as appropriate, after doing length checks via strlen(). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 44889da5b704483b7ee013ec828ff64b64980de8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 3 19:58:19 2011 -0400 dload: rearrange code to avoid extra cpp block Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6cce517f1a78df885a1574252b3db9886185159d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 3 18:55:04 2011 -0400 lib/rawstr: borrow raw string functions from curl We'll need these functions to do locale agnostic and case insensitive string comparisons. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paclist.in | 85 ++++------------- lib/libalpm/Makefile.am | 1 + lib/libalpm/be_sync.c | 30 ++++-- lib/libalpm/dload.c | 232 +++++++++++++++++++++++++++++++++------------ lib/libalpm/dload.h | 15 ++- lib/libalpm/handle.c | 2 +- lib/libalpm/rawstr.c | 135 +++++++++++++++++++++++++++ lib/libalpm/sync.c | 39 +++++--- lib/libalpm/util.h | 2 + scripts/pacman-key.sh.in | 2 +- scripts/repo-add.sh.in | 6 +- src/pacman/conf.c | 4 +- src/pacman/query.c | 17 ++-- src/pacman/sync.c | 78 ++++++---------- src/pacman/util.c | 11 +-- src/util/vercmp.c | 2 +- 16 files changed, 439 insertions(+), 222 deletions(-) create mode 100644 lib/libalpm/rawstr.c hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] fix segfault if pacman.conf can't be read
by Florian Pritz 05 Jul '11

05 Jul '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- src/pacman/conf.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 3af3fa5..fac6da3 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -750,7 +750,9 @@ static int _parseconfig(const char *file, struct section_t *section, } cleanup: - fclose(fp); + if (fp) { + fclose(fp); + } pm_printf(ALPM_LOG_DEBUG, "config: finished parsing %s\n", file); return ret; } -- 1.7.6

1 0

[pacman-dev] [PATCH] fix segfault if pacman.conf can't be read
by Florian Pritz 05 Jul '11

05 Jul '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- src/pacman/conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 3af3fa5..b724ae3 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -750,7 +750,7 @@ static int _parseconfig(const char *file, struct section_t *section, } cleanup: - fclose(fp); + if (fp) fclose(fp); pm_printf(ALPM_LOG_DEBUG, "config: finished parsing %s\n", file); return ret; } -- 1.7.6

1 0

[pacman-dev] [PATCH] fix segfault if pacman.conf can't be read
by Florian Pritz 05 Jul '11

05 Jul '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- src/pacman/conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 3af3fa5..b724ae3 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -750,7 +750,7 @@ static int _parseconfig(const char *file, struct section_t *section, } cleanup: - fclose(fp); + if (fp) fclose(fp); pm_printf(ALPM_LOG_DEBUG, "config: finished parsing %s\n", file); return ret; } -- 1.7.6

2 1

[pacman-dev] Mirrorlist as Dependency
by David J. Haines 05 Jul '11

05 Jul '11

All, I was wondering whether it would be perhaps closer to KISS and/or more logically coherent not to have pacman-mirrorlist as a dependency of pacman. You don't actually need the mirrors to use pacman, and if you maintain a local mirror or build your own packages with ABS, /etc/pacman.d/mirrorlist just gets in the way and/or becomes cruft. Thoughts? David J. Haines dhaines(a)gmail.com

3 4