- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-134-ga4240a55
by Allan McRae 03 Dec '20

03 Dec '20

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 a4240a55e448ffba15a5edbad1a31cb76f821231 (commit) via 20f2ae56eb4ae1affd274185c173524f5b4fb2f1 (commit) via 5c24f7dd11a241f6414e3ee6f95f224382ec27ce (commit) from 08f4ae709ca00ec9b4c56d92d3cdd7de4e6effc2 (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 a4240a55e448ffba15a5edbad1a31cb76f821231 Author: Colin Woodbury <colin(a)fosskers.ca> Date: Wed Nov 25 12:53:11 2020 -0800 Restore usage line for -Fh Unlike the other main commands, -F was missing its top-level usage line in its help output. Signed-off-by: Colin Woodbury <colin(a)fosskers.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 20f2ae56eb4ae1affd274185c173524f5b4fb2f1 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 3 21:34:01 2020 +1000 Modify "pacman -h" output for files operations pacman -F can take both a file(s) or a package(s) as arguments. Passing a file is more common, so adjust to show that in the help. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5c24f7dd11a241f6414e3ee6f95f224382ec27ce Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Nov 30 18:21:26 2020 +0000 libalpm: set ret in download files download_files never set ret on failiure, so even when downloading fails, the transaction goes on to commit and error out. :: Retrieving packages... python-packaging-20.4-4-any.pkg.tar.zst failed to download error: failed retrieving file 'python-packaging-20.4-4-any.pkg.tar.zst' from mirror.oldsql.cc : The requested URL returned error: 404 warning: failed to retrieve some files (1/1) checking keys in keyring (1/1) checking package integrity error: failed to commit transaction (wrong or NULL argument passed) Errors occurred, no packages were upgraded. Also make the ret checking more consistent. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 6 ++++-- src/pacman/pacman.c | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Restore usage line for -Fh
by Colin Woodbury 03 Dec '20

03 Dec '20

Unlike the other main commands, -F was missing its top-level usage line in its help output. Signed-off-by: Colin Woodbury <colin(a)fosskers.ca> --- src/pacman/pacman.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fefd3fa4..69e2e42a 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -176,6 +176,8 @@ static void usage(int op, const char * const myname) printf("%s: %s {-T --deptest} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); } else if(op == PM_OP_FILES) { + printf("%s: %s {-F --files} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); + printf("%s:\n", str_opt); addlist(_(" -l, --list list the files owned by the queried package\n")); addlist(_(" -q, --quiet show less information for query and search\n")); addlist(_(" -x, --regex enable searching using regular expressions\n")); -- 2.29.2

2 3

[pacman-dev] [PATCH] Modify "pacman -h" output for files operations
by Allan McRae 03 Dec '20

03 Dec '20

pacman -F can take both a file(s) or a package(s) as arguments. Passing a file is more common, so adjust to show that in the help. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fefd3fa4..f98c9a4a 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -110,7 +110,7 @@ static void usage(int op, const char * const myname) printf(" %s {-h --help}\n", myname); printf(" %s {-V --version}\n", myname); printf(" %s {-D --database} <%s> <%s>\n", myname, str_opt, str_pkg); - printf(" %s {-F --files} [%s] [%s]\n", myname, str_opt, str_pkg); + printf(" %s {-F --files} [%s] [%s]\n", myname, str_opt, str_file); printf(" %s {-Q --query} [%s] [%s]\n", myname, str_opt, str_pkg); printf(" %s {-R --remove} [%s] <%s>\n", myname, str_opt, str_pkg); printf(" %s {-S --sync} [%s] [%s]\n", myname, str_opt, str_pkg); -- 2.29.2

1 0

[pacman-dev] [PATCH] lock file may be left behind when a signal arrives while in cleanup
by lilydjwg 03 Dec '20

03 Dec '20

When a SIGINT or SIGHUP arrives before alpm_unlock (in alpm_release) but after remove_soft_interrupt_handler, the lock file will be left behind. Signed-off-by: lilydjwg <lilydjwg(a)gmail.com> --- src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fefd3fa4..2d2e41d2 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -287,7 +287,6 @@ static void setuseragent(void) */ static void cleanup(int ret) { - remove_soft_interrupt_handler(); if(config) { /* free alpm library resources */ if(config->handle && alpm_release(config->handle) == -1) { @@ -297,6 +296,7 @@ static void cleanup(int ret) config_free(config); config = NULL; } + remove_soft_interrupt_handler(); /* free memory */ FREELIST(pm_targets); -- 2.28.0

2 4

[pacman-dev] [PATCH] libalpm: set ret in download files
by morganamilo 30 Nov '20

30 Nov '20

download_files never set ret on failiure, so even when downloading fails, the transaction goes on to commit and error out. :: Retrieving packages... python-packaging-20.4-4-any.pkg.tar.zst failed to download error: failed retrieving file 'python-packaging-20.4-4-any.pkg.tar.zst' from mirror.oldsql.cc : The requested URL returned error: 404 warning: failed to retrieve some files (1/1) checking keys in keyring (1/1) checking package integrity error: failed to commit transaction (wrong or NULL argument passed) Errors occurred, no packages were upgraded. Also make the ret checking more consistent. diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 601f1d69..5d8652a5 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -769,7 +769,7 @@ static int download_files(alpm_handle_t *handle) } ret = find_dl_candidates(handle, &files); - if(ret) { + if(ret != 0) { goto finish; } @@ -818,7 +818,9 @@ static int download_files(alpm_handle_t *handle) payloads = alpm_list_add(payloads, payload); } - if(_alpm_download(handle, payloads, cachedir) == -1) { + + ret = _alpm_download(handle, payloads, cachedir); + if(ret != 0) { event.type = ALPM_EVENT_PKG_RETRIEVE_FAILED; EVENT(handle, &event); _alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files\n")); -- 2.29.2

3 2

[pacman-dev] [PATCH 1/5] libalpm: set parallel_downloads to 1 when creating the handle
by morganamilo 28 Nov '20

28 Nov '20

Fixes FS#68729 diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 34c5b4b2..5d36136d 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -61,6 +61,8 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, /* set default database extension */ STRDUP(myhandle->dbext, ".db", goto nomem); + myhandle->parallel_downloads = 1; + lockfilelen = strlen(myhandle->dbpath) + strlen(lf) + 1; MALLOC(myhandle->lockfile, lockfilelen, goto nomem); snprintf(myhandle->lockfile, lockfilelen, "%s%s", myhandle->dbpath, lf); -- 2.29.2

3 9

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-131-g08f4ae70
by Allan McRae 26 Nov '20

26 Nov '20

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 08f4ae709ca00ec9b4c56d92d3cdd7de4e6effc2 (commit) via 73e0d7dedc197f71c4fd6b7c18d2b2f2d63bf013 (commit) via 66f9f315cf36a5b73c18c627f7cee060a1360abd (commit) via 75cfce94682fcd0e9bbeed5db1f97dbb5b1be9e7 (commit) via 4b8c274f7fc1ecd8cee9176471f081da3323b258 (commit) via 9dc29ebf5f3c6fe34b5a1b60f6f57f88668d9d20 (commit) via db4092e33dacc6a0bb8afd283a82e6f4327cb865 (commit) via 2859a6eefcb465a382267c6e5981192c6a54f5bb (commit) via 94ac3330dd3a42958ad5d9606ec254bc112936bf (commit) from 4d8f58d3b940f778b27c59e53ea9f3fab20a07ba (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 08f4ae709ca00ec9b4c56d92d3cdd7de4e6effc2 Author: Ivy Foster <escondida(a)iff.ink> Date: Wed Nov 25 22:38:24 2020 -0600 Add fossil scm support to makepkg Signed-off-by: Ivy Foster <escondida(a)iff.ink> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 73e0d7dedc197f71c4fd6b7c18d2b2f2d63bf013 Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Nov 24 12:39:08 2020 +0000 libalpm: add alpm_option_get_parallel_downloads Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 66f9f315cf36a5b73c18c627f7cee060a1360abd Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Nov 24 12:39:07 2020 +0000 libalpm: set errno when setting parallel downloads with an invalid number Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 75cfce94682fcd0e9bbeed5db1f97dbb5b1be9e7 Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Nov 24 12:39:06 2020 +0000 libalpm: clarify alpm_download_event_completed_t status The comment makes it seem that the result itself is an error code. But all it does is simply return -1 to indicate an error occured; Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4b8c274f7fc1ecd8cee9176471f081da3323b258 Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Nov 24 12:39:05 2020 +0000 libalpm: don't call dlcb when not set Fixes FS#68728: Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9dc29ebf5f3c6fe34b5a1b60f6f57f88668d9d20 Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Nov 24 12:39:04 2020 +0000 libalpm: set parallel_downloads to 1 when creating the handle Fixes FS#68729 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit db4092e33dacc6a0bb8afd283a82e6f4327cb865 Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Tue Nov 3 17:04:38 2020 -0800 Move cursor to the end of the screen at the SIGINT It requires exposing 'move cursor to the end' function in a pacman header file. We use it as a chance to make naming of the cursor management functions more consistent. Note that there is still possibility of a race condition in the cursor update logic. 'update cursor index variable' and 'send ASCII control symbols to console' is not an atomic operation. So if an SIGINT is received between these two action then cursor position is going to be screwed. Fixes FS#67973 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2859a6eefcb465a382267c6e5981192c6a54f5bb Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Thu Oct 22 09:31:14 2020 -0700 Go to the end of screen if 'printonly' mode enabled At the end of download operation our code makes sure the cursor is moved to the end of the drawing area. But 'printonly' mode has its own if() branch that skips this cursor alignment. Add cursor_goto_end() to the 'printonly' codepath to make sure it does not clobber previous output. Fixes FS#68355 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 94ac3330dd3a42958ad5d9606ec254bc112936bf Author: Michael Straube <michael.straubej(a)gmail.com> Date: Wed Oct 21 10:05:43 2020 +0200 libmakepkg: compress: fix tar extension With commit 74aacf44958e1343b910b3fbdcf753393857f070 creating uncompressed .tar packages fails. -> Compressing package... /usr/share/makepkg/util/compress.sh: line 70: COMPRESS.TAR[@]: invalid variable name bsdtar: Write error Empty the '$ext' variable for the '.tar' extension in get_compress_command() to fix this. We would fallback to cat for 'tar' anyways. Signed-off-by: Michael Straube <michael.straubej(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.asciidoc | 3 + etc/makepkg.conf.in | 1 + lib/libalpm/alpm.c | 2 + lib/libalpm/alpm.h | 8 +- lib/libalpm/dload.c | 4 +- lib/libalpm/handle.c | 14 +++- scripts/libmakepkg/executable/vcs.sh.in | 2 +- .../libmakepkg/source/{git.sh.in => fossil.sh.in} | 96 ++++++++++------------ scripts/libmakepkg/source/meson.build | 1 + scripts/libmakepkg/util/compress.sh.in | 3 + scripts/libmakepkg/util/source.sh.in | 5 +- src/pacman/callback.c | 23 +++--- src/pacman/sighandler.c | 3 + src/pacman/util.h | 1 + 14 files changed, 91 insertions(+), 75 deletions(-) copy scripts/libmakepkg/source/{git.sh.in => fossil.sh.in} (51%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Move cursor to the end of the screen at the SIGINT
by Anatol Pomozov 26 Nov '20

26 Nov '20

It requires exposing 'move cursor to the end' function in a pacman header file. We use it as a chance to make naming of the cursor management functions more consistent. Note that there is still possibility of a race condition in the cursor update logic. 'update cursor index variable' and 'send ASCII control symbols to console' is not an atomic operation. So if an SIGINT is received between these two action then cursor position is going to be screwed. Fixes FS#67973 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- src/pacman/callback.c | 24 +++++++++++------------- src/pacman/sighandler.c | 3 +++ src/pacman/util.h | 1 + 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 53518101..12ab952f 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -92,8 +92,6 @@ struct pacman_multibar_ui { struct pacman_multibar_ui multibar_ui = {0}; -static void cursor_goto_end(void); - void multibar_move_completed_up(bool value) { multibar_ui.move_completed_up = value; } @@ -226,7 +224,7 @@ static int number_length(size_t n) void cb_event(alpm_event_t *event) { if(config->print) { - cursor_goto_end(); + console_cursor_move_end(); return; } switch(event->type) { @@ -389,7 +387,7 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_DB_RETRIEVE_FAILED: case ALPM_EVENT_PKG_RETRIEVE_DONE: case ALPM_EVENT_PKG_RETRIEVE_FAILED: - cursor_goto_end(); + console_cursor_move_end(); flush_output_list(); on_progress = 0; break; @@ -694,7 +692,7 @@ static int dload_progressbar_enabled(void) } /* Goto the line that corresponds to num-th active download */ -static void cursor_goto_bar(int num) +static void console_cursor_goto_bar(int num) { if(num > multibar_ui.cursor_lineno) { console_cursor_move_down(num - multibar_ui.cursor_lineno); @@ -705,9 +703,9 @@ static void cursor_goto_bar(int num) } /* Goto the line *after* the last active progress bar */ -static void cursor_goto_end(void) +void console_cursor_move_end(void) { - cursor_goto_bar(multibar_ui.active_downloads_num); + console_cursor_goto_bar(multibar_ui.active_downloads_num); } /* Returns true if element with the specified name is found, false otherwise */ @@ -849,7 +847,7 @@ static void dload_init_event(const char *filename, alpm_download_event_init_t *d bar->rate = 0.0; multibar_ui.active_downloads = alpm_list_add(multibar_ui.active_downloads, bar); - cursor_goto_end(); + console_cursor_move_end(); printf(_(" %s downloading...\n"), filename); multibar_ui.cursor_lineno++; multibar_ui.active_downloads_num++; @@ -894,7 +892,7 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr bar->total_size = data->total; bar->xfered = data->downloaded; - cursor_goto_bar(index); + console_cursor_goto_bar(index); draw_pacman_progress_bar(bar); fflush(stdout); } @@ -920,7 +918,7 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl bar->total_size = data->total; if(data->result == 1) { - cursor_goto_bar(index); + console_cursor_goto_bar(index); printf(_(" %s is up to date"), bar->filename); /* The line contains text from previous status. Erase these leftovers. */ console_erase_line(); @@ -947,16 +945,16 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl multibar_ui.active_downloads->data = bar; baritem->data = former_topbar; - cursor_goto_bar(index); + console_cursor_goto_bar(index); draw_pacman_progress_bar(former_topbar); index = 0; } - cursor_goto_bar(index); + console_cursor_goto_bar(index); draw_pacman_progress_bar(bar); } else { - cursor_goto_bar(index); + console_cursor_goto_bar(index); printf(_(" %s failed to download"), bar->filename); console_erase_line(); } diff --git a/src/pacman/sighandler.c b/src/pacman/sighandler.c index fc4ea766..ff9c6ac4 100644 --- a/src/pacman/sighandler.c +++ b/src/pacman/sighandler.c @@ -53,6 +53,8 @@ static void _reset_handler(int signum) */ static void soft_interrupt_handler(int signum) { + console_cursor_move_end(); + if(signum == SIGINT) { const char msg[] = "\nInterrupt signal received\n"; xwrite(STDERR_FILENO, msg, ARRAYSIZE(msg) - 1); @@ -96,6 +98,7 @@ static void segv_handler(int signum) sigset_t segvset; const char msg[] = "\nerror: segmentation fault\n" "Please submit a full bug report with --debug if appropriate.\n"; + console_cursor_move_end(); xwrite(STDERR_FILENO, msg, sizeof(msg) - 1); xwrite(STDOUT_FILENO, CURSOR_SHOW_ANSICODE, sizeof(CURSOR_SHOW_ANSICODE) - 1); diff --git a/src/pacman/util.h b/src/pacman/util.h index c97048fb..ceaec6bd 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -85,6 +85,7 @@ void console_cursor_hide(void); void console_cursor_show(void); void console_cursor_move_up(unsigned int lines); void console_cursor_move_down(unsigned int lines); +void console_cursor_move_end(void); /* Erases line from the current cursor position till the end of the line */ void console_erase_line(void); -- 2.29.2

2 1

[pacman-dev] [PATCH v2] libmakepkg: lint all arrays for empty values
by morganamilo 26 Nov '20

26 Nov '20

Empty values break pacman's db format, as an empty line indicates an end of section. --- I've seen this out in the wild: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vim-coc-highlight-gi… diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index 1bc49722..22f5fbbb 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -31,7 +31,7 @@ lint_pkgbuild_functions+=('lint_variable') lint_variable() { - local i a pkg out bad ret=0 + local i a pkg out bad array var ret=0 # global variables for i in ${pkgbuild_schema_arrays[@]}; do @@ -93,5 +93,62 @@ lint_variable() { done done + # ensure lists don't contain empty values + for i in ${pkgbuild_schema_arrays[@]}; do + if declare -p $i > /dev/null 2>&1; then + array_build "array" "$i" + for var in "${array[@]}"; do + if [[ -z "$var" ]]; then + error "$(gettext "%s is not allowed to be empty")" "$i" + ret=1 + fi + done + fi + done + + for a in ${arch[@]}; do + [[ $a == "any" ]] && continue + + for i in ${pkgbuild_schema_arch_arrays[@]}; do + if declare -p "${i}_${a}" > /dev/null 2>&1; then + array_build "array" "${i}_${a}" + for var in "${array[@]}"; do + if [[ -z "$var" ]]; then + error "$(gettext "%s is not allowed to be empty")" "${i}_${a}" + ret=1 + fi + done + fi + done + done + + for pkg in ${pkgname[@]}; do + for i in ${pkgbuild_schema_arrays[@]}; do + if extract_function_variable "package_$pkg" $i 1 out; then + for val in "${out[@]}" ;do + if [[ -z "$val" ]]; then + error "$(gettext "%s is not allowed to be empty")" "$i" + ret=1 + fi + done + fi + done + + for a in ${arch[@]}; do + [[ $a == "any" ]] && continue + + for i in ${pkgbuild_schema_arch_arrays[@]}; do + if extract_function_variable "package_$pkg" "${i}_${a}" 1 out; then + for val in "${out[@]}" ;do + if [[ -z "$val" ]]; then + error "$(gettext "%s is not allowed to be empty")" "${i}_${a}" + ret=1 + fi + done + fi + done + done + done + return $ret } -- 2.29.1

2 1

[pacman-dev] [PATCH v2] Go to the end of screen if 'printonly' mode enabled
by Anatol Pomozov 26 Nov '20

26 Nov '20

At the end of download operation our code makes sure the cursor is moved to the end of the drawing area. But 'printonly' mode has its own if() branch that skips this cursor alignment. Add cursor_goto_end() to the 'printonly' codepath to make sure it does not clobber previous output. Fixes FS#68355 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- src/pacman/callback.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 4240a779..53518101 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -226,6 +226,7 @@ static int number_length(size_t n) void cb_event(alpm_event_t *event) { if(config->print) { + cursor_goto_end(); return; } switch(event->type) { -- 2.29.0

2 1