- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-1-g11e09a23
by Allan McRae 09 Dec '20

09 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 11e09a23beb89c3b7bf06209a317a4b6ac75ee38 (commit) from a4240a55e448ffba15a5edbad1a31cb76f821231 (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 11e09a23beb89c3b7bf06209a317a4b6ac75ee38 Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Tue Dec 8 11:57:27 2020 -0800 Implement TotalDownload functionality With the recent 'multibar' interface changes TotalDownload has been disabled. Now we have a new UI and we need to find another way to display this information. When 'TotalDownload' config option is enabled we are going to have an extra progress bar at the bottom of the screen that shows how much of the entire download has been completed. Closes FS#68202 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.asciidoc | 6 +- lib/libalpm/sync.c | 5 -- src/pacman/callback.c | 146 ++++++++++++++++++++++++++++++++------------- 3 files changed, 106 insertions(+), 51 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Implement TotalDownload functionality
by Anatol Pomozov 08 Dec '20

08 Dec '20

With the recent 'multibar' interface changes TotalDownload has been disabled. Now we have a new UI and we need to find another way to display this information. When 'TotalDownload' config option is enabled we are going to have an extra progress bar at the bottom of the screen that shows how much of the entire download has been completed. Closes FS#68202 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- doc/pacman.conf.5.asciidoc | 6 +-- lib/libalpm/sync.c | 5 -- src/pacman/callback.c | 108 ++++++++++++++++++++++++++++++++----- 3 files changed, 96 insertions(+), 23 deletions(-) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index dd1d3d5e..32612eb9 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -191,10 +191,8 @@ Options not support escape characters. *TotalDownload*:: - When downloading, display the amount downloaded, download rate, ETA, - and completed percentage of the entire download list rather - than the percent of each individual download target. The progress - bar is still based solely on the current file download. + When downloading, display an extra progress bar with the amount downloaded, + download rate, ETA, and completed percentage of the entire download list. This option won't work if XferCommand is used. *CheckSpace*:: diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 5d8652a5..e25e56d4 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -846,11 +846,6 @@ finish: pkg->download_size = 0; } - /* clear out value to let callback know we are done */ - if(handle->totaldlcb) { - handle->totaldlcb(0); - } - return ret; } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 12ab952f..49bc3df4 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -40,8 +40,9 @@ #include "conf.h" /* download progress bar */ -static off_t list_xfered = 0.0; +static int total_enabled = 0; static off_t list_total = 0.0; +static struct pacman_progress_bar *totalbar; /* delayed output during progress bar */ static int on_progress = 0; @@ -92,6 +93,10 @@ struct pacman_multibar_ui { struct pacman_multibar_ui multibar_ui = {0}; +static int dload_progressbar_enabled(void); +static void init_total_progressbar(void); +static void update_total_finalstats(void); + void multibar_move_completed_up(bool value) { multibar_ui.move_completed_up = value; } @@ -327,6 +332,10 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_PKG_RETRIEVE_START: colon_printf(_("Retrieving packages...\n")); on_progress = 1; + total_enabled = config->totaldownload && list_total; + if(total_enabled) { + init_total_progressbar(); + } break; case ALPM_EVENT_DISKSPACE_START: if(config->noprogressbar) { @@ -388,6 +397,11 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_PKG_RETRIEVE_DONE: case ALPM_EVENT_PKG_RETRIEVE_FAILED: console_cursor_move_end(); + if(total_enabled && dload_progressbar_enabled()) { + update_total_finalstats(); + printf("\n"); + } + total_enabled = 0; flush_output_list(); on_progress = 0; break; @@ -679,11 +693,6 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, void cb_dl_total(off_t total) { list_total = total; - /* if we get a 0 value, it means this list has finished downloading, - * so clear out our list_xfered as well */ - if(total == 0) { - list_xfered = 0; - } } static int dload_progressbar_enabled(void) @@ -726,6 +735,16 @@ static bool find_bar_for_filename(const char *filename, int *index, struct pacma return false; } +static void init_total_progressbar(void) +{ + totalbar = calloc(1, sizeof(struct pacman_progress_bar)); + assert(totalbar); + totalbar->filename = "Total progress:"; + totalbar->init_time = get_time_ms(); + totalbar->total_size = list_total; + totalbar->rate = 0.0; +} + static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) { int infolen; @@ -851,10 +870,17 @@ static void dload_init_event(const char *filename, alpm_download_event_init_t *d printf(_(" %s downloading...\n"), filename); multibar_ui.cursor_lineno++; multibar_ui.active_downloads_num++; + + if(total_enabled) { + /* redraw the total download progress bar */ + draw_pacman_progress_bar(totalbar); + printf("\n"); + multibar_ui.cursor_lineno++; + } } -/* Draws download progress */ -static void dload_progress_event(const char *filename, alpm_download_event_progress_t *data) + +static off_t update_file_dload_bar(const char *filename, alpm_download_event_progress_t *data) { int index; struct pacman_progress_bar *bar; @@ -862,10 +888,7 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr double last_chunk_rate; int64_t timediff; bool ok; - - if(!dload_progressbar_enabled()) { - return; - } + off_t last_chunk_amount; ok = find_bar_for_filename(filename, &index, &bar); assert(ok); @@ -875,11 +898,12 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr if(timediff < UPDATE_SPEED_MS) { /* return if the calling interval was too short */ - return; + return 0; } bar->sync_time = curr_time; - last_chunk_rate = (double)(data->downloaded - bar->xfered) / (timediff / 1000.0); + last_chunk_amount = data->downloaded - bar->xfered; + last_chunk_rate = (double)last_chunk_amount * 1000 / timediff; /* average rate to reduce jumpiness */ bar->rate = (last_chunk_rate + 2 * bar->rate) / 3; if(bar->rate > 0.0) { @@ -894,6 +918,62 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr console_cursor_goto_bar(index); draw_pacman_progress_bar(bar); + + return last_chunk_amount; +} + +static void update_total_dload_bar(off_t last_chunk_amount) +{ + int64_t curr_time = get_time_ms(); + int64_t timediff; + double last_chunk_rate; + + timediff = curr_time - totalbar->init_time; + totalbar->xfered += last_chunk_amount; + last_chunk_rate = (double)totalbar->xfered * 1000 / timediff; + totalbar->rate = (last_chunk_rate + 2 * totalbar->rate) / 3; + totalbar->eta = (totalbar->total_size - totalbar->xfered) / totalbar->rate; + + console_cursor_move_end(); + draw_pacman_progress_bar(totalbar); +} + +static void update_total_finalstats(void) +{ + int64_t timediff; + + /* compute final values */ + totalbar->xfered = totalbar->total_size; + timediff = get_time_ms() - totalbar->init_time; + + /* if transfer was too fast, treat it as a 1ms transfer, for the sake + * of the rate calculation */ + if(timediff < 1) + timediff = 1; + + totalbar->rate = (double)totalbar->xfered * 1000 / timediff; + /* round elapsed time (in ms) to the nearest second */ + totalbar->eta = (unsigned int)(timediff + 500) / 1000; + + console_cursor_move_end(); + draw_pacman_progress_bar(totalbar); +} + +/* Handles download progress event */ +static void dload_progress_event(const char *filename, alpm_download_event_progress_t *data) +{ + off_t last_chunk_amount; + + if(!dload_progressbar_enabled()) { + return; + } + + last_chunk_amount = update_file_dload_bar(filename, data); + + if(total_enabled && last_chunk_amount) { + update_total_dload_bar(last_chunk_amount); + } + fflush(stdout); } -- 2.29.2

2 4

[pacman-dev] [PATCH v2] Implement TotalDownload functionality
by Anatol Pomozov 08 Dec '20

08 Dec '20

With the recent 'multibar' interface changes TotalDownload has been disabled. Now we have a new UI and we need to find another way to display this information. When 'TotalDownload' config option is enabled we are going to have an extra progress bar at the bottom of the screen that shows how much of the entire download has been completed. Closes FS#68202 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- doc/pacman.conf.5.asciidoc | 6 +- lib/libalpm/sync.c | 5 -- src/pacman/callback.c | 146 ++++++++++++++++++++++++++----------- 3 files changed, 106 insertions(+), 51 deletions(-) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index dd1d3d5e..32612eb9 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -191,10 +191,8 @@ Options not support escape characters. *TotalDownload*:: - When downloading, display the amount downloaded, download rate, ETA, - and completed percentage of the entire download list rather - than the percent of each individual download target. The progress - bar is still based solely on the current file download. + When downloading, display an extra progress bar with the amount downloaded, + download rate, ETA, and completed percentage of the entire download list. This option won't work if XferCommand is used. *CheckSpace*:: diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 5d8652a5..e25e56d4 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -846,11 +846,6 @@ finish: pkg->download_size = 0; } - /* clear out value to let callback know we are done */ - if(handle->totaldlcb) { - handle->totaldlcb(0); - } - return ret; } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 12ab952f..9cc7541d 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -40,8 +40,9 @@ #include "conf.h" /* download progress bar */ -static off_t list_xfered = 0.0; +static int total_enabled = 0; static off_t list_total = 0.0; +static struct pacman_progress_bar *totalbar; /* delayed output during progress bar */ static int on_progress = 0; @@ -56,10 +57,12 @@ static alpm_list_t *output = NULL; struct pacman_progress_bar { const char *filename; - off_t xfered; + off_t xfered; /* Current amount of transferred data */ off_t total_size; uint64_t init_time; /* Time when this download started doing any progress */ uint64_t sync_time; /* Last time we updated the bar info */ + off_t sync_xfered; /* Amount of transferred data at the `sync_time` timestamp. It can be + smaller than `xfered` if we did not update bar UI for a while. */ double rate; unsigned int eta; /* ETA in seconds */ bool completed; /* transfer is completed */ @@ -92,6 +95,11 @@ struct pacman_multibar_ui { struct pacman_multibar_ui multibar_ui = {0}; +static int dload_progressbar_enabled(void); +static void init_total_progressbar(void); +static void update_bar_finalstats(struct pacman_progress_bar *bar); +static void draw_pacman_progress_bar(struct pacman_progress_bar *bar); + void multibar_move_completed_up(bool value) { multibar_ui.move_completed_up = value; } @@ -327,6 +335,10 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_PKG_RETRIEVE_START: colon_printf(_("Retrieving packages...\n")); on_progress = 1; + total_enabled = config->totaldownload && list_total; + if(total_enabled) { + init_total_progressbar(); + } break; case ALPM_EVENT_DISKSPACE_START: if(config->noprogressbar) { @@ -388,6 +400,12 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_PKG_RETRIEVE_DONE: case ALPM_EVENT_PKG_RETRIEVE_FAILED: console_cursor_move_end(); + if(total_enabled && dload_progressbar_enabled()) { + update_bar_finalstats(totalbar); + draw_pacman_progress_bar(totalbar); + printf("\n"); + } + total_enabled = 0; flush_output_list(); on_progress = 0; break; @@ -679,11 +697,6 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, void cb_dl_total(off_t total) { list_total = total; - /* if we get a 0 value, it means this list has finished downloading, - * so clear out our list_xfered as well */ - if(total == 0) { - list_xfered = 0; - } } static int dload_progressbar_enabled(void) @@ -726,6 +739,16 @@ static bool find_bar_for_filename(const char *filename, int *index, struct pacma return false; } +static void init_total_progressbar(void) +{ + totalbar = calloc(1, sizeof(struct pacman_progress_bar)); + assert(totalbar); + totalbar->filename = _("Total:"); + totalbar->init_time = get_time_ms(); + totalbar->total_size = list_total; + totalbar->rate = 0.0; +} + static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) { int infolen; @@ -742,7 +765,7 @@ static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) const unsigned short cols = getcols(); if(bar->total_size) { - file_percent = (bar->xfered * 100) / bar->total_size; + file_percent = (bar->sync_xfered * 100) / bar->total_size; } else { file_percent = 100; } @@ -802,7 +825,7 @@ static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) } rate_human = humanize_size((off_t)bar->rate, '\0', -1, &rate_label); - xfered_human = humanize_size(bar->xfered, '\0', -1, &xfered_label); + xfered_human = humanize_size(bar->sync_xfered, '\0', -1, &xfered_label); printf(" %ls%-*s ", wcfname, padwid, ""); /* We will show 1.62 MiB/s, 11.6 MiB/s, but 116 KiB/s and 1116 KiB/s */ @@ -851,49 +874,100 @@ static void dload_init_event(const char *filename, alpm_download_event_init_t *d printf(_(" %s downloading...\n"), filename); multibar_ui.cursor_lineno++; multibar_ui.active_downloads_num++; + + if(total_enabled) { + /* redraw the total download progress bar */ + draw_pacman_progress_bar(totalbar); + printf("\n"); + multibar_ui.cursor_lineno++; + } } -/* Draws download progress */ -static void dload_progress_event(const char *filename, alpm_download_event_progress_t *data) +/* Update progress bar rate/eta stats. + * Returns true if the bar redraw is required, false otherwise + */ +static bool update_bar_stats(struct pacman_progress_bar *bar) { - int index; - struct pacman_progress_bar *bar; - int64_t curr_time = get_time_ms(); - double last_chunk_rate; int64_t timediff; - bool ok; - - if(!dload_progressbar_enabled()) { - return; - } - - ok = find_bar_for_filename(filename, &index, &bar); - assert(ok); + off_t last_chunk_amount; + double last_chunk_rate; + int64_t curr_time = get_time_ms(); /* compute current average values */ timediff = curr_time - bar->sync_time; if(timediff < UPDATE_SPEED_MS) { /* return if the calling interval was too short */ - return; + return false; } + last_chunk_amount = bar->xfered - bar->sync_xfered; + bar->sync_xfered = bar->xfered; bar->sync_time = curr_time; - last_chunk_rate = (double)(data->downloaded - bar->xfered) / (timediff / 1000.0); + last_chunk_rate = (double)last_chunk_amount * 1000 / timediff; /* average rate to reduce jumpiness */ bar->rate = (last_chunk_rate + 2 * bar->rate) / 3; if(bar->rate > 0.0) { - bar->eta = (data->total - data->downloaded) / bar->rate; + bar->eta = (bar->total_size - bar->sync_xfered) / bar->rate; } else { bar->eta = UINT_MAX; } + return true; +} + +static void update_bar_finalstats(struct pacman_progress_bar *bar) +{ + int64_t timediff; + + /* compute final values */ + bar->xfered = bar->total_size; + bar->sync_xfered = bar->total_size; + timediff = get_time_ms() - bar->init_time; + + /* if transfer was too fast, treat it as a 1ms transfer, for the sake + * of the rate calculation */ + if(timediff < 1) + timediff = 1; + + bar->rate = (double)bar->total_size * 1000 / timediff; + /* round elapsed time (in ms) to the nearest second */ + bar->eta = (unsigned int)(timediff + 500) / 1000; +} + +/* Handles download progress event */ +static void dload_progress_event(const char *filename, alpm_download_event_progress_t *data) +{ + int index; + struct pacman_progress_bar *bar; + bool ok; + off_t last_chunk_amount; + + if(!dload_progressbar_enabled()) { + return; + } + + ok = find_bar_for_filename(filename, &index, &bar); + assert(ok); + /* Total size is received after the download starts. */ - bar->total_size = data->total; + last_chunk_amount = data->downloaded - bar->xfered; bar->xfered = data->downloaded; + bar->total_size = data->total; + + if(update_bar_stats(bar)) { + console_cursor_goto_bar(index); + draw_pacman_progress_bar(bar); + } + + if(total_enabled) { + totalbar->xfered += last_chunk_amount; + if(update_bar_stats(totalbar)) { + console_cursor_move_end(); + draw_pacman_progress_bar(totalbar); + } + } - console_cursor_goto_bar(index); - draw_pacman_progress_bar(bar); fflush(stdout); } @@ -902,7 +976,6 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl { int index; struct pacman_progress_bar *bar; - int64_t timediff; bool ok; if(!dload_progressbar_enabled()) { @@ -923,18 +996,7 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl /* The line contains text from previous status. Erase these leftovers. */ console_erase_line(); } else if(data->result == 0) { - /* compute final values */ - bar->xfered = bar->total_size; - timediff = get_time_ms() - bar->init_time; - - /* if transfer was too fast, treat it as a 1ms transfer, for the sake - * of the rate calculation */ - if(timediff < 1) - timediff = 1; - - bar->rate = (double)bar->xfered / (timediff / 1000.0); - /* round elapsed time (in ms) to the nearest second */ - bar->eta = (unsigned int)(timediff + 500) / 1000; + update_bar_finalstats(bar); if(multibar_ui.move_completed_up && index != 0) { /* If this item completed then move it to the top. -- 2.29.2

1 0

[pacman-dev] Remove skipped warning message for already installed packages when --needed is specified?
by Daan De Meyer 07 Dec '20

07 Dec '20

Hi, I recently added --needed to pacman's invocation in mkosi but noticed that even when --needed is specified, pacman still prints warning messages for packages that it's skipping because they are already installed. My intuition was that by enabling --needed, I was explicitly telling pacman that there might be packages that are already installed in the packages that I'm installing and that I want to skip those and not be warned about them. The skipping works fine but I still get warnings. Would it make sense to remove the skipped warning message for packages that are already installed when --needed is specified since the user is explicitly requesting this behavior? Cheers, Daan

2 2

[pacman-dev] [PATCH] Add --confirm
by morganamilo 07 Dec '20

07 Dec '20

this is useful for cancelling the automatically passed --noconfirm by makechrootpkg diff --git a/doc/makepkg.8.asciidoc b/doc/makepkg.8.asciidoc index 3b5e61b3..b3ecbe12 100644 --- a/doc/makepkg.8.asciidoc +++ b/doc/makepkg.8.asciidoc @@ -184,6 +184,9 @@ Options (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. +*\--confirm*:: + Cancels the effects of a previous --noconfirm. + *\--needed*:: (Passed to pacman) Tell pacman not to reinstall a target if it is already up-to-date. (used with '-i' / '\--install'). diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b39433f3..1c8e8a0e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -997,6 +997,7 @@ usage() { printf -- "$(gettext " --asdeps Install packages as non-explicitly installed")\n" printf -- "$(gettext " --needed Do not reinstall the targets that are already up to date")\n" printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" + printf -- "$(gettext " --confirm Cancels the effects of a previous --noconfirm")\n" printf -- "$(gettext " --noprogressbar Do not show a progress bar when downloading files")\n" echo printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT" @@ -1036,7 +1037,7 @@ OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options -OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') +OPT_LONG+=('asdeps' 'confirm' 'noconfirm' 'needed' 'noprogressbar') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit $E_INVALID_OPTION @@ -1050,6 +1051,7 @@ while true; do --asdeps) ASDEPS=1;; --needed) NEEDED=1;; --noconfirm) PACMAN_OPTS+=("--noconfirm") ;; + --confirm) PACMAN_OPTS+=("--confirm") ;; --noprogressbar) PACMAN_OPTS+=("--noprogressbar") ;; # Makepkg Options -- 2.29.2

2 1

[pacman-dev] Alternatives system
by Allan McRae 06 Dec '20

06 Dec '20

Hi all, I plan to finish implementing an alternatives system for pacman post 5.2 release: https://wiki.archlinux.org/index.php/User:Allan/Alternatives Any comments or suggestions? Thanks, Allan

6 7

[pacman-dev] [GIT] The official pacman repository tag, last-deltapkgs-commit, created. v5.1.1-144-g377d4714
by Allan McRae 04 Dec '20

04 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 tag, last-deltapkgs-commit has been created at 377d47142f7aaa01ca782e6587f2d4caf663865b (commit) - Log ----------------------------------------------------------------- commit 377d47142f7aaa01ca782e6587f2d4caf663865b Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Thu Feb 21 13:20:19 2019 +0100 doc: add man page for pacman-conf Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

2 2

[pacman-dev] [GIT] The official pacman repository annotated tag, v6.0.0alpha1, created. v6.0.0alpha1
by Allan McRae 04 Dec '20

04 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 annotated tag, v6.0.0alpha1 has been created at 09b67861d9c550b0de411f95f36421d48c524499 (tag) tagging a4240a55e448ffba15a5edbad1a31cb76f821231 (commit) replaces v5.2.1 tagged by Allan McRae on Fri Dec 4 13:36:09 2020 +1000 - Log ----------------------------------------------------------------- Time to road-test the new downloader code -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEZkWwqMcAXnjbHXhk+Z/+D+rpmb0FAl/Jrs8ACgkQ+Z/+D+rp mb3T8gf/e6W1zu0Uhs2HqzqTvZHCIHnROKNSMBH/h3iA1iavwqS6fvnZXqOcsIEC 02Nk8H9Tu4V0EIDWck9wjAGddtQNeR1w3/ljaEZmazILH8mUYbHu4t/VSJH68JgP EBF2BhEL6Ut2g2YuYOZSrIjC6cSdJ7j3uxM7ltuhZibCvux8Q2UxbFdncTvyB6ql 2L2cKWl9RURXu72+JGdGY5xyAv5KG5mwKyEPieWBV5+Mhb5iCDFfH9ILVO/XCwK8 Gv+bb4UT+IZ+UO9zj/rVl07lqqiGf8Ynj2DsdK6t7Vx1QIV+ms6ru27EqcKVkumr P2LRogLuerYf5CrO/I5saaf+B/LZtg== =4C8n -----END PGP SIGNATURE----- Allan McRae (31): Move update-copyright into build-aux Remove "Generated from ...; do not edit by hand" from scripts libalpm/sync.c: Do not download missing keys multiple times pactest: set package tar format to GNU_FORMAT Handle .part files that are the size of the correct package Add Eli to current maintainers Fix leak in _alpm_db_search on error condition Improved documentation for alpm_db_search() parameters Fix documentation of alpm_mtree_next and remove libarchive exposure tests: Fix typo in test description Increase meson test timeout Remove unneeded ltmain patch Increase maximum database size Fix "pacman -U <url>" operations Note that checksums from "makepkg -g" are not ideal makepkg: add CRC checksums and set these to be the default Add pacman-hooks.5 man page symlink build-aux/update-copyright 2019 2020 Remove unneeded goto cleanup Add file and line number to RET_ERR{,_VOID} Use STRDUP for error checking in more places Use GOTO_ERR throughout pacman.8: Fix typo Add Gitlab Runner configuration Convert gitlab valgrind runner to meson Remove autotools support libalpm/signing.c: Fix calculation of packet size in parse_subpacket Revert "makepkg: drop duplicate reporting of missing dependencies" pacman-key: change signing key to RSA4096 makepkg.conf: Reword "Defaults" Modify "pacman -h" output for files operations Anatol Pomozov (33): Eliminate extra loop over dbs_sync Simplify construction of payloads in download_files Do not download files if find_dl_candidates() fails Move flushing 'output' list into separate function Add GOTO_ERR() macro to set error and then goto a label Hide cursor while pacman is running Add config option to specify amount of parallel download streams Introduce alpm_dbs_update() function for parallel db updates Add multi_curl handle to ALPM global context Inline dload_payload->curlerr field into a local variable Implement _alpm_multi_download Implement multiplexed download using mCURL Introduce event types for start/end database list download Extend download callback interface with start/complete events Implement multibar UI Convert download packages logic to multiplexed API Convert downloading databases to the new multiplexed API Swap alpm_db_update() implementation to multiplexed version Convert '-U pkg1 pkg2' codepath to parallel download Cleanup the old sequential download code Move signature payload creation to download engine Do not use counter for error tracking Add a utility function to check whether a file exists in the cache FS#33992: force download *.sig file if it does not exist in the cache Fallback to detached signatures during keyring check Build signature remote name based on the main payload name Do not free payload fields in the middle of this structure use Check that destfile_name exists before using it Fix error during keyring checking Enable sha256/md5 hash verification if detached signatures are used FS#66472: Remove *.sig file if package corrupted Go to the end of screen if 'printonly' mode enabled Move cursor to the end of the screen at the SIGINT Carson Black (1): Dull version colour numbers in summary Chih-Hsuan Yen (1): util.c: table_print_line: properly align texts involving CJK Colin Woodbury (1): Restore usage line for -Fh Daniel T. Borelli (1): Dereference double pointer before assigning NULL Dave Reisner (5): Ensure regex object is always initialized Use c99 struct initialization to avoid memset calls makepkg: drop duplicate reporting of missing dependencies meson: handle XFAIL tests outside of TAP Avoid depending on side effects in assert(...) expressions Denton Liu (1): srcinfo.sh: remove trailing newline Earnestly (1): Use noextract with pacman-conf NoExtract Eli Schwartz (30): scripts/library: remove human_to_size build: remove use of handcrafted m4 in configuring scripts makepkg: fix regression that broke extraction of file:// sources meson: make non-symlink scripts install for real, and use a better wrapper pactest: add environment option to run tests with valgrind makepkg: add the $startdir to package .BUILDINFO autotools: emit error message when autoconf-archive is missing doc: clarify the format of a PKGBUILD source fragment doc: reformat intro to VCS sources to distinguish the grammar makepkg: make per-package files containing '$pkgname' consistently work meson: use better check for debug builds editorconfig: set meson indentation style doc: remove vim modelines from BUILDINFO(5) pacman-conf: add support for new ParallelDownloads config option pacman-conf: fix incomplete support for ILoveCandy Log invalid conf settings as an error libmakepkg/strip: don't re-add the same debug source multiple times build: add libintl dependency to meson and the .pc file makepkg: guard against undefined git pinned sources makepkg: correctly handle missing download clients libmakepkg: fix regression in sending plain() output to stderr makepkg/repo-add: handle GPGKEY with spaces makepkg/repo-add: do not accept public-only keys for signing doc/pacman.8: fix typo libmakepkg: extend compress.sh to also permit checking validity repo-add: use more libmakepkg to handle common compression routines remove more autotools files makepkg: libprovides: don't provide both versioned and unversioned sonames makepkg: fix signing of source packages makepkg: properly localize some internal function variables Ethan Sommer (5): libmakepkg: add optional argument support to parseopts libmakepkg: fix empty arguments in parseopts makepkg: replaces sed in-place with built in substitution repo-add: use wc -c on stdin instead of file to avoid use of cut libmakepkg: use readelf instead of file for finding ELF file types Filipe Laíns (1): ci: cache packages Ivy Foster (2): Add NoProgressbar to pacman.conf options Add fossil scm support to makepkg Levente Polyak (1): makepkg: deterministic PKGINFO libprovides for multiple library versions Matthew Sexton (2): pacman-key: hide lsign and revoke output behind --verbose pacman-key: ignore already lsigned/deleted keys Michael Straube (2): makepkg: emptydirs: fix typo libmakepkg: compress: fix tar extension Morten Linderud (1): doc/makepkg.8: Added punctuations. Rikard Falkeborn (2): Add REALLOC macro to simplify realloc error handling Constify some input pointers Ronan Pigott (1): Add pacman-conf zsh completions morganamilo (12): pacman: clarify error when alpm fails to init pacman: make exact_file an int pacman+libalpm: handle search errors pacman: print error when -Fx is given invalid regex libalpm: fix alpm_option_set_assumeinstalled Docs docs docs libalpm: set parallel_downloads to 1 when creating the handle libalpm: don't call dlcb when not set libalpm: clarify alpm_download_event_completed_t status libalpm: set errno when setting parallel downloads with an invalid number libalpm: add alpm_option_get_parallel_downloads libalpm: set ret in download files ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[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