- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] test: update mailing list url
by Jelle van der Waa 07 Apr '21

07 Apr '21

From: Jelle van der Waa <jelle(a)vdwaa.nl> The Arch Linux mailing lists are these days served from the lists subdomain. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- test/pacman/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pacman/ChangeLog b/test/pacman/ChangeLog index fed468d0..eb097084 100644 --- a/test/pacman/ChangeLog +++ b/test/pacman/ChangeLog @@ -26,4 +26,4 @@ Release 0.1 (06/01/30) Initial release. Announcement on the Arch Linux pacman-dev mailing list: -http://www.archlinux.org/pipermail/pacman-dev/2006-January/000186.html +http://lists.archlinux.org/pipermail/pacman-dev/2006-January/000186.html -- 2.31.1

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-84-g2535611d
by Allan McRae 07 Apr '21

07 Apr '21

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 2535611d6c3cbf951408c50ab35953efaf32f686 (commit) via d6f86594434729b77e9131880738290140086d40 (commit) via 8aa2a48fc34bb55ee620c0eec4855c62d91ef97b (commit) via 90600583930b1a99436673d6247d04e7237286c0 (commit) via 4bf7aa119d7fc2ace226439407169884e07dbc88 (commit) via bdf6aa3fb757a2363a4e708174b7d23a4997763d (commit) from 1e60a5f00674a9a9b0c530c741bd6701d0e1e834 (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 2535611d6c3cbf951408c50ab35953efaf32f686 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Apr 5 17:26:07 2021 -0400 makepkg: add PACMAN_AUTH configurable setting for sudo elevation If specified, this will be used no matter what. If not, then we check if sudo exists and use that, or else fall back on su. Implements FS#32621 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d6f86594434729b77e9131880738290140086d40 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Apr 5 17:36:06 2021 -0400 ensure tests are parsed as TAP since they are, in fact, TAP Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8aa2a48fc34bb55ee620c0eec4855c62d91ef97b Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Apr 5 17:13:12 2021 -0400 makepkg: fix the use of spaces in the localname:: component of sources Broken via refactoring in commit aa6fe1160b39cd364a6595b7c9f56acb1cea3432 but for obvious reasons only one person in the last 9 years has ever actually tried to do this. Still, it's technically correct to allow it. Fixes FS#70254 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 90600583930b1a99436673d6247d04e7237286c0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Mar 28 02:30:52 2021 -0700 include retries and signatures in download count Fixes: FS#69881 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4bf7aa119d7fc2ace226439407169884e07dbc88 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Mar 28 02:30:51 2021 -0700 skip servers with too many errors Keep track of errors from servers so that bad ones can be skipped once a threshold is reached. Key the error tracking off the hostname because hosts may serve multiple repos under different url's and errors are likely to be host-wide. Implements: FS#29293. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bdf6aa3fb757a2363a4e708174b7d23a4997763d Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 27 09:13:05 2021 +1000 libmakepkg: fix detection of source file names for debug packages The current gcc build from git master give different output from readelf: gcc-10.2.0 $ readelf "hello" --debug-dump | grep hello <11> DW_AT_name : (indirect string, offset: 0xbfc): hello.cpp gcc-git $ readelf "hello" --debug-dump | grep hello <12> DW_AT_name : (indirect line string, offset: 0x0): hello.cpp This causes the awk statement extracting the file name to fail as it relied on the information being in the 8th field. Instead, extract the information from the final field. Fixes FS#70168 Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.conf.5.asciidoc | 8 +++ etc/makepkg.conf.in | 7 ++ lib/libalpm/alpm.c | 1 + lib/libalpm/dload.c | 107 +++++++++++++++++++++++++++---- lib/libalpm/handle.h | 1 + scripts/libmakepkg/executable/sudo.sh.in | 2 +- scripts/libmakepkg/tidy/strip.sh.in | 2 +- scripts/libmakepkg/util/source.sh.in | 2 +- scripts/makepkg.sh.in | 13 +++- test/scripts/meson.build | 1 + test/util/meson.build | 1 + 11 files changed, 125 insertions(+), 20 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] skip servers with too many errors
by Andrew Gregory 07 Apr '21

07 Apr '21

Keep track of errors from servers so that bad ones can be skipped once a threshold is reached. Key the error tracking off the hostname because hosts may serve multiple repos under different url's and errors are likely to be host-wide. Implements: FS#29293. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Changes from 1st draft: * error list is now tracked on the handle, i.e. servers blacklisted during -y will still be ignored during -u * a warning message is printed when a server is ignored * error tracking keys off the hostname I have not removed the individual error messages. I agree with Emil that those messages provide useful information to the user about what, if anything, they need to do about their mirrorlist. I think a small number of similar error messages is worth the utility they add. lib/libalpm/alpm.c | 1 + lib/libalpm/dload.c | 89 ++++++++++++++++++++++++++++++++++++++++++-- lib/libalpm/handle.h | 1 + 3 files changed, 87 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index f8298454..6708e202 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -114,6 +114,7 @@ int SYMEXPORT alpm_release(alpm_handle_t *myhandle) #ifdef HAVE_LIBCURL curl_multi_cleanup(myhandle->curlm); curl_global_cleanup(); + FREELIST(myhandle->server_errors); #endif _alpm_handle_unlock(myhandle); diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 0d0936c7..1318bde2 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -51,8 +51,83 @@ #ifdef HAVE_LIBCURL +/* RFC1123 states applications should support this length */ +#define HOSTNAME_SIZE 256 + static int curl_add_payload(alpm_handle_t *handle, CURLM *curlm, struct dload_payload *payload, const char *localpath); +static int curl_gethost(const char *url, char *buffer, size_t buf_len); + +/* number of "soft" errors required to blacklist a server, set to 0 to disable + * server blacklisting */ +const unsigned int server_error_limit = 3; + +struct server_error_count { + char server[HOSTNAME_SIZE]; + unsigned int errors; +}; + +static struct server_error_count *find_server_errors(alpm_handle_t *handle, const char *server) +{ + alpm_list_t *i; + struct server_error_count *h; + char hostname[HOSTNAME_SIZE]; + /* key off the hostname because a host may serve multiple repos under + * different url's and errors are likely to be host-wide */ + if(curl_gethost(server, hostname, sizeof(hostname)) != 0) { + return NULL; + } + for(i = handle->server_errors; i; i = i->next) { + h = i->data; + if(strcmp(hostname, h->server) == 0) { + return h; + } + } + if((h = calloc(sizeof(struct server_error_count), 1)) + && alpm_list_append(&handle->server_errors, h)) { + strcpy(h->server, hostname); + h->errors = 0; + return h; + } else { + free(h); + return NULL; + } +} + +static int should_skip_server(alpm_handle_t *handle, const char *server) +{ + struct server_error_count *h; + if(server_error_limit && (h = find_server_errors(handle, server)) ) { + return h->errors >= server_error_limit; + } + return 0; +} + +static void server_increment_error(alpm_handle_t *handle, const char *server, int count) +{ + struct server_error_count *h; + if(server_error_limit + && (h = find_server_errors(handle, server)) + && !should_skip_server(handle, server) ) { + h->errors += count; + + if(should_skip_server(handle, server)) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("too many errors from %s, skipping for the remainder of this transaction\n"), + h->server); + } + } +} + +static void server_soft_error(alpm_handle_t *handle, const char *server) +{ + server_increment_error(handle, server, 1); +} + +static void server_hard_error(alpm_handle_t *handle, const char *server) +{ + server_increment_error(handle, server, server_error_limit); +} static const char *get_filename(const char *url) { @@ -332,9 +407,6 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat return fp; } -/* RFC1123 states applications should support this length */ -#define HOSTNAME_SIZE 256 - /* Return 0 if retry was successful, -1 otherwise */ static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload *payload) { @@ -342,7 +414,7 @@ static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload size_t len; alpm_handle_t *handle = payload->handle; - if(payload->servers) { + while(payload->servers && should_skip_server(handle, payload->servers->data)) { payload->servers = payload->servers->next; } if(!payload->servers) { @@ -351,6 +423,7 @@ static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload return -1; } server = payload->servers->data; + payload->servers = payload->servers->next; /* regenerate a new fileurl */ FREE(payload->fileurl); @@ -423,6 +496,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), payload->remote_name, hostname, payload->error_buffer); + server_soft_error(handle, payload->fileurl); } if(curl_retry_next_server(curlm, curl, payload) == 0) { return 2; @@ -440,6 +514,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : expected download size exceeded\n"), payload->remote_name, hostname); + server_soft_error(handle, payload->fileurl); } goto cleanup; case CURLE_COULDNT_RESOLVE_HOST: @@ -448,6 +523,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), payload->remote_name, hostname, payload->error_buffer); + server_hard_error(handle, payload->fileurl); if(curl_retry_next_server(curlm, curl, payload) == 0) { return 2; } else { @@ -463,6 +539,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), payload->remote_name, hostname, payload->error_buffer); + server_soft_error(handle, payload->fileurl); } else { _alpm_log(handle, ALPM_LOG_DEBUG, "failed retrieving file '%s' from %s : %s\n", @@ -632,11 +709,15 @@ static int curl_add_payload(alpm_handle_t *handle, CURLM *curlm, ASSERT(!payload->filepath, GOTO_ERR(handle, ALPM_ERR_WRONG_ARGS, cleanup)); } else { const char *server; + while(payload->servers && should_skip_server(handle, payload->servers->data)) { + payload->servers = payload->servers->next; + } ASSERT(payload->servers, GOTO_ERR(handle, ALPM_ERR_SERVER_NONE, cleanup)); ASSERT(payload->filepath, GOTO_ERR(handle, ALPM_ERR_WRONG_ARGS, cleanup)); server = payload->servers->data; + payload->servers = payload->servers->next; len = strlen(server) + strlen(payload->filepath) + 2; MALLOC(payload->fileurl, len, GOTO_ERR(handle, ALPM_ERR_MEMORY, cleanup)); diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 349ef2c7..fdd8e6e7 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -60,6 +60,7 @@ struct __alpm_handle_t { #ifdef HAVE_LIBCURL /* libcurl handle */ CURLM *curlm; + alpm_list_t *server_errors; #endif unsigned short disable_dl_timeout; -- 2.31.1

2 1

[pacman-dev] [PATCH] ensure tests are parsed as TAP since they are, in fact, TAP
by Eli Schwartz 05 Apr '21

05 Apr '21

Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- After this change, meson's test harness reports: 334/335 vercmptest OK 0.15s 92 subtests passed 335/335 makepkg-template_test.sh OK 0.83s 36 subtests passed The 'XX subtests passed' is new to this change. test/scripts/meson.build | 1 + test/util/meson.build | 1 + 2 files changed, 2 insertions(+) diff --git a/test/scripts/meson.build b/test/scripts/meson.build index 6d13ad1ee..8e921ffad 100644 --- a/test/scripts/meson.build +++ b/test/scripts/meson.build @@ -6,6 +6,7 @@ tests = [ foreach tst : tests test(tst, BASH, + protocol : 'tap', env : TEST_ENV, args : [ join_paths(meson.current_source_dir(), tst), diff --git a/test/util/meson.build b/test/util/meson.build index 07b29e5c4..b4046298f 100644 --- a/test/util/meson.build +++ b/test/util/meson.build @@ -1,6 +1,7 @@ test('vercmptest', BASH, env : TEST_ENV, + protocol : 'tap', args : [ join_paths(meson.current_source_dir(), 'vercmptest.sh') ]) -- 2.31.1

1 0

[pacman-dev] [PATCH] makepkg: add PACMAN_AUTH configurable setting for sudo elevation
by Eli Schwartz 05 Apr '21

05 Apr '21

If specified, this will be used no matter what. If not, then we check if sudo exists and use that, or else fall back on su. Implements FS#32621 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/makepkg.conf.5.asciidoc | 8 ++++++++ etc/makepkg.conf.in | 7 +++++++ scripts/makepkg.sh.in | 13 ++++++++++--- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc index 2c7a54dbf..398529158 100644 --- a/doc/makepkg.conf.5.asciidoc +++ b/doc/makepkg.conf.5.asciidoc @@ -278,6 +278,14 @@ Options `.tar.lzo`, `.tar.lrz`, `.tar.lz4`, `.tar.lz` and `.tar.Z`, or simply `.tar` to disable compression entirely. +**PACMAN_AUTH=()**:: + Specify a command prefix for running pacman as root. If unset, makepkg will + check for the presence of sudo(8) and su(1) in turn, and try the first one + it finds. + + + If present, `%q` will be replaced with the shell-quoted form of the command + to run. Otherwise, the command to run is appended to the auth command. + See Also diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 43a69df66..fff5b8eb2 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -147,3 +147,10 @@ COMPRESSLZ=(lzip -c -f) # PKGEXT='@PKGEXT@' SRCEXT='@SRCEXT@' + +######################################################################### +# OTHER +######################################################################### +# +#-- Command used to run pacman as root, instead of trying sudo and su +PACMAN_AUTH=() diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f4a2de7d4..a0cd1a4fb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -225,15 +225,22 @@ missing_source_file() { } run_pacman() { - local cmd + local cmd cmdescape if [[ $1 = -@(T|Q)*([[:alpha:]]) ]]; then cmd=("$PACMAN_PATH" "$@") else cmd=("$PACMAN_PATH" "${PACMAN_OPTS[@]}" "$@") - if type -p sudo >/dev/null; then + cmdescape="$(printf '%q ' "${cmd[@]}")" + if (( ${#PACMAN_AUTH[@]} )); then + if in_array '%q' "${PACMAN_AUTH[@]}"; then + cmd=("${PACMAN_AUTH[@]/\%q/$cmdescape}") + else + cmd=("${PACMAN_AUTH[@]}" "${cmd[@]}") + fi + elif type -p sudo >/dev/null; then cmd=(sudo "${cmd[@]}") else - cmd=(su root -c "$(printf '%q ' "${cmd[@]}")") + cmd=(su root -c "$cmdescape") fi local lockfile="$(pacman-conf DBPath)/db.lck" while [[ -f $lockfile ]]; do -- 2.31.0

3 4

[pacman-dev] [PATCH] makepkg: fix the use of spaces in the localname:: component of sources
by Eli Schwartz 05 Apr '21

05 Apr '21

Broken via refactoring in commit aa6fe1160b39cd364a6595b7c9f56acb1cea3432 but for obvious reasons only one person in the last 9 years has ever actually tried to do this. Still, it's technically correct to allow it. Fixes FS#70254 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/util/source.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/util/source.sh.in b/scripts/libmakepkg/util/source.sh.in index 029bf8ed4..cd6ccbe69 100644 --- a/scripts/libmakepkg/util/source.sh.in +++ b/scripts/libmakepkg/util/source.sh.in @@ -58,7 +58,7 @@ get_filename() { # if a filename is specified, use it if [[ $netfile = *::* ]]; then - printf "%s\n" ${netfile%%::*} + printf "%s\n" "${netfile%%::*}" return fi -- 2.31.1

1 0

[pacman-dev] [Proposal] make "makepkg --holdver" preserve the $pkgver, too
by Erich Eckner 30 Mar '21

30 Mar '21

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I'd like to propose to let makepkg not only hold the version of the VCS sources, but also the $pkgver itself, when --holdver is given (that is: call pkgver() only, whenn --holdver is not given). In case, there is genuine need for keeping VCS versions, but still updating $pkgver via pkgver(), a different option name could be chosen (--holdpkgver ?). Motivation: This would be useful for building older packages (e.g. from git checkouts) which offer a pkgver() function. ("older" can simply mean, that the source is updated faster than the package is being checked into git) Is anyone else finding this useful? Opinions? If we settle on something, I can look into how to implement it, myself (but I don't want to line up at the front :-D). regards, Erich -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE3p92iMrPBP64GmxZCu7JB1Xae1oFAmBi1JgACgkQCu7JB1Xa e1qIkxAAnLoodUckvSYOaA9fouDO2ZjfhztixUfRAvELT5Refpn8Frh0PAEQNAt1 4JUUEPqL89nSd0CQe03IOEr1SQ6+8xYPaRhJLTG37rxcP+uZbE3gokz/Jin0jUn5 3L6uXQzqnaJWstg7Wz17/SSjhwIpxSDj5iYAV34IoasFSg+sLSFyRYiJ3399aFyc MvDrTqI1GjRvCoa6a/PYG4h+9YmQJfIr7vTZ19ZPpZKrz/HilwowPRNcvqFyj6si A4yuMLjxWFOyo3ry+FngTTzE0tIYpp1FoQJKg1iR7Ll8rbz4SZnModCmojIsmkqs eog3PKil1V25OYjingIge4Fz8B+qPJcA8Fne/JNGNjEo8vqI/JnD4FsZ/JwS1ajg A4BJs/3xWJPQ7eg2LLfD8PKQ6wrmExhaG96iv9Q/zonvuFBU7sen8aVuFWsC30vp 8kJcWvBTTQoB+L6Q8VUng8zFf42UGxSPugtCzyrvKHA3onHfnwH06mEOpI4P4gCs NpI9cpbGoSAny24qU8pxknKOSSvdGX1xBojMLeHgVhaTEY3Oonht16QrP+t4IOVc vDTI97A/qOqQK/kmCBEFPvk0+Tfk1W2e6/BEE9lDiMC7EKEWGyFmalGJIIUIEKeH tsywoa8VNDR2j1jr6X2wT1G7uAko8kJW6cK+WkZ/wS9EEQ9DnEA= =6sJj -----END PGP SIGNATURE-----

1 1

[pacman-dev] [PATCH 2/2] include retries and signatures in download count
by Andrew Gregory 28 Mar '21

28 Mar '21

Fixes: FS#69881 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/dload.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 1318bde2..2183a3e2 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -456,7 +456,7 @@ static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload * Returns -2 if an error happened for an optional file */ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, - const char *localpath) + const char *localpath, int *active_downloads_num) { alpm_handle_t *handle = NULL; struct dload_payload *payload = NULL; @@ -499,6 +499,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, server_soft_error(handle, payload->fileurl); } if(curl_retry_next_server(curlm, curl, payload) == 0) { + (*active_downloads_num)++; return 2; } else { goto cleanup; @@ -525,6 +526,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, payload->remote_name, hostname, payload->error_buffer); server_hard_error(handle, payload->fileurl); if(curl_retry_next_server(curlm, curl, payload) == 0) { + (*active_downloads_num)++; return 2; } else { goto cleanup; @@ -546,6 +548,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, payload->remote_name, hostname, payload->error_buffer); } if(curl_retry_next_server(curlm, curl, payload) == 0) { + (*active_downloads_num)++; return 2; } else { goto cleanup; @@ -613,6 +616,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, sig->max_size = 16 * 1024; curl_add_payload(handle, curlm, sig, localpath); + (*active_downloads_num)++; } /* time condition was met and we didn't download anything. we need to @@ -789,12 +793,11 @@ static int curl_download_internal(alpm_handle_t *handle, const char *localpath) { int active_downloads_num = 0; - bool recheck_downloads = false; int err = 0; int max_streams = handle->parallel_downloads; CURLM *curlm = handle->curlm; - while(active_downloads_num > 0 || payloads || recheck_downloads) { + while(active_downloads_num > 0 || payloads) { CURLMcode mc; for(; active_downloads_num < max_streams && payloads; active_downloads_num++) { @@ -828,7 +831,6 @@ static int curl_download_internal(alpm_handle_t *handle, err = -1; } - recheck_downloads = false; while(true) { int msgs_left = 0; CURLMsg *msg = curl_multi_info_read(curlm, &msgs_left); @@ -836,7 +838,8 @@ static int curl_download_internal(alpm_handle_t *handle, break; } if(msg->msg == CURLMSG_DONE) { - int ret = curl_check_finished_download(curlm, msg, localpath); + int ret = curl_check_finished_download(curlm, msg, + localpath, &active_downloads_num); if(ret == -1) { /* if current payload failed to download then stop adding new payloads but wait for the * current ones @@ -844,11 +847,6 @@ static int curl_download_internal(alpm_handle_t *handle, payloads = NULL; err = -1; } - /* curl_multi_check_finished_download() might add more payloads e.g. in case of a retry - * from the next mirror. We need to execute curl_multi_perform() at least one more time - * to make sure new payload requests are processed. - */ - recheck_downloads = true; } else { _alpm_log(handle, ALPM_LOG_ERROR, _("curl transfer error: %d\n"), msg->msg); } -- 2.31.1

1 0

[pacman-dev] [PATCH] libmakepkg: fix detection of file names with future gcc versions
by Allan McRae 26 Mar '21

26 Mar '21

The current gcc build from git master give different output from readelf: gcc-10.2.0 $ readelf "hello" --debug-dump | grep hello <11> DW_AT_name : (indirect string, offset: 0xbfc): hello.cpp gcc-git $ readelf "hello" --debug-dump | grep hello <12> DW_AT_name : (indirect line string, offset: 0x0): hello.cpp This causes the awk statement extracting the file name to fail as it relied on the information being in the 8th field. Instead, extract the information from the final field. Fixes FS#70168 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/tidy/strip.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index ceb2a108..737c5115 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -37,7 +37,7 @@ build_id() { source_files() { LANG=C readelf "$1" --debug-dump | \ - awk '/DW_AT_name +:/{name=$8}/DW_AT_comp_dir +:/{{if (name == "<artificial>") next}{if (name !~ /^[<\/]/) {printf "%s/", $8}}{print name}}' + awk '/DW_AT_name +:/{name=$NF}/DW_AT_comp_dir +:/{{if (name == "<artificial>") next}{if (name !~ /^[<\/]/) {printf "%s/", $NF}}{print name}}' } strip_file() { -- 2.31.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-78-g1e60a5f0
by Allan McRae 25 Mar '21

25 Mar '21

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 1e60a5f00674a9a9b0c530c741bd6701d0e1e834 (commit) via 9bf3d6a7603bf48771a20d1f4bd789670e7446f7 (commit) from ede73f4d898946a7e54634169b3605a024553315 (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 1e60a5f00674a9a9b0c530c741bd6701d0e1e834 Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Mon Mar 15 16:33:08 2021 -0700 Remove "total download" callback in favor of generic event callback Total download callback called right before packages start downloaded. But we already have an event for such event (ALPM_EVENT_PKG_RETRIEVE_START) and it is naturally to use the event to pass information about expected download size. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9bf3d6a7603bf48771a20d1f4bd789670e7446f7 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sat Mar 13 22:06:00 2021 -0500 remove sed command lookup and hardcoding in edit-script.sh We should not need to hardcode the path to sed as we simply don't care. We don't check what kind of sed we found, and we're using the same one we initially found on the PATH, which is surely still on the PATH. At one point we did care to find the system copy of sed and hardcode it in makepkg, because we also passed non-portable -i options to it and makepkg needed to continue working on macOS even if some incompatible GNU sed got installed afterward, elsewhere on the PATH. But this was never relevant to the in-tree buildsystem script running sed. In commit 3a814ee6bca9ee24a868c0dc032b321048a53e08 we removed even that, so we don't need to look it up at all. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 1 - build-aux/edit-script.sh.in | 2 +- lib/libalpm/alpm.h | 32 ++++++++++++-------------------- lib/libalpm/dload.c | 3 ++- lib/libalpm/handle.c | 13 ------------- lib/libalpm/handle.h | 1 - lib/libalpm/sync.c | 25 +++++++++---------------- meson.build | 2 -- src/pacman/callback.c | 9 ++------- src/pacman/callback.h | 2 -- src/pacman/conf.c | 4 ---- 11 files changed, 26 insertions(+), 68 deletions(-) hooks/post-receive -- The official pacman repository

2 1