November 2019 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix documentation of alpm_mtree_next and remove libarchive exposure
by Allan McRae 26 Nov '19

26 Nov '19

The documentation of the return types of alpm_mtree_next was incorrect. This extended into the relevant function in be_local.c. Also, return explicit integer values, rather than the ARCHIVE_xxx values, to avoid unnecessarily exposing frontends to libarchive internals (even though it makes no functional difference). Original-work-by: morganamilo <morganamilo(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Reviewing morganamilo documentation patch lead me further into the rabbit hole... lib/libalpm/alpm.h | 2 +- lib/libalpm/be_local.c | 18 ++++++++++++++++-- src/pacman/check.c | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c200a5d8..956284bd 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1329,7 +1329,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 0 on success, 1 if end of archive is reached, -1 otherwise. */ int alpm_pkg_mtree_next(const alpm_pkg_t *pkg, struct archive *archive, struct archive_entry **entry); diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 5d4a7508..b89acf05 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -284,12 +284,26 @@ error: * @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 0 on success, 1 if end of archive is reached, -1 otherwise. */ static int _cache_mtree_next(const alpm_pkg_t UNUSED *pkg, struct archive *mtree, struct archive_entry **entry) { - return archive_read_next_header(mtree, entry); + int ret; + ret = archive_read_next_header(mtree, entry); + + switch(ret) { + case ARCHIVE_OK: + return 0; + break; + case ARCHIVE_EOF: + return 1; + break; + default: + break; + } + + return -1; } /** diff --git a/src/pacman/check.c b/src/pacman/check.c index ab35891a..85b25f39 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -277,7 +277,7 @@ int check_pkg_full(alpm_pkg_t *pkg) return 0; } - while(alpm_pkg_mtree_next(pkg, mtree, &entry) == ARCHIVE_OK) { + while(alpm_pkg_mtree_next(pkg, mtree, &entry) == 0) { struct stat st; const char *path = archive_entry_pathname(entry); char filepath[PATH_MAX]; -- 2.24.0

1 0

[pacman-dev] [PATCH] meson: add configure-time option to run tests with valgrind
by Eli Schwartz 26 Nov '19

26 Nov '19

ninja doesn't support dynamic modification of commands via command-line defines the way Make does. Resolves a major blocker for FS#64394 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson_options.txt | 4 ++++ test/pacman/meson.build | 3 +++ 2 files changed, 7 insertions(+) diff --git a/meson_options.txt b/meson_options.txt index 4d8cc300..80d9422a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -54,3 +54,7 @@ option('i18n', type : 'boolean', value : true, # tools option('file-seccomp', type: 'feature', value: 'auto', description: 'determine whether file is seccomp-enabled') + +# test options +option('valgrind', type : 'boolean', value : false, + description : 'run pacman tests using valgrind') diff --git a/test/pacman/meson.build b/test/pacman/meson.build index 4e87b4f3..2e0a2f5f 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -346,6 +346,9 @@ foreach input : pacman_tests if not conf.get('HAVE_LIBGPGME') args += '--without-gpg' endif + if get_option('valgrind') + args += '--valgrind' + endif test( test_name, -- 2.24.0

2 3

[pacman-dev] [PATCH v2] meson: make non-symlink scripts install for real, and use a better wrapper
by Eli Schwartz 26 Nov '19

26 Nov '19

We now generate the scripts using their real name, install them using meson's builtin facility instead of an install_script, and generate the wrapper scripts in the root of the build directory, instead of a subdirectory. This gets us closer to resolving FS#64394. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- v2: remove EXTRA_DIST file from autotools Makefile.am | 1 - build-aux/meson-install-script.sh | 6 ----- meson.build | 16 ++++++++++++- scripts/meson.build | 38 ++++++++++++++----------------- 4 files changed, 32 insertions(+), 29 deletions(-) delete mode 100644 build-aux/meson-install-script.sh diff --git a/Makefile.am b/Makefile.am index 9216ef00..fbbc2559 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,6 @@ EXTRA_DIST = \ HACKING test/tap.sh \ meson.build meson_options.txt \ build-aux/edit-script.sh.in \ - build-aux/meson-install-script.sh \ build-aux/meson-make-symlink.sh \ build-aux/script-wrapper.sh.in diff --git a/build-aux/meson-install-script.sh b/build-aux/meson-install-script.sh deleted file mode 100644 index f5a42fca..00000000 --- a/build-aux/meson-install-script.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -built_script=$1 -dest_path=$2 - -install -Dm755 "$built_script" "$DESTDIR/$dest_path" diff --git a/meson.build b/meson.build index 2c9185a6..572526b2 100644 --- a/meson.build +++ b/meson.build @@ -32,7 +32,6 @@ SED = find_program('sed') DU = find_program('du') LDCONFIG = get_option('ldconfig') MESON_MAKE_SYMLINK = join_paths(meson.source_root(), 'build-aux/meson-make-symlink.sh') -MESON_INSTALL_SCRIPT = join_paths(meson.source_root(), 'build-aux/meson-install-script.sh') BASH = find_program('bash4', 'bash') if BASH.found() @@ -366,6 +365,21 @@ executable( install : true, ) +foreach wrapper : script_wrappers + cdata = configuration_data() + cdata.set_quoted('BASH', BASH.path()) + cdata.set_quoted('BUILDDIR', wrapper[2]) + cdata.set_quoted('REAL_PROGPATH', wrapper[1].full_path()) + + # Create a wrapper script that bootstraps the real script within the build + # directory. Use configure_file instead of a custom_target to ensure that + # permissions on the input script wrapper are preserved. + configure_file( + input : join_paths(meson.source_root(), 'build-aux', 'script-wrapper.sh.in'), + output : wrapper[0], + configuration : cdata) +endforeach + configure_file( input : 'etc/makepkg.conf.in', output : 'makepkg.conf', diff --git a/scripts/meson.build b/scripts/meson.build index 696d8ddd..d2466523 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -26,42 +26,38 @@ foreach script : scripts install_dir : get_option('bindir')) endforeach +script_wrappers = [] foreach script : wrapped_scripts script_shortname = script.split('.')[0] - # Build the script, but don't install it. We want to keep it as a "private" - # artifact that we reference from a wrapper script in order to bootstrap it - # the build directory. internal_script = custom_target( script, input : script, command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@', '0755'], - output : script, - build_by_default : true) - - cdata = configuration_data() - cdata.set_quoted('BASH', BASH.path()) - cdata.set_quoted('BUILDDIR', meson.current_build_dir()) - cdata.set_quoted('REAL_PROGPATH', internal_script.full_path()) - - # Create a wrapper script that bootstraps the real script within the build - # directory. Use configure_file instead of a custom_target to ensure that - # permissions on the input script wrapper are preserved. - configure_file( - input : join_paths(meson.source_root(), 'build-aux', 'script-wrapper.sh.in'), output : script_shortname, - configuration : cdata) + install : true, + install_dir : BINDIR) + + script_wrappers += [[ script_shortname, internal_script, meson.current_build_dir() ]] - # Install the real script - meson.add_install_script(MESON_INSTALL_SCRIPT, - internal_script.full_path(), - join_paths(BINDIR, script_shortname)) + if script_shortname == 'repo-add' + repo_add = internal_script + endif endforeach foreach symlink : ['repo-remove', 'repo-elephant'] meson.add_install_script(MESON_MAKE_SYMLINK, 'repo-add', join_paths(BINDIR, symlink)) + + internal_script = custom_target( + symlink, + build_by_default : true, + command : ['ln', '-sf', 'repo-add', '@OUTPUT@'], + depends : repo_add, + output : symlink) + + script_wrappers += [[ symlink, internal_script, meson.current_build_dir() ]] endforeach subdir('libmakepkg') -- 2.24.0

2 1

[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