- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-118-ge176b8ec
by Allan McRae 19 May '21

19 May '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 e176b8ec198ef34ae70a1f46b7b7fe998aa0c475 (commit) via 0e655dd4923495ffcf478e2e695f402670e5ac7b (commit) via 7464062ad6b3a60be6f11e080f11a6b091e496f9 (commit) via 58fde8666896639e5cfb3923fbbfd52d166bffe7 (commit) via 17ccc2f9c22914d1c20b4f7849130c4171fed54b (commit) from 618fa4f675594798825a01bd0a3462903dda6ef7 (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 e176b8ec198ef34ae70a1f46b7b7fe998aa0c475 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed May 19 03:23:51 2021 -0400 makepkg: squelch readelf warnings from debug stripping readelf --debug-dump sometimes reports inscrutable warnings which don't actually affect our extraction of source filenames. For example: readelf: Warning: There is a hole [0xd3d - 0xd89] in .debug_loc section. Now gcc 11 seems to have dramatically increased the number of warnings: readelf: Warning: Corrupt offset (0x0000008e) in range entry 9 [...] readelf: Warning: Corrupt offset (0x000010f0) in range entry 250 The resulting debuginfo created by the very same toolchain works fine, as does the list of source filenames. But the warnings are quite noisy... send them to /dev/null since they are not actionable in the context of getting source files Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0e655dd4923495ffcf478e2e695f402670e5ac7b Author: Allan McRae <allan(a)archlinux.org> Date: Tue May 18 21:00:03 2021 +1000 Update README for pacman-6.0 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7464062ad6b3a60be6f11e080f11a6b091e496f9 Author: Allan McRae <allan(a)archlinux.org> Date: Mon May 17 20:13:48 2021 +1000 Update maintainers list Update to relflect the current state of affairs. Add Morgan, drop Dave. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 58fde8666896639e5cfb3923fbbfd52d166bffe7 Author: Allan McRae <allan(a)archlinux.org> Date: Mon May 17 20:02:17 2021 +1000 Use attribute to declare case statement fallthroughs Clang does not recognise the comment style notification of expected case statement fallthrough. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 17ccc2f9c22914d1c20b4f7849130c4171fed54b Author: Allan McRae <allan(a)archlinux.org> Date: Mon May 17 17:09:18 2021 +1000 Silence new warning with gcc-11 Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 34 +++++++++++++++++++++++++++++++--- doc/footer.asciidoc | 3 ++- lib/libalpm/sync.c | 2 +- scripts/libmakepkg/tidy/strip.sh.in | 2 +- src/pacman/callback.c | 2 +- src/pacman/pacman.c | 5 +++-- src/pacman/util.c | 1 + 7 files changed, 40 insertions(+), 9 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Use attribute to declare case statement fallthroughs
by Allan McRae 19 May '21

19 May '21

Clang does not recognise the comment style notification of expected case statement fallthrough. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/sync.c | 2 +- src/pacman/pacman.c | 5 +++-- src/pacman/util.c | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7ef558c4..36ad6242 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1026,7 +1026,7 @@ static int check_validity(alpm_handle_t *handle, v->siglevel & ALPM_SIG_PACKAGE_OPTIONAL, v->siglevel & ALPM_SIG_PACKAGE_MARGINAL_OK, v->siglevel & ALPM_SIG_PACKAGE_UNKNOWN_OK); - /* fallthrough */ + __attribute__((fallthrough)); case ALPM_ERR_PKG_INVALID_CHECKSUM: prompt_to_delete(handle, v->path, v->error); break; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 7e810127..e398855a 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -196,7 +196,7 @@ static void usage(int op, const char * const myname) addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); addlist(_(" --ignoregroup <grp>\n" " ignore a group upgrade (can be used more than once)\n")); - /* fall through */ + __attribute__((fallthrough)); case PM_OP_REMOVE: addlist(_(" -d, --nodeps skip dependency version checks (-dd to skip all checks)\n")); addlist(_(" --assume-installed <package=version>\n" @@ -412,7 +412,8 @@ static int parsearg_global(int opt) unsigned short debug = (unsigned short)atoi(optarg); switch(debug) { case 2: - config->logmask |= ALPM_LOG_FUNCTION; /* fall through */ + config->logmask |= ALPM_LOG_FUNCTION; + __attribute__((fallthrough)); case 1: config->logmask |= ALPM_LOG_DEBUG; break; diff --git a/src/pacman/util.c b/src/pacman/util.c index 59d6a72e..5486e7a5 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1069,6 +1069,7 @@ static char *pkg_get_location(alpm_pkg_t *pkg) } /* fallthrough - for theoretical serverless repos */ + __attribute__((fallthrough)); case ALPM_PKG_FROM_FILE: return strdup(alpm_pkg_get_filename(pkg)); -- 2.31.1

2 1

[pacman-dev] [PATCH] makepkg: squelch readelf warnings from debug stripping
by Eli Schwartz 19 May '21

19 May '21

readelf --debug-dump sometimes reports inscrutable warnings which don't actually affect our extraction of source filenames. For example: readelf: Warning: There is a hole [0xd3d - 0xd89] in .debug_loc section. Now gcc 11 seems to have dramatically increased the number of warnings: readelf: Warning: Corrupt offset (0x0000008e) in range entry 9 [...] readelf: Warning: Corrupt offset (0x000010f0) in range entry 250 The resulting debuginfo created by the very same toolchain works fine, as does the list of source filenames. But the warnings are quite noisy... send them to /dev/null since they are not actionable in the context of getting source files Signed-off-by: Eli Schwartz <eschwartz(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 737c51153..5d03b28f2 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -36,7 +36,7 @@ build_id() { } source_files() { - LANG=C readelf "$1" --debug-dump | \ + LANG=C readelf "$1" --debug-dump 2>/dev/null | \ awk '/DW_AT_name +:/{name=$NF}/DW_AT_comp_dir +:/{{if (name == "<artificial>") next}{if (name !~ /^[<\/]/) {printf "%s/", $NF}}{print name}}' } -- 2.31.1

1 0

[pacman-dev] [PATCH] Update README for pacman-6.0
by Allan McRae 18 May '21

18 May '21

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- README | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/README b/README index 4465432a..71f9a58f 100644 --- a/README +++ b/README @@ -661,10 +661,38 @@ API CHANGES BETWEEN 5.2 AND 6.0 [REMOVED] - ALPM_EVENT_PKGDOWNLOAD_START, ALPM_EVENT_PKGDOWNLOAD_DONE, ALPM_EVENT_PKGDOWNLOAD_FAILED +- old TotalDownload implementation + - alpm_cb_totaldl + - alpm_option_get_totaldlcb() + - alpm_option_set_totaldlcb() [CHANGED] -- alpm_db_update() changed its signature and now accepts a list of databases - rather than a single database. This is need to handle database downloading - in a multiplexed way. +- alpm_db_update() now accepts a list of databases rather than a single database. +- alpm_fetch_pkgurl() accepts a list of packages to download. +- alpm_db_search() now has an additional parameter and returns success status +- ALPM_EVENT_RETRIEVE_* -> ALPM_EVENT_DB_RETRIEVE_* and ALPM_EVENT_PKG_RETRIEVE_* +- alpm_cb_download pass event and data +- multi architecture support + - alpm_option_get_arch() -> alpm_option_get_architectures() + - alpm_option_set_arch() -> alpm_option_set_architectures() +- alpm_db_get_servers() copies parameter data [ADDED] +- parallel download support + - alpm_option_set_parallel_downloads() + - alpm_option_get_parallel_downloads() +- file download events + - alpm_download_event_type_t + - alpm_download_event_init_t + - alpm_download_event_progress_t + - alpm_download_event_completed_t +- download misc + - ALPM_DOWNLOAD_RETRY + - alpm_download_event_retry_t + - alpm_event_pkg_retrieve_t +- multiarchitecture support + - alpm_option_add_architecture() + - alpm_option_remove_architecture() +- misc + - alpm_pkg_get_sig() +- callbacks add front-end provided context -- 2.31.1

1 0

[pacman-dev] [PATCH] libalpm: remove unused error value
by morganamilo 18 May '21

18 May '21

--- lib/libalpm/alpm.h | 2 -- lib/libalpm/error.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c4acc062..a5f4a6ae 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -292,8 +292,6 @@ typedef enum _alpm_errno_t { ALPM_ERR_PKG_INVALID_NAME, /** Package has an invalid architecture */ ALPM_ERR_PKG_INVALID_ARCH, - /** Unused */ - ALPM_ERR_PKG_REPO_NOT_FOUND, /* Signatures */ /** Signatures are missing */ ALPM_ERR_SIG_MISSING, diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index c06d091a..c1a16cee 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -125,8 +125,6 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err) return _("package filename is not valid"); case ALPM_ERR_PKG_INVALID_ARCH: return _("package architecture is not valid"); - case ALPM_ERR_PKG_REPO_NOT_FOUND: - return _("could not find repository for target"); /* Signatures */ case ALPM_ERR_SIG_MISSING: return _("missing PGP signature"); -- 2.31.1

3 4

[pacman-dev] [PATCH] libalpm: fix alpm_fetch_pkgurl with a fetch callback
by Guillaume Benoit 18 May '21

18 May '21

After download, alpm_fetch_pkgurl uses payload->destfile_name and payload->tempfile_name in order to find the downloaded file path. Those fields are not set if a custom fetch callback is defined. Use filecache_find_url instead, like in the beginning of the function. --- lib/libalpm/dload.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 6f33451a..d45c7707 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -1007,16 +1007,11 @@ int SYMEXPORT alpm_fetch_pkgurl(alpm_handle_t *handle, const alpm_list_t *urls, EVENT(handle, &event); } - for(i = payloads; i; i = i->next) { - struct dload_payload *payload = i->data; - char *filepath; + for(i = urls; i; i = i->next) { + char *url = i->data; - if(payload->destfile_name) { - const char *filename = mbasename(payload->destfile_name); - filepath = _alpm_filecache_find(handle, filename); - } else { - STRDUP(filepath, payload->tempfile_name, GOTO_ERR(handle, ALPM_ERR_MEMORY, err)); - } + /* attempt again to find the file in our pkgcache */ + char *filepath = filecache_find_url(handle, url); if(filepath) { alpm_list_append(fetched, filepath); } else { -- 2.31.1

3 9

[pacman-dev] [PATCH] Update maintainers list
by Allan McRae 18 May '21

18 May '21

Update to relflect the current state of affairs. Add Morgan, drop Dave. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Morgan has been contributing patches consistently over the last couple of releases - in the top 3 patch contributors for both the 5.2 and 6.0 releases, and in the top 10 of patch submitters overall. Being a maintainer comes with the added responsibility of doing a bit of patch review! (I am always looking for more eyes on patches!) doc/footer.asciidoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/footer.asciidoc b/doc/footer.asciidoc index 1bae8b20..edf36080 100644 --- a/doc/footer.asciidoc +++ b/doc/footer.asciidoc @@ -18,8 +18,8 @@ Current maintainers: * Allan McRae <allan(a)archlinux.org> * Andrew Gregory <andrew.gregory.8(a)gmail.com> -* Dave Reisner <dreisner(a)archlinux.org> * Eli Schwartz <eschwartz(a)archlinux.org> +* Morgan Adamiec <morganamilo(a)archlinux.org> Past major contributors: @@ -29,6 +29,7 @@ Past major contributors: * Dan McGee <dan(a)archlinux.org> * Xavier Chantry <shiningxc(a)gmail.com> * Nagy Gabor <ngaba(a)bibl.u-szeged.hu> +* Dave Reisner <dreisner(a)archlinux.org> For additional contributors, use `git shortlog -s` on the pacman.git repository. -- 2.31.1

1 0

[pacman-dev] [PATCH] Silence new warning with gcc-11
by Allan McRae 17 May '21

17 May '21

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 99ad716e..75c74f8b 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -677,7 +677,7 @@ void cb_progress(void *ctx, alpm_progress_t event, const char *pkgname, int i = textlen - 3; wchar_t *p = wcstr; /* grab the max number of char columns we can fill */ - while(i - wcwidth(*p) > 0) { + while(i > wcwidth(*p)) { i -= wcwidth(*p); p++; } -- 2.31.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-113-g618fa4f6
by Allan McRae 17 May '21

17 May '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 618fa4f675594798825a01bd0a3462903dda6ef7 (commit) via d6ffa7f56134b37efb0ea798dc6a0013e8a4d561 (commit) via 8bf17b29a24802c587afda0e96d93b22c5f5caeb (commit) via 4fead44e3ce97d3a83ca6bab393d480746ba9227 (commit) via 15be417c17809cbf2721a3fb0c519ee910b8d0a6 (commit) via 31c42c338b717ea6e0cae92c2279d859a882d1b3 (commit) from ef14c3380da0ed0e3eeba7e8b6c66294db316883 (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 618fa4f675594798825a01bd0a3462903dda6ef7 Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun May 9 15:18:17 2021 +0100 libalpm: check for duplicate filenames This partially fixes FS#67850 It fixes the case for -S'ing packages but not -U'ing urls. pacman -S a/a b/b resolving dependencies... error: packages a and b have the same filename: a-1-1-any.pkg.tar.zst error: failed to prepare transaction (duplicate filename) Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d6ffa7f56134b37efb0ea798dc6a0013e8a4d561 Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun May 9 15:18:18 2021 +0100 fix formatting mistake Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8bf17b29a24802c587afda0e96d93b22c5f5caeb Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun May 9 14:23:57 2021 +0100 libalpm: fix download rates becoming negative When a download fails on one mirror a new download is started on the next mirror. This causes the ammount downloaded to reset, confusing the rate math and making it display a negative rate. This is further complicated by the fact that a download may be resumed from where it is or started over. To account for this we alert the frontend that the download was restarted. Pacman then starts the progress bar over. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4fead44e3ce97d3a83ca6bab393d480746ba9227 Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun May 9 13:18:38 2021 +0100 libalpm: clone data on alpm_db_set_servers Every alpm_option_set function clones the input so lets be more consistent. Also this fixes servers not being sanatized. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 15be417c17809cbf2721a3fb0c519ee910b8d0a6 Author: morganamilo <morganamilo(a)archlinux.org> Date: Fri May 7 07:26:12 2021 +0100 remove unused variable in meson.build Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 31c42c338b717ea6e0cae92c2279d859a882d1b3 Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun Apr 18 20:59:45 2021 +0100 Match initial download message with progress message When initially downloading a package, pacman will display a message like: wine-6.6-1-x86_64.pkg.tar.zst downloading... Then when the download progresses the message will change to: wine-6.6-1-x86_64.pkg.tar.zst So instead lets match the progress message so there's no sudden change. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 16 ++++++++++++---- lib/libalpm/db.c | 8 +++++++- lib/libalpm/dload.c | 33 +++++++++++++++++++++++++-------- lib/libalpm/error.c | 2 ++ lib/libalpm/sync.c | 19 +++++++++++++++++++ lib/libalpm/trans.c | 2 +- meson.build | 1 - src/pacman/callback.c | 34 ++++++++++++++++++++++++++++++++-- 8 files changed, 98 insertions(+), 17 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2 3/4] libalpm: check for duplicate filenames
by morganamilo 09 May '21

09 May '21

This partially fixes FS#67850 It fixes the case for -S'ing packages but not -U'ing urls. pacman -S a/a b/b resolving dependencies... error: packages a and b have the same filename: a-1-1-any.pkg.tar.zst error: failed to prepare transaction (duplicate filename) --- lib/libalpm/alpm.h | 2 ++ lib/libalpm/error.c | 2 ++ lib/libalpm/sync.c | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 833df829..ccf2edc2 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -257,6 +257,8 @@ typedef enum _alpm_errno_t { ALPM_ERR_TRANS_NULL, /** Duplicate target in transaction */ ALPM_ERR_TRANS_DUP_TARGET, + /** Duplicate filename in transaction */ + ALPM_ERR_TRANS_DUP_FILENAME, /** A transaction has not been initialized */ ALPM_ERR_TRANS_NOT_INITIALIZED, /** Transaction has not been prepared */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index c6f19599..c06d091a 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -90,6 +90,8 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err) return _("transaction not initialized"); case ALPM_ERR_TRANS_DUP_TARGET: return _("duplicate target"); + case ALPM_ERR_TRANS_DUP_FILENAME: + return _("duplicate filename"); case ALPM_ERR_TRANS_NOT_INITIALIZED: return _("transaction not initialized"); case ALPM_ERR_TRANS_NOT_PREPARED: diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7fa50a13..8ccb0ba0 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -464,6 +464,25 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) } } + /* Ensure two packages don't have the same filename */ + for(i = resolved; i; i = i->next) { + alpm_pkg_t *pkg1 = i->data; + for(j = i->next; j; j = j->next) { + alpm_pkg_t *pkg2 = j->data; + if(strcmp(pkg1->filename, pkg2->filename) == 0) { + alpm_list_free(resolved); + ret = -1; + handle->pm_errno = ALPM_ERR_TRANS_DUP_FILENAME; + _alpm_log(handle, ALPM_LOG_ERROR, _("packages %s and %s have the same filename: %s\n"), + pkg1->name, pkg2->name, pkg1->filename); + } + } + } + + if(ret != 0) { + goto cleanup; + } + /* Set DEPEND reason for pulled packages */ for(i = resolved; i; i = i->next) { alpm_pkg_t *pkg = i->data; -- 2.31.1

1 1