- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-106-g72238aa0
by Allan McRae 01 May '21

01 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 72238aa046b8a8de1c7b9110726986c7538023b5 (commit) via eb1a63a516cb3791d0084b0d05b074c963aa01e9 (commit) via 0ff94ae85d40efdc177e1852ef58848f82d14156 (commit) via 8faf749fd19aff0eb35eb7108d2fd379d3c9c3b9 (commit) via ab622b4881e6b971c62de4323c72c87a6da51323 (commit) via e7fa35baa22bf6710a904815456d3ff679005fc7 (commit) via 523c393e9e6175e632d355c9440abb0be164a362 (commit) from 558d08d821a6797c972acdf02e03aa1a1ff49917 (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 72238aa046b8a8de1c7b9110726986c7538023b5 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Apr 27 19:11:27 2021 -0700 call download progress callback for signatures pacman may not care about them, but other front-ends do. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit eb1a63a516cb3791d0084b0d05b074c963aa01e9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Apr 26 20:47:58 2021 -0700 alpm_db_update: indicate if dbs were up to date Restore the prior indicator whether or not databases were up to date. 0 is used to indicate if *any* db was actually updated as callers are more likely to care about that than if *all* dbs were updated. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 0ff94ae85d40efdc177e1852ef58848f82d14156 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Apr 26 19:37:52 2021 -0700 fix downloading multiple urls with XferCommand An extra break causes _alpm_download to break out of the payload loop as soon as it sees a successful url download with XferCommand. Fixes: FS#70608 - -U fails to download all files with XferCommand Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 8faf749fd19aff0eb35eb7108d2fd379d3c9c3b9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Apr 26 19:34:14 2021 -0700 pmserve: allow serving byte objects directly Useful for serving in-memory package files. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit ab622b4881e6b971c62de4323c72c87a6da51323 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Apr 26 19:32:57 2021 -0700 pmpkg: add makepkg_bytes Builds the package file in memory. Useful with the built-in server. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit e7fa35baa22bf6710a904815456d3ff679005fc7 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Apr 25 11:03:54 2021 -0700 add front-end provided context to callbacks Our callbacks require front-ends to maintain state in order to provide reasonable output. The new download callback in particular requires much more complex state information to be saved. Without the ability to provide context, state must be saved globally, which may not be possible for all front-ends. Scripting language bindings in particular have no way to register per-handle callbacks without some form of context. Implements: FS#12721 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 523c393e9e6175e632d355c9440abb0be164a362 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Apr 23 14:34:47 2021 -0400 makepkg: document BUILDTOOL and BUILDTOOLVER environmental variables These were added without documentation in commit a33cdac10bf1a68279ea1b9baa26aa09126f1ca4 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.asciidoc | 8 +++ lib/libalpm/alpm.h | 76 ++++++++++++++++++---- lib/libalpm/dload.c | 61 ++++++++--------- lib/libalpm/handle.c | 54 +++++++++++++-- lib/libalpm/handle.h | 12 +++- lib/libalpm/log.c | 2 +- lib/libalpm/sync.c | 2 +- src/pacman/callback.c | 30 +++++++-- src/pacman/callback.h | 14 ++-- src/pacman/conf.c | 18 ++--- src/util/testpkg.c | 7 +- test/pacman/meson.build | 2 + test/pacman/pmpkg.py | 14 ++-- test/pacman/pmserve.py | 2 + .../tests/upgrade-download-with-xfercommand.py | 26 ++++++++ 15 files changed, 246 insertions(+), 82 deletions(-) create mode 100644 test/pacman/tests/upgrade-download-with-xfercommand.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libalpm: download signatures with a fetch callback
by Guillaume Benoit 30 Apr '21

30 Apr '21

Remove an unwanted break and download signatures when using a custom fetch callback. --- lib/libalpm/dload.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index a4c42f8d..6f33451a 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -877,9 +877,26 @@ int _alpm_download(alpm_handle_t *handle, int success = 0; if(payload->fileurl) { - if (handle->fetchcb(payload->fileurl, localpath, payload->force) != -1) { - success = 1; - break; + int ret; + + ret = handle->fetchcb(payload->fileurl, localpath, payload->force); + + if (ret != -1) { + /* Let's check if client requested downloading accompanion *.sig file */ + if(payload->download_signature) { + char *sig_fileurl; + + size_t sig_len = strlen(payload->fileurl) + 5; + MALLOC(sig_fileurl, sig_len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(sig_fileurl, sig_len, "%s.sig", payload->fileurl); + + ret = handle->fetchcb(sig_fileurl, localpath, payload->force); + + free(sig_fileurl); + } + if (ret != -1) { + success = 1; + } } } else { for(s = payload->servers; s; s = s->next) { @@ -892,12 +909,26 @@ int _alpm_download(alpm_handle_t *handle, snprintf(fileurl, len, "%s/%s", server, payload->filepath); ret = handle->fetchcb(fileurl, localpath, payload->force); - free(fileurl); if (ret != -1) { - success = 1; - break; + /* Let's check if client requested downloading accompanion *.sig file */ + if(payload->download_signature) { + char *sig_fileurl; + + size_t sig_len = strlen(fileurl) + 5; + MALLOC(sig_fileurl, sig_len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(sig_fileurl, sig_len, "%s.sig", fileurl); + + ret = handle->fetchcb(sig_fileurl, localpath, payload->force); + + free(sig_fileurl); + } + if (ret != -1) { + success = 1; + break; + } } + free(fileurl); } } if(!success && !payload->errors_ok) { -- 2.31.1

1 0

[pacman-dev] [PATCH] call download progress callback for signatures
by Andrew Gregory 30 Apr '21

30 Apr '21

pacman may not care about them, but other front-ends do. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/dload.c | 18 +++++++----------- src/pacman/callback.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 935f5418..8fa46bb2 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -166,11 +166,6 @@ static int dload_progress_cb(void *file, curl_off_t dltotal, curl_off_t dlnow, off_t current_size, total_size; alpm_download_event_progress_t cb_data = {0}; - /* do not print signature files progress bar */ - if(payload->signature) { - return 0; - } - /* avoid displaying progress bar for redirects with a body */ if(payload->respcode >= 300) { return 0; @@ -669,7 +664,7 @@ cleanup: unlink(payload->tempfile_name); } - if(handle->dlcb && !payload->signature) { + if(handle->dlcb) { alpm_download_event_completed_t cb_data = {0}; cb_data.total = bytes_dl; cb_data.result = ret; @@ -782,6 +777,12 @@ static int curl_add_payload(alpm_handle_t *handle, CURLM *curlm, curl_easy_setopt(curl, CURLOPT_WRITEDATA, payload->localf); curl_multi_add_handle(curlm, curl); + + if(handle->dlcb) { + alpm_download_event_init_t cb_data = {.optional = payload->errors_ok}; + handle->dlcb(handle->dlcb_ctx, payload->remote_name, ALPM_DOWNLOAD_INIT, &cb_data); + } + return 0; cleanup: @@ -810,11 +811,6 @@ static int curl_download_internal(alpm_handle_t *handle, struct dload_payload *payload = payloads->data; if(curl_add_payload(handle, curlm, payload, localpath) == 0) { - if(handle->dlcb && !payload->signature) { - alpm_download_event_init_t cb_data = {.optional = payload->errors_ok}; - handle->dlcb(handle->dlcb_ctx, payload->remote_name, ALPM_DOWNLOAD_INIT, &cb_data); - } - payloads = payloads->next; } else { /* The payload failed to start. Do not start any new downloads. diff --git a/src/pacman/callback.c b/src/pacman/callback.c index c3563af3..ae7e1bed 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -1070,10 +1070,22 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl } } +static int strendswith(const char *haystack, const char *needle) +{ + size_t hlen = strlen(haystack), nlen = strlen(needle); + return hlen >= nlen && strcmp(haystack + hlen - nlen, needle) == 0; +} + /* Callback to handle display of download progress */ void cb_download(void *ctx, const char *filename, alpm_download_event_type_t event, void *data) { (void)ctx; + + /* do not print signature files progress bar */ + if(strendswith(filename, ".sig")) { + return; + } + if(event == ALPM_DOWNLOAD_INIT) { dload_init_event(filename, data); } else if(event == ALPM_DOWNLOAD_PROGRESS) { -- 2.31.1

1 0

[pacman-dev] Patch Policy Inquiry
by Sijie Bu 29 Apr '21

29 Apr '21

Hello, Not sure if I'm posting it to the right place, but this is a developer-related question so hopefully it's in the right place. I will be starting an internship project with CIP United, a company specialized in MIPS processors, and will be porting Arch to MIPS64 R6. And my project supervisor would like to know pacman's patch policies for architecture-specific modifications. I have already asked on arch-ports list and was told by people from Arch Linux 32 that the pacman codebase is generally portable, but I see them maintaining a fork for certain i486-specific optimizations. I have also looked at the readme files (HACKING etc.) but was unable to find a clear statement of your patch policies. Therefore, I would like to know some details about your patch policies, especially the ones regarding non-amd64 architectures. Thank you for your time and have a nice day. Sincerely Tom

3 2

[pacman-dev] [PATCH] alpm_db_update: indicate if dbs were up to date
by Andrew Gregory 27 Apr '21

27 Apr '21

Restore the prior indicator whether or not databases were up to date. 0 is used to indicate if *any* db was actually updated as callers are more likely to care about that than if *all* dbs were updated. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Please include this for v6.0. Pacutils uses the up-to-date indicator. lib/libalpm/alpm.h | 3 ++- lib/libalpm/dload.c | 35 +++++++++++++++++++++-------------- lib/libalpm/sync.c | 2 +- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2e99d4d8..f47ddc1d 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1356,7 +1356,8 @@ int alpm_db_remove_server(alpm_db_t *db, const char *url); * @param dbs list of package databases to update * @param force if true, then forces the update, otherwise update only in case * the databases aren't up to date - * @return 0 on success, -1 on error (pm_errno is set accordingly) + * @return 0 on success, -1 on error (pm_errno is set accordingly), + * 1 if all databases are up to to date */ int alpm_db_update(alpm_handle_t *handle, alpm_list_t *dbs, int force); diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 57d25383..00a729ec 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -788,6 +788,10 @@ cleanup: return ret; } +/* Returns -1 if an error happened for a required file + * Returns 0 if a payload was actually downloaded + * Returns 1 if no files were downloaded and all errors were non-fatal + */ static int curl_download_internal(alpm_handle_t *handle, alpm_list_t *payloads /* struct dload_payload */, const char *localpath) @@ -795,6 +799,7 @@ static int curl_download_internal(alpm_handle_t *handle, int active_downloads_num = 0; int err = 0; int max_streams = handle->parallel_downloads; + int updated = 0; /* was a file actually updated */ CURLM *curlm = handle->curlm; while(active_downloads_num > 0 || payloads) { @@ -846,6 +851,8 @@ static int curl_download_internal(alpm_handle_t *handle, */ payloads = NULL; err = -1; + } else if(ret == 0) { + updated = 1; } } else { _alpm_log(handle, ALPM_LOG_ERROR, _("curl transfer error: %d\n"), msg->msg); @@ -854,11 +861,15 @@ static int curl_download_internal(alpm_handle_t *handle, } _alpm_log(handle, ALPM_LOG_DEBUG, "curl_download_internal return code is %d\n", err); - return err; + return err ? -1 : updated ? 0 : 1; } #endif +/* Returns -1 if an error happened for a required file + * Returns 0 if a payload was actually downloaded + * Returns 1 if no files were downloaded and all errors were non-fatal + */ int _alpm_download(alpm_handle_t *handle, alpm_list_t *payloads /* struct dload_payload */, const char *localpath) @@ -871,20 +882,18 @@ int _alpm_download(alpm_handle_t *handle, #endif } else { alpm_list_t *p; + int updated = 0; for(p = payloads; p; p = p->next) { struct dload_payload *payload = p->data; alpm_list_t *s; - int success = 0; + int ret = -1; if(payload->fileurl) { - if (handle->fetchcb(payload->fileurl, localpath, payload->force) != -1) { - success = 1; - } + ret = handle->fetchcb(payload->fileurl, localpath, payload->force); } else { - for(s = payload->servers; s; s = s->next) { + for(s = payload->servers; s && ret == -1; s = s->next) { const char *server = s->data; char *fileurl; - int ret; size_t len = strlen(server) + strlen(payload->filepath) + 2; MALLOC(fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); @@ -892,18 +901,16 @@ int _alpm_download(alpm_handle_t *handle, ret = handle->fetchcb(fileurl, localpath, payload->force); free(fileurl); - - if (ret != -1) { - success = 1; - break; - } } } - if(!success && !payload->errors_ok) { + + if(ret == -1 && !payload->errors_ok) { RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); + } else if(ret == 0) { + updated = 1; } } - return 0; + return updated ? 0 : 1; } } diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7fa50a13..2419cc69 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -815,7 +815,7 @@ static int download_files(alpm_handle_t *handle) } ret = _alpm_download(handle, payloads, cachedir); - if(ret != 0) { + if(ret == -1) { event.type = ALPM_EVENT_PKG_RETRIEVE_FAILED; EVENT(handle, &event); _alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files\n")); -- 2.31.1

1 0

[pacman-dev] [PATCH 1/3] pmpkg: add makepkg_bytes
by Andrew Gregory 27 Apr '21

27 Apr '21

Builds the package file in memory. Useful with the built-in server. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/pmpkg.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index 8ff1ec1e..01ed4e0a 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -98,7 +98,12 @@ def parse_filename(name): filename, extra = filename.split("|") return filename - def makepkg(self, path): + def makepkg_bytes(self): + buf = BytesIO(); + self.makepkg(fileobj=buf) + return buf.getvalue() + + def makepkg(self, path=None, fileobj=None): """Creates an Arch Linux package archive. A package archive is generated in the location 'path', based on the data @@ -138,11 +143,12 @@ def makepkg(self, path): if any(self.install.values()): archive_files.append((".INSTALL", self.installfile())) - self.path = os.path.join(path, self.filename()) - util.mkdir(os.path.dirname(self.path)) + if path: + self.path = os.path.join(path, self.filename()) + util.mkdir(os.path.dirname(self.path)) # Generate package metadata - tar = tarfile.open(self.path, "w:gz", format=tarfile.GNU_FORMAT) + tar = tarfile.open(name=self.path, fileobj=fileobj, mode="w:gz", format=tarfile.GNU_FORMAT) for name, data in archive_files: info = tarfile.TarInfo(name) info.size = len(data) -- 2.31.1

1 2

[pacman-dev] [PATCH] add front-end provided context to callbacks
by Andrew Gregory 26 Apr '21

26 Apr '21

Our callbacks require front-ends to maintain state in order to provide reasonable output. The new download callback in particular requires much more complex state information to be saved. Without the ability to provide context, state must be saved globally, which may not be possible for all front-ends. Scripting language bindings in particular have no way to register per-handle callbacks without some form of context. Implements: FS#12721 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/alpm.h | 73 +++++++++++++++++++++++++++++++++++-------- lib/libalpm/dload.c | 11 ++++--- lib/libalpm/handle.c | 54 ++++++++++++++++++++++++++++---- lib/libalpm/handle.h | 12 +++++-- lib/libalpm/log.c | 2 +- src/pacman/callback.c | 18 +++++++---- src/pacman/callback.h | 14 ++++----- src/pacman/conf.c | 18 ++++++----- src/util/testpkg.c | 7 +++-- 9 files changed, 157 insertions(+), 52 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 833df829..496732d7 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -971,8 +971,9 @@ typedef union _alpm_event_t { /** Event callback. * * Called when an event occurs + * @param ctx user-provided context * @param event the event that occurred */ -typedef void (*alpm_cb_event)(alpm_event_t *); +typedef void (*alpm_cb_event)(void *ctx, alpm_event_t *); /** * Type of question. @@ -1114,9 +1115,10 @@ typedef union _alpm_question_t { /** Question callback. * * This callback allows user to give input and decide what to do during certain events + * @param ctx user-provided context * @param question the question being asked. */ -typedef void (*alpm_cb_question)(alpm_question_t *); +typedef void (*alpm_cb_question)(void *ctx, alpm_question_t *); /** An enum over different kinds of progress alerts. */ typedef enum _alpm_progress_t { @@ -1147,6 +1149,7 @@ typedef enum _alpm_progress_t { * Alert the front end about the progress of certain events. * Allows the implementation of loading bars for events that * make take a while to complete. + * @param ctx user-provided context * @param progress the kind of event that is progressing * @param pkg for package operations, the name of the package being operated on * @param percent the percent completion of the action @@ -1154,7 +1157,7 @@ typedef enum _alpm_progress_t { * @param current the current amount of items completed */ /** Progress callback */ -typedef void (*alpm_cb_progress)(alpm_progress_t progress, const char *pkg, +typedef void (*alpm_cb_progress)(void *ctx, alpm_progress_t progress, const char *pkg, int percent, size_t howmany, size_t current); /* @@ -1201,22 +1204,24 @@ typedef struct _alpm_download_event_completed_t { } alpm_download_event_completed_t; /** Type of download progress callbacks. + * @param ctx user-provided context * @param filename the name of the file being downloaded * @param event the event type * @param data the event data of type alpm_download_event_*_t */ -typedef void (*alpm_cb_download)(const char *filename, +typedef void (*alpm_cb_download)(void *ctx, const char *filename, alpm_download_event_type_t event, void *data); /** A callback for downloading files + * @param ctx user-provided context * @param url the URL of the file to be downloaded * @param localpath the directory to which the file should be downloaded * @param force whether to force an update, even if the file is the same * @return 0 on success, 1 if the file exists and is identical, -1 on * error. */ -typedef int (*alpm_cb_fetch)(const char *url, const char *localpath, +typedef int (*alpm_cb_fetch)(void *ctx, const char *url, const char *localpath, int force); /* End of libalpm_cb */ @@ -1464,11 +1469,12 @@ typedef enum _alpm_loglevel_t { * libalpm will call this function whenever something is to be logged. * many libalpm will produce log output. Additionally any calls to \link alpm_logaction * \endlink will also call this callback. + * @param ctx user-provided context * @param level the currently set loglevel * @param fmt the printf like format string * @param args printf like arguments */ -typedef void (*alpm_cb_log)(alpm_loglevel_t level, const char *fmt, va_list args); +typedef void (*alpm_cb_log)(void *ctx, alpm_loglevel_t level, const char *fmt, va_list args); /** A printf-like function for logging. * @param handle the context handle @@ -1498,12 +1504,19 @@ int alpm_logaction(alpm_handle_t *handle, const char *prefix, */ alpm_cb_log alpm_option_get_logcb(alpm_handle_t *handle); +/** Returns the callback used for logging. + * @param handle the context handle + * @return the currently set log callback context + */ +void *alpm_option_get_logcb_ctx(alpm_handle_t *handle); + /** Sets the callback used for logging. * @param handle the context handle * @param cb the cb to use + * @param ctx user-provided context to pass to cb * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb); +int alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb, void *ctx); /** Returns the callback used to report download progress. * @param handle the context handle @@ -1511,12 +1524,19 @@ int alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb); */ alpm_cb_download alpm_option_get_dlcb(alpm_handle_t *handle); +/** Returns the callback used to report download progress. + * @param handle the context handle + * @return the currently set download callback context + */ +void *alpm_option_get_dlcb_ctx(alpm_handle_t *handle); + /** Sets the callback used to report download progress. * @param handle the context handle * @param cb the cb to use + * @param ctx user-provided context to pass to cb * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int alpm_option_set_dlcb(alpm_handle_t *handle, alpm_cb_download cb); +int alpm_option_set_dlcb(alpm_handle_t *handle, alpm_cb_download cb, void *ctx); /** Returns the downloading callback. * @param handle the context handle @@ -1524,12 +1544,19 @@ int alpm_option_set_dlcb(alpm_handle_t *handle, alpm_cb_download cb); */ alpm_cb_fetch alpm_option_get_fetchcb(alpm_handle_t *handle); +/** Returns the downloading callback. + * @param handle the context handle + * @return the currently set fetch callback context + */ +void *alpm_option_get_fetchcb_ctx(alpm_handle_t *handle); + /** Sets the downloading callback. * @param handle the context handle * @param cb the cb to use + * @param ctx user-provided context to pass to cb * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int alpm_option_set_fetchcb(alpm_handle_t *handle, alpm_cb_fetch cb); +int alpm_option_set_fetchcb(alpm_handle_t *handle, alpm_cb_fetch cb, void *ctx); /** Returns the callback used for events. * @param handle the context handle @@ -1537,12 +1564,19 @@ int alpm_option_set_fetchcb(alpm_handle_t *handle, alpm_cb_fetch cb); */ alpm_cb_event alpm_option_get_eventcb(alpm_handle_t *handle); +/** Returns the callback used for events. + * @param handle the context handle + * @return the currently set event callback context + */ +void *alpm_option_get_eventcb_ctx(alpm_handle_t *handle); + /** Sets the callback used for events. * @param handle the context handle * @param cb the cb to use + * @param ctx user-provided context to pass to cb * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int alpm_option_set_eventcb(alpm_handle_t *handle, alpm_cb_event cb); +int alpm_option_set_eventcb(alpm_handle_t *handle, alpm_cb_event cb, void *ctx); /** Returns the callback used for questions. * @param handle the context handle @@ -1550,13 +1584,19 @@ int alpm_option_set_eventcb(alpm_handle_t *handle, alpm_cb_event cb); */ alpm_cb_question alpm_option_get_questioncb(alpm_handle_t *handle); +/** Returns the callback used for questions. + * @param handle the context handle + * @return the currently set question callback context + */ +void *alpm_option_get_questioncb_ctx(alpm_handle_t *handle); + /** Sets the callback used for questions. * @param handle the context handle * @param cb the cb to use + * @param ctx user-provided context to pass to cb * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int alpm_option_set_questioncb(alpm_handle_t *handle, alpm_cb_question cb); - +int alpm_option_set_questioncb(alpm_handle_t *handle, alpm_cb_question cb, void *ctx); /**Returns the callback used for operation progress. * @param handle the context handle @@ -1564,12 +1604,19 @@ int alpm_option_set_questioncb(alpm_handle_t *handle, alpm_cb_question cb); */ alpm_cb_progress alpm_option_get_progresscb(alpm_handle_t *handle); +/**Returns the callback used for operation progress. + * @param handle the context handle + * @return the currently set progress callback context + */ +void *alpm_option_get_progresscb_ctx(alpm_handle_t *handle); + /** Sets the callback used for operation progress. * @param handle the context handle * @param cb the cb to use + * @param ctx user-provided context to pass to cb * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int alpm_option_set_progresscb(alpm_handle_t *handle, alpm_cb_progress cb); +int alpm_option_set_progresscb(alpm_handle_t *handle, alpm_cb_progress cb, void *ctx); /* End of callback accessors */ /** @} */ diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index a4c42f8d..70ec318a 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -209,7 +209,8 @@ static int dload_progress_cb(void *file, curl_off_t dltotal, curl_off_t dlnow, * download_size (nor included in the total download size callback) */ cb_data.total = dltotal; cb_data.downloaded = dlnow; - payload->handle->dlcb(payload->remote_name, ALPM_DOWNLOAD_PROGRESS, &cb_data); + payload->handle->dlcb(payload->handle->dlcb_ctx, + payload->remote_name, ALPM_DOWNLOAD_PROGRESS, &cb_data); payload->prevprogress = current_size; return 0; @@ -672,7 +673,7 @@ cleanup: alpm_download_event_completed_t cb_data = {0}; cb_data.total = bytes_dl; cb_data.result = ret; - handle->dlcb(payload->remote_name, ALPM_DOWNLOAD_COMPLETED, &cb_data); + handle->dlcb(handle->dlcb_ctx, payload->remote_name, ALPM_DOWNLOAD_COMPLETED, &cb_data); } curl_multi_remove_handle(curlm, curl); @@ -806,7 +807,7 @@ static int curl_download_internal(alpm_handle_t *handle, if(curl_add_payload(handle, curlm, payload, localpath) == 0) { if(handle->dlcb && !payload->signature) { alpm_download_event_init_t cb_data = {.optional = payload->errors_ok}; - handle->dlcb(payload->remote_name, ALPM_DOWNLOAD_INIT, &cb_data); + handle->dlcb(handle->dlcb_ctx, payload->remote_name, ALPM_DOWNLOAD_INIT, &cb_data); } payloads = payloads->next; @@ -877,7 +878,7 @@ int _alpm_download(alpm_handle_t *handle, int success = 0; if(payload->fileurl) { - if (handle->fetchcb(payload->fileurl, localpath, payload->force) != -1) { + if (handle->fetchcb(handle->fetchcb_ctx, payload->fileurl, localpath, payload->force) != -1) { success = 1; break; } @@ -891,7 +892,7 @@ int _alpm_download(alpm_handle_t *handle, MALLOC(fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); snprintf(fileurl, len, "%s/%s", server, payload->filepath); - ret = handle->fetchcb(fileurl, localpath, payload->force); + ret = handle->fetchcb(handle->fetchcb_ctx, fileurl, localpath, payload->force); free(fileurl); if (ret != -1) { diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 7b8cb1da..86361070 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -162,36 +162,72 @@ alpm_cb_log SYMEXPORT alpm_option_get_logcb(alpm_handle_t *handle) return handle->logcb; } +void SYMEXPORT *alpm_option_get_logcb_ctx(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->logcb_ctx; +} + alpm_cb_download SYMEXPORT alpm_option_get_dlcb(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); return handle->dlcb; } +void SYMEXPORT *alpm_option_get_dlcb_ctx(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->dlcb_ctx; +} + alpm_cb_fetch SYMEXPORT alpm_option_get_fetchcb(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); return handle->fetchcb; } +void SYMEXPORT *alpm_option_get_fetchcb_ctx(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->fetchcb_ctx; +} + alpm_cb_event SYMEXPORT alpm_option_get_eventcb(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); return handle->eventcb; } +void SYMEXPORT *alpm_option_get_eventcb_ctx(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->eventcb_ctx; +} + alpm_cb_question SYMEXPORT alpm_option_get_questioncb(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); return handle->questioncb; } +void SYMEXPORT *alpm_option_get_questioncb_ctx(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->questioncb_ctx; +} + alpm_cb_progress SYMEXPORT alpm_option_get_progresscb(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); return handle->progresscb; } +void SYMEXPORT *alpm_option_get_progresscb_ctx(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->progresscb_ctx; +} + const char SYMEXPORT *alpm_option_get_root(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); @@ -300,45 +336,51 @@ int SYMEXPORT alpm_option_get_parallel_downloads(alpm_handle_t *handle) return handle->parallel_downloads; } -int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb) +int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb, void *ctx) { CHECK_HANDLE(handle, return -1); handle->logcb = cb; + handle->logcb_ctx = ctx; return 0; } -int SYMEXPORT alpm_option_set_dlcb(alpm_handle_t *handle, alpm_cb_download cb) +int SYMEXPORT alpm_option_set_dlcb(alpm_handle_t *handle, alpm_cb_download cb, void *ctx) { CHECK_HANDLE(handle, return -1); handle->dlcb = cb; + handle->dlcb_ctx = ctx; return 0; } -int SYMEXPORT alpm_option_set_fetchcb(alpm_handle_t *handle, alpm_cb_fetch cb) +int SYMEXPORT alpm_option_set_fetchcb(alpm_handle_t *handle, alpm_cb_fetch cb, void *ctx) { CHECK_HANDLE(handle, return -1); handle->fetchcb = cb; + handle->fetchcb_ctx = ctx; return 0; } -int SYMEXPORT alpm_option_set_eventcb(alpm_handle_t *handle, alpm_cb_event cb) +int SYMEXPORT alpm_option_set_eventcb(alpm_handle_t *handle, alpm_cb_event cb, void *ctx) { CHECK_HANDLE(handle, return -1); handle->eventcb = cb; + handle->eventcb_ctx = ctx; return 0; } -int SYMEXPORT alpm_option_set_questioncb(alpm_handle_t *handle, alpm_cb_question cb) +int SYMEXPORT alpm_option_set_questioncb(alpm_handle_t *handle, alpm_cb_question cb, void *ctx) { CHECK_HANDLE(handle, return -1); handle->questioncb = cb; + handle->questioncb_ctx = ctx; return 0; } -int SYMEXPORT alpm_option_set_progresscb(alpm_handle_t *handle, alpm_cb_progress cb) +int SYMEXPORT alpm_option_set_progresscb(alpm_handle_t *handle, alpm_cb_progress cb, void *ctx) { CHECK_HANDLE(handle, return -1); handle->progresscb = cb; + handle->progresscb_ctx = ctx; return 0; } diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 2d8d0f9e..9d938d18 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -34,19 +34,19 @@ #define EVENT(h, e) \ do { \ if((h)->eventcb) { \ - (h)->eventcb((alpm_event_t *) (e)); \ + (h)->eventcb((h)->eventcb_ctx, (alpm_event_t *) (e)); \ } \ } while(0) #define QUESTION(h, q) \ do { \ if((h)->questioncb) { \ - (h)->questioncb((alpm_question_t *) (q)); \ + (h)->questioncb((h)->questioncb_ctx, (alpm_question_t *) (q)); \ } \ } while(0) #define PROGRESS(h, e, p, per, n, r) \ do { \ if((h)->progresscb) { \ - (h)->progresscb(e, p, per, n, r); \ + (h)->progresscb((h)->progresscb_ctx, e, p, per, n, r); \ } \ } while(0) @@ -72,11 +72,17 @@ struct __alpm_handle_t { /* callback functions */ alpm_cb_log logcb; /* Log callback function */ + void *logcb_ctx; alpm_cb_download dlcb; /* Download callback function */ + void *dlcb_ctx; alpm_cb_fetch fetchcb; /* Download file callback function */ + void *fetchcb_ctx; alpm_cb_event eventcb; + void *eventcb_ctx; alpm_cb_question questioncb; + void *questioncb_ctx; alpm_cb_progress progresscb; + void *progresscb_ctx; /* filesystem paths */ char *root; /* Root path, default '/' */ diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index 4c781ea2..c4d291cb 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -107,6 +107,6 @@ void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, const char *fmt, ... } va_start(args, fmt); - handle->logcb(flag, fmt, args); + handle->logcb(handle->logcb_ctx, flag, fmt, args); va_end(args); } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a28a79a9..13e38122 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -232,8 +232,9 @@ static int number_length(size_t n) } /* callback to handle messages/notifications from libalpm transactions */ -void cb_event(alpm_event_t *event) +void cb_event(void *ctx, alpm_event_t *event) { + (void)ctx; if(config->print) { console_cursor_move_end(); return; @@ -434,8 +435,9 @@ void cb_event(alpm_event_t *event) } /* callback to handle questions from libalpm transactions (yes/no) */ -void cb_question(alpm_question_t *question) +void cb_question(void *ctx, alpm_question_t *question) { + (void)ctx; if(config->print) { switch(question->type) { case ALPM_QUESTION_INSTALL_IGNOREPKG: @@ -556,8 +558,8 @@ void cb_question(alpm_question_t *question) } /* callback to handle display of transaction progress */ -void cb_progress(alpm_progress_t event, const char *pkgname, int percent, - size_t howmany, size_t current) +void cb_progress(void *ctx, alpm_progress_t event, const char *pkgname, + int percent, size_t howmany, size_t current) { static int prevpercent; static size_t prevcurrent; @@ -571,6 +573,8 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, const unsigned short cols = getcols(); + (void)ctx; + if(config->noprogressbar || cols == 0) { return; } @@ -1069,8 +1073,9 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl } /* Callback to handle display of download progress */ -void cb_download(const char *filename, alpm_download_event_type_t event, void *data) +void cb_download(void *ctx, const char *filename, alpm_download_event_type_t event, void *data) { + (void)ctx; if(event == ALPM_DOWNLOAD_INIT) { dload_init_event(filename, data); } else if(event == ALPM_DOWNLOAD_PROGRESS) { @@ -1084,8 +1089,9 @@ void cb_download(const char *filename, alpm_download_event_type_t event, void *d } /* Callback to handle notifications from the library */ -void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) +void cb_log(void *ctx, alpm_loglevel_t level, const char *fmt, va_list args) { + (void)ctx; if(!fmt || strlen(fmt) == 0) { return; } diff --git a/src/pacman/callback.h b/src/pacman/callback.h index 8ac9d960..83cf8cdd 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -26,22 +26,22 @@ #include <alpm.h> /* callback to handle messages/notifications from libalpm */ -void cb_event(alpm_event_t *event); +void cb_event(void *ctx, alpm_event_t *event); /* callback to handle questions from libalpm (yes/no) */ -void cb_question(alpm_question_t *question); +void cb_question(void *ctx, alpm_question_t *question); /* callback to handle display of progress */ -void cb_progress(alpm_progress_t event, const char *pkgname, int percent, - size_t howmany, size_t remain); +void cb_progress(void *ctx, alpm_progress_t event, const char *pkgname, + int percent, size_t howmany, size_t remain); /* callback to handle display of download progress */ -void cb_download(const char *filename, alpm_download_event_type_t event, +void cb_download(void *ctx, const char *filename, alpm_download_event_type_t event, void *data); /* callback to handle messages/notifications from pacman library */ -__attribute__((format(printf, 2, 0))) -void cb_log(alpm_loglevel_t level, const char *fmt, va_list args); +__attribute__((format(printf, 3, 0))) +void cb_log(void *ctx, alpm_loglevel_t level, const char *fmt, va_list args); /* specify if multibar UI should move completed bars to the top of the screen */ void multibar_move_completed_up(bool value); diff --git a/src/pacman/conf.c b/src/pacman/conf.c index a4f2ba35..877913b0 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -277,8 +277,8 @@ static int systemvp(const char *file, char *const argv[]) } /** External fetch callback */ -static int download_with_xfercommand(const char *url, const char *localpath, - int force) +static int download_with_xfercommand(void *ctx, const char *url, + const char *localpath, int force) { int ret = 0, retval; int usepart = 0; @@ -288,6 +288,8 @@ static int download_with_xfercommand(const char *url, const char *localpath, const char **argv; size_t i; + (void)ctx; + if(!config->xfercommand_argv) { return -1; } @@ -836,11 +838,11 @@ static int setup_libalpm(void) } config->handle = handle; - alpm_option_set_logcb(handle, cb_log); - alpm_option_set_dlcb(handle, cb_download); - alpm_option_set_eventcb(handle, cb_event); - alpm_option_set_questioncb(handle, cb_question); - alpm_option_set_progresscb(handle, cb_progress); + alpm_option_set_logcb(handle, cb_log, NULL); + alpm_option_set_dlcb(handle, cb_download, NULL); + alpm_option_set_eventcb(handle, cb_event, NULL); + alpm_option_set_questioncb(handle, cb_question, NULL); + alpm_option_set_progresscb(handle, cb_progress, NULL); if(config->op == PM_OP_FILES) { alpm_option_set_dbext(handle, ".files"); @@ -887,7 +889,7 @@ static int setup_libalpm(void) } if(config->xfercommand) { - alpm_option_set_fetchcb(handle, download_with_xfercommand); + alpm_option_set_fetchcb(handle, download_with_xfercommand, NULL); } else if(!(alpm_capabilities() & ALPM_CAPABILITY_DOWNLOADER)) { pm_printf(ALPM_LOG_WARNING, _("no '%s' configured\n"), "XferCommand"); } diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 28dcdc50..26600a9d 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -24,9 +24,10 @@ #include <alpm.h> #include "util.h" /* For Localization */ -__attribute__((format(printf, 2, 0))) -static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) +__attribute__((format(printf, 3, 0))) +static void output_cb(void *ctx, alpm_loglevel_t level, const char *fmt, va_list args) { + (void)ctx; if(fmt[0] == '\0') { return; } @@ -64,7 +65,7 @@ int main(int argc, char *argv[]) } /* let us get log messages from libalpm */ - alpm_option_set_logcb(handle, output_cb); + alpm_option_set_logcb(handle, output_cb, NULL); /* set gpgdir to default */ alpm_option_set_gpgdir(handle, GPGDIR); -- 2.31.1

2 1

[pacman-dev] [PATCH] document commit a33cdac10bf1a68279ea1b9baa26aa09126f1ca4
by Eli Schwartz 26 Apr '21

26 Apr '21

Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/makepkg.8.asciidoc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/makepkg.8.asciidoc b/doc/makepkg.8.asciidoc index 3b5e61b31..38032e7bb 100644 --- a/doc/makepkg.8.asciidoc +++ b/doc/makepkg.8.asciidoc @@ -279,6 +279,14 @@ Environment Variables **SOURCE_DATE_EPOCH=**"<date>":: Used for link:https://reproducible-builds.org/docs/[Reproducible Builds]. +**BUILDTOOL=**"<name>":: + The name of a tool ecosystem used to set up the build environment. Used for + defining a spec for reproducible builds, e.g. the linkman:makepkg.conf[5] + used. + +**BUILDTOOLVER=**"<version>":: + The version of the '$BUILDTOOL' used. + Configuration ------------- See linkman:makepkg.conf[5] for more details on configuring makepkg using the -- 2.31.1

2 1

[pacman-dev] [PATCH] makepkg: add tool details to buildinfo to aid determining flags
by anthraxx＠archlinux.org 23 Apr '21

23 Apr '21

From: Levente Polyak <anthraxx(a)archlinux.org> If a makepkg consumer uses a build wrapper to override compiler flags this may lead to unreproducible packages as there is no way to know which exact files were used for tooling that tries to reproduce said package. Instead of vendoring the whole used makepkg.conf file into buildinfo, this patch adds two new properties to the .BUILDINFO file named BUILDTOOL and BUILDTOOLVER which by default are simply makepkg's own values. Downstream consumers may override those values: For example in Arch Linux the devtools package can set those values and allow reproducible builds tooling to fetch the appropriate makepkg.conf. Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> --- scripts/makepkg.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 92cb6398..e58edfa1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -651,6 +651,8 @@ write_buildinfo() { write_kv_pair "builddate" "${SOURCE_DATE_EPOCH}" write_kv_pair "builddir" "${BUILDDIR}" write_kv_pair "startdir" "${startdir}" + write_kv_pair "buildtool" "${BUILDTOOL:-makepkg}" + write_kv_pair "buildtoolver" "${BUILDTOOLVER:-$makepkg_version}" write_kv_pair "buildenv" "${BUILDENV[@]}" write_kv_pair "options" "${OPTIONS[@]}" -- 2.31.1

6 12

[pacman-dev] [PATCH 1/2] libmakepkg: always remap debug prefix
by morganamilo 23 Apr '21

23 Apr '21

Sometimes non debug flags still generate debug symbols. So always remap them. diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in index 60913080..52ff4750 100644 --- a/scripts/libmakepkg/buildenv/debugflags.sh.in +++ b/scripts/libmakepkg/buildenv/debugflags.sh.in @@ -30,9 +30,6 @@ buildenv_functions+=('buildenv_debugflags') buildenv_debugflags() { if check_option "debug" "y"; then - DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" - DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" - DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}" CFLAGS+=" $DEBUG_CFLAGS" CXXFLAGS+=" $DEBUG_CXXFLAGS" RUSTFLAGS+=" $DEBUG_RUSTFLAGS" diff --git a/scripts/libmakepkg/buildenv/flags.sh.in b/scripts/libmakepkg/buildenv/flags.sh.in new file mode 100644 index 00000000..d41556d3 --- /dev/null +++ b/scripts/libmakepkg/buildenv/flags.sh.in @@ -0,0 +1,34 @@ +#!/usr/bin/bash +# +# debugflags.sh - Specify default flags for building a package +# +# Copyright (c) 2012-2021 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_BUILDENV_FLAGS_SH" ]] && return +LIBMAKEPKG_BUILDENV_FLAGS_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/option.sh" + +buildenv_functions+=('buildenv_flags') + +buildenv_flags() { + CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}" +} diff --git a/scripts/libmakepkg/buildenv/meson.build b/scripts/libmakepkg/buildenv/meson.build index b72d91c0..a69accb7 100644 --- a/scripts/libmakepkg/buildenv/meson.build +++ b/scripts/libmakepkg/buildenv/meson.build @@ -4,6 +4,7 @@ sources = [ 'buildflags.sh.in', 'compiler.sh.in', 'debugflags.sh.in', + 'flags.sh.in', 'lto.sh.in', 'makeflags.sh.in', ] -- 2.31.1

3 7

[pacman-dev] Fwd: pacman-6.0 slushy freeze
by Luna Jernberg 23 Apr '21

23 Apr '21

Started helping with the Swedish translation today ---------- Forwarded message --------- From: Luna Jernberg <droidbittin(a)gmail.com> Date: Fri, Apr 23, 2021 at 5:00 AM Subject: Re: [pacman-dev] pacman-6.0 slushy freeze To: <allan(a)archlinux.org> 2 strings left i am unsure of at the moment On Fri, Apr 23, 2021 at 4:41 AM Luna Jernberg <droidbittin(a)gmail.com> wrote: > Started with the Swedish translation now > > On Fri, Apr 23, 2021 at 2:04 AM Allan McRae <allan(a)archlinux.org> wrote: > >> Hi all, >> >> We are now in a slushy freeze for pacman-6.0. >> >> This means I will not look at new patches unless they fix a breakage. >> However, I aim to get through the few patches I have not looked at that >> were submitted before now (and revisions of those patches if quickly >> done). >> >> I will also pull the final 5.2.x translation files from Transifex, and >> push the 6.0 strings (again noting, slushy freeze, so strings may change). >> >> Allan >> >

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-99-g558d08d8
by Allan McRae 23 Apr '21

23 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 558d08d821a6797c972acdf02e03aa1a1ff49917 (commit) via 15270d4a344a5d5cbf992aac58913c9356a80927 (commit) from 8fe552070945561a0cd4dc24d3fcb22ed377f1a0 (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 558d08d821a6797c972acdf02e03aa1a1ff49917 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Apr 23 10:44:27 2021 +1000 Prepare translations for next release Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 15270d4a344a5d5cbf992aac58913c9356a80927 Author: Andrew Gregory <andrew(a)archlinux.org> Date: Mon Jun 22 02:12:41 2020 -0700 update NEWS for 5.2.2 Signed-off-by: Andrew Gregory <andrew(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 30 + lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/ar.po | 267 +++--- lib/libalpm/po/ast.po | 267 +++--- lib/libalpm/po/bg.po | 267 +++--- lib/libalpm/po/br.po | 267 +++--- lib/libalpm/po/ca.po | 267 +++--- lib/libalpm/po/cs.po | 282 +++--- lib/libalpm/po/da.po | 267 +++--- lib/libalpm/po/de.po | 284 +++--- lib/libalpm/po/el.po | 295 ++++--- lib/libalpm/po/en_GB.po | 267 +++--- lib/libalpm/po/eo.po | 499 +++++------ lib/libalpm/po/es.po | 267 +++--- lib/libalpm/po/es_419.po | 271 +++--- lib/libalpm/po/eu.po | 271 +++--- lib/libalpm/po/eu_ES.po | 271 +++--- lib/libalpm/po/fi.po | 267 +++--- lib/libalpm/po/fr.po | 275 +++--- lib/libalpm/po/gl.po | 267 +++--- lib/libalpm/po/hi.po | 1038 ++++++++++++++++++++++ lib/libalpm/po/hr.po | 267 +++--- lib/libalpm/po/hu.po | 267 +++--- lib/libalpm/po/id.po | 267 +++--- lib/libalpm/po/it.po | 273 +++--- lib/libalpm/po/ja.po | 271 +++--- lib/libalpm/po/kk.po | 267 +++--- lib/libalpm/po/ko.po | 267 +++--- lib/libalpm/po/libalpm.pot | 271 +++--- lib/libalpm/po/lt.po | 267 +++--- lib/libalpm/po/nb.po | 281 +++--- lib/libalpm/po/nl.po | 269 +++--- lib/libalpm/po/pl.po | 280 +++--- lib/libalpm/po/pt.po | 267 +++--- lib/libalpm/po/pt_BR.po | 267 +++--- lib/libalpm/po/ro.po | 271 +++--- lib/libalpm/po/ru.po | 267 +++--- lib/libalpm/po/sk.po | 290 ++++--- lib/libalpm/po/sl.po | 269 +++--- lib/libalpm/po/sr.po | 277 +++--- lib/libalpm/po/sr(a)latin.po | 277 +++--- lib/libalpm/po/sv.po | 340 ++++---- lib/libalpm/po/tr.po | 275 +++--- lib/libalpm/po/uk.po | 267 +++--- lib/libalpm/po/zh_CN.po | 286 ++++--- lib/libalpm/po/zh_TW.po | 267 +++--- scripts/po/LINGUAS | 1 + scripts/po/bg.po | 645 +++++++------- scripts/po/br.po | 636 +++++++------- scripts/po/ca.po | 676 ++++++++------- scripts/po/cs.po | 686 +++++++-------- scripts/po/da.po | 649 +++++++------- scripts/po/de.po | 701 +++++++-------- scripts/po/el.po | 688 +++++++-------- scripts/po/en_GB.po | 648 +++++++------- scripts/po/eo.po | 662 +++++++------- scripts/po/es.po | 673 ++++++++------- scripts/po/es_419.po | 662 +++++++------- scripts/po/eu.po | 645 +++++++------- scripts/po/eu_ES.po | 645 +++++++------- scripts/po/fi.po | 589 ++++++------- scripts/po/fr.po | 668 ++++++++------- scripts/po/gl.po | 659 +++++++------- scripts/po/hi.po | 1609 ++++++++++++++++++++++++++++++++++ scripts/po/hu.po | 659 +++++++------- scripts/po/id.po | 633 +++++++------- scripts/po/it.po | 661 +++++++------- scripts/po/ja.po | 672 ++++++++------- scripts/po/ko.po | 650 +++++++------- scripts/po/lt.po | 667 ++++++++------- scripts/po/nb.po | 664 +++++++------- scripts/po/nl.po | 656 +++++++------- scripts/po/pacman-scripts.pot | 564 ++++++------ scripts/po/pl.po | 687 +++++++-------- scripts/po/pt.po | 646 +++++++------- scripts/po/pt_BR.po | 660 +++++++------- scripts/po/ro.po | 643 +++++++------- scripts/po/ru.po | 653 +++++++------- scripts/po/sk.po | 642 +++++++------- scripts/po/sl.po | 620 +++++++------- scripts/po/sr.po | 658 +++++++------- scripts/po/sr(a)latin.po | 658 +++++++------- scripts/po/sv.po | 732 ++++++++-------- scripts/po/tr.po | 662 +++++++------- scripts/po/uk.po | 653 +++++++------- scripts/po/zh_CN.po | 714 ++++++++-------- scripts/po/zh_TW.po | 667 ++++++++------- src/pacman/po/LINGUAS | 1 + src/pacman/po/ar.po | 565 ++++++------ src/pacman/po/ast.po | 565 ++++++------ src/pacman/po/bg.po | 565 ++++++------ src/pacman/po/br.po | 569 ++++++------ src/pacman/po/ca.po | 569 ++++++------ src/pacman/po/cs.po | 643 +++++++------- src/pacman/po/da.po | 567 ++++++------ src/pacman/po/de.po | 1052 ++++++++++++----------- src/pacman/po/el.po | 632 +++++++------- src/pacman/po/en_GB.po | 567 ++++++------ src/pacman/po/eo.po | 603 +++++++------ src/pacman/po/es.po | 577 +++++++------ src/pacman/po/es_419.po | 594 +++++++------ src/pacman/po/eu.po | 570 ++++++------ src/pacman/po/eu_ES.po | 570 ++++++------ src/pacman/po/fi.po | 568 ++++++------ src/pacman/po/fr.po | 610 +++++++------ src/pacman/po/gl.po | 573 +++++++------ src/pacman/po/hi.po | 1902 +++++++++++++++++++++++++++++++++++++++++ src/pacman/po/hr.po | 588 +++++++------ src/pacman/po/hu.po | 563 ++++++------ src/pacman/po/id.po | 567 ++++++------ src/pacman/po/it.po | 573 +++++++------ src/pacman/po/ja.po | 571 +++++++------ src/pacman/po/ko.po | 573 +++++++------ src/pacman/po/lt.po | 577 +++++++------ src/pacman/po/nb.po | 625 +++++++------- src/pacman/po/nl.po | 717 ++++++++-------- src/pacman/po/pacman.pot | 561 ++++++------ src/pacman/po/pl.po | 628 +++++++------- src/pacman/po/pt.po | 570 ++++++------ src/pacman/po/pt_BR.po | 569 ++++++------ src/pacman/po/ro.po | 576 +++++++------ src/pacman/po/ru.po | 563 ++++++------ src/pacman/po/sk.po | 569 ++++++------ src/pacman/po/sl.po | 594 +++++++------ src/pacman/po/sr.po | 575 +++++++------ src/pacman/po/sr(a)latin.po | 575 +++++++------ src/pacman/po/sv.po | 655 +++++++------- src/pacman/po/tr.po | 575 +++++++------ src/pacman/po/uk.po | 573 +++++++------ src/pacman/po/zh_CN.po | 625 +++++++------- src/pacman/po/zh_TW.po | 563 ++++++------ 131 files changed, 37438 insertions(+), 29866 deletions(-) create mode 100644 lib/libalpm/po/hi.po create mode 100644 scripts/po/hi.po create mode 100644 src/pacman/po/hi.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, release/5.2.x, updated. v5.2.2-1-gf55c9f30
by Allan McRae 23 Apr '21

23 Apr '21

1 0

[pacman-dev] pacman-6.0 slushy freeze
by Allan McRae 23 Apr '21

23 Apr '21

Hi all, We are now in a slushy freeze for pacman-6.0. This means I will not look at new patches unless they fix a breakage. However, I aim to get through the few patches I have not looked at that were submitted before now (and revisions of those patches if quickly done). I will also pull the final 5.2.x translation files from Transifex, and push the 6.0 strings (again noting, slushy freeze, so strings may change). Allan

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-97-g8fe55207
by Allan McRae 22 Apr '21

22 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 8fe552070945561a0cd4dc24d3fcb22ed377f1a0 (commit) via 079b9d44e2faadd83856de07f890bae5cc51c5a4 (commit) via 41f9c50abf08e71aa5fd03568934ab80abc7715c (commit) via 63ad8b8b7639ac29fad6c4e0dcc699510c47d587 (commit) via a33cdac10bf1a68279ea1b9baa26aa09126f1ca4 (commit) via 3179db108a83104d9de6d1d607f55f8118e92160 (commit) via abdb4d7fa699ae3b8ff09ba79656f6853b9a1357 (commit) via 0699321b3ce71c46fbd0a10fede3959d0fac7009 (commit) via 288cd1c74afc5ff2e28b9a45a76d2146da583903 (commit) via 3688c947f86f1ddbb24d6bf3b8b42fbe0be6fd0e (commit) via 207f0439eeecb505f74590af481236ec60c09876 (commit) from c294b7cb4c3a160cbbbe404baeaa23a3c8290a99 (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 8fe552070945561a0cd4dc24d3fcb22ed377f1a0 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Apr 19 22:25:51 2021 -0400 meson: make our symlinking script more portable We do not need the --relative case as it is dead code (we only ever link a filename without directory components). For the rest, GNU-specific ln -T does two things: - if the link name is an existing directory, ln fails instead of creating a surprising link inside the directory - if the link name is a symlink to a directory, ln treats it as a file, and due to -f, unlinks it The second case can be portably solved by ln -n, and both cases can be solved by doing what the original autotools Makefile did: rm -f && ln -s If the file exists, it will be removed. If it cannot be removed, it must be an ordinary directory, and the script aborts with an error. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 079b9d44e2faadd83856de07f890bae5cc51c5a4 Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun Apr 18 20:59:44 2021 +0100 Only enable total progress when downloads > 1 Otherwise the total progress will just match the one package and be pretty useless. commit 41f9c50abf08e71aa5fd03568934ab80abc7715c Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun Apr 18 20:59:43 2021 +0100 Always enable TotalDownload Previously TotalDownload would switch the % download from per package to overall. Meaning you had a choice of which information to dispplay. Now with parallel downloads TotalDownload adds an extra progress bar. There's no reason to have this an off by default feature. Let's just make it always on. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 63ad8b8b7639ac29fad6c4e0dcc699510c47d587 Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Apr 20 09:48:20 2021 +0100 pacman: fix total bar leaking Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a33cdac10bf1a68279ea1b9baa26aa09126f1ca4 Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Thu Apr 22 21:46:56 2021 +0200 makepkg: add tool details to buildinfo to aid determining flags If a makepkg consumer uses a build wrapper to override compiler flags this may lead to unreproducible packages as there is no way to know which exact files were used for tooling that tries to reproduce said package. Instead of vendoring the whole used makepkg.conf file into buildinfo, this patch adds two new properties to the .BUILDINFO file named BUILDTOOL and BUILDTOOLVER which by default are simply makepkg's own values. Downstream consumers may override those values: For example in Arch Linux the devtools package can set those values and allow reproducible builds tooling to fetch the appropriate makepkg.conf. Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3179db108a83104d9de6d1d607f55f8118e92160 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Apr 21 22:47:13 2021 +1000 Add support for multiple 'Architecture' values This allows architecture to be multivalued. On x86-64 machines, this could be something like: Architecture = x86-64-v3 x86-64 We use the first specified Architecture value in mirrorlist $arch variable replacement, as this is backwards-compatible and sane. Original-patch-by: Dan McGee <dan(a)archlinux.org> Patch-updated-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit abdb4d7fa699ae3b8ff09ba79656f6853b9a1357 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Apr 19 10:36:14 2021 +0100 pacman: stop eta timer breaking allignment When the download estimate is over an hour the format displayed changes from mm:ss to hh:mm:ss. This causes everything to be out of alignment due to the extra characters. So instead lets just go back to --:-- when the download => 100 minutes. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0699321b3ce71c46fbd0a10fede3959d0fac7009 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Apr 18 23:25:13 2021 -0400 meson: make -uninstalled.pc correct This pkg-config file is automatically created in the meson-uninstalled/ directory of the build tree, and points to the built artifacts there. If this directory is added to PKG_CONFIG_PATH, it will be preferred over an installed copy. Making this work properly means it becomes trivially possible to build a private copy of libalpm, and then compile other projects using it rather than the system copy. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 288cd1c74afc5ff2e28b9a45a76d2146da583903 Author: Mark Weiman <mark.weiman(a)markzz.com> Date: Fri Apr 16 23:45:23 2021 -0400 Fix build error when SIGPOLL is not available On Linux, SIGPOLL is a valid signal, but on systems like FreeBSD, it is not. This patch does a preprocessor check to see if SIGPOLL is available or not. Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3688c947f86f1ddbb24d6bf3b8b42fbe0be6fd0e Author: Mark Weiman <mark.weiman(a)markzz.com> Date: Fri Apr 16 23:45:22 2021 -0400 Add an include for signal.h when needed On Linux, signal.h is not required to have access to the signal constants. On FreeBSD, this is not the case and requires signal.h to be explicitly included. This patch adds an include for signal.h in any source file that uses it. Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 207f0439eeecb505f74590af481236ec60c09876 Author: Mark Weiman <mark.weiman(a)markzz.com> Date: Fri Apr 16 23:45:21 2021 -0400 meson.build: Fix detection of symbols This patch changes the behavior of meson to define configuration options *only* when the symbol checked is present. Currently, it defines all of them in config.h whether the symbol exists or not and the code that looks for it doesn't check the macro's value, but whether it's defined. Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 4 +-- build-aux/meson-make-symlink.sh | 8 ++--- doc/pacman.conf.5.asciidoc | 15 +++------ etc/pacman.conf.in | 1 - lib/libalpm/alpm.h | 30 ++++++++++++------ lib/libalpm/handle.c | 30 ++++++++++++++---- lib/libalpm/handle.h | 2 +- lib/libalpm/trans.c | 21 ++++++++++-- lib/libalpm/util.c | 9 ++++-- meson.build | 5 ++- scripts/completion/zsh_completion.in | 1 - scripts/makepkg.sh.in | 2 ++ src/pacman/callback.c | 18 +++++------ src/pacman/conf.c | 37 +++++++++++++--------- src/pacman/conf.h | 7 ++-- src/pacman/pacman-conf.c | 7 ++-- src/pacman/pacman.c | 2 +- test/pacman/meson.build | 2 ++ .../{upgrade071.py => multiple-architectures01.py} | 8 ++--- .../{upgrade084.py => multiple-architectures02.py} | 8 ++--- 20 files changed, 132 insertions(+), 85 deletions(-) copy test/pacman/tests/{upgrade071.py => multiple-architectures01.py} (57%) copy test/pacman/tests/{upgrade084.py => multiple-architectures02.py} (54%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] pacman: fix total bar leaking
by morganamilo 22 Apr '21

22 Apr '21

diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 5e910136..faecbc5b 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -340,7 +340,7 @@ void cb_event(alpm_event_t *event) on_progress = 1; list_total_pkgs = event->pkg_retrieve.num; list_total = event->pkg_retrieve.total_size; - total_enabled = config->totaldownload && list_total; + total_enabled = config->totaldownload && list_total && dload_progressbar_enabled(); if(total_enabled) { init_total_progressbar(); } @@ -405,9 +405,10 @@ 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()) { + if(total_enabled) { update_bar_finalstats(totalbar); draw_pacman_progress_bar(totalbar); + free(totalbar); printf("\n"); } total_enabled = 0; -- 2.31.1

2 1

[pacman-dev] [PATCH] Add support for multiple 'Architecture' values
by Allan McRae 22 Apr '21

22 Apr '21

From: Dan McGee <dan(a)archlinux.org> This allows architecture to be multivalued. On x86-64 machines, this could be something like: Architecture = x86-64-v3 x86-64 We use the first specified Architecture value in mirrorlist $arch variable replacement, as this is backwards-compatible and sane. Original-patch-by: Dan McGee <dan(a)archlinux.org> Patch-updated-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Here is the link to Dan's original patch from 2012! https://code.toofishes.net/cgit/dan/pacman.git/commit/?h=multiarch&id=673c7… Getting this patch to apply did not require much effort, so I left Dan as the author. We guess the original patch did not get applied because it got lost due to no-one pushing it for inclusion. doc/pacman.conf.5.asciidoc | 10 +++--- lib/libalpm/alpm.h | 30 ++++++++++++----- lib/libalpm/handle.c | 30 +++++++++++++---- lib/libalpm/handle.h | 2 +- lib/libalpm/trans.c | 21 ++++++++++-- src/pacman/conf.c | 33 ++++++++++++------- src/pacman/conf.h | 4 +-- src/pacman/pacman-conf.c | 4 +-- src/pacman/pacman.c | 2 +- test/pacman/meson.build | 2 ++ test/pacman/tests/multiple-architectires01.py | 14 ++++++++ test/pacman/tests/multiple-architectires02.py | 16 +++++++++ 12 files changed, 127 insertions(+), 41 deletions(-) create mode 100644 test/pacman/tests/multiple-architectires01.py create mode 100644 test/pacman/tests/multiple-architectires02.py diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index 9bd31916..11ca1e4f 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -113,9 +113,9 @@ Options general configuration options. Wildcards in the specified paths will get expanded based on linkman:glob[7] rules. -*Architecture =* auto | i686 | x86_64 | ...:: - If set, pacman will only allow installation of packages of the given - architecture (e.g. 'i686', 'x86_64', etc). The special value 'auto' will +*Architecture =* auto &| i686 &| x86_64 | ...:: + If set, pacman will only allow installation of packages with the given + architectures (e.g. 'i686', 'x86_64', etc). The special value 'auto' will use the system architecture, provided via ``uname -m''. If unset, no architecture checks are made. *NOTE*: Packages with the special architecture 'any' can always be installed, as they are meant to be @@ -252,8 +252,8 @@ number. During parsing, pacman will define the `$repo` variable to the name of the current section. This is often utilized in files specified using the 'Include' directive so all repositories can use the same mirrorfile. pacman also defines -the `$arch` variable to the value of `Architecture`, so the same mirrorfile can -even be used for different architectures. +the `$arch` variable to the first (or only) value of the `Architecture` option, +so the same mirrorfile can even be used for different architectures. *SigLevel =* ...:: Set the signature verification level for this repository. For more diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 833df829..2e99d4d8 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -2016,25 +2016,37 @@ int alpm_option_remove_assumeinstalled(alpm_handle_t *handle, const alpm_depend_ /** @} */ -/** @name Accessors for the configured architecture - * - * libalpm will only install packages that match the configured architecture. - * The architecture does not need to match the physical architecture. - * It can just be treated as a label. +/** @name Accessors to the list of allowed architectures. + * libalpm will only install packages that match one of the configured + * architectures. The architectures do not need to match the physical + architecture. They can just be treated as a label. * @{ */ /** Returns the allowed package architecture. * @param handle the context handle - * @return the configured package architecture + * @return the configured package architectures */ -const char *alpm_option_get_arch(alpm_handle_t *handle); +alpm_list_t *alpm_option_get_architectures(alpm_handle_t *handle); -/** Sets the allowed package architecture. +/** Adds an allowed package architecture. * @param handle the context handle * @param arch the architecture to set */ -int alpm_option_set_arch(alpm_handle_t *handle, const char *arch); +int alpm_option_add_architecture(alpm_handle_t *handle, const char *arch); + +/** Sets the allowed package architecture. + * @param handle the context handle + * @param arches the architecture to set + */ +int alpm_option_set_architectures(alpm_handle_t *handle, alpm_list_t *arches); + +/** Removes an allowed package architecture. + * @param handle the context handle + * @param arch the architecture to remove + */ +int alpm_option_remove_architecture(alpm_handle_t *handle, const char *arch); + /* End of arch accessors */ /** @} */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 7b8cb1da..46224a25 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -77,7 +77,7 @@ void _alpm_handle_free(alpm_handle_t *handle) FREELIST(handle->hookdirs); FREE(handle->logfile); FREE(handle->lockfile); - FREE(handle->arch); + FREELIST(handle->architectures); FREE(handle->gpgdir); FREELIST(handle->noupgrade); FREELIST(handle->noextract); @@ -276,10 +276,10 @@ alpm_list_t SYMEXPORT *alpm_option_get_assumeinstalled(alpm_handle_t *handle) return handle->assumeinstalled; } -const char SYMEXPORT *alpm_option_get_arch(alpm_handle_t *handle) +alpm_list_t SYMEXPORT *alpm_option_get_architectures(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); - return handle->arch; + return handle->architectures; } int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle) @@ -720,11 +720,29 @@ int SYMEXPORT alpm_option_remove_assumeinstalled(alpm_handle_t *handle, const al return 0; } -int SYMEXPORT alpm_option_set_arch(alpm_handle_t *handle, const char *arch) +int SYMEXPORT alpm_option_add_architecture(alpm_handle_t *handle, const char *arch) { + handle->architectures = alpm_list_add(handle->architectures, strdup(arch)); + return 0; +} + +int SYMEXPORT alpm_option_set_architectures(alpm_handle_t *handle, alpm_list_t *arches) +{ + CHECK_HANDLE(handle, return -1); + if(handle->architectures) FREELIST(handle->architectures); + handle->architectures = alpm_list_strdup(arches); + return 0; +} + +int SYMEXPORT alpm_option_remove_architecture(alpm_handle_t *handle, const char *arch) +{ + char *vdata = NULL; CHECK_HANDLE(handle, return -1); - if(handle->arch) FREE(handle->arch); - STRDUP(handle->arch, arch, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + handle->architectures = alpm_list_remove_str(handle->architectures, arch, &vdata); + if(vdata != NULL) { + FREE(vdata); + return 1; + } return 0; } diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 2d8d0f9e..52dc2125 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -96,7 +96,7 @@ struct __alpm_handle_t { alpm_list_t *assumeinstalled; /* List of virtual packages used to satisfy dependencies */ /* options */ - char *arch; /* Architecture of packages we should allow */ + alpm_list_t *architectures; /* Architectures of packages we should allow */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ char *dbext; /* Sync DB extension */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index c6ec7eea..939ab05a 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -71,14 +71,29 @@ static alpm_list_t *check_arch(alpm_handle_t *handle, alpm_list_t *pkgs) alpm_list_t *i; alpm_list_t *invalid = NULL; - const char *arch = handle->arch; - if(!arch) { + if(!handle->architectures) { + _alpm_log(handle, ALPM_LOG_DEBUG, "skipping architecture checks\n"); return NULL; } for(i = pkgs; i; i = i->next) { alpm_pkg_t *pkg = i->data; + alpm_list_t *j; + int found = 0; const char *pkgarch = alpm_pkg_get_arch(pkg); - if(pkgarch && strcmp(pkgarch, arch) && strcmp(pkgarch, "any")) { + + /* always allow non-architecture packages and those marked "any" */ + if(!pkgarch || strcmp(pkgarch, "any") == 0) { + continue; + } + + for(j = handle->architectures; j; j = j->next) { + if(strcmp(pkgarch, j->data) == 0) { + found = 1; + break; + } + } + + if(!found) { char *string; const char *pkgname = pkg->name; const char *pkgver = pkg->version; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index cde96716..9578daa3 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -159,7 +159,7 @@ int config_free(config_t *oldconfig) FREELIST(oldconfig->cachedirs); free(oldconfig->xfercommand); free(oldconfig->print_format); - free(oldconfig->arch); + FREELIST(oldconfig->architectures); wordsplit_free(oldconfig->xfercommand_argv); free(oldconfig); @@ -394,16 +394,19 @@ cleanup: } -int config_set_arch(const char *arch) +int config_add_architecture(char *arch) { if(strcmp(arch, "auto") == 0) { struct utsname un; + char *newarch; uname(&un); - config->arch = strdup(un.machine); - } else { - config->arch = strdup(arch); + newarch = strdup(un.machine); + free(arch); + arch = newarch; } - pm_printf(ALPM_LOG_DEBUG, "config: arch: %s\n", config->arch); + + pm_printf(ALPM_LOG_DEBUG, "config: arch: %s\n", arch); + config->architectures = alpm_list_add(config->architectures, arch); return 0; } @@ -638,9 +641,12 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "HookDir") == 0) { setrepeatingoption(value, "HookDir", &(config->hookdirs)); } else if(strcmp(key, "Architecture") == 0) { - if(!config->arch) { - config_set_arch(value); + alpm_list_t *i, *arches = NULL; + setrepeatingoption(value, "Architecture", &arches); + for(i = arches; i; i = alpm_list_next(i)) { + config_add_architecture(i->data); } + alpm_list_free(arches); } else if(strcmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { @@ -751,17 +757,20 @@ static int _parse_options(const char *key, char *value, static char *replace_server_vars(config_t *c, config_repo_t *r, const char *s) { - if(c->arch == NULL && strstr(s, "$arch")) { + if(c->architectures == NULL && strstr(s, "$arch")) { pm_printf(ALPM_LOG_ERROR, _("mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"), s, "$arch", "Architecture"); return NULL; } - if(c->arch) { + /* use first specified architecture */ + if(c->architectures) { char *temp, *replaced; + alpm_list_t *i = config->architectures; + const char *arch = i->data; - replaced = strreplace(s, "$arch", c->arch); + replaced = strreplace(s, "$arch", arch); temp = replaced; replaced = strreplace(temp, "$repo", r->name); @@ -893,7 +902,7 @@ static int setup_libalpm(void) pm_printf(ALPM_LOG_WARNING, _("no '%s' configured\n"), "XferCommand"); } - alpm_option_set_arch(handle, config->arch); + alpm_option_set_architectures(handle, config->architectures); alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 1b9fb337..316c8d0f 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -57,7 +57,6 @@ typedef struct __config_t { unsigned short usesyslog; unsigned short color; unsigned short disable_dl_timeout; - char *arch; char *print_format; /* unfortunately, we have to keep track of paths both here and in the library * because they can come from both the command line or config file, and we @@ -70,6 +69,7 @@ typedef struct __config_t { char *sysroot; alpm_list_t *hookdirs; alpm_list_t *cachedirs; + alpm_list_t *architectures; unsigned short op_q_isfile; unsigned short op_q_info; @@ -244,7 +244,7 @@ int config_free(config_t *oldconfig); void config_repo_free(config_repo_t *repo); -int config_set_arch(const char *arch); +int config_add_architecture(char *arch); int parseconfig(const char *file); int parseconfigfile(const char *file); int setdefaults(config_t *c); diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index f8fac75d..6ca21119 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -258,7 +258,7 @@ static void dump_config(void) show_list_str("NoUpgrade", config->noupgrade); show_list_str("NoExtract", config->noextract); - show_str("Architecture", config->arch); + show_list_str("Architecture", config->architectures); show_str("XferCommand", config->xfercommand); show_bool("UseSyslog", config->usesyslog); @@ -364,7 +364,7 @@ static int list_directives(void) } else if(strcasecmp(i->data, "Architecture") == 0) { - show_str("Architecture", config->arch); + show_list_str("Architecture", config->architectures); } else if(strcasecmp(i->data, "XferCommand") == 0) { show_str("XferCommand", config->xfercommand); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index b2aabc08..7e810127 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -377,7 +377,7 @@ static int parsearg_global(int opt) { switch(opt) { case OP_ARCH: - config_set_arch(optarg); + config_add_architecture(strdup(optarg)); break; case OP_ASK: config->noask = 1; diff --git a/test/pacman/meson.build b/test/pacman/meson.build index 52ff9b9a..60722a8a 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -85,6 +85,8 @@ pacman_tests = [ 'tests/mode001.py', 'tests/mode002.py', 'tests/mode003.py', + 'tests/multiple-architectires01.py', + 'tests/multiple-architectires02.py', 'tests/noupgrade-inverted.py', 'tests/overwrite-files-match-negated.py', 'tests/overwrite-files-match.py', diff --git a/test/pacman/tests/multiple-architectires01.py b/test/pacman/tests/multiple-architectires01.py new file mode 100644 index 00000000..39f3e1f7 --- /dev/null +++ b/test/pacman/tests/multiple-architectires01.py @@ -0,0 +1,14 @@ +self.description = "Install a package (multiple Architecture options, wrong)" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +p.arch = 'i686' +self.addpkg(p) + +self.option["Architecture"] = ['i586', 'i486', 'i386'] + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=dummy") diff --git a/test/pacman/tests/multiple-architectires02.py b/test/pacman/tests/multiple-architectires02.py new file mode 100644 index 00000000..18625ec6 --- /dev/null +++ b/test/pacman/tests/multiple-architectires02.py @@ -0,0 +1,16 @@ +self.description = "Install a package (multiple Architecture options)" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +p.arch = 'i486' +self.addpkg(p) + +self.option["Architecture"] = ['i586', 'i486', 'i386'] + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +for f in p.files: + self.addrule("FILE_EXIST=%s" % f) \ No newline at end of file -- 2.31.1

3 3

[pacman-dev] [Proposal] --ignore-externals for svn source
by Erich Eckner 20 Apr '21

20 Apr '21

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I'm trying to put an svn source into a PKGBUILD, but unfortunately, the source has many large externals, that I'd like to ignore. If I read scripts/libmakepkg/source/svn.sh.in correctly, the cloning of all externals is (currently) hard coded. I would like to implement some option to disable that. What would be the best format for that? The only thing, I could come up with, is a source in the form: "$local_name::svn+https://$url#$revision?ignore_externals" However, this looks totally wrong, as "ignore_externals" is nothing, that should be done with the tree after cloning (in contrast to "signed" for git), but rather something, that should be inherent to the source (like a different protocol). Or is there already some nice trick to achieve, what I want? (I tried to put "ignore-externals" into .makepkg/config inside the svn tree, but it didn't change anything.) regards, Erich -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE3p92iMrPBP64GmxZCu7JB1Xae1oFAmB+uZEACgkQCu7JB1Xa e1oXFg/+MVWKx3whEHs1uvEpuT2WXUSGVPuwUXdzfsVN7kTy80lzREIcFWx6O6Gy WyxtqCixNlZ4eOW6EseIeuVIQtgLPUN0HHUPiPRIlRWEJv4Jhys3blneeosjMzg8 cbUEawpdRs2Txgo3wYH6WhY+JeVI3uaw7YT1gStQhdsepPNUnhBnwqK5PiEiAwUg pBGivY4Ma40PgdjByW21abBlV4RGCiDniRLlvmvHRXOeeq7aOsKL5YzetAFrdxfl IpSDIC7es9KHFu48b0TTHFlbgr/mTLQY/YsHmXYZmJzPAW++ooD+ebUj+6eIYGUL OnyUjUY3v+uyGI6Eo2B8qQQ98nDfIAksrOjzgjAwmQG9PgN5HGXP4C2WYigOrl8s +mGQ69mFDb+T4t0SSl0mIiID0l7UMmvFs7iZ4aeuAeJCNWvV7fWAlXudpgZ19TEY McdVZa+0AlFS0x9/jo1h8b71kWb/N3rr5gCeOyePDKKuBA49AtwhvK/Miz77OVOz KoOkc/vwNXLkIyhfvlmi12FlWcKU5BblYkwJ/NQBv+SpE0ZroPT7V3+VuydmipTx NoUJmOVS61ZTJFgSJd14vHroRKY0lSJzQ3Jvv5Vtn1FNP1oNmwF1ZYfeXorvWtG/ f8zIxPtcsSSif6gd4YJ2QxSteKnbH658F+rRooB/FD/0UP5+o+E= =FiDa -----END PGP SIGNATURE-----

2 2

[pacman-dev] [PATCH 0/4] Various fixes for FreeBSD (and perhaps others)
by Mark Weiman 20 Apr '21

20 Apr '21

This is a patch set that fixes a few issues when attempting to build on FreeBSD. Mark Weiman (4): Fix check for FSSTATSTYPE meson.build: Fix detection of symbols Add an include for signal.h when needed Fix build error when SIGPOLL is not available lib/libalpm/util.c | 10 +++++++++- meson.build | 34 +++++++++++++++++++++++++++++++--- src/pacman/conf.c | 4 ++++ 3 files changed, 44 insertions(+), 4 deletions(-) -- 2.31.1

6 32

[pacman-dev] [PATCH 1/3] Always enable TotalDownload
by morganamilo 20 Apr '21

20 Apr '21

Previously TotalDownload would switch the % download from per package to overall. Meaning you had a choice of which information to dispplay. Now with parallel downloads TotalDownload adds an extra progress bar. There's no reason to have this an off by default feature. Let's just make it always on. --- README | 4 ++-- doc/pacman.conf.5.asciidoc | 5 ----- etc/pacman.conf.in | 1 - scripts/completion/zsh_completion.in | 1 - src/pacman/callback.c | 2 +- src/pacman/conf.c | 3 --- src/pacman/conf.h | 3 --- src/pacman/pacman-conf.c | 3 --- 8 files changed, 3 insertions(+), 19 deletions(-) diff --git a/README b/README index 470ccf3c..4465432a 100644 --- a/README +++ b/README @@ -194,8 +194,8 @@ remove.c and sync.c). The frontend is using a configuration file, usually "/etc/pacman.conf". Some of these options are only useful for the frontend only (mainly the ones used to -control the output like totaldownload, or the behavior with cleanmethod and -syncfirst). The rest is used to configure the library. +control the output like verbosepkglist, or the behavior with cleanmethod). +The rest is used to configure the library. [UPGRADE/REMOVE/SYNC] diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index 9bd31916..a024c3a7 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -190,11 +190,6 @@ Options Disables progress bars. This is useful for terminals which do not support escape characters. -*TotalDownload*:: - 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*:: Performs an approximate check for adequate available disk space before installing packages. diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 634ecc06..1799efc7 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -32,7 +32,6 @@ Architecture = auto #UseSyslog #Color #NoProgressBar -#TotalDownload CheckSpace #VerbosePkgLists ParallelDownloads = 5 diff --git a/scripts/completion/zsh_completion.in b/scripts/completion/zsh_completion.in index e4bf3312..5fd8aebc 100644 --- a/scripts/completion/zsh_completion.in +++ b/scripts/completion/zsh_completion.in @@ -511,7 +511,6 @@ _pacman_conf_general_directives=( 'XferCommand' 'UseSyslog' 'Color' - 'TotalDownload' 'CheckSpace' 'VerbosePkgLists' 'DisableDownloadTimeout' diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a28a79a9..2b79812e 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -340,7 +340,7 @@ void cb_event(alpm_event_t *event) on_progress = 1; list_total_pkgs = event->pkg_retrieve.num; list_total = event->pkg_retrieve.total_size; - total_enabled = config->totaldownload && list_total; + total_enabled = list_total; if(total_enabled) { init_total_progressbar(); } diff --git a/src/pacman/conf.c b/src/pacman/conf.c index a4f2ba35..2349e638 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -601,9 +601,6 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "VerbosePkgLists") == 0) { config->verbosepkglists = 1; pm_printf(ALPM_LOG_DEBUG, "config: verbosepkglists\n"); - } else if(strcmp(key, "TotalDownload") == 0) { - config->totaldownload = 1; - pm_printf(ALPM_LOG_DEBUG, "config: totaldownload\n"); } else if(strcmp(key, "CheckSpace") == 0) { config->checkspace = 1; } else if(strcmp(key, "Color") == 0) { diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 1b9fb337..773fb6a9 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -113,9 +113,6 @@ typedef struct __config_t { unsigned short chomp; /* format target pkg lists as table */ unsigned short verbosepkglists; - /* When downloading, display the amount downloaded, rate, ETA, and percent - * downloaded of the total download list */ - unsigned short totaldownload; /* number of parallel download streams */ unsigned int parallel_downloads; /* select -Sc behavior */ diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index f8fac75d..91986ba4 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -263,7 +263,6 @@ static void dump_config(void) show_bool("UseSyslog", config->usesyslog); show_bool("Color", config->color); - show_bool("TotalDownload", config->totaldownload); show_bool("CheckSpace", config->checkspace); show_bool("VerbosePkgLists", config->verbosepkglists); show_bool("DisableDownloadTimeout", config->disable_dl_timeout); @@ -372,8 +371,6 @@ static int list_directives(void) show_bool("UseSyslog", config->usesyslog); } else if(strcasecmp(i->data, "Color") == 0) { show_bool("Color", config->color); - } else if(strcasecmp(i->data, "TotalDownload") == 0) { - show_bool("TotalDownload", config->totaldownload); } else if(strcasecmp(i->data, "CheckSpace") == 0) { show_bool("CheckSpace", config->checkspace); } else if(strcasecmp(i->data, "VerbosePkgLists") == 0) { -- 2.31.1

2 4

[pacman-dev] [PATCH v2] meson: make our symlinking script more portable
by Eli Schwartz 20 Apr '21

20 Apr '21

We do not need the --relative case as it is dead code (we only ever link a filename without directory components). For the rest, GNU-specific ln -T does two things: - if the link name is an existing directory, ln fails instead of creating a surprising link inside the directory - if the link name is a symlink to a directory, ln treats it as a file, and due to -f, unlinks it The second case can be portably solved by ln -n, and both cases can be solved by doing what the original autotools Makefile did: rm -f && ln -s If the file exists, it will be removed. If it cannot be removed, it must be an ordinary directory, and the script aborts with an error. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- v2: autotools had an elegant way to solve this which is very portable and also super simple. build-aux/meson-make-symlink.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build-aux/meson-make-symlink.sh b/build-aux/meson-make-symlink.sh index 501cd43d4..3e3aa7ba2 100644 --- a/build-aux/meson-make-symlink.sh +++ b/build-aux/meson-make-symlink.sh @@ -5,8 +5,6 @@ set -eu # and we need to create the target directory... mkdir -vp "$(dirname "${DESTDIR:-}$2")" -if [ "$(dirname $1)" = . ]; then - ln -vfs -T "$1" "${DESTDIR:-}$2" -else - ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" -fi + +rm -f "${DESTDIR:-}$2" +ln -vs "$1" "${DESTDIR:-}$2" -- 2.31.1

1 0

[pacman-dev] [PATCH] meson: make our symlinking script more portable
by Eli Schwartz 19 Apr '21

19 Apr '21

We do not need the --relative case as it is dead code (we only ever link a filename without directory components). For the rest, GNU-specific ln -T does two things: - if the link name is an existing directory, ln fails instead of creating a surprising link inside the directory - if the link name is a symlink to a directory, ln treats it as a file, and due to -f, unlinks it The second case can be portably solved by ln -n, and the first case is not actually currently functional, but we can portably replace the error message with rmdir, so, why not? Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- build-aux/meson-make-symlink.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build-aux/meson-make-symlink.sh b/build-aux/meson-make-symlink.sh index 501cd43d4..27d068efe 100644 --- a/build-aux/meson-make-symlink.sh +++ b/build-aux/meson-make-symlink.sh @@ -5,8 +5,11 @@ set -eu # and we need to create the target directory... mkdir -vp "$(dirname "${DESTDIR:-}$2")" -if [ "$(dirname $1)" = . ]; then - ln -vfs -T "$1" "${DESTDIR:-}$2" -else - ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" + +# ln -T is neither portable, nor useful if we would like to actually succeed +# ln -F is nice, but BSD only +if [ ! -L "${DESTDIR:-}$2" ] && [ -d "${DESTDIR:-}$2" ]; then + rmdir "${DESTDIR:-}$2" fi + +ln -vnfs "$1" "${DESTDIR:-}$2" -- 2.31.1

2 3

[pacman-dev] Missing spaces in Swedish translation string
by Víctor López Juan 19 Apr '21

19 Apr '21

Hi all, I run pacman v5.2.2 with Swedish localization. When removing a package with dependencies, the string … > Att ta bort XXXXförstör beroendet 'YYYY' som krävs avZZZZ … is displayed, which loosely translates as: > Removing XXXXdestroys dependency 'YYYY' which is needed byZZZZ There should be a space before "förstör" and after "av", like this: > Att ta bort XXXX förstör beroendet 'YYYY' som krävs av ZZZZ which loosely corresponds to: > Removing XXXX destroys dependency 'YYYY' which is needed by ZZZZ I have attached an example of the command output (log.txt). I have tried to fix this on Transifex, but I was unable to join the Pacman translation team for Swedish. My username there is lopezjuan. Best regards, Víctor

3 3

[pacman-dev] [PATCH] meson: make -uninstalled.pc correct
by Eli Schwartz 19 Apr '21

19 Apr '21

This pkg-config file is automatically created in the meson-uninstalled/ directory of the build tree, and points to the built artifacts there. If this directory is added to PKG_CONFIG_PATH, it will be preferred over an installed copy. Making this work properly means it becomes trivially possible to build a private copy of libalpm, and then compile other projects using it rather than the system copy. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- I've been using this in combination with some custom patches to pyalpm (to actually use pkg-config), to generate statically linked pyalpm wheels that don't break every time the pacman-git ABI breaks. meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index 579ff2ed8..7b833571f 100644 --- a/meson.build +++ b/meson.build @@ -319,6 +319,7 @@ libalpm = library( 'alpm', version : libalpm_version, objects: libalpm_a.extract_all_objects(recursive: true), + include_directories : includes, dependencies : alpm_deps, install : true) -- 2.31.1

2 1

[pacman-dev] [PATCH] makepkg: --source should download repos with PGP signatures
by Eli Schwartz 08 Apr '21

08 Apr '21

We optimize this out for sourceballs since VCS sources don't get their checksums verified. But this logic is broken ever since we implemented PGP signature checking for git sources -- if the git source is signed, we still check it, but we don't make sure to download it first. makepkg then fails to generate a sourceball unless you previously ran --verifysource or attempted to build. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/source.sh.in | 5 ++++- scripts/libmakepkg/source/git.sh.in | 9 ++++++--- scripts/makepkg.sh.in | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/scripts/libmakepkg/source.sh.in b/scripts/libmakepkg/source.sh.in index a0c6b662..b95e6be8 100644 --- a/scripts/libmakepkg/source.sh.in +++ b/scripts/libmakepkg/source.sh.in @@ -35,7 +35,7 @@ done download_sources() { local netfile all_sources - local get_source_fn=get_all_sources_for_arch get_vcs=1 + local get_source_fn=get_all_sources_for_arch get_vcs=1 get_pgp=0 msg "$(gettext "Retrieving sources...")" @@ -47,6 +47,9 @@ download_sources() { novcs) get_vcs=0 ;; + getpgp) + (( SKIPPGPCHECK )) || get_pgp=1 + ;; *) break ;; diff --git a/scripts/libmakepkg/source/git.sh.in b/scripts/libmakepkg/source/git.sh.in index 7d191b8d..d090f14e 100644 --- a/scripts/libmakepkg/source/git.sh.in +++ b/scripts/libmakepkg/source/git.sh.in @@ -29,13 +29,16 @@ source "$LIBRARY/util/pkgbuild.sh" download_git() { + local netfile=$1 + local query=$(get_uri_query "$netfile") + # abort early if parent says not to fetch if declare -p get_vcs > /dev/null 2>&1; then - (( get_vcs )) || return + if (( ! get_pgp )) || [[ $query != signed ]]; then + (( get_vcs )) || return + fi fi - local netfile=$1 - local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7e8d6805..c9940f0a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1416,7 +1416,7 @@ if (( SOURCEONLY )); then download_sources allarch elif ( (( ! SKIPCHECKSUMS )) || \ ( (( ! SKIPPGPCHECK )) && source_has_signatures ) ); then - download_sources allarch novcs + download_sources allarch novcs getpgp fi check_source_integrity all cd_safe "$startdir" -- 2.28.0

2 1