- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] pacman+libalpm: print version names for conflicting packages
by morganamilo 26 Nov '19

26 Nov '19

When ever pacman prints a conflict, it now prints pkgname-version, instead of just pkgname. alpm_conflict_t now carries pointers to alpm_pkg_t instead of just the names of each package. Fixes FS#12536 (point 2) --- One slight difference here is that the alpm_conflict_t used to hold a dupe of the pkgnames, while now it holds a pointer to the real alpm_pkg_t. We could make it so that it holds a dupe of the package but that will be slower. Of course conflicts are pretty rare and usually involve manual intervention anyway so what does speed matter? Conflicts are also usually handled before the transaction finishes, so is there ever a reason for the front end to keep the conflict around after? Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index d3630385..d9d3e4e0 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -247,10 +247,8 @@ typedef struct _alpm_depmissing_t { /** Conflict */ typedef struct _alpm_conflict_t { - unsigned long package1_hash; - unsigned long package2_hash; - char *package1; - char *package2; + alpm_pkg_t *package1; + alpm_pkg_t *package2; alpm_depend_t *reason; } alpm_conflict_t; diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 80827ed6..d35fe106 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -50,17 +50,11 @@ static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, CALLOC(conflict, 1, sizeof(alpm_conflict_t), return NULL); - conflict->package1_hash = pkg1->name_hash; - conflict->package2_hash = pkg2->name_hash; - STRDUP(conflict->package1, pkg1->name, goto error); - STRDUP(conflict->package2, pkg2->name, goto error); + conflict->package1 = pkg1; + conflict->package2 = pkg2; conflict->reason = reason; return conflict; - -error: - alpm_conflict_free(conflict); - return NULL; } /** @@ -69,8 +63,6 @@ error: void SYMEXPORT alpm_conflict_free(alpm_conflict_t *conflict) { ASSERT(conflict != NULL, return); - FREE(conflict->package2); - FREE(conflict->package1); FREE(conflict); } @@ -82,17 +74,11 @@ alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict) alpm_conflict_t *newconflict; CALLOC(newconflict, 1, sizeof(alpm_conflict_t), return NULL); - newconflict->package1_hash = conflict->package1_hash; - newconflict->package2_hash = conflict->package2_hash; - STRDUP(newconflict->package1, conflict->package1, goto error); - STRDUP(newconflict->package2, conflict->package2, goto error); + newconflict->package1 = conflict->package1; + newconflict->package2 = conflict->package2; newconflict->reason = conflict->reason; return newconflict; - -error: - alpm_conflict_free(newconflict); - return NULL; } /** @@ -108,10 +94,10 @@ static int conflict_isin(alpm_conflict_t *needle, alpm_list_t *haystack) alpm_list_t *i; for(i = haystack; i; i = i->next) { alpm_conflict_t *conflict = i->data; - if(needle->package1_hash == conflict->package1_hash - && needle->package2_hash == conflict->package2_hash - && strcmp(needle->package1, conflict->package1) == 0 - && strcmp(needle->package2, conflict->package2) == 0) { + if(needle->package1->name_hash == conflict->package2->name_hash + && needle->package2->name_hash == conflict->package2->name_hash + && strcmp(needle->package1->name, conflict->package1->name) == 0 + && strcmp(needle->package2->name, conflict->package2->name) == 0) { return 1; } } diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 59108eb9..ae491280 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -510,21 +510,23 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) for(i = deps; i; i = i->next) { alpm_conflict_t *conflict = i->data; + const char *name1 = conflict->package1->name; + const char *name2 = conflict->package2->name; alpm_pkg_t *rsync, *sync, *sync1, *sync2; /* have we already removed one of the conflicting targets? */ - sync1 = alpm_pkg_find(trans->add, conflict->package1); - sync2 = alpm_pkg_find(trans->add, conflict->package2); + sync1 = alpm_pkg_find(trans->add, name1); + sync2 = alpm_pkg_find(trans->add, name2); if(!sync1 || !sync2) { continue; } _alpm_log(handle, ALPM_LOG_DEBUG, "conflicting packages in the sync list: '%s' <-> '%s'\n", - conflict->package1, conflict->package2); + name1, name2); /* if sync1 provides sync2, we remove sync2 from the targets, and vice versa */ - alpm_depend_t *dep1 = alpm_dep_from_string(conflict->package1); - alpm_depend_t *dep2 = alpm_dep_from_string(conflict->package2); + alpm_depend_t *dep1 = alpm_dep_from_string(name1); + alpm_depend_t *dep2 = alpm_dep_from_string(name2); if(_alpm_depcmp(sync1, dep2)) { rsync = sync2; sync = sync1; @@ -552,8 +554,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) /* Prints warning */ _alpm_log(handle, ALPM_LOG_WARNING, - _("removing '%s' from target list because it conflicts with '%s'\n"), - rsync->name, sync->name); + _("removing '%s-%s' from target list because it conflicts with '%s-%s'\n"), + rsync->name, rsync->version, sync->name, sync->version); trans->add = alpm_list_remove(trans->add, rsync, _alpm_pkg_cmp, NULL); /* rsync is not a transaction target anymore */ trans->unresolvable = alpm_list_add(trans->unresolvable, rsync); @@ -574,16 +576,18 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) .conflict = i->data }; alpm_conflict_t *conflict = i->data; + const char *name1 = conflict->package1->name; + const char *name2 = conflict->package2->name; int found = 0; - /* if conflict->package2 (the local package) is not elected for removal, + /* if name2 (the local package) is not elected for removal, we ask the user */ - if(alpm_pkg_find(trans->remove, conflict->package2)) { + if(alpm_pkg_find(trans->remove, name2)) { found = 1; } for(j = trans->add; j && !found; j = j->next) { alpm_pkg_t *spkg = j->data; - if(alpm_pkg_find(spkg->removes, conflict->package2)) { + if(alpm_pkg_find(spkg->removes, name2)) { found = 1; } } @@ -592,14 +596,14 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) } _alpm_log(handle, ALPM_LOG_DEBUG, "package '%s' conflicts with '%s'\n", - conflict->package1, conflict->package2); + name1, name2); QUESTION(handle, &question); if(question.remove) { /* append to the removes list */ - alpm_pkg_t *sync = alpm_pkg_find(trans->add, conflict->package1); - alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, conflict->package2); - _alpm_log(handle, ALPM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2); + alpm_pkg_t *sync = alpm_pkg_find(trans->add, name1); + alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, name2); + _alpm_log(handle, ALPM_LOG_DEBUG, "electing '%s' for removal\n", name2); sync->removes = alpm_list_add(sync->removes, local); } else { /* abort */ _alpm_log(handle, ALPM_LOG_ERROR, _("unresolvable package conflicts detected\n")); diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 08da4bb7..812b64e3 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -393,18 +393,22 @@ void cb_question(alpm_question_t *question) { alpm_question_conflict_t *q = &question->conflict; /* print conflict only if it contains new information */ - if(strcmp(q->conflict->package1, q->conflict->reason->name) == 0 - || strcmp(q->conflict->package2, q->conflict->reason->name) == 0) { - q->remove = noyes(_("%s and %s are in conflict. Remove %s?"), - q->conflict->package1, - q->conflict->package2, - q->conflict->package2); + if(strcmp(alpm_pkg_get_name(q->conflict->package1), q->conflict->reason->name) == 0 + || strcmp(alpm_pkg_get_name(q->conflict->package2), q->conflict->reason->name) == 0) { + q->remove = noyes(_("%s-%s and %s-%s are in conflict. Remove %s?"), + alpm_pkg_get_name(q->conflict->package1), + alpm_pkg_get_version(q->conflict->package1), + alpm_pkg_get_name(q->conflict->package2), + alpm_pkg_get_version(q->conflict->package2), + alpm_pkg_get_name(q->conflict->package2)); } else { - q->remove = noyes(_("%s and %s are in conflict (%s). Remove %s?"), - q->conflict->package1, - q->conflict->package2, + q->remove = noyes(_("%s-%s and %s-%s are in conflict (%s). Remove %s?"), + alpm_pkg_get_name(q->conflict->package1), + alpm_pkg_get_version(q->conflict->package1), + alpm_pkg_get_name(q->conflict->package2), + alpm_pkg_get_version(q->conflict->package2), q->conflict->reason->name, - q->conflict->package2); + alpm_pkg_get_name(q->conflict->package2)); } } break; diff --git a/src/pacman/database.c b/src/pacman/database.c index 378edc8c..db8ed2de 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -157,7 +157,7 @@ static int check_db_local_package_conflicts(alpm_list_t *pkglist) for(i = data; i; i = i->next) { alpm_conflict_t *conflict = i->data; pm_printf(ALPM_LOG_ERROR, "'%s' conflicts with '%s'\n", - conflict->package1, conflict->package2); + alpm_pkg_get_name(conflict->package1), alpm_pkg_get_name(conflict->package2)); ret++; } alpm_list_free_inner(data, (alpm_list_fn_free)alpm_conflict_free); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4bdeff7b..73e0496e 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -777,12 +777,19 @@ int sync_prepare_execute(void) alpm_conflict_t *conflict = i->data; /* only print reason if it contains new information */ if(conflict->reason->mod == ALPM_DEP_MOD_ANY) { - colon_printf(_("%s and %s are in conflict\n"), - conflict->package1, conflict->package2); + colon_printf(_("%s-%s and %s-%s are in conflict\n"), + alpm_pkg_get_name(conflict->package1), + alpm_pkg_get_version(conflict->package1), + alpm_pkg_get_name(conflict->package2), + alpm_pkg_get_version(conflict->package2)); } else { char *reason = alpm_dep_compute_string(conflict->reason); - colon_printf(_("%s and %s are in conflict (%s)\n"), - conflict->package1, conflict->package2, reason); + colon_printf(_("%s-%s and %s-%s are in conflict (%s)\n"), + alpm_pkg_get_name(conflict->package1), + alpm_pkg_get_version(conflict->package1), + alpm_pkg_get_name(conflict->package2), + alpm_pkg_get_version(conflict->package2), + reason); free(reason); } alpm_conflict_free(conflict); -- 2.24.0

2 1

[pacman-dev] [PATCH] makepkg: add the $startdir to package .BUILDINFO
by Eli Schwartz 26 Nov '19

26 Nov '19

This value is needed for reproducible builds. The reason is because $BUILDDIR changes its behavior depending on whether it is the same as $startdir, and the result is that we cannot know whether builddir is actually 'builddir' or 'builddir' + '/$pkgbase'. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2deb61da..f95f7168 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -643,6 +643,7 @@ write_buildinfo() { write_kv_pair "packager" "${PACKAGER}" write_kv_pair "builddate" "${SOURCE_DATE_EPOCH}" write_kv_pair "builddir" "${BUILDDIR}" + write_kv_pair "startdir" "${startdir}" write_kv_pair "buildenv" "${BUILDENV[@]}" write_kv_pair "options" "${OPTIONS[@]}" -- 2.24.0

2 3

[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

[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

[pacman-dev] [PATCH] pactest: set package tar format to GNU_FORMAT
by Allan McRae 12 Nov '19

12 Nov '19

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> --- This patch at least gets us back to where we were with python-3.7. We probably have heaps more issues with UTF-8 usage... test/pacman/pmpkg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index 6a845222..e40868cc 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -142,7 +142,7 @@ def makepkg(self, path): util.mkdir(os.path.dirname(self.path)) # Generate package metadata - tar = tarfile.open(self.path, "w:gz") + tar = tarfile.open(self.path, "w:gz", format=tarfile.GNU_FORMAT) for name, data in archive_files: info = tarfile.TarInfo(name) info.size = len(data) -- 2.24.0

1 0

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

12 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> --- This sort of seems to work, but passing variables around between different meson.build files feels awkward. On the plus side, fewer build-aux/ scripts! Is this a desirable experience? We now create all the wrapped scripts in the root of the build tree, which matches what we do for the pacman binaries and so on, and I guess this should be fine since unlike autotools we do not need to care about dirtying the source tree (we cannot do in-tree builds). It is more convenient accessing the scripts from there, too, and in fact we now create wrappers for repo-elephant (long may he live), pacman-key, pacman-db-upgrade, etc as well. build-aux/meson-install-script.sh | 6 ----- meson.build | 16 ++++++++++++- scripts/meson.build | 38 ++++++++++++++----------------- 3 files changed, 32 insertions(+), 28 deletions(-) delete mode 100644 build-aux/meson-install-script.sh 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

1 1

[pacman-dev] [PATCH] libalpm/sync.c: Do not download missing keys multiple times
by Allan McRae 11 Nov '19

11 Nov '19

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> --- lib/libalpm/sync.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 59108eb9..70c37890 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -873,6 +873,14 @@ finish: } #ifdef HAVE_LIBGPGME + +static int key_cmp(const void *k1, const void *k2) { + const struct keyinfo_t *key1 = k1; + const char *key2 = k2; + + return strcmp(key1->keyid, key2); +} + static int check_keyring(alpm_handle_t *handle) { size_t current = 0, numtargs; @@ -910,7 +918,7 @@ static int check_keyring(alpm_handle_t *handle) alpm_list_t *k; for(k = keys; k; k = k->next) { char *key = k->data; - if(!alpm_list_find_str(errors, key) && + if(!alpm_list_find(errors, key, key_cmp) && _alpm_key_in_keychain(handle, key) == 0) { keyinfo = malloc(sizeof(struct keyinfo_t)); if(!keyinfo) { @@ -940,7 +948,7 @@ static int check_keyring(alpm_handle_t *handle) alpm_list_t *k; for(k = errors; k; k = k->next) { keyinfo = k->data; - if(_alpm_key_import(handle, keyinfo->uid, keyinfo->keyid) == -1) { + if(_alpm_key_import(handle, keyinfo->uid, keyinfo->keyid) == -1) { fail = 1; } free(keyinfo->uid); -- 2.24.0

1 0

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

10 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 27f354a7874b965bf223832bdf9749504cd1a590 (commit) via 94982d0061890529cc22401b6763fb5e9ef4e7d1 (commit) via 1df22d3242a5db640a83124402249d34ac2e61e9 (commit) via 7b73c4a75fbddcfa1bc552fed49c228b9cdaf7b0 (commit) via 8c7043390f80d93445f2817ae5419b06fc72983a (commit) via 2dd7725f2a0cccd0a248531551c9fbea4ef35f1f (commit) from 3a814ee6bca9ee24a868c0dc032b321048a53e08 (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 27f354a7874b965bf223832bdf9749504cd1a590 Author: morganamilo <morganamilo(a)gmail.com> Date: Wed Nov 6 01:42:11 2019 +0000 pacman+libalpm: handle search errors Previously, pacman treated no matches and an error during search the same. To fix this, alpm_db_search now returns its status as an int and instead takes the to be returned list as a param. Allowing front ends to easily differentiate between errors and no matches. Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 94982d0061890529cc22401b6763fb5e9ef4e7d1 Author: morganamilo <morganamilo(a)gmail.com> Date: Wed Nov 6 00:37:26 2019 +0000 pacman: make exact_file an int We only ever use it as a bool, no need to pass a char* around. Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1df22d3242a5db640a83124402249d34ac2e61e9 Author: Ethan Sommer <e5ten.arch(a)gmail.com> Date: Wed Nov 6 20:23:08 2019 -0500 repo-add: use wc -c on stdin instead of file to avoid use of cut Redirect file to stdin so wc -c doesn't print a file name that needs to be stripped. Signed-off-by: Ethan Sommer <e5ten.arch(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7b73c4a75fbddcfa1bc552fed49c228b9cdaf7b0 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Nov 6 00:26:38 2019 -0500 build: remove use of handcrafted m4 in configuring scripts Now that library/ is fully gone, we don't need this anymore. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8c7043390f80d93445f2817ae5419b06fc72983a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Nov 6 00:05:22 2019 -0500 scripts/library: remove human_to_size pkgdelta was the last user, and it is gone now. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2dd7725f2a0cccd0a248531551c9fbea4ef35f1f Author: Allan McRae <allan(a)archlinux.org> Date: Wed Nov 6 15:46:59 2019 +1000 Remove "Generated from ...; do not edit by hand" from scripts This is a useless piece of information. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 1 - build-aux/edit-script.sh.in | 1 - lib/libalpm/alpm.h | 6 +++-- lib/libalpm/db.c | 24 +++++++++-------- lib/libalpm/db.h | 3 ++- meson.build | 2 -- scripts/Makefile.am | 9 ++----- scripts/library/README | 10 ------- scripts/library/human_to_size.sh | 51 ----------------------------------- scripts/makepkg-template.pl.in | 1 - scripts/makepkg.sh.in | 1 - scripts/meson.build | 16 ++--------- scripts/pacman-db-upgrade.sh.in | 1 - scripts/pacman-key.sh.in | 1 - scripts/po/POTFILES.in | 1 - scripts/repo-add.sh.in | 5 ++-- src/pacman/files.c | 10 +++---- src/pacman/package.c | 7 +++-- src/pacman/query.c | 10 ++++++- src/pacman/sync.c | 10 ++++++- test/scripts/Makefile.am | 3 +-- test/scripts/human_to_size_test.sh | 55 -------------------------------------- test/scripts/meson.build | 1 - 23 files changed, 54 insertions(+), 175 deletions(-) delete mode 100644 scripts/library/README delete mode 100644 scripts/library/human_to_size.sh delete mode 100755 test/scripts/human_to_size_test.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] pacman: print error message for -F with invalid regex
by morganamilo 09 Nov '19

09 Nov '19

diff --git a/src/pacman/files.c b/src/pacman/files.c index 19191dd8..05b6f223 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -115,7 +115,8 @@ 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 */ + pm_printf(ALPM_LOG_ERROR, + _("search failed: invalid regular expression '%s'\n"), targ); goto notfound; } } -- 2.23.0

3 2

[pacman-dev] [PATCH] Warn about skipping invalid regex with -Fx
by Allan McRae 08 Nov '19

08 Nov '19

Print a warning when -Fx encounters a broken regex. These were previosly skipped silently as when providing -Fx with multiple arguments, a file that matches any of the arguments is returned. This means encountering one broken argument is not an error. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index 3b6dc23b..fa3d9651 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -115,7 +115,7 @@ 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 */ + pm_printf(ALPM_LOG_WARNING, "skipping invalid regex: '%s'\n", targ); goto notfound; } } -- 2.23.0

1 0

[pacman-dev] [PATCH] pacman+libalpm: handle search errors
by morganamilo 08 Nov '19

08 Nov '19

Previously, pacman treated no matches and an error during search the same. To fix this, alpm_db_search now returns its status as an int and instead takes the to be returned list as a param. Allowing front ends to easily differentiate between errors and no matches. Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 4486da44..d3630385 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -997,9 +997,11 @@ 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 - * @return the list of packages matching all regular expressions on success, NULL on error + * @param ret the list of packages matching all regular expressions + * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -alpm_list_t *alpm_db_search(alpm_db_t *db, const alpm_list_t *needles); +int alpm_db_search(alpm_db_t *db, const alpm_list_t *needles, + alpm_list_t **ret); typedef enum _alpm_db_usage_t { ALPM_DB_USAGE_SYNC = 1, diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index a443e552..cf4c865f 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -298,12 +298,14 @@ alpm_list_t SYMEXPORT *alpm_db_get_groupcache(alpm_db_t *db) } /** Searches a database. */ -alpm_list_t SYMEXPORT *alpm_db_search(alpm_db_t *db, const alpm_list_t *needles) +int SYMEXPORT alpm_db_search(alpm_db_t *db, const alpm_list_t *needles, + alpm_list_t **ret) { - ASSERT(db != NULL, return NULL); + ASSERT(db != NULL && ret != NULL && *ret == NULL, + RET_ERR(db->handle, ALPM_ERR_WRONG_ARGS, -1)); db->handle->pm_errno = ALPM_ERR_OK; - return _alpm_db_search(db, needles); + return _alpm_db_search(db, needles, ret); } /** Sets the usage bitmask for a repo */ @@ -396,13 +398,13 @@ int _alpm_db_cmp(const void *d1, const void *d2) return strcmp(db1->treename, db2->treename); } -alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles) +int _alpm_db_search(alpm_db_t *db, const alpm_list_t *needles, + alpm_list_t **ret) { const alpm_list_t *i, *j, *k; - alpm_list_t *ret = NULL; if(!(db->usage & ALPM_DB_USAGE_SEARCH)) { - return NULL; + return 0; } /* copy the pkgcache- we will free the list var after each needle */ @@ -415,12 +417,12 @@ alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles) if(i->data == NULL) { continue; } - ret = NULL; + *ret = NULL; targ = i->data; _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, NULL); + RET_ERR(db->handle, ALPM_ERR_INVALID_REGEX, -1); } for(j = list; j; j = j->next) { @@ -463,18 +465,18 @@ alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles) _alpm_log(db->handle, ALPM_LOG_DEBUG, "search target '%s' matched '%s' on package '%s'\n", targ, matched, name); - ret = alpm_list_add(ret, pkg); + *ret = alpm_list_add(*ret, pkg); } } /* Free the existing search list, and use the returned list for the * next needle. This allows for AND-based package searching. */ alpm_list_free(list); - list = ret; + list = *ret; regfree(&reg); } - return ret; + return 0; } /* Returns a new package cache from db. diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index f17444e6..e7ad98f5 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -87,7 +87,8 @@ alpm_db_t *_alpm_db_new(const char *treename, int is_local); void _alpm_db_free(alpm_db_t *db); const char *_alpm_db_path(alpm_db_t *db); int _alpm_db_cmp(const void *d1, const void *d2); -alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles); +int _alpm_db_search(alpm_db_t *db, const alpm_list_t *needles, + alpm_list_t **ret); alpm_db_t *_alpm_db_register_local(alpm_handle_t *handle); alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, int level); diff --git a/src/pacman/package.c b/src/pacman/package.c index 35cfcd94..ec6e78fc 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -518,12 +518,13 @@ void print_groups(alpm_pkg_t *pkg) * @param db the database we're searching * @param targets the targets we're searching for * @param show_status show if the package is also in the local db + * @return -1 on error, 0 if there were matches, 1 if there were not */ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status) { int freelist = 0; alpm_db_t *db_local; - alpm_list_t *i, *searchlist; + alpm_list_t *i, *searchlist = NULL; unsigned short cols; const colstr_t *colstr = &config->colstr; @@ -533,7 +534,9 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status) /* if we have a targets list, search for packages matching it */ if(targets) { - searchlist = alpm_db_search(db, targets); + if(alpm_db_search(db, targets, &searchlist) != 0) { + return -1; + } freelist = 1; } else { searchlist = alpm_db_get_pkgcache(db); diff --git a/src/pacman/query.c b/src/pacman/query.c index 2b9ee7a6..bdcfc3c1 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -233,7 +233,15 @@ targcleanup: static int query_search(alpm_list_t *targets) { alpm_db_t *db_local = alpm_get_localdb(config->handle); - return dump_pkg_search(db_local, targets, 0); + int ret = dump_pkg_search(db_local, targets, 0); + if(ret == -1) { + alpm_errno_t err = alpm_errno(config->handle); + pm_printf(ALPM_LOG_ERROR, "search failed: %s\n", alpm_strerror(err)); + return 1; + } + + return ret; + } static unsigned short pkg_get_locality(alpm_pkg_t *pkg) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 9033cee7..4bdeff7b 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -311,7 +311,15 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) for(i = syncs; i; i = alpm_list_next(i)) { alpm_db_t *db = i->data; - found += !dump_pkg_search(db, targets, 1); + int ret = dump_pkg_search(db, targets, 1); + + if(ret == -1) { + alpm_errno_t err = alpm_errno(config->handle); + pm_printf(ALPM_LOG_ERROR, "search failed: %s\n", alpm_strerror(err)); + return 1; + } + + found += !ret; } return (found == 0); -- 2.23.0

3 2

[pacman-dev] [PATCH] repo-add: use wc -c on stdin instead of file to avoid use of cut
by Ethan Sommer 07 Nov '19

07 Nov '19

Redirect file to stdin so wc -c doesn't print a file name that needs to be stripped. Signed-off-by: Ethan Sommer <e5ten.arch(a)gmail.com> --- scripts/repo-add.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index caf1232d..7b2a9edb 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -273,7 +273,7 @@ db_write_entry() { error "$(gettext "Cannot use armored signatures for packages: %s")" "$pkgfile.sig" return 1 fi - pgpsigsize=$(wc -c "$pkgfile.sig" | cut -d' ' -f1) + pgpsigsize=$(wc -c < "$pkgfile.sig") if (( pgpsigsize > 16384 )); then error "$(gettext "Invalid package signature file '%s'.")" "$pkgfile.sig" return 1 @@ -282,7 +282,7 @@ db_write_entry() { pgpsig=$(base64 "$pkgfile.sig" | tr -d '\n') fi - csize=$(wc -c "$pkgfile" | cut -d' ' -f1) + csize=$(wc -c < "$pkgfile") # compute checksums msg2 "$(gettext "Computing checksums...")" -- 2.23.0

2 1

[pacman-dev] [PATCH] pacman: make exact_file an int
by morganamilo 07 Nov '19

07 Nov '19

We only ever use it as a bool, no need to pass a char* around. Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/src/pacman/files.c b/src/pacman/files.c index 19191dd8..3b6dc23b 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -58,7 +58,7 @@ static void print_owned_by(alpm_db_t *db, alpm_pkg_t *pkg, char *filename) alpm_pkg_get_version(pkg), colstr->nocolor); } -static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg, char *exact_file) +static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg, int exact_file) { alpm_db_t *db_local = alpm_get_localdb(config->handle); const colstr_t *colstr = &config->colstr; @@ -71,7 +71,7 @@ static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg, ch } } else if(config->quiet) { printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg)); - } else if(exact_file != NULL) { + } else if(exact_file) { alpm_list_t *ml; for(ml = match; ml; ml = alpm_list_next(ml)) { char *filename = ml->data; @@ -104,9 +104,9 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { int found = 0; regex_t reg; size_t len = strlen(targ); - char *exact_file = strchr(targ, '/'); + int exact_file = strchr(targ, '/') != NULL; - if(exact_file != NULL) { + if(exact_file) { while(len > 1 && targ[0] == '/') { targ++; len--; @@ -131,7 +131,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { alpm_filelist_t *files = alpm_pkg_get_files(pkg); alpm_list_t *match = NULL; - if(exact_file != NULL) { + if(exact_file) { if (regex) { for(size_t f = 0; f < files->count; f++) { char *c = files->files[f].name; -- 2.23.0

2 1

[pacman-dev] [PATCH] Remove "Generated from ...; do not edit by hand" from scripts
by Allan McRae 06 Nov '19

06 Nov '19

This is a useless piece of information. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- build-aux/edit-script.sh.in | 1 - scripts/Makefile.am | 3 +-- scripts/makepkg-template.pl.in | 1 - scripts/makepkg.sh.in | 1 - scripts/pacman-db-upgrade.sh.in | 1 - scripts/pacman-key.sh.in | 1 - scripts/repo-add.sh.in | 1 - 7 files changed, 1 insertion(+), 8 deletions(-) diff --git a/build-aux/edit-script.sh.in b/build-aux/edit-script.sh.in index 7423a223..661c22d5 100644 --- a/build-aux/edit-script.sh.in +++ b/build-aux/edit-script.sh.in @@ -20,7 +20,6 @@ mode=$3 -e "s|@DEBUGSUFFIX[@]|@DEBUGSUFFIX@|g" \ -e "s|@INODECMD[@]|@INODECMD@|g" \ -e "s|@FILECMD[@]|@FILECMD@|g" \ - -e "s|@configure_input[@]|Generated from ${input##*/}; do not edit by hand.|g" \ "$input" >"$output" if [[ $mode ]]; then diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 3cb6c133..191fc3d3 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -186,8 +186,7 @@ edit = sed \ -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ -e "s|@INODECMD[@]|$(INODECMD)|g" \ -e "s|@FILECMD[@]|$(FILECMD)|g" \ - -e 's|@SCRIPTNAME[@]|$@|g' \ - -e 's|@configure_input[@]|Generated from $<; do not edit by hand.|g' + -e 's|@SCRIPTNAME[@]|$@|g' ## All the scripts depend on Makefile so that they are rebuilt when the ## prefix etc. changes. Use chmod -w to prevent people from editing the diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index da5eba1b..762dd4be 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -1,6 +1,5 @@ #!/usr/bin/perl # makepkg-template - template system for makepkg -# @configure_input@ # # Copyright (c) 2013-2019 Pacman Development Team <pacman-dev(a)archlinux.org> # diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 22df1b9f..2deb61da 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1,7 +1,6 @@ #!/bin/bash # # makepkg - make packages compatible for use with pacman -# @configure_input@ # # Copyright (c) 2006-2019 Pacman Development Team <pacman-dev(a)archlinux.org> # Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 5d65bc88..4a904b6d 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -1,7 +1,6 @@ #!/bin/bash -e # # pacman-db-upgrade - upgrade the local pacman db to a newer format -# @configure_input@ # # Copyright (c) 2010-2019 Pacman Development Team <pacman-dev(a)archlinux.org> # diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 366fd205..613b3514 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -2,7 +2,6 @@ # # pacman-key - manages pacman's keyring # Based on apt-key, from Debian -# @configure_input@ # # Copyright (c) 2010-2019 Pacman Development Team <pacman-dev(a)archlinux.org> # diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index caf1232d..f7dd8948 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -2,7 +2,6 @@ # # repo-add - add a package to a given repo database file # repo-remove - remove a package entry from a given repo database file -# @configure_input@ # # Copyright (c) 2006-2019 Pacman Development Team <pacman-dev(a)archlinux.org> # -- 2.23.0

1 0