- Pacman-dev - lists.archlinux.org

[PATCH] Do not use WKD to import keys for package installs from a file
by Allan McRae 06 Mar '22

06 Mar '22

In order to use WKD in pacman -U/--upgrade operations, we need to get the packager information from the .PKGINFO within the package. That has obvious security implications. e.g. something like this could convince a user to download a different key to what they expect: packager = foo bar <>^[[2K^[[0G:: Import PGP key DEADBEEF, "foo <bar> While downloading an untrusted key has little impact due to the web-of-trust model used by pacman, this could be bad in combination with an exploit that allowed trust of keys in the keyring to be altered. To be safe, do not use WKD when installing using -U. Fixes FS#73703. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_package.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index e837ffb8..203c98c1 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -721,7 +721,6 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful int validation = 0; char *sigpath; alpm_pkg_t *pkg_temp; - char *packager; CHECK_HANDLE(handle, return -1); ASSERT(pkg != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); @@ -747,13 +746,7 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful char *key = k->data; if(_alpm_key_in_keychain(handle, key) == 0) { pkg_temp = _alpm_pkg_load_internal(handle, filename, full); - if(pkg_temp) { - packager = pkg_temp->packager; - - } else { - packager = NULL; - } - if(_alpm_key_import(handle, packager, key) == -1) { + if(_alpm_key_import(handle, NULL, key) == -1) { fail = 1; } _alpm_pkg_free(pkg_temp); -- 2.35.1

1 0

[PATCH] Fix segfault when failing to import keys
by Allan McRae 06 Mar '22

06 Mar '22

Avoid a segfault when a search of the keyserver returns that the key is found but returns no primary IDs. We are then likely going to fail the import, but attempt anyway because no-one know what a keyserver will do! Fixes FS#73534. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/signing.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 0e022624..8a7fd87c 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -359,14 +359,18 @@ static int key_search_keyserver(alpm_handle_t *handle, const char *fpr, } else { pgpkey->fingerprint = key->subkeys->keyid; } - pgpkey->uid = key->uids->uid; - pgpkey->name = key->uids->name; - pgpkey->email = key->uids->email; + + /* we are probably going to fail importing, but continue anyway... */ + if(key->uids != NULL) { + pgpkey->uid = key->uids->uid; + pgpkey->name = key->uids->name; + pgpkey->email = key->uids->email; + } + pgpkey->created = key->subkeys->timestamp; pgpkey->expires = key->subkeys->expires; pgpkey->length = key->subkeys->length; pgpkey->revoked = key->subkeys->revoked; - /* Initialize with '?', this is overwritten unless public key * algorithm is unknown. */ pgpkey->pubkey_algo = '?'; @@ -535,7 +539,7 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr) ret = 0; } else { _alpm_log(handle, ALPM_LOG_ERROR, - _("key \"%s\" could not be imported\n"), fetch_key.uid); + _("key \"%s\" could not be imported\n"), fpr); } } else { _alpm_log(handle, ALPM_LOG_ERROR, -- 2.35.1

1 0

[PATCH] Ensure WKD key lookup returns the correct key
by Allan McRae 06 Mar '22

06 Mar '22

Looking up a key using WKD just ensures you have a key with the same email address, it does not ensure that a key with the correct fingerprint has been downloaded. Check a key with the relevant fingerprint is available after a WKD import. --- lib/libalpm/signing.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 8df2868c..0e022624 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -253,9 +253,10 @@ error: * This requires GPGME to call the gpg binary. * @param handle the context handle * @param email the email address of the key to import + * @param fpr the fingerprint key ID to look up (or NULL) * @return 0 on success, -1 on error */ -static int key_import_wkd(alpm_handle_t *handle, const char *email) +static int key_import_wkd(alpm_handle_t *handle, const char *email, const char *fpr) { gpgme_error_t gpg_err; gpgme_ctx_t ctx = {0}; @@ -274,7 +275,12 @@ static int key_import_wkd(alpm_handle_t *handle, const char *email) _alpm_log(handle, ALPM_LOG_DEBUG, _("looking up key %s using WKD\n"), email); gpg_err = gpgme_get_key(ctx, email, &key, 0); if(gpg_err_code(gpg_err) == GPG_ERR_NO_ERROR) { - ret = 0; + /* check if correct key was imported via WKD */ + if(fpr && _alpm_key_in_keychain(handle, fpr)) { + ret = 0; + } else { + _alpm_log(handle, ALPM_LOG_DEBUG, "key lookup failed: WKD imported wrong fingerprint\n"); + } } gpgme_key_unref(key); @@ -516,7 +522,7 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr) if(question.import) { /* Try to import the key from a WKD first */ if(email_from_uid(uid, &email) == 0) { - ret = key_import_wkd(handle, email); + ret = key_import_wkd(handle, email, fpr); free(email); } -- 2.35.1

1 0

[Git][pacman/pacman][master] 10 commits: Make link time optimization flags configurable
by Allan McRae (＠allan) 06 Mar '22

06 Mar '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: e1ce2351 by Evangelos Foutras at 2022-03-06T14:45:36+10:00 Make link time optimization flags configurable We want to use -flto=auto in Arch Linux to speed up building, but we can't hardcode it in buildenv/lto.sh because other downstreams might have clang < 13.0.0 which did not recognize -flto=auto as equivalent to -flto=full. Introducing an LTOFLAGS variable to makepkg.conf seems the way to go. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 0a792843 by Allan McRae at 2022-03-06T14:53:42+10:00 Silence meson run_command warning Upsteam is warning about future change in the run_command check argument. Ref: https://github.com/mesonbuild/meson/issues/9300 Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 5bbda937 by Allan McRae at 2022-03-06T15:07:57+10:00 Silence meson warning about extract_all_objects Upstream is changing the default from false to true. This makes no difference to us, so just set as the future default. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 569bcd9d by Allan McRae at 2022-03-06T15:24:19+10:00 Add missing parameter names to silence doxygen Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - ad918bcb by Allan McRae at 2022-03-06T15:32:27+10:00 Remove reference to internal type in docs Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 6cdb2030 by Allan McRae at 2022-03-06T15:32:34+10:00 Update Doxygen configuration to silence warnings Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 3a39eff1 by Allan McRae at 2022-03-06T15:55:17+10:00 meson.build: change ExternalProgram.path to full_path Removes "Future-deprecated features used", but reuires meson-0.55 Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - c89f42f1 by Allan McRae at 2022-03-06T16:26:34+10:00 meson: do not use meson.source_root() and meson.build_root() Using meson.source_root() and meson.build_root() are deprectated in meson-0.56. Using current_source_dir() or current_build_dir() (which have been available in all Meson versions) would require manually adding "../" in some places. Instead, use project_source_root() and project_build_root() and require meson-0.56. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 7ba2c276 by Allan McRae at 2022-03-06T17:25:42+10:00 Fix typo/omission in man pages Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 7340fb9b by morganamilo at 2022-03-06T17:32:23+10:00 libalpm: mark filelist_contains as taking a const filelist This is useful for bindings as it guarantees the value will not be changed. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 13 changed files: - doc/Doxyfile.in - doc/makepkg.conf.5.asciidoc - doc/pacman-conf.8.asciidoc - doc/pacman.conf.5.asciidoc - etc/makepkg.conf.in - lib/libalpm/alpm.h - lib/libalpm/filelist.c - meson.build - scripts/libmakepkg/buildenv/buildflags.sh.in - scripts/libmakepkg/buildenv/lto.sh.in - scripts/libmakepkg/lint_config/variable.sh.in - scripts/meson.build - test/pacman/meson.build View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/49b08fa9d14a9cc06f01c6… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/49b08fa9d14a9cc06f01c6… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] libalpm: mark filelist_contains as taking a const filelist
by morganamilo 06 Mar '22

06 Mar '22

This is useful for bindings as it gaurintees the value will not be changed. --- lib/libalpm/alpm.h | 2 +- lib/libalpm/filelist.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index e108213b..f1485bd8 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -161,7 +161,7 @@ typedef struct _alpm_backup_t { * @param path the path to search for in the package * @return a pointer to the matching file or NULL if not found */ -alpm_file_t *alpm_filelist_contains(alpm_filelist_t *filelist, const char *path); +alpm_file_t *alpm_filelist_contains(const alpm_filelist_t *filelist, const char *path); /** Frees a file list */ void alpm_filelist_free(alpm_filelist_t *files); diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index 9dfe2012..ffdde9b6 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -118,7 +118,7 @@ static int _alpm_files_cmp(const void *f1, const void *f2) return strcmp(file1->name, file2->name); } -alpm_file_t SYMEXPORT *alpm_filelist_contains(alpm_filelist_t *filelist, +alpm_file_t SYMEXPORT *alpm_filelist_contains(const alpm_filelist_t *filelist, const char *path) { alpm_file_t key; -- 2.34.1

2 1

Issues in pacmans man pages
by Helge Kreutzmann 06 Mar '22

06 Mar '22

Dear Pacman maintainer, the manpage-l10n project maintains a large number of translations of man pages both from a large variety of sources (including Pacman) as well for a large variety of target languages. During their work translators notice different possible issues in the original (english) man pages. Sometimes this is a straightforward typo, sometimes a hard to read sentence, sometimes this is a convention not held up and sometimes we simply do not understand the original. We use several distributions as sources and update regularly (at least every 2 month). This means we are fairly recent (some distributions like archlinux also update frequently) but might miss the latest upstream version once in a while, so the error might be already fixed. We apologize and ask you to close the issue immediately if this should be the case, but given the huge volume of projects and the very limited number of volunteers we are not able to double check each and every issue. Secondly we translators see the manpages in the neutral po format, i.e. converted and harmonized, but not the original source (be it man, groff, xml or other). So we cannot provide a true patch (where possible), but only an approximation which you need to convert into your source format. Finally the issues I'm reporting have accumulated over time and are not always discovered by me, so sometimes my description of the problem my be a bit limited - do not hesitate to ask so we can clarify them. I'm now reporting the errors for your project. If future reports should use another channel, please let me know. Man page: libalpm.3 Issue: B<libalpm_list(3)> → B<libalpm_list>(3) "B<libalpm_list(3)>" -- Man page: libalpm.3 Issue: Number out of B<>, e.g. B<libalpm_list(3)> → B<libalpm_list>(3) "B<libalpm_list(3)>, B<libalpm_cb(3)>, B<libalpm_databases(3)>, " "B<libalpm_depends(3)>, B<libalpm_errors(3)>, B<libalpm_files(3)>, " "B<libalpm_groups(3)>, B<libalpm_handle(3)>, B<libalpm_log(3)>, " "B<libalpm_misc(3)>, B<libalpm_options(3)>, B<libalpm_packages(3)>, " "B<libalpm_sig(3)>, B<libalpm_trans(3)>" -- Man page: makepkg-template.1 Issue: "name" and "version" should be I<> as they are options of the program. "Currently used keys are: name (mandatory) and version\\&. Template names are " "limited to alphanumerics, \"@\", \"+\", \"\\&.\", \"-\", and \"_\"\\&. " "Versions are limited to numbers and \"\\&.\"\\&." -- Man page: pacman.8 Issue: This and other options' parameters could be wrapped in 'I<' and '>' msgid "I<pacman> E<lt>operationE<gt> [options] [targets]" -- Man page: pacman.8 Issue: Curly double quotes in some strings, others regular quotes. Uniformize. "Since version 3\\&.0\\&.0, pacman has been the front-end to B<libalpm>(3), " "the \\(lqArch Linux Package Management\\(rq library\\&. This library allows " "alternative front-ends to be written (for instance, a GUI front-end)\\&." -- Man page: pacman.8 Issue: 'Search' 'owns' 'group' 'list' 'check' = option-related words, wrap around with "I<--" and ">" (or "B<--" and ">"?) "Show less information for certain query operations\\&. This is useful when " "pacman\\(cqs output is processed in a script\\&. Search will only show " "package names and not version, group, and description information; owns will " "only show package names instead of \"file is owned by pkg\" messages; group " "will only show package names and omit group names; list will only show files " "and omit package names; check will only show pairs of package names and " "missing files; a bare query will only show package names rather than names " "and versions\\&." -- Man page: pacman.8 Issue: 'Search' 'group' 'list' = option-related words, wrap around with "I<--" and ">" "Show less information for certain sync operations\\&. This is useful when " "pacman\\(cqs output is processed in a script\\&. Search will only show " "package names and not repository, version, group, and description " "information; list will only show package names and omit databases and " "versions; group will only show package names and omit group names\\&." -- Man page: pacman.conf.5 Issue: wget → B<wget>(1) "If set, an external program will be used to download all remote files\\&. " "All instances of %u will be replaced with the download URL\\&. If present, " "instances of %o will be replaced with the local filename, plus a \\(lq\\&." "part\\(rq extension, which allows programs like wget to do file resumes " "properly\\&." "This option is useful for users who experience problems with built-in HTTP/" "FTP support, or need the more advanced proxy support that comes with " "utilities like wget\\&." -- Man page: pacman.conf.5 Issue: -U → B<-U> "Set the signature verification level for installing packages using the \"-U" "\" operation on a local file\\&. Uses the value from SigLevel as the default" "\\&." -- Man page: pacman.conf.5 Issue: syslog() → B<syslog>() "Log action messages through syslog()\\&. This will insert log entries into /" "var/log/messages or equivalent\\&." -- Man page: pacman.conf.5 Issue: Where did "%o" come from? The XferCommand command usage does not have an %o "If set, an external program will be used to download all remote files\\&. " "All instances of %u will be replaced with the download URL\\&. If present, " "instances of %o will be replaced with the local filename, plus a \\(lq\\&." "part\\(rq extension, which allows programs like wget to do file resumes " "properly\\&." -- Man page: pacman.conf.5 Issue: [options] should be wrapped with I<> "The I<SigLevel> directive is valid in both the [options] and repository " "sections\\&. If used in [options], it sets a default value for any " "repository that does not provide the setting\\&." -- Man page: pacman-conf.8 Issue: remote → repository "B<-r, --repo> E<lt>remoteE<gt>" -- Dr. Helge Kreutzmann debian(a)helgefjell.de Dipl.-Phys. http://www.helgefjell.de/debian.php 64bit GNU powered gpg signed mail preferred Help keep free software "libre": http://www.ffii.de/

2 1

[PATCH v2] meson: do not use meson.source_root() and meson.build_root()
by Allan McRae 06 Mar '22

06 Mar '22

Using meson.source_root() and meson.build_root() are deprectated in meson-0.56. Using current_source_dir() or current_build_dir() (which have been available in all Meson versions) would require manually adding "../" in some places. Instead, use project_source_root() and project_build_root() and require meson-0.56. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v2: fix testsuite running meson.build | 14 +++++++------- scripts/meson.build | 2 +- test/pacman/meson.build | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index b8e64127..b7cca865 100644 --- a/meson.build +++ b/meson.build @@ -8,7 +8,7 @@ project('pacman', 'sysconfdir=/etc', 'localstatedir=/var', ], - meson_version : '>= 0.55') + meson_version : '>= 0.56') libalpm_version = '13.0.1' @@ -29,7 +29,7 @@ PKGDATADIR = join_paths(PREFIX, DATAROOTDIR, meson.project_name()) PYTHON = import('python').find_installation('python3') LDCONFIG = get_option('ldconfig') -MESON_MAKE_SYMLINK = join_paths(meson.source_root(), 'build-aux/meson-make-symlink.sh') +MESON_MAKE_SYMLINK = join_paths(meson.project_source_root(), 'build-aux/meson-make-symlink.sh') BASH = find_program('bash4', 'bash') if BASH.found() @@ -382,7 +382,7 @@ foreach wrapper : script_wrappers # 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'), + input : join_paths(meson.project_source_root(), 'build-aux', 'script-wrapper.sh.in'), output : wrapper[0], configuration : cdata) endforeach @@ -416,10 +416,10 @@ foreach path : [ endforeach TEST_ENV = environment() -TEST_ENV.set('PMTEST_SCRIPTLIB_DIR', join_paths(meson.source_root(), 'scripts/library/')) -TEST_ENV.set('PMTEST_LIBMAKEPKG_DIR', join_paths(meson.build_root(), 'scripts/libmakepkg/')) -TEST_ENV.set('PMTEST_UTIL_DIR', meson.build_root() + '/') -TEST_ENV.set('PMTEST_SCRIPT_DIR', join_paths(meson.build_root(), 'scripts/')) +TEST_ENV.set('PMTEST_SCRIPTLIB_DIR', join_paths(meson.project_source_root(), 'scripts/library/')) +TEST_ENV.set('PMTEST_LIBMAKEPKG_DIR', join_paths(meson.project_build_root(), 'scripts/libmakepkg/')) +TEST_ENV.set('PMTEST_UTIL_DIR', meson.project_build_root() + '/') +TEST_ENV.set('PMTEST_SCRIPT_DIR', join_paths(meson.project_build_root(), 'scripts/')) subdir('test/pacman') subdir('test/scripts') diff --git a/scripts/meson.build b/scripts/meson.build index d2466523..e5b9ff4a 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -10,7 +10,7 @@ scripts = [ ] SCRIPT_EDITOR = find_program(configure_file( - input : join_paths(meson.source_root(), 'build-aux/edit-script.sh.in'), + input : join_paths(meson.project_source_root(), 'build-aux/edit-script.sh.in'), output : 'edit-script.sh', configuration : substs)) diff --git a/test/pacman/meson.build b/test/pacman/meson.build index ecab75b2..7ebdd98e 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -354,7 +354,7 @@ foreach input : pacman_tests args = [ join_paths(meson.current_source_dir(), 'pactest.py'), '--scriptlet-shell', get_option('scriptlet-shell'), - '--bindir', meson.build_root(), + '--bindir', meson.project_build_root(), '--ldconfig', LDCONFIG, '--verbose', join_paths(meson.current_source_dir(), input) -- 2.35.1

1 0

[PATCH] meson: do not use meson.source_root() and meson.build_root()
by Allan McRae 06 Mar '22

06 Mar '22

Using meson.source_root() and meson.build_root() are deprectated in meson-0.56. Using current_source_dir() or current_build_dir() (which have been available in all Meson versions) would require manually adding "../" in some places. Instead, use project_source_root() and project_build_root() and require meson-0.56. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- meson.build | 14 +++++++------- scripts/meson.build | 2 +- test/pacman/meson.build | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index b8e64127..b7cca865 100644 --- a/meson.build +++ b/meson.build @@ -8,7 +8,7 @@ project('pacman', 'sysconfdir=/etc', 'localstatedir=/var', ], - meson_version : '>= 0.55') + meson_version : '>= 0.56') libalpm_version = '13.0.1' @@ -29,7 +29,7 @@ PKGDATADIR = join_paths(PREFIX, DATAROOTDIR, meson.project_name()) PYTHON = import('python').find_installation('python3') LDCONFIG = get_option('ldconfig') -MESON_MAKE_SYMLINK = join_paths(meson.source_root(), 'build-aux/meson-make-symlink.sh') +MESON_MAKE_SYMLINK = join_paths(meson.project_source_root(), 'build-aux/meson-make-symlink.sh') BASH = find_program('bash4', 'bash') if BASH.found() @@ -382,7 +382,7 @@ foreach wrapper : script_wrappers # 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'), + input : join_paths(meson.project_source_root(), 'build-aux', 'script-wrapper.sh.in'), output : wrapper[0], configuration : cdata) endforeach @@ -416,10 +416,10 @@ foreach path : [ endforeach TEST_ENV = environment() -TEST_ENV.set('PMTEST_SCRIPTLIB_DIR', join_paths(meson.source_root(), 'scripts/library/')) -TEST_ENV.set('PMTEST_LIBMAKEPKG_DIR', join_paths(meson.build_root(), 'scripts/libmakepkg/')) -TEST_ENV.set('PMTEST_UTIL_DIR', meson.build_root() + '/') -TEST_ENV.set('PMTEST_SCRIPT_DIR', join_paths(meson.build_root(), 'scripts/')) +TEST_ENV.set('PMTEST_SCRIPTLIB_DIR', join_paths(meson.project_source_root(), 'scripts/library/')) +TEST_ENV.set('PMTEST_LIBMAKEPKG_DIR', join_paths(meson.project_build_root(), 'scripts/libmakepkg/')) +TEST_ENV.set('PMTEST_UTIL_DIR', meson.project_build_root() + '/') +TEST_ENV.set('PMTEST_SCRIPT_DIR', join_paths(meson.project_build_root(), 'scripts/')) subdir('test/pacman') subdir('test/scripts') diff --git a/scripts/meson.build b/scripts/meson.build index d2466523..e5b9ff4a 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -10,7 +10,7 @@ scripts = [ ] SCRIPT_EDITOR = find_program(configure_file( - input : join_paths(meson.source_root(), 'build-aux/edit-script.sh.in'), + input : join_paths(meson.project_source_root(), 'build-aux/edit-script.sh.in'), output : 'edit-script.sh', configuration : substs)) diff --git a/test/pacman/meson.build b/test/pacman/meson.build index ecab75b2..6f16919c 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -354,7 +354,7 @@ foreach input : pacman_tests args = [ join_paths(meson.current_source_dir(), 'pactest.py'), '--scriptlet-shell', get_option('scriptlet-shell'), - '--bindir', meson.build_root(), + '--bindir', meson.current_build_dir(), '--ldconfig', LDCONFIG, '--verbose', join_paths(meson.current_source_dir(), input) -- 2.35.1

1 1

[PATCH] meson.build: change ExternalProgram.path to full_path
by Allan McRae 06 Mar '22

06 Mar '22

Removes "Future-deprecated features used", but reuires meson-0.55 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 563e9ab6..b8e64127 100644 --- a/meson.build +++ b/meson.build @@ -8,7 +8,7 @@ project('pacman', 'sysconfdir=/etc', 'localstatedir=/var', ], - meson_version : '>= 0.51') + meson_version : '>= 0.55') libalpm_version = '13.0.1' @@ -262,7 +262,7 @@ substs.set('sysconfdir', SYSCONFDIR) substs.set('localstatedir', LOCALSTATEDIR) substs.set('PKGDATADIR', PKGDATADIR) substs.set('PREFIX', PREFIX) -substs.set('BASH', BASH.path()) +substs.set('BASH', BASH.full_path()) substs.set('PACKAGE_VERSION', PACKAGE_VERSION) substs.set('PACKAGE_NAME', meson.project_name()) substs.set('BUILDSCRIPT', BUILDSCRIPT) @@ -374,7 +374,7 @@ executable( foreach wrapper : script_wrappers cdata = configuration_data() - cdata.set_quoted('BASH', BASH.path()) + cdata.set_quoted('BASH', BASH.full_path()) cdata.set_quoted('BUILDDIR', wrapper[2]) cdata.set_quoted('REAL_PROGPATH', wrapper[1].full_path()) -- 2.35.1

1 0

[PATCH 1/2] Remove reference to internal type in docs
by Allan McRae 06 Mar '22

06 Mar '22

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 5eaf0500..2a9200b5 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -107,7 +107,7 @@ typedef struct _alpm_db_t alpm_db_t; * Packages from databases are automatically freed when the database is unregistered. Packages loaded * from a file must be freed manually. * - * Packages can then be queried for metadata or added to a \link alpm_trans_t transaction \endlink + * Packages can then be queried for metadata or added to a transaction * to be added or removed from the system. * @ingroup libalpm_packages */ -- 2.35.1

1 1