- Pacman-dev - lists.archlinux.org

[Git][pacman/pacman][master] 5 commits: meson: replace deprecated get_pkgconfig_variable()
by Allan McRae (＠allan) 29 Jul '22

29 Jul '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: daa2db6a by Joe Baldino at 2022-07-29T09:41:47+10:00 meson: replace deprecated get_pkgconfig_variable() Apparently that function was deprecated in 0.56, so use the generic getter introduced in 0.51 instead. This squashes a warning. Signed-off-by: Joe Baldino <pedanticdm(a)gmx.us> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 5abe1455 by Alexander F. Rødseth at 2022-07-29T09:42:38+10:00 pacman: remove redundant argument The fill_progress function is called from two locations, and both locations pass in the same percentage value twice. This patch modifies the function signature to to receive the percentage value just once. Signed-off-by: Alexander F. Rødseth <xyproto(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 51b2e1c9 by Alexander F. Rødseth at 2022-07-29T09:44:04+10:00 pacman: let the progress bar "C"/"c" move up and down at a more regular rate For some terminal widths, the "C"/"c" character does not alternate at regular intervals, but may look like it is stuck at either lowercase or uppercase. The previous behavior toggled based on the character position, while this new behavior toggles the chomp alternation based on the progress percentage value. This leads to slightly improved chomping. Signed-off-by: Alexander F. Rødseth <xyproto(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 79bd5121 by Daan De Meyer at 2022-07-29T10:17:52+10:00 Add --keyringdir meson option to configure the keyring directory On Debian, keyrings are stored in /usr/share/keyrings. To support this, let's add a new --keyringdir option that allows configuring the directory under datarootdir where the keyrings should be imported from. We default to 'pacman/keyrings' for backwards compatibility. - - - - - e017a597 by soloturn at 2022-07-29T11:00:01+10:00 makepkg: Add GITFLAGS environmental variable to customise checkout The default flag used to clone a git repository when using makepkg is "--mirror". However, when working with huge repositories, the use of different flags during cloning can allow an faster checkout. For example, using "--filter=blob:none" allows for small checkouts, at the expense of requiring downloads during the build stage if anything but the HEAD commit is used for the build. In addition, this example would serve as a replacement for the often requested (but broken) addition of --depth=1. Add support for the environment variable GITFLAG to pass flags for the git clone command. Note that this overrides the default rather than adding to it in order to prevent incompatibilities. - - - - - 10 changed files: - build-aux/edit-script.sh.in - doc/makepkg.8.asciidoc - doc/meson.build - doc/pacman-key.8.asciidoc - meson.build - meson_options.txt - scripts/completion/zsh_completion.in - scripts/libmakepkg/source/git.sh.in - scripts/pacman-key.sh.in - src/pacman/callback.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/ff7c6c8e570bcf5e078763… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/ff7c6c8e570bcf5e078763… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH 1/2] pacman: remove redundant argument
by Alexander F. Rødseth 28 Jul '22

28 Jul '22

The fill_progress function is called from two locations, and both locations pass in the same percentage value twice. This patch modifies the function signature to to receive the percentage value just once. Signed-off-by: Alexander F. Rødseth <xyproto(a)archlinux.org> --- src/pacman/callback.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a06f3bcc..df4032a4 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -150,12 +150,11 @@ static int64_t get_update_timediff(int first_call) } /* refactored from cb_trans_progress */ -static void fill_progress(const int bar_percent, const int disp_percent, - const int proglen) +static void fill_progress(const int percent, const int proglen) { /* 8 = 1 space + 1 [ + 1 ] + 5 for percent */ const int hashlen = proglen > 8 ? proglen - 8 : 0; - const int hash = bar_percent * hashlen / 100; + const int hash = percent * hashlen / 100; int i; if(hashlen > 0) { @@ -188,7 +187,7 @@ static void fill_progress(const int bar_percent, const int disp_percent, /* print display percent after progress bar */ /* 5 = 1 space + 3 digits + 1 % */ if(proglen >= 5) { - printf(" %3d%%", disp_percent); + printf(" %3d%%", percent); } putchar('\r'); @@ -677,7 +676,7 @@ void cb_progress(void *ctx, alpm_progress_t event, const char *pkgname, free(wcstr); /* call refactored fill progress function */ - fill_progress(percent, percent, cols - infolen); + fill_progress(percent, cols - infolen); if(percent == 100) { putchar('\n'); @@ -855,7 +854,7 @@ static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) free(fname); free(wcfname); - fill_progress(file_percent, file_percent, cols - infolen); + fill_progress(file_percent, cols - infolen); return; } -- 2.37.1

2 3

[PATCH] meson: replace deprecated get_pkgconfig_variable()
by Joe Baldino 28 Jul '22

28 Jul '22

Apparently that function was deprecated in 0.56, so use the generic getter introduced in 0.51 instead. This squashes a warning. Signed-off-by: Joe Baldino <pedanticdm(a)gmx.us> --- Notes: WARNING: Deprecated features used: * 0.56.0: {'dependency.get_pkgconfig_variable'} See: https://mesonbuild.com/Reference-manual_returned_dep.html#depget_variable meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1519a2bbb4ef..6ea97672e33d 100644 --- a/meson.build +++ b/meson.build @@ -43,7 +43,7 @@ endif bashcompletion = dependency('bash-completion', required : false) if bashcompletion.found() - BASHCOMPDIR = bashcompletion.get_pkgconfig_variable('completionsdir') + BASHCOMPDIR = bashcompletion.get_variable(pkgconfig: 'completionsdir') else BASHCOMPDIR = join_paths(DATAROOTDIR, 'bash-completion/completions') endif -- 2.37.1

2 1

Fwd: [PATCH] This simple patch allows comments in the middle of a line.
by Fabiano Furtado 25 Jul '22

25 Jul '22

>From 4a87185f577d61f51c94e9b158d602460c795330 Mon Sep 17 00:00:00 2001 From: Fabiano Furtado <fabianofurtado <at> gmail <dot> com> Date: Sun, 24 Jul 2022 16:44:31 -0300 Subject: [PATCH] As described in https://archlinux.org/pacman/pacman.conf.5.html#_description, "Comments are only supported by beginning a line with the hash (#) symbol. Comments cannot begin in the middle of a line.". This patch allows comments in the middle of a line. Example: LogFile = /tmp/pacman.log#/var/log/pacman.log Signed-off-by: Fabiano Furtado <fabianofurtado <at> gmail <dot> com> --- src/common/ini.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/common/ini.c b/src/common/ini.c index 410a2843..4d09d844 100644 --- a/src/common/ini.c +++ b/src/common/ini.c @@ -60,14 +60,22 @@ int parse_ini(const char *file, ini_parser_fn cb, void *data) } while(safe_fgets(line, PATH_MAX, fp)) { - char *key, *value; + char *key, *value, *comment; size_t line_len; linenum++; + if(line[0] == '#') { + continue; + } + + if((comment = strchr(line,'#')) != NULL) { + *comment = '\0'; + } + line_len = strtrim(line); - if(line_len == 0 || line[0] == '#') { + if(line_len == 0) { continue; } -- 2.37.1

2 2

[PATCH] proto: Change the default checksum from md5 to sha256
by Ben Westover 22 Jul '22

22 Jul '22

MD5 isn't a very good checksum, and the PKGBUILD page on the Arch Wiki states that it should not be used, instead recommending sha256 or b2. This patch changes the default from md5 to sha256 because that seems to be the most commonly used checksum today. Signed-off-by: Ben Westover <kwestover.kw(a)gmail.com> --- proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD-vcs.proto | 2 +- proto/PKGBUILD.proto | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index 9898ef81..eea97e56 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -28,7 +28,7 @@ changelog= source=("$pkgbase-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() +sha256sums=() validpgpkeys=() prepare() { diff --git a/proto/PKGBUILD-vcs.proto b/proto/PKGBUILD-vcs.proto index ae9956a9..49c6759f 100644 --- a/proto/PKGBUILD-vcs.proto +++ b/proto/PKGBUILD-vcs.proto @@ -25,7 +25,7 @@ options=() install= source=('FOLDER::VCS+URL#FRAGMENT') noextract=() -md5sums=('SKIP') +sha256sums=('SKIP') # Please refer to the 'USING VCS SOURCES' section of the PKGBUILD man page for # a description of each element in the source array. diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index a2c600d5..9aff797c 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -27,7 +27,7 @@ changelog= source=("$pkgname-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() +sha256sums=() validpgpkeys=() prepare() { -- 2.36.1

1 0

[PATCH v2] util: Flush cursor state to stdout before removing signal handler
by Chris Down 22 Jul '22

22 Jul '22

It's possible that the cursor does not reappear after pressing ^C during shutdown. In my case, I noticed this when pressing ^C after getting results from `pacman -F` -- this can reasonably reliably be triggered by issuing a file query and pressing ^C shortly after results are shown. There are two reasons for this issue: 1. The graceful SIGINT handler is removed at the start of cleanup(), but the window from entering cleanup() to reaching exit() is non trivial. The main offender is FREELIST(pm_targets), which on my T14s takes >0.1s to execute. This means that if you are unlucky enough to press ^C while there, the cursor isn't coming back, because we haven't issued any command to show the cursor again yet, and the userspace signal handler is already blown away. 2. Moving console_cursor_show() to earlier in cleanup() only half solves the issue. While it's fine not to flush after _hiding_ the cursor, since it will at least make itself apparent before any other text reaches the screen, _showing_ the cursor must be followed by flushing stdout, because once the graceful SIGINT handler is gone, if you press ^C, no flush will be triggered (and thus there will be no cursor). This fixes the issue by always starting out by showing the cursor again at cleanup() time. This means that no matter where we get caught at ^C, we will not end up leaving the terminal without its beloved ensign. Signed-off-by: Chris Down <chris(a)chrisdown.name> --- src/pacman/pacman.c | 2 +- src/pacman/util.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index ea536a47..e5c6e420 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -289,6 +289,7 @@ static void setuseragent(void) */ static void cleanup(int ret) { + console_cursor_show(); remove_soft_interrupt_handler(); if(config) { /* free alpm library resources */ @@ -302,7 +303,6 @@ static void cleanup(int ret) /* free memory */ FREELIST(pm_targets); - console_cursor_show(); exit(ret); } diff --git a/src/pacman/util.c b/src/pacman/util.c index 53833d6f..e92b2012 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1426,6 +1426,16 @@ void console_cursor_hide(void) { void console_cursor_show(void) { if(isatty(fileno(stdout))) { printf(CURSOR_SHOW_ANSICODE); + + /* We typically explicitly show the cursor either when we are + * getting input from stdin, or when we are in the process of + * exiting. In the former case, it's not guaranteed that the + * terminal will see the command before reading from stdin. In + * the latter case, we need to make sure that if we get a + * further TERM/INT after we return signal disposition to + * SIG_DFL, it doesn't leave the cursor invisible. + */ + fflush(stdout); } } -- 2.35.1

2 4

[Git][pacman/pacman][master] util: Flush cursor state to stdout before removing signal handler
by Allan McRae (＠allan) 22 Jul '22

22 Jul '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: ff7c6c8e by Chris Down at 2022-07-22T10:20:55+10:00 util: Flush cursor state to stdout before removing signal handler It's possible that the cursor does not reappear after pressing ^C during shutdown. In my case, I noticed this when pressing ^C after getting results from `pacman -F` -- this can reasonably reliably be triggered by issuing a file query and pressing ^C shortly after results are shown. There are two reasons for this issue: 1. The graceful SIGINT handler is removed at the start of cleanup(), but the window from entering cleanup() to reaching exit() is non trivial. The main offender is FREELIST(pm_targets), which on my T14s takes >0.1s to execute. This means that if you are unlucky enough to press ^C while there, the cursor isn't coming back, because we haven't issued any command to show the cursor again yet, and the userspace signal handler is already blown away. 2. Moving console_cursor_show() to earlier in cleanup() only half solves the issue. While it's fine not to flush after _hiding_ the cursor, since it will at least make itself apparent before any other text reaches the screen, _showing_ the cursor must be followed by flushing stdout, because once the graceful SIGINT handler is gone, if you press ^C, no flush will be triggered (and thus there will be no cursor). This fixes the issue by always starting out by showing the cursor again at cleanup() time. This means that no matter where we get caught at ^C, we will not end up leaving the terminal without its beloved ensign. Signed-off-by: Chris Down <chris(a)chrisdown.name> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 2 changed files: - src/pacman/pacman.c - src/pacman/util.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/ff7c6c8e570bcf5e0787639… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/ff7c6c8e570bcf5e0787639… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] 8 commits: add extended data field for arbitrary package data
by Allan McRae (＠allan) 21 Jul '22

21 Jul '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 3405709b by Andrew Gregory at 2022-07-21T19:01:27+10:00 add extended data field for arbitrary package data This adds a mechanism for package builders to add arbitrary data to packages that is not necessarily relevant enough to the package installation process to gain first-class support in alpm. Currently these fields have to be added to parsers with a "not actually used" comment and can't be retrieved through the API. Extended data is stored in "name=value" format in the xdata field (%XDATA% in desc files): xdata = pkgtype=debug or %XDATA% pkgtype=debug Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> - - - - - fe028c7f by Andrew Gregory at 2022-07-21T19:01:38+10:00 query: print extended data when extra info is requested Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> - - - - - 6dcd4b53 by Andrew Gregory at 2022-07-21T19:01:45+10:00 makepkg: store pkgtype in xdata Package type is not relevant to alpm or even exposed to front-ends in any way. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> - - - - - 819a0c29 by Jelle van der Waa at 2022-07-21T19:09:59+10:00 util.c: extend --print-format with expac options Extend --print-format with all expac format strings which can be easily added without conversions and through a simple C macro. Signed-off-by: Jelle van der Waa <jelle(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 7bcc2d9b by Allan McRae at 2022-07-21T19:50:10+10:00 Correctly handle failure in getting build or install dates alpm_pkg_get_builddate() and alpm_pkg_get_installdate() both return -1 on error. Correctly handle the error condition in pacman. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 00bc386d by Jelle van der Waa at 2022-07-21T19:56:18+10:00 util.c: extend --print-format with %b for builddate Signed-off-by: Jelle van der Waa <jelle(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - cb9776a0 by Jelle van der Waa at 2022-07-21T19:58:20+10:00 util.c: extend --print-format with %C, %D, %M Extend print-format with checkdepends, depends and makedepends. Signed-off-by: Jelle van der Waa <jelle(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 015eb31c by Chris Down at 2022-07-21T20:00:44+10:00 dload: Remove unused ABORT_SIGINT The last user of ABORT_SIGINT was removed in commit 84723cab5dfc ("Cleanup the old sequential download code"), and this isn't exported as part of the public API. Signed-off-by: Chris Down <chris(a)chrisdown.name> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 11 changed files: - doc/pacman.8.asciidoc - lib/libalpm/alpm.h - lib/libalpm/be_local.c - lib/libalpm/be_package.c - lib/libalpm/be_sync.c - lib/libalpm/dload.c - lib/libalpm/package.c - lib/libalpm/package.h - scripts/makepkg.sh.in - src/pacman/package.c - src/pacman/util.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/2bf67416c17c99851e2d0b… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/2bf67416c17c99851e2d0b… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] Fix buffer overflow for 'Include' parameter in pacman.conf
by tim174 21 Jul '22

21 Jul '22

If the 'Include' parameter in the config file is set to a long string (for example 3000x '/') the pacman config parser will crash when calling glob in conf.c with this value. If the string is shorter than approx. 3000 symbols the normal error message is printed and the segfault does not occur. I was able to reproduce this on my own system and on the official Arch Linux iso image. The PATH_MAX variable is too large to prevent this bug, hence the new variable GLOB_LIMIT with a security buffer of 1000 since I don't know how persistent this limit is across systems. Its origin is unclear to me and I am not sure if it is a fixed value. This is why I would appreciate any help to make this a sustainable patch. Thanks Tim Signed-off-by: Tim <tim174 at protonmail.com> --- src/pacman/conf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f9edf75b..d8222752 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -65,6 +65,9 @@ config_t *config = NULL; #define BOLDWHITE "\033[1;37m" #define GREY46 "\033[38;5;243m" +/* limit for glob input variable */ +#define GLOB_LIMIT 2000 + void enable_colors(int colors) { colstr_t *colstr = &config->colstr; @@ -1042,6 +1045,13 @@ static int process_include(const char *value, void *data, return 1; } + if(strlen(value) > GLOB_LIMIT) { + pm_printf(ALPM_LOG_ERROR, + ("config file %s, line %d, directive '%s': value too long\n"), + file, linenum, "Include"); + return 1; + } + if(section->depth >= config_max_recursion) { pm_printf(ALPM_LOG_ERROR, _("config parsing exceeded max recursion depth of %d.\n"), -- 2.34.1

2 1

[PATCH] dload: Remove unused ABORT_SIGINT
by Chris Down 21 Jul '22

21 Jul '22

The last user of ABORT_SIGINT was removed in commit 84723cab5dfc ("Cleanup the old sequential download code"), and this isn't exported as part of the public API. Signed-off-by: Chris Down <chris(a)chrisdown.name> --- lib/libalpm/dload.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 7c27c3ea..4fa17b35 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -153,8 +153,7 @@ static char *get_fullpath(const char *path, const char *filename, } enum { - ABORT_SIGINT = 1, - ABORT_OVER_MAXFILESIZE + ABORT_OVER_MAXFILESIZE = 1, }; static int dload_interrupted; -- 2.35.1

2 1