- Pacman-dev - lists.archlinux.org

[PATCH] set bash env variables before running scripts
by Andrew Gregory 13 Mar '22

13 Mar '22

Bash sources user configuration files under a number of conditions that can cause issues with scripts when bash is used as the scriptlet shell. Bash assumes it's being run under rsh/ssh if stdin is connected to a socket and sources the user bashrc unless the environment variable $SHLVL is >= 2. Commit 6a4c6a02de9b45abe4c0f78c4f5d14d92d3359d6 switched from pipes to sockets when communicating with child processes to work around SIGPIPE issues. Normally $SHLVL would be inherited from the shell running pacman, but operations involving scriptlets are generally run with sudo which does not let the $SHLVL variable through unless specifically configured to. Similarly $BASH_ENV can cause bash to source user-specified configuration files if set. https://lists.gnu.org/archive/html/help-bash/2022-02/msg00082.html Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Not entirely sure we should actually be unsetting $BASH_ENV, but Chet recommended it. lib/libalpm/util.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 06e0fe7f2..7340ce832 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -659,6 +659,11 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], "/", strerror(errno)); exit(1); } + /* bash thinks it's being run under rsh/ssh if stdin is a socket and + * sources ~/.bashrc unles SHLVL is > 1 */ + setenv("SHLVL", "1", 0); + /* bash sources $BASH_ENV when run non-interactively */ + unsetenv("BASH_ENV"); umask(0022); _alpm_reset_signals(); execv(cmd, argv); -- 2.35.1

2 1

Fix typo in German translation
by Robert Löhning 12 Mar '22

12 Mar '22

Hello, I'd like to submit a one character translation fix. Please find it attached and inline below. Sorry for using Thunderbird, git send-email didn't seem to work for me. Best Regards, Robert From 6c1a2e034a1a98a7c88fcdb8f53a3615f709df0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= <robert.loehning(a)qt.io> Date: Thu, 10 Mar 2022 23:26:19 +0100 Subject: [PATCH] Fix typo in German translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert Löhning <robert.loehning(a)qt.io> --- src/pacman/po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po index 8a3dcfbe..ba1ae792 100644 --- a/src/pacman/po/de.po +++ b/src/pacman/po/de.po @@ -1293,7 +1293,7 @@ msgstr " --noconfirm fragt niemals nach einer Bestätigung\n" #: src/pacman/pacman.c:226 #, c-format msgid " --confirm always ask for confirmation\n" -msgstr " --confirm fraht immer nach einer Bestätigung\n" +msgstr " --confirm fragt immer nach einer Bestätigung\n" #: src/pacman/pacman.c:227 #, c-format -- 2.25.1

2 1

[PATCH] makepkg: use bsdtar --no-read-sparse for archive creation if available
by Jonas Witschel 10 Mar '22

10 Mar '22

bsdtar uses the "pax" TAR archive format by default, which has support for storing sparse file information in the archive. Unfortunately this is a source of unreproducibility because the sparse encoding is taken from the file system and different file systems handle sparse files differently: some file systems have no support for sparsely encoded files at all, and even file systems with sparse file support can report different file information for identical files due to differing implementations. As a real world example where this happens, consider the Arch Linux package "brotli-testdata 1.0.9-7", which contains a sparsely encoded all-zeros file "usr/share/brotli/testdata/zeros". Building this package on a btrfs file system yields a different package than building it on tmpfs or ext4 solely due to different sparse file information that gets recorded in the package tarball. To improve the reproducibility of archives containing sparsely encoded files, libarchive version 3.6.0 introduces a new --no-read-sparse option. This skips reading sparse file information from disk entirely and therefore stores files "expanded" in the archive, which is the only way to make them reliably reproducible across file systems. makepkg will use this option if libarchive is recent enough to support it, which is detected at build time. --- build-aux/edit-script.sh.in | 1 + meson.build | 6 ++++++ scripts/makepkg.sh.in | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build-aux/edit-script.sh.in b/build-aux/edit-script.sh.in index 85c56cfe..992033b2 100644 --- a/build-aux/edit-script.sh.in +++ b/build-aux/edit-script.sh.in @@ -20,6 +20,7 @@ sed \ -e "s|@DEBUGSUFFIX[@]|@DEBUGSUFFIX@|g" \ -e "s|@INODECMD[@]|@INODECMD@|g" \ -e "s|@FILECMD[@]|@FILECMD@|g" \ + -e "s|@BSDTAR_NO_READ_SPARSE[@]|@BSDTAR_NO_READ_SPARSE@|g" \ "$input" >"$output" if [[ $mode ]]; then diff --git a/meson.build b/meson.build index b7cca865..1519a2bb 100644 --- a/meson.build +++ b/meson.build @@ -91,6 +91,11 @@ endif libarchive = dependency('libarchive', version : '>=3.0.0', static : get_option('buildstatic')) +if libarchive.version().version_compare('>=3.6.0') + bsdtar_no_read_sparse = '--no-read-sparse' +else + bsdtar_no_read_sparse = '' +endif libcurl = dependency('libcurl', version : '>=7.55.0', @@ -274,6 +279,7 @@ substs.set('LIBMAKEPKGDIR', LIBMAKEPKGDIR) substs.set('STRIP_BINARIES', strip_binaries) substs.set('STRIP_SHARED', strip_shared) substs.set('STRIP_STATIC', strip_static) +substs.set('BSDTAR_NO_READ_SPARSE', bsdtar_no_read_sparse) subdir('lib/libalpm') subdir('src/common') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5aaabf63..69757d03 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -616,7 +616,7 @@ create_package() { msg2 "$(gettext "Compressing package...")" # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail - list_package_files | LANG=C bsdtar --no-fflags -cnf - --null --files-from - | + list_package_files | LANG=C bsdtar --no-fflags @BSDTAR_NO_READ_SPARSE@ -cnf - --null --files-from - | compress_as "$PKGEXT" > "${pkg_file}" || ret=$? shopt -u -o pipefail @@ -714,7 +714,7 @@ create_srcpackage() { # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail - LANG=C bsdtar --no-fflags -cLf - ${pkgbase} | compress_as "$SRCEXT" > "${pkg_file}" || ret=$? + LANG=C bsdtar --no-fflags @BSDTAR_NO_READ_SPARSE@ -cLf - ${pkgbase} | compress_as "$SRCEXT" > "${pkg_file}" || ret=$? shopt -u -o pipefail -- 2.35.1

2 1

[Git][pacman/pacman][master] 7 commits: Ensure WKD key lookup returns the correct key
by Allan McRae (＠allan) 07 Mar '22

07 Mar '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: e1246bad by Allan McRae at 2022-03-06T19:57:09+10:00 Ensure WKD key lookup returns the correct key 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. - - - - - 6b37d994 by Allan McRae at 2022-03-06T20:36:59+10:00 Fix segfault when failing to import keys 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> - - - - - 632eb973 by Allan McRae at 2022-03-06T21:25:30+10:00 Do not use WKD to import keys for package installs from a file 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> - - - - - 40583ebe by Allan McRae at 2022-03-06T21:49:56+10:00 Avoid information leakage with badly formed download header Parsing of Content-Disposition relies on well formed headers. A malformed header such as: Content-Disposition=""; will result in a strnduppayload->content_disp_name, -1, ptr), which will copy memory until it hits a \0. Prevent this by only copying the value if it exists. Fixes FS#73704. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 293762ea by Andrew Gregory at 2022-03-07T20:37:01+10:00 query: only strip leading local/ for db packages Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 221905b5 by Andrew Gregory at 2022-03-07T20:37:45+10:00 query: allow querying extra info for package files Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - bddfcc3f by morganamilo at 2022-03-08T09:56:53+10:00 libalpm: add getter for handle on db and pkg db and pkg store a pointer to the handle for internal use but don't actually provide a way for a user to get it. Making this accessible is more convenient for front ends and FFI wrappers. For example, in other languages it's common to return the error value directly. To achieve this the python and rust wrappers also store their own pointer to the handle inside their own pkg/db wrappers. Exposing this would allow the wrappers to forgo the extra pointer and just return `pkg.get_handle().last_error()`. - - - - - 7 changed files: - lib/libalpm/alpm.h - lib/libalpm/be_package.c - lib/libalpm/db.c - lib/libalpm/dload.c - lib/libalpm/package.c - lib/libalpm/signing.c - src/pacman/query.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/7340fb9b2e070ac90f0746… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/7340fb9b2e070ac90f0746… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] Avoid information leakage with badly formed download header
by Allan McRae 06 Mar '22

06 Mar '22

Parsing of Content-Disposition relies on well formed headers. A malformed header such as: Content-Disposition=""; will result in a strnduppayload->content_disp_name, -1, ptr), which will copy memory until it hits a \0. Prevent this by only copying the value if it exists. Fixes FS#73704. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/dload.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index a64f405f..7c27c3ea 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -295,8 +295,11 @@ static size_t dload_parseheader_cb(void *ptr, size_t size, size_t nmemb, void *u endptr--; } - STRNDUP(payload->content_disp_name, fptr, endptr - fptr + 1, - RET_ERR(payload->handle, ALPM_ERR_MEMORY, realsize)); + /* avoid information leakage with badly formed headers */ + if(endptr > fptr) { + STRNDUP(payload->content_disp_name, fptr, endptr - fptr + 1, + RET_ERR(payload->handle, ALPM_ERR_MEMORY, realsize)); + } } } -- 2.35.1

1 0

[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