- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] pacman: print error when -Fx is given invalid regex
by morganamilo 26 Nov '19

26 Nov '19

When processing the targets for -Fx, compile all the regex ahead of time, printing an error for each that failed to compile. Then, if they all compiled successfully, continue with printing files. Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/src/pacman/files.c b/src/pacman/files.c index 3b6dc23b..91d891a6 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -94,17 +94,26 @@ static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg, in } } +struct filetarget { + char *targ; + int exact_file; + regex_t reg; +}; + +static void filetarget_free(struct filetarget *ftarg) { + regfree(&ftarg->reg); + free(ftarg); +} + static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { int ret = 0; - alpm_list_t *t; + alpm_list_t *t, *filetargs = NULL; for(t = targets; t; t = alpm_list_next(t)) { char *targ = t->data; - alpm_list_t *s; - int found = 0; - regex_t reg; size_t len = strlen(targ); int exact_file = strchr(targ, '/') != NULL; + regex_t reg; if(exact_file) { while(len > 1 && targ[0] == '/') { @@ -115,11 +124,33 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { if(regex) { if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { - /* TODO: error message */ - goto notfound; + pm_printf(ALPM_LOG_ERROR, + _("invalid regular expression '%s'\n"), targ); + ret = 1; + continue; } } + struct filetarget *ftarg = malloc(sizeof(struct filetarget)); + ftarg->targ = targ; + ftarg->exact_file = exact_file; + ftarg->reg = reg; + + filetargs = alpm_list_add(filetargs, ftarg); + } + + if(ret != 0) { + goto cleanup; + } + + for(t = filetargs; t; t = alpm_list_next(t)) { + struct filetarget *ftarg = t->data; + char *targ = ftarg->targ; + regex_t *reg = &ftarg->reg; + int exact_file = ftarg->exact_file; + alpm_list_t *s; + int found = 0; + for(s = syncs; s; s = alpm_list_next(s)) { alpm_list_t *p; alpm_db_t *repo = s->data; @@ -135,7 +166,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { if (regex) { for(size_t f = 0; f < files->count; f++) { char *c = files->files[f].name; - if(regexec(&reg, c, 0, 0, 0) == 0) { + if(regexec(reg, c, 0, 0, 0) == 0) { match = alpm_list_add(match, files->files[f].name); found = 1; } @@ -151,7 +182,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { char *c = strrchr(files->files[f].name, '/'); if(c && *(c + 1)) { if(regex) { - m = regexec(&reg, (c + 1), 0, 0, 0); + m = regexec(reg, (c + 1), 0, 0, 0); } else { m = strcmp(c + 1, targ); } @@ -170,16 +201,15 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { } } - if(regex) { - regfree(&reg); - } - -notfound: if(!found) { ret = 1; } } +cleanup: + alpm_list_free_inner(filetargs, (alpm_list_fn_free) filetarget_free); + alpm_list_free(filetargs); + return ret; } -- 2.23.0

2 1

[pacman-dev] [PATCH] makepkg: fix regression that broke extraction of file:// sources
by Eli Schwartz 26 Nov '19

26 Nov '19

In commit 9c817b654996249b8022e189ee7e2692f4668431 we made these sources extendable, and heuristically determined the correct extraction functions to use. But our fallback for protos that didn't have an exact extract_* function didn't take into account that 'extract_file' matches an actual proto... so we passed the netfile in while the function expected a file. Solution: the function should expect a netfile too, thereby allowing us to delay an attempted resolution of netfile -> file, to the one case where it is actually used. This makes us slightly more efficient in the non-file case, makes our functions a bit more consistent, and makes file:// extraction work again. Fixes FS#64648 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/source.sh.in | 3 +-- scripts/libmakepkg/source/file.sh.in | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/libmakepkg/source.sh.in b/scripts/libmakepkg/source.sh.in index 16db14af..4eaf6269 100644 --- a/scripts/libmakepkg/source.sh.in +++ b/scripts/libmakepkg/source.sh.in @@ -75,12 +75,11 @@ extract_sources() { get_all_sources_for_arch 'all_sources' for netfile in "${all_sources[@]}"; do - local file=$(get_filename "$netfile") local proto=$(get_protocol "$netfile") if declare -f extract_$proto > /dev/null; then extract_$proto "$netfile" else - extract_file "$file" + extract_file "$netfile" fi done } diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index 7297a1c6..df4256f7 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -83,8 +83,9 @@ download_file() { } extract_file() { - local file=$1 + local netfile=$1 + local file=$(get_filename "$netfile") local filepath=$(get_filepath "$file") rm -f "$srcdir/${file}" ln -s "$filepath" "$srcdir/" -- 2.24.0

2 1

[pacman-dev] [PATCH] Improved documentation for alpm_db_search() parameters
by Allan McRae 21 Nov '19

21 Nov '19

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index d3630385..c200a5d8 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -997,7 +997,8 @@ alpm_list_t *alpm_db_get_groupcache(alpm_db_t *db); /** Searches a database with regular expressions. * @param db pointer to the package database to search in * @param needles a list of regular expressions to search for - * @param ret the list of packages matching all regular expressions + * @param ret pointer to list for storing packages matching all + * regular expressions - must point to an empty (NULL) alpm_list_t *. * @return 0 on success, -1 on error (pm_errno is set accordingly) */ int alpm_db_search(alpm_db_t *db, const alpm_list_t *needles, -- 2.24.0

1 0

[pacman-dev] [PATCH] Fix leak in _alpm_db_search on error condition
by Allan McRae 21 Nov '19

21 Nov '19

--- lib/libalpm/db.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index cf4c865f..43ca1fc8 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -422,7 +422,10 @@ int _alpm_db_search(alpm_db_t *db, const alpm_list_t *needles, _alpm_log(db->handle, ALPM_LOG_DEBUG, "searching for target '%s'\n", targ); if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { - RET_ERR(db->handle, ALPM_ERR_INVALID_REGEX, -1); + db->handle->pm_errno = ALPM_ERR_INVALID_REGEX; + alpm_list_free(list); + alpm_list_free(*ret); + return -1; } for(j = list; j; j = j->next) { -- 2.24.0

1 0

[pacman-dev] [PATCH] alpm: fix documentation for alpm_mtree_next
by morganamilo 20 Nov '19

20 Nov '19

End of archive is 1, not 0, also it is possible for errors to occur. Signed-off-by: morganamilo <morganamilo(a)archlinux.org> diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index d3630385..9c474443 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1328,7 +1328,7 @@ struct archive *alpm_pkg_mtree_open(alpm_pkg_t *pkg); * @param pkg the package that the mtree file is being read from * @param archive the archive structure reading from the mtree file * @param entry an archive_entry to store the entry header information - * @return 0 if end of archive is reached, non-zero otherwise. + * @return 1 if end of archive is reached, 0 on success, otherwise error */ int alpm_pkg_mtree_next(const alpm_pkg_t *pkg, struct archive *archive, struct archive_entry **entry); diff --git a/src/pacman/query.c b/src/pacman/query.c index bdcfc3c1..4e3ec5a0 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -194,7 +194,7 @@ static int query_fileowner(alpm_list_t *targets) if(strncmp(rpath, root, rootlen) != 0) { /* file is outside root, we know nothing can own it */ - pm_printf(ALPM_LOG_ERROR, _("No package owns %s\n"), filename); + pm_printf(ALPM_LOG_ERROR, _("No package owns %s\n"), rpath); goto targcleanup; } -- 2.24.0

1 1

[pacman-dev] [PATCH] Add Eli to current maintainers
by Allan McRae 16 Nov '19

16 Nov '19

Also retire Dan into past major contributors. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/footer.asciidoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/footer.asciidoc b/doc/footer.asciidoc index cdaba40c..1c33d016 100644 --- a/doc/footer.asciidoc +++ b/doc/footer.asciidoc @@ -18,14 +18,15 @@ Current maintainers: * Allan McRae <allan(a)archlinux.org> * Andrew Gregory <andrew.gregory.8(a)gmail.com> -* Dan McGee <dan(a)archlinux.org> * Dave Reisner <dreisner(a)archlinux.org> +* Eli Schwartz <eschwartz(a)archlinux.org> Past major contributors: * Judd Vinet <jvinet(a)zeroflux.org> * Aurelien Foret <aurelien(a)archlinux.org> * Aaron Griffin <aaron(a)archlinux.org> +* Dan McGee <dan(a)archlinux.org> * Xavier Chantry <shiningxc(a)gmail.com> * Nagy Gabor <ngaba(a)bibl.u-szeged.hu> -- 2.24.0

3 2

[pacman-dev] [PATCH] libalpm:Dereference double pointer before assigning NULL.
by Daniel T. Borelli 16 Nov '19

16 Nov '19

Hi. I believe that the author's intention was to dereference the double pointer before assigning it NULL so that it has an effect outside the function. Signed-off-by: Daniel T. Borelli <danieltborelli(a)gmail.com> --- lib/libalpm/signing.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index cab31f8e..3c4f883f 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -479,7 +479,7 @@ static int email_from_uid(const char *uid, char **email) char *start, *end; if (uid == NULL) { - email = NULL; + *email = NULL; return -1; } @@ -492,7 +492,7 @@ static int email_from_uid(const char *uid, char **email) STRNDUP(*email, start+1, end-start-1, return -1); return 0; } else { - email = NULL; + *email = NULL; return -1; } } -- 2.24.0

2 1

[pacman-dev] [PATCH] Handle .part files that are the size of the correct package
by Allan McRae 16 Nov '19

16 Nov '19

In rare cases, likely due to a well timed Ctrl+C, but possibly due to a broken mirror, a ".part" file may have size at least that of the correct package size. When encountering this issue, currently pacman fails in different ways depending on where the package falls in the list to download. If last, "wrong or NULL argument passed" error is reported, or a "invalid or corrupt package" issue if not. Capture these .part files, and remove the extension. This lets pacman either use the package if valid, or offer to remove it if it fails checksum or signature verification. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- To test this patch do: mv /var/cache/pacman/pkg/xz-5.2.4-2-x86_64.pkg.tar.xz{,.part} pacman -S xz Having to run _alpm_filecache_find() in find_dl_candidates() on all packages that have download size of 0 is not given we run already it in compute_download_size(). However, we would require storing it in the alpm_pkg_t struct and I don't think that overhead was worth it. However, we then call _alpm_filecache_find() in check_validity() and load_package()... Still probably not worth it! lib/libalpm/dload.c | 6 ++++++ lib/libalpm/sync.c | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index ddcc45f6..40a1d07d 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -414,6 +414,12 @@ static int curl_download_internal(struct dload_payload *payload, curl_set_handle_opts(payload, curl, error_buffer); + if(payload->max_size == payload->initial_size) { + /* .part file is complete */ + ret = 0; + goto cleanup; + } + if(localf == NULL) { localf = fopen(payload->tempfile_name, payload->tempfile_openmode); if(localf == NULL) { diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 70c37890..97a351fe 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -731,6 +731,8 @@ static int find_dl_candidates(alpm_db_t *repo, alpm_list_t **files) alpm_pkg_t *spkg = i->data; if(spkg->origin != ALPM_PKG_FROM_FILE && repo == spkg->origin_data.db) { + char *fpath = NULL; + if(!repo->servers) { handle->pm_errno = ALPM_ERR_SERVER_NONE; _alpm_log(handle, ALPM_LOG_ERROR, "%s: %s\n", @@ -738,13 +740,21 @@ static int find_dl_candidates(alpm_db_t *repo, alpm_list_t **files) return 1; } - if(spkg->download_size != 0) { + ASSERT(spkg->filename != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1)); + + if(spkg->download_size == 0) { + /* check for file in cache - allows us to handle complete .part files */ + fpath = _alpm_filecache_find(handle, spkg->filename); + } + + if(spkg->download_size != 0 || !fpath) { struct dload_payload *payload; - ASSERT(spkg->filename != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1)); payload = build_payload(handle, spkg->filename, spkg->size, repo->servers); ASSERT(payload, return -1); *files = alpm_list_add(*files, payload); } + + FREE(fpath); } } -- 2.24.0

2 1

[pacman-dev] pacman -D --notes="project bar" asar
by Daan van Rossum 15 Nov '19

15 Nov '19

Dear pacman devs, I occasionally miss something like an "Install Notes" field in the pacman database (a variant of "Install Reason") for the installer to leave arbitrary notes that help understand/remember why certain packages exist on a system. Systems managed by pacman do not need reinstalls or OS upgrades that start from scratch. So packages that are installed for a particular reason can get carried along for a long time. A "Notes" field could be particularly useful for multi-user machines. The info could be provided at install time (and be passed on to any dependencies that get pulled in) # pacman -S asar --notes="project bar" or at a later point: # pacman -D asar --notes="project bar" and be visible as package property: # pacman -Qi asar <snip> Download Size : 95.72 KiB Installed Size : 457.00 KiB Install Notes : "project foo" "project bar" Packager : ... It's just another idea. I'll like pacman with or without this feature :) Best, Daan

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-15-gb9faf652
by Allan McRae 15 Nov '19

15 Nov '19

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 b9faf652735c603d1bdf849a570185eb721f11c1 (commit) via 540b19164b1ab3a4950b4a828fb90d047f4a591d (commit) from 27f354a7874b965bf223832bdf9749504cd1a590 (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 b9faf652735c603d1bdf849a570185eb721f11c1 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 12 16:14:57 2019 +1000 pactest: set package tar format to GNU_FORMAT python-3.8 changed the default tar format to PAX_FORMAT. This caused issues in our testsuite with package extraction of files with UTF-8 characters as we run the tests under the C locale. sycn600.py: error: error while reading package /tmp/pactest-xuhri4xa/var/cache/pacman/pkg/unicodechars-2.0-1.pkg.tar.gz: Pathname can't be converted from UTF-8 to current locale. Set format back to GNU_FORMAT. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 540b19164b1ab3a4950b4a828fb90d047f4a591d Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 12 07:29:52 2019 +1000 libalpm/sync.c: Do not download missing keys multiple times We now store key structs of our missing key info, so can not search the list for string matches. This caused missing keys to be downloaded once for every package they signed. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 12 ++++++++++-- test/pacman/pmpkg.py | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0