- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Remove alpm_db_update() function
by Anatol Pomozov 07 May '20

07 May '20

This function got replaced by its multiplexed couterpart alpm_dbs_update(). If one needs to reproduce alpm_db_update() functionality then create a single item list and pass it to alpm_dbs_update(). Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/alpm.h | 36 --------- lib/libalpm/be_sync.c | 165 ------------------------------------------ 2 files changed, 201 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 8fe11a9b..70ed459c 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1048,42 +1048,6 @@ int alpm_db_add_server(alpm_db_t *db, const char *url); int alpm_db_remove_server(alpm_db_t *db, const char *url); /** @} */ -/** Update a package database - * - * An update of the package database \a db will be attempted. Unless - * \a force is true, the update will only be performed if the remote - * database was modified since the last update. - * - * This operation requires a database lock, and will return an applicable error - * if the lock could not be obtained. - * - * Example: - * @code - * alpm_list_t *syncs = alpm_get_syncdbs(); - * for(i = syncs; i; i = alpm_list_next(i)) { - * alpm_db_t *db = alpm_list_getdata(i); - * result = alpm_db_update(0, db); - * - * if(result < 0) { - * printf("Unable to update database: %s\n", alpm_strerrorlast()); - * } else if(result == 1) { - * printf("Database already up to date\n"); - * } else { - * printf("Database updated\n"); - * } - * } - * @endcode - * - * @note After a successful update, the \link alpm_db_get_pkgcache() - * package cache \endlink will be invalidated - * @param force if true, then forces the update, otherwise update only in case - * the database isn't up to date - * @param db pointer to the package database to update - * @return 0 on success, -1 on error (pm_errno is set accordingly), 1 if up to - * to date - */ -int alpm_db_update(int force, alpm_db_t *db); - /** Update package databases * * An update of the package databases in the list \a dbs will be attempted. diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 826c11e6..73915321 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -136,171 +136,6 @@ valid: return 0; } -int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) -{ - char *syncpath; - const char *dbext; - alpm_list_t *i; - int updated = 0; - int ret = -1; - mode_t oldmask; - alpm_handle_t *handle; - int siglevel; - - /* Sanity checks */ - ASSERT(db != NULL, return -1); - handle = db->handle; - handle->pm_errno = ALPM_ERR_OK; - ASSERT(db != handle->db_local, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); - ASSERT(db->servers != NULL, RET_ERR(handle, ALPM_ERR_SERVER_NONE, -1)); - - if(!(db->usage & ALPM_DB_USAGE_SYNC)) { - return 0; - } - - syncpath = get_sync_dir(handle); - if(!syncpath) { - return -1; - } - - /* force update of invalid databases to fix potential mismatched database/signature */ - if(db->status & DB_STATUS_INVALID) { - force = 1; - } - - /* make sure we have a sane umask */ - oldmask = umask(0022); - - siglevel = alpm_db_get_siglevel(db); - - /* attempt to grab a lock */ - if(_alpm_handle_lock(handle)) { - free(syncpath); - umask(oldmask); - RET_ERR(handle, ALPM_ERR_HANDLE_LOCK, -1); - } - - dbext = db->handle->dbext; - - for(i = db->servers; i; i = i->next) { - const char *server = i->data, *final_db_url = NULL; - struct dload_payload payload = {0}; - size_t len; - int sig_ret = 0; - - /* set hard upper limit of 128MiB */ - payload.max_size = 128 * 1024 * 1024; - - /* print server + filename into a buffer */ - len = strlen(server) + strlen(db->treename) + strlen(dbext) + 2; - MALLOC(payload.fileurl, len, - { - free(syncpath); - umask(oldmask); - RET_ERR(handle, ALPM_ERR_MEMORY, -1); - } - ); - snprintf(payload.fileurl, len, "%s/%s%s", server, db->treename, dbext); - payload.handle = handle; - payload.force = force; - payload.unlink_on_fail = 1; - - ret = _alpm_download(&payload, syncpath, NULL, &final_db_url); - _alpm_dload_payload_reset(&payload); - updated = (updated || ret == 0); - - if(ret != -1 && updated && (siglevel & ALPM_SIG_DATABASE)) { - /* an existing sig file is no good at this point */ - char *sigpath = _alpm_sigpath(handle, _alpm_db_path(db)); - if(!sigpath) { - ret = -1; - break; - } - unlink(sigpath); - free(sigpath); - - - /* check if the final URL from internal downloader looks reasonable */ - if(final_db_url != NULL) { - if(strlen(final_db_url) < 3 - || strcmp(final_db_url + strlen(final_db_url) - strlen(dbext), - dbext) != 0) { - final_db_url = NULL; - } - } - - /* if we downloaded a DB, we want the .sig from the same server */ - if(final_db_url != NULL) { - /* print final_db_url into a buffer (leave space for .sig) */ - len = strlen(final_db_url) + 5; - } else { - /* print server + filename into a buffer (leave space for separator and .sig) */ - len = strlen(server) + strlen(db->treename) + strlen(dbext) + 6; - } - - MALLOC(payload.fileurl, len, - { - free(syncpath); - umask(oldmask); - RET_ERR(handle, ALPM_ERR_MEMORY, -1); - } - ); - - if(final_db_url != NULL) { - snprintf(payload.fileurl, len, "%s.sig", final_db_url); - } else { - snprintf(payload.fileurl, len, "%s/%s%s.sig", server, db->treename, dbext); - } - - payload.handle = handle; - payload.force = 1; - payload.errors_ok = (siglevel & ALPM_SIG_DATABASE_OPTIONAL); - - /* set hard upper limit of 16KiB */ - payload.max_size = 16 * 1024; - - sig_ret = _alpm_download(&payload, syncpath, NULL, NULL); - /* errors_ok suppresses error messages, but not the return code */ - sig_ret = payload.errors_ok ? 0 : sig_ret; - _alpm_dload_payload_reset(&payload); - } - - if(ret != -1 && sig_ret != -1) { - break; - } - } - - if(updated) { - /* Cache needs to be rebuilt */ - _alpm_db_free_pkgcache(db); - - /* clear all status flags regarding validity/existence */ - db->status &= ~DB_STATUS_VALID; - db->status &= ~DB_STATUS_INVALID; - db->status &= ~DB_STATUS_EXISTS; - db->status &= ~DB_STATUS_MISSING; - - /* if the download failed skip validation to preserve the download error */ - if(ret != -1 && sync_db_validate(db) != 0) { - /* pm_errno should be set */ - ret = -1; - } - } - - if(ret == -1) { - /* pm_errno was set by the download code */ - _alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync db: %s\n", - alpm_strerror(handle->pm_errno)); - } else { - handle->pm_errno = ALPM_ERR_OK; - } - - _alpm_handle_unlock(handle); - free(syncpath); - umask(oldmask); - return ret; -} - int SYMEXPORT alpm_dbs_update(alpm_handle_t *handle, alpm_list_t *dbs, int force) { char *syncpath; const char *dbext = handle->dbext; -- 2.26.1

2 2

[pacman-dev] [PATCH] Convert download packages logic to multiplexed API
by Anatol Pomozov 07 May '20

07 May '20

Create a list of dload_payloads and pass it to the new _alpm_multi_* interface. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/sync.c | 74 ++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 46 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 8a9dcae8..aa417bca 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -726,47 +726,13 @@ static int find_dl_candidates(alpm_handle_t *handle, alpm_list_t **files) return 0; } -static int download_single_file(alpm_handle_t *handle, struct dload_payload *payload, - const char *cachedir) -{ - alpm_event_pkgdownload_t event = { - .type = ALPM_EVENT_PKGDOWNLOAD_START, - .file = payload->remote_name - }; - const alpm_list_t *server; - - payload->handle = handle; - payload->allow_resume = 1; - - EVENT(handle, &event); - for(server = payload->servers; server; server = server->next) { - const char *server_url = server->data; - size_t len; - - /* print server + filename into a buffer */ - len = strlen(server_url) + strlen(payload->remote_name) + 2; - MALLOC(payload->fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - snprintf(payload->fileurl, len, "%s/%s", server_url, payload->remote_name); - - if(_alpm_download(payload, cachedir, NULL, NULL) != -1) { - event.type = ALPM_EVENT_PKGDOWNLOAD_DONE; - EVENT(handle, &event); - return 0; - } - _alpm_dload_payload_reset_for_retry(payload); - } - - event.type = ALPM_EVENT_PKGDOWNLOAD_FAILED; - EVENT(handle, &event); - return -1; -} - static int download_files(alpm_handle_t *handle) { const char *cachedir; alpm_list_t *i, *files = NULL; int errors = 0; alpm_event_t event; + alpm_list_t *payloads = NULL; cachedir = _alpm_filecache_setup(handle); handle->trans->state = STATE_DOWNLOADING; @@ -814,26 +780,42 @@ static int download_files(alpm_handle_t *handle) event.type = ALPM_EVENT_RETRIEVE_START; EVENT(handle, &event); - event.type = ALPM_EVENT_RETRIEVE_DONE; for(i = files; i; i = i->next) { const alpm_pkg_t *pkg = i->data; - struct dload_payload payload = {0}; + struct dload_payload *payload = NULL; - STRDUP(payload.remote_name, pkg->filename, GOTO_ERR(handle, ALPM_ERR_MEMORY, finish)); - payload.servers = pkg->origin_data.db->servers; - payload.max_size = pkg->size; + CALLOC(payload, 1, sizeof(*payload), GOTO_ERR(handle, ALPM_ERR_MEMORY, finish)); + STRDUP(payload->remote_name, pkg->filename, GOTO_ERR(handle, ALPM_ERR_MEMORY, finish)); + STRDUP(payload->filepath, pkg->filename, GOTO_ERR(handle, ALPM_ERR_MEMORY, finish)); + payload->max_size = pkg->size; + payload->servers = pkg->origin_data.db->servers; + payload->handle = handle; + payload->allow_resume = 1; - if(download_single_file(handle, &payload, cachedir) == -1) { - errors++; - event.type = ALPM_EVENT_RETRIEVE_FAILED; - _alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files\n")); - } - _alpm_dload_payload_reset(&payload); + payloads = alpm_list_add(payloads, payload); + + /* TOASK: do we need to initiate *.sig file download here? */ + } + /* TOASK: the sequential download logic reported ALPM_EVENT_PKGDOWNLOAD_START/DONE/FAILED event. + * Do we want to report the event as well? If yes then it should be moved inside alpm_multi_*() + * function but at that point ALPM operates with dload_payload() and does not care if it downloads + * package or database file. + */ + event.type = ALPM_EVENT_RETRIEVE_DONE; + if(_alpm_multi_download(handle, payloads, cachedir) == -1) { + errors++; + event.type = ALPM_EVENT_RETRIEVE_FAILED; + _alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files\n")); } EVENT(handle, &event); } finish: + if(payloads) { + alpm_list_free_inner(payloads, (alpm_list_fn_free)_alpm_dload_payload_reset); + FREELIST(payloads); + } + if(files) { alpm_list_free(files); } -- 2.26.1

2 5

[pacman-dev] [PATCH v2] Extend download callback interface with start/complete events
by Anatol Pomozov 06 May '20

06 May '20

With the previous download interface the callback uses the first progress event as 'download has started' signal. Unfortunately it does not work with up-to-date files that never receive 'download progress' events. Up-to-date database messages are currently handled in sync_syncdbs() after the sequential download is completed and a result from ALPM is received. But this is not going to work with multiplexed download interface that returns the result only after all files are completed. Another problem with 'first progress event is the beginning of the download' is that such events time are unpredictable. Thus the UI progress bar order might differ from what has been passed by client to alpm_dbs_update() function. We actually want to keep the dbs progress bars in a strict order. To help to solve the given problems extend the download callback to allow 2 more events - download started and completed. 'Download started' events appear in the same order as in the list given by a client. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/alpm.h | 35 ++++++++++++++++++++++++++++++++--- lib/libalpm/dload.c | 19 +++++++++++++++---- src/pacman/callback.c | 10 +++++++++- src/pacman/callback.h | 3 ++- src/pacman/conf.c | 2 +- 5 files changed, 59 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index a31f7a8a..534a8189 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -715,13 +715,42 @@ typedef void (*alpm_cb_progress)(alpm_progress_t, const char *, int, size_t, siz * Downloading */ +/* File download events. + * These events are reported by ALPM via download callback. + */ +typedef enum { + ALPM_DOWNLOAD_INIT, /* alpm initializes file download logic */ + ALPM_DOWNLOAD_PROGRESS, /* download progress reported */ + ALPM_DOWNLOAD_COMPLETED /* alpm is about to release data related to the file */ +} alpm_download_event_type_t; + +typedef struct { + int optional; /* whether this file is optional and thus the errors could be ignored */ +} alpm_download_event_init_t; + +typedef struct { + off_t downloaded; /* amount of data downloaded */ + off_t total; /* total amount need to be downloaded */ +} alpm_download_event_progress_t; + +typedef struct { + /* total bytes in file */ + off_t total; + /* download result code: + * 0 - download completed successfully + * 1 - the file is up-to-date + * negative - error code + */ + int result; +} alpm_download_event_completed_t; + /** Type of download progress callbacks. * @param filename the name of the file being downloaded - * @param xfered the number of transferred bytes - * @param total the total number of bytes to transfer + * @param event the event type + * @param data the event data of type alpm_download_event_*_t */ typedef void (*alpm_cb_download)(const char *filename, - off_t xfered, off_t total); + alpm_download_event_type_t event, void *data); typedef void (*alpm_cb_totaldl)(off_t total); diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index c65bb5e4..2f360ab8 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -88,6 +88,7 @@ static int dload_progress_cb(void *file, curl_off_t dltotal, curl_off_t dlnow, { struct dload_payload *payload = (struct dload_payload *)file; off_t current_size, total_size; + alpm_download_event_progress_t cb_data = {0}; /* avoid displaying progress bar for redirects with a body */ if(payload->respcode >= 300) { @@ -127,16 +128,20 @@ static int dload_progress_cb(void *file, curl_off_t dltotal, curl_off_t dlnow, * x {x>0}, x: download complete * x {x>0, x<y}, y {y > 0}: download progress, expected total is known */ if(!payload->cb_initialized) { - payload->handle->dlcb(payload->remote_name, 0, -1); + cb_data.downloaded = 0; + cb_data.total = -1; payload->cb_initialized = 1; } if(payload->prevprogress == current_size) { - payload->handle->dlcb(payload->remote_name, 0, 0); + cb_data.downloaded = 0; + cb_data.total = 0; } else { /* do NOT include initial_size since it wasn't part of the package's * download_size (nor included in the total download size callback) */ - payload->handle->dlcb(payload->remote_name, dlnow, dltotal); + cb_data.downloaded = dlnow; + cb_data.total = dltotal; } + payload->handle->dlcb(payload->remote_name, ALPM_DOWNLOAD_PROGRESS, &cb_data); payload->prevprogress = current_size; @@ -660,6 +665,7 @@ static int curl_multi_check_finished_download(CURLM *curlm, CURLMsg *msg, long remote_time = -1; struct stat st; char hostname[HOSTNAME_SIZE]; + alpm_download_event_completed_t cb_data = {0}; int ret = -1; curlerr = curl_easy_getinfo(curl, CURLINFO_PRIVATE, &payload); @@ -819,7 +825,9 @@ cleanup: unlink(payload->tempfile_name); } - // TODO: report that the download has been completed + cb_data.total = bytes_dl; + cb_data.result = ret; + handle->dlcb(payload->remote_name, ALPM_DOWNLOAD_COMPLETED, &cb_data); curl_multi_remove_handle(curlm, curl); curl_easy_cleanup(curl); @@ -937,6 +945,9 @@ static int curl_multi_download_internal(alpm_handle_t *handle, struct dload_payload *payload = payloads->data; if(curl_multi_add_payload(handle, curlm, payload, localpath) == 0) { + alpm_download_event_init_t cb_data = {.optional = payload->errors_ok}; + + handle->dlcb(payload->remote_name, ALPM_DOWNLOAD_INIT, &cb_data); payloads = payloads->next; // TODO: report that download has started } else { diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a129758b..613d59d4 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -648,7 +648,7 @@ void cb_dl_total(off_t total) } /* callback to handle display of download progress */ -void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) +static void dload_progress_event(const char *filename, off_t file_xfered, off_t file_total) { static double rate_last; static off_t xfered_last; @@ -858,6 +858,14 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) return; } +void cb_download(const char *filename, alpm_download_event_type_t event, void *data) +{ + if(event == ALPM_DOWNLOAD_PROGRESS) { + alpm_download_event_progress_t *progress = data; + dload_progress_event(filename, progress->downloaded, progress->total); + } +} + /* Callback to handle notifications from the library */ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) { diff --git a/src/pacman/callback.h b/src/pacman/callback.h index b4bde5f2..6d92e86b 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -37,7 +37,8 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, /* callback to handle receipt of total download value */ void cb_dl_total(off_t total); /* callback to handle display of download progress */ -void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total); +void cb_download(const char *filename, alpm_download_event_type_t event, + void *data); /* callback to handle messages/notifications from pacman library */ __attribute__((format(printf, 2, 0))) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 7390d741..ac5a5329 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -837,7 +837,7 @@ static int setup_libalpm(void) config->handle = handle; alpm_option_set_logcb(handle, cb_log); - alpm_option_set_dlcb(handle, cb_dl_progress); + 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); -- 2.26.2

2 1

[pacman-dev] [PATCH] doc: remove vim modelines from BUILDINFO(5)
by Eli Schwartz 06 May '20

06 May '20

We (thought we) removed all modelines from the project in commit 860e4c4943ad062bd0eff99f28e7d64804b3c08e, but apparently this one sneaked in by virtue of this manpage being added to the project after the "remove all the modelines" patch was submitted, but before it was applied. I must have failed to update the patch to remove it from this file also. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Found this while pondering to write a pkg.tar(5) manpage. doc/BUILDINFO.5.asciidoc | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/BUILDINFO.5.asciidoc b/doc/BUILDINFO.5.asciidoc index bb300e18..72b297dd 100644 --- a/doc/BUILDINFO.5.asciidoc +++ b/doc/BUILDINFO.5.asciidoc @@ -1,6 +1,3 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: -///// BUILDINFO(5) ============ -- 2.26.2

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-66-g411b12d0
by Allan McRae 06 May '20

06 May '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 411b12d09ddb47722acf6d354c17ee9ee5228964 (commit) via 3a6c9220fffe1836f2f1b8e8618543791bd3901f (commit) via df30f10672ba46a34521d6a503e8a1764d4795cc (commit) from cebda6d0ee4c58521cafd9d0980c8b79cc068602 (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 411b12d09ddb47722acf6d354c17ee9ee5228964 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue May 5 00:41:10 2020 -0400 editorconfig: set meson indentation style meson.build gets two-space indents, but our global tabbed default was overriding this. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3a6c9220fffe1836f2f1b8e8618543791bd3901f Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue May 5 00:41:09 2020 -0400 meson: use better check for debug builds meson 0.48 added the 'debug' and 'optimization' builtin options, which bidirectionally map to the buildtype, but in some cases where debug is enabled, the builtype may be custom. Checking the 'debug' option lets us detect every case currently detected, plus a few more, and does so in a shorter and more concise manner. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit df30f10672ba46a34521d6a503e8a1764d4795cc Author: Allan McRae <allan(a)archlinux.org> Date: Tue May 5 11:29:44 2020 +1000 Convert gitlab valgrind runner to meson Turns out environmental variables do get passed through fakechroot! Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .editorconfig | 4 ++++ .gitlab-ci.yml | 9 ++++----- meson.build | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2] Introduce event types for start/end database list download
by Anatol Pomozov 06 May '20

06 May '20

Multiplexed database/files downloads will use multiple progress bars. The UI logic is quite complicated and printing error messages while handling multiple progress bars is going to be challenging. Instead we are going to save all ALPM error messages to a list and flush it at the end of the download process. Use on_progress variable that blocks error messages printing. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/alpm.h | 18 ++++++++++++------ lib/libalpm/be_sync.c | 7 +++++++ lib/libalpm/sync.c | 6 +++--- src/pacman/callback.c | 15 ++++++++++++--- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2cf20343..a31f7a8a 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -402,12 +402,18 @@ typedef enum _alpm_event_type_t { /** Scriptlet has printed information; See alpm_event_scriptlet_info_t for * arguments. */ ALPM_EVENT_SCRIPTLET_INFO, - /** Files will be downloaded from a repository. */ - ALPM_EVENT_RETRIEVE_START, - /** Files were downloaded from a repository. */ - ALPM_EVENT_RETRIEVE_DONE, - /** Not all files were successfully downloaded from a repository. */ - ALPM_EVENT_RETRIEVE_FAILED, + /** Database files will be downloaded from a repository. */ + ALPM_EVENT_DB_RETRIEVE_START, + /** Database files were downloaded from a repository. */ + ALPM_EVENT_DB_RETRIEVE_DONE, + /** Not all database files were successfully downloaded from a repository. */ + ALPM_EVENT_DB_RETRIEVE_FAILED, + /** Package files will be downloaded from a repository. */ + ALPM_EVENT_PKG_RETRIEVE_START, + /** Package files were downloaded from a repository. */ + ALPM_EVENT_PKG_RETRIEVE_DONE, + /** Not all package files were successfully downloaded from a repository. */ + ALPM_EVENT_PKG_RETRIEVE_FAILED, /** A file will be downloaded from a repository; See alpm_event_pkgdownload_t * for arguments */ ALPM_EVENT_PKGDOWNLOAD_START, diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 1be40650..826c11e6 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -308,6 +308,7 @@ int SYMEXPORT alpm_dbs_update(alpm_handle_t *handle, alpm_list_t *dbs, int force int ret = -1; mode_t oldmask; alpm_list_t *payloads = NULL; + alpm_event_t event; /* Sanity checks */ CHECK_HANDLE(handle, return -1); @@ -382,10 +383,16 @@ int SYMEXPORT alpm_dbs_update(alpm_handle_t *handle, alpm_list_t *dbs, int force } } + event.type = ALPM_EVENT_DB_RETRIEVE_START; + EVENT(handle, &event); ret = _alpm_multi_download(handle, payloads, syncpath); if(ret < 0) { + event.type = ALPM_EVENT_DB_RETRIEVE_FAILED; + EVENT(handle, &event); goto cleanup; } + event.type = ALPM_EVENT_DB_RETRIEVE_DONE; + EVENT(handle, &event); for(i = dbs; i; i = i->next) { alpm_db_t *db = i->data; diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 8a9dcae8..855ca69c 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -812,9 +812,9 @@ static int download_files(alpm_handle_t *handle) } } - event.type = ALPM_EVENT_RETRIEVE_START; + event.type = ALPM_EVENT_PKG_RETRIEVE_START; EVENT(handle, &event); - event.type = ALPM_EVENT_RETRIEVE_DONE; + event.type = ALPM_EVENT_PKG_RETRIEVE_DONE; for(i = files; i; i = i->next) { const alpm_pkg_t *pkg = i->data; struct dload_payload payload = {0}; @@ -825,7 +825,7 @@ static int download_files(alpm_handle_t *handle) if(download_single_file(handle, &payload, cachedir) == -1) { errors++; - event.type = ALPM_EVENT_RETRIEVE_FAILED; + event.type = ALPM_EVENT_PKG_RETRIEVE_FAILED; _alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files\n")); } _alpm_dload_payload_reset(&payload); diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 8fb89b39..a129758b 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -280,8 +280,12 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_SCRIPTLET_INFO: fputs(event->scriptlet_info.line, stdout); break; - case ALPM_EVENT_RETRIEVE_START: + case ALPM_EVENT_DB_RETRIEVE_START: + on_progress = 1; + break; + case ALPM_EVENT_PKG_RETRIEVE_START: colon_printf(_("Retrieving packages...\n")); + on_progress = 1; break; case ALPM_EVENT_DISKSPACE_START: if(config->noprogressbar) { @@ -338,6 +342,13 @@ void cb_event(alpm_event_t *event) } } break; + case ALPM_EVENT_DB_RETRIEVE_DONE: + case ALPM_EVENT_DB_RETRIEVE_FAILED: + case ALPM_EVENT_PKG_RETRIEVE_DONE: + case ALPM_EVENT_PKG_RETRIEVE_FAILED: + flush_output_list(); + on_progress = 0; + break; /* all the simple done events, with fallthrough for each */ case ALPM_EVENT_FILECONFLICTS_DONE: case ALPM_EVENT_CHECKDEPS_DONE: @@ -349,8 +360,6 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_KEY_DOWNLOAD_DONE: case ALPM_EVENT_LOAD_DONE: case ALPM_EVENT_DISKSPACE_DONE: - case ALPM_EVENT_RETRIEVE_DONE: - case ALPM_EVENT_RETRIEVE_FAILED: case ALPM_EVENT_HOOK_DONE: case ALPM_EVENT_HOOK_RUN_DONE: /* we can safely ignore those as well */ -- 2.26.2

2 1

[pacman-dev] [PATCH] Introduce event types for start/end database list download
by Anatol Pomozov 06 May '20

06 May '20

Multiplexed database/files downloads will use multiple progress bars. The UI logic is quite complicated and printing error messages while handling multiple progress bars is going to be challenging. Instead we are going to save all ALPM error messages to a list and flush it at the end of the download process. Use on_progress variable that blocks error messages printing. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/alpm.h | 6 ++++++ lib/libalpm/be_sync.c | 7 +++++++ src/pacman/callback.c | 13 +++++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2cf20343..aee5aa0d 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -403,6 +403,12 @@ typedef enum _alpm_event_type_t { * arguments. */ ALPM_EVENT_SCRIPTLET_INFO, /** Files will be downloaded from a repository. */ + ALPM_EVENT_DB_RETRIEVE_START, + /** Files were downloaded from a repository. */ + ALPM_EVENT_DB_RETRIEVE_DONE, + /** Not all files were successfully downloaded from a repository. */ + ALPM_EVENT_DB_RETRIEVE_FAILED, + /** Files will be downloaded from a repository. */ ALPM_EVENT_RETRIEVE_START, /** Files were downloaded from a repository. */ ALPM_EVENT_RETRIEVE_DONE, diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 1be40650..826c11e6 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -308,6 +308,7 @@ int SYMEXPORT alpm_dbs_update(alpm_handle_t *handle, alpm_list_t *dbs, int force int ret = -1; mode_t oldmask; alpm_list_t *payloads = NULL; + alpm_event_t event; /* Sanity checks */ CHECK_HANDLE(handle, return -1); @@ -382,10 +383,16 @@ int SYMEXPORT alpm_dbs_update(alpm_handle_t *handle, alpm_list_t *dbs, int force } } + event.type = ALPM_EVENT_DB_RETRIEVE_START; + EVENT(handle, &event); ret = _alpm_multi_download(handle, payloads, syncpath); if(ret < 0) { + event.type = ALPM_EVENT_DB_RETRIEVE_FAILED; + EVENT(handle, &event); goto cleanup; } + event.type = ALPM_EVENT_DB_RETRIEVE_DONE; + EVENT(handle, &event); for(i = dbs; i; i = i->next) { alpm_db_t *db = i->data; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 8fb89b39..585eae09 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -280,8 +280,12 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_SCRIPTLET_INFO: fputs(event->scriptlet_info.line, stdout); break; + case ALPM_EVENT_DB_RETRIEVE_START: + on_progress = 1; + break; case ALPM_EVENT_RETRIEVE_START: colon_printf(_("Retrieving packages...\n")); + on_progress = 1; break; case ALPM_EVENT_DISKSPACE_START: if(config->noprogressbar) { @@ -338,6 +342,13 @@ void cb_event(alpm_event_t *event) } } break; + case ALPM_EVENT_DB_RETRIEVE_DONE: + case ALPM_EVENT_DB_RETRIEVE_FAILED: + case ALPM_EVENT_RETRIEVE_DONE: + case ALPM_EVENT_RETRIEVE_FAILED: + flush_output_list(); + on_progress = 0; + break; /* all the simple done events, with fallthrough for each */ case ALPM_EVENT_FILECONFLICTS_DONE: case ALPM_EVENT_CHECKDEPS_DONE: @@ -349,8 +360,6 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_KEY_DOWNLOAD_DONE: case ALPM_EVENT_LOAD_DONE: case ALPM_EVENT_DISKSPACE_DONE: - case ALPM_EVENT_RETRIEVE_DONE: - case ALPM_EVENT_RETRIEVE_FAILED: case ALPM_EVENT_HOOK_DONE: case ALPM_EVENT_HOOK_RUN_DONE: /* we can safely ignore those as well */ -- 2.26.1

2 3

[pacman-dev] [PATCH] Add a helper macro to free() dload_payload structure
by Anatol Pomozov 05 May '20

05 May '20

It frees all the dynamically allocated fields plus the struct itself Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/dload.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index a40b51b7..3f2fb9ea 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -56,6 +56,11 @@ void _alpm_dload_payload_reset_for_retry(struct dload_payload *payload); int _alpm_download(struct dload_payload *payload, const char *localpath, char **final_file, const char **final_url); +#define DLOAD_PAYLOAD_FREE(payload) { \ + _alpm_dload_payload_reset(payload); \ + FREE(payload); \ +} + int _alpm_multi_download(alpm_handle_t *handle, alpm_list_t *payloads /* struct dload_payload */, const char *localpath); -- 2.26.2

2 6

[pacman-dev] [PATCH] Add str_endswith() utility function
by Anatol Pomozov 05 May '20

05 May '20

It provides an easy way to check whether a string ends with a given suffix. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- src/common/util-common.c | 18 ++++++++++++++++++ src/common/util-common.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/src/common/util-common.c b/src/common/util-common.c index 7d43ac0d..11ffc705 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -198,6 +198,24 @@ char *strndup(const char *s, size_t n) } #endif +/** Helper function for check whether a string ends with a given suffix + * @param str a string + * @param suffix we want to check + * @return 0 in case if the given string does not end with the suffix, + * a non-zero value otherwise. + */ +int str_endswith(const char *str, const char *suffix) +{ + int str_len = strlen(str); + int suffix_len = strlen(suffix); + + if(suffix_len > str_len) { + return 0; + } + + return !strcmp(str + str_len - suffix_len, suffix); +} + void wordsplit_free(char **ws) { if(ws) { diff --git a/src/common/util-common.h b/src/common/util-common.h index 483d5da4..6b66be3e 100644 --- a/src/common/util-common.h +++ b/src/common/util-common.h @@ -35,6 +35,8 @@ char **wordsplit(const char *str); size_t strtrim(char *str); +int str_endswith(const char *str, const char *suffix); + #ifndef HAVE_STRNDUP char *strndup(const char *s, size_t n); #endif -- 2.26.2

2 2

[pacman-dev] Planning the move to the Arch Linux Gitlab instance
by Allan McRae 05 May '20

05 May '20

Hi all, Arch Linux is setting up its own Gitlab instance. I have been playing around with it for the day and I think pacman should transition there. Note: the current pacman repo on the Arch Gitlab is a playground I have been using. It will be deleted. There are some features that are of interest: - CI on merge requests, which will catch build issues automatically. - Review where I can easily see what changed on resubmission - integrated bug tracker, patchwork, ... meaning I spend less time updating things on multiple sites. We can also do things like provide regular developers a namespace. e.g. I would own allan/* branches, and could prepare work and request merges from branches there. So how would we proceed? Bugs: Do we pick a date where we disable new bug submissions on the current tracker and point towards gitlab? Are old bug transferred after some ruthless trimming - I don't think this can be automated... Do we leave it open until all bugs get closed? Patchwork: The got "cleared" somewhat recently, when an update occurred. At bit of effort could followup al the changes needed that never were done and clear this out. Mailing list: New patches would no longer appear here. I don't know how much we can get gitlab to report to the mailing list, or if we even want to. The mailing list would still serve as a good place to discuss feature implementation in a more public way. Date: What is a good time for all this to happen? Once Anatol's parallel downloads patches are fully committed, I'd like to make a 6.0.0beta1 release to get some good coverage on these changes. Could we move at the same time? Let me have opinions. Cheers, Allan

4 5

[pacman-dev] [PATCH 1/2] meson: use better check for debug builds
by Eli Schwartz 05 May '20

05 May '20

meson 0.48 added the 'debug' and 'optimization' builtin options, which bidirectionally map to the buildtype, but in some cases where debug is enabled, the builtype may be custom. Checking the 'debug' option lets us detect every case currently detected, plus a few more, and does so in a shorter and more concise manner. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 572526b2..680cf62b 100644 --- a/meson.build +++ b/meson.build @@ -177,7 +177,7 @@ elif conf.has('HAVE_STRUCT_STATFS_F_FLAGS') conf.set('FSSTATSTYPE', 'struct statfs') endif -if get_option('buildtype').startswith('debug') +if get_option('debug') extra_cflags = [ '-Wcast-align', '-Wclobbered', -- 2.26.2

2 3

[pacman-dev] [PATCH] Convert gitlab valgrind runner to meson
by Allan McRae 05 May '20

05 May '20

Turns out environmental variables do get passed through fakechroot! Signed-off-by: Allan McRae <allan(a)archlinux.org> --- .gitlab-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4961352e..a53d60cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,11 +62,10 @@ arch-clang: arch-valgrind: extends: .arch-test script: - - pacman -Syu --needed --noconfirm autoconf-archive valgrind - - autoreconf -i - - ./configure --enable-warningflags --disable-doc - - make - - fakechroot make PY_LOG_FLAGS=--valgrind check + - pacman -Syu --needed --noconfirm valgrind + - meson build + - ninja -C build + - PACTEST_VALGRIND=1 fakechroot meson test -C build arch-nettle: extends: .arch-test -- 2.25.1

1 0

[pacman-dev] Bug: using --program-prefix configure option breaks makepkg
by Wouter Wijsman 04 May '20

04 May '20

Hi Pacman team, In the last couple of days I've been trying to build pacman for use with a homebrew sdk for the Playstation portable. The idea is for it to allow sharing of libraries for the system. To make sure this version of pacman doesn't collide with the system's, I use the --program-prefix option for the configure script, which adds "psp-" in front of all binary names. Now when using the --program-prefix option, makepkg is no longer able to work. This because it has the name for the pacman executable name hardcoded it seems. I compile with the following commands: ./configure --prefix=${PSPDEV} --with-buildscript=PSPBUILD --with-root-dir=${PSPDEV}/psp --program-prefix="psp-" --disable-doc make make install For this to work, I require the following patch: https://github.com/sharkwouter/psptoolchain/blob/psp-pacman/patches/pacman-… Is there a way to prevent me from needing this patch? Besides this patch, the pacman 5.2.1 tarball build and works fine for my purposes. P.S. I did find another small annoyance. Which is that "make install" fails if the bash completion files are already installed. Kind regards, Wouter Wijsman

4 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-63-gcebda6d0
by Allan McRae 04 May '20

04 May '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via cebda6d0ee4c58521cafd9d0980c8b79cc068602 (commit) via 0b81fb64d3f36710d3988ab49feae8c7cc37c1af (commit) from 969e1ab996e79f3e121d0fb3bfd4e91ac7d6f488 (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 cebda6d0ee4c58521cafd9d0980c8b79cc068602 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat May 2 12:12:32 2020 -0400 meson: handle XFAIL tests outside of TAP This change causes expected fail tests to actually fail by eliding the '# TODO' from the test plan. In turn, we can now properly use 'should_fail' in the meson test() rule and see these expected fail tests in the output: Before: ... 320/332 upgrade077.py OK 0.12679290771484375 s 321/332 upgrade078.py OK 0.12620115280151367 s 322/332 upgrade080.py OK 0.1252129077911377 s ... Ok: 332 Expected Fail: 0 Fail: 0 Unexpected Pass: 0 Skipped: 0 Timeout: 0 After: ... 320/332 upgrade077.py OK 0.12679290771484375 s 321/332 upgrade078.py EXPECTEDFAIL0.12620115280151367 s 322/332 upgrade080.py OK 0.1252129077911377 s ... Ok: 326 Expected Fail: 6 Fail: 0 Unexpected Pass: 0 Skipped: 0 Timeout: 0 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0b81fb64d3f36710d3988ab49feae8c7cc37c1af Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 2 17:48:48 2020 +1000 Add Gitlab Runner configuration Arch Linux is setting up a Gitlab instance. This adds CI for the pacman project, testing a range of configurations on Arch and basic builds on Fedora and Debian. Note that asciidoc is specifically not installed on the Debian run because it is all sorts of broken... Also, the defaults have been set to meson, with two autotools tests that will soon be removed. Original-file from: Andrew Gregory <andrew.gregory.8(a)gmail.com> Altered-to-run-on-Arch-Gitlab by: Sven-Hendrik Haase <svenstaro(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitlab-ci.yml | 128 ++++++++++++++++++++++++++++++++++++++++++++++++ test/pacman/meson.build | 15 +++++- test/pacman/pmenv.py | 7 ++- 3 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 .gitlab-ci.yml hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix program name transformation options for configure script
by Wouter Wijsman 04 May '20

04 May '20

The configure script which is generated when running autotools has the following options for modifying the name of the executables build: 1. --program-prefix 2. --program-suffix 3. --program-transform-name Using any of these options gives autotools the program_transform_name variable, but it wasn't being used for the makepkg script, which made these options cause issues with starting makepkg. This commit addresses this. Signed-off-by: Wouter Wijsman <wwijsman(a)live.nl> --- scripts/Makefile.am | 8 +++++++- scripts/makepkg.sh.in | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 47455ed2..113ad86c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -164,6 +164,10 @@ else REAL_PACKAGE_VERSION = $(PACKAGE_VERSION) endif +# Real executable names using program_transform_name +PACMAN_INSTALL_NAME := $(shell echo pacman|sed '$(program_transform_name)') +PACMAN_CONF_INSTALL_NAME := $(shell echo pacman-conf|sed '$(program_transform_name)') + #### Taken from the autoconf scripts Makefile.am #### edit = sed \ -e 's|@rootdir[@]|$(ROOTDIR)|g' \ @@ -182,7 +186,9 @@ edit = sed \ -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ -e "s|@INODECMD[@]|$(INODECMD)|g" \ -e "s|@FILECMD[@]|$(FILECMD)|g" \ - -e 's|@SCRIPTNAME[@]|$@|g' + -e 's|@SCRIPTNAME[@]|$@|g' \ + -e 's|@PACMAN_INSTALL_NAME[@]|$(PACMAN_INSTALL_NAME)|g' \ + -e 's|@PACMAN_CONF_INSTALL_NAME[@]|$(PACMAN_CONF_INSTALL_NAME)|g' ## All the scripts depend on Makefile so that they are rebuilt when the ## prefix etc. changes. Use chmod -w to prevent people from editing the diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d1416d15..38b6eda9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -43,6 +43,8 @@ unset GREP_OPTIONS declare -r makepkg_version='@PACKAGE_VERSION@' declare -r confdir='@sysconfdir@' declare -r BUILDSCRIPT='@BUILDSCRIPT@' +declare -r PACMAN_INSTALL_NAME='@PACMAN_INSTALL_NAME@' +declare -r PACMAN_CONF_INSTALL_NAME='@PACMAN_CONF_INSTALL_NAME@' declare -r startdir="$(pwd -P)" LIBRARY=${LIBRARY:-'@libmakepkgdir@'} @@ -235,7 +237,7 @@ run_pacman() { else cmd=(su root -c "$(printf '%q ' "${cmd[@]}")") fi - local lockfile="$(pacman-conf DBPath)/db.lck" + local lockfile="$(${PACMAN_CONF_INSTALL_NAME} DBPath)/db.lck" while [[ -f $lockfile ]]; do local timer=0 msg "$(gettext "Pacman is currently in use, please wait...")" @@ -1123,7 +1125,7 @@ unset var PACKAGER=${PACKAGER:-"Unknown Packager"} # set pacman command if not already defined -PACMAN=${PACMAN:-pacman} +PACMAN=${PACMAN:-${PACMAN_INSTALL_NAME}} # save full path to command as PATH may change when sourcing /etc/profile PACMAN_PATH=$(type -P $PACMAN) -- 2.20.1

1 0

[pacman-dev] Showing optional dependencies in pactree output
by Frederick Zhang 04 May '20

04 May '20

Hi all, I noticed that there is a patch by Johannes available at [1] which adds a new flag to pactree to show optional dependencies as well. I think this is a nice feature to have however it seems that the patch was never merged. I just tried it out locally and managed to compile with a few minor changes. If it wasn't rejected for some reason guess I could submit a patch if needed? [1] https://lists.archlinux.org/pipermail/pacman-dev/2016-February/020922.html -- Best regards, Frederick Zhang Email: frederick888(a)tsundere.moe PGP: 8BFB EA5B 4C44 BFAC C8EC 5F93 1F92 8BE6 0D8B C11D

2 1

[pacman-dev] [PATCH] Add makedepends to -Si/-Qi output
by Carson Black 04 May '20

04 May '20

Fairly self explanatory patch. pacman didn't show makedepends, now it does. Signed-off-by: Carson Black <uhhadd(a)gmail.com> --- src/pacman/package.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pacman/package.c b/src/pacman/package.c index 4c93a443..c3c3dbf6 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -70,6 +70,7 @@ enum { T_URL, T_VALIDATED_BY, T_VERSION, + T_BUILD_DEPENDS_ON, /* the following is a sentinel and should remain in last position */ _T_MAX }; @@ -124,6 +125,7 @@ static void make_aligned_titles(void) buf[T_URL] = _("URL"); buf[T_VALIDATED_BY] = _("Validated By"); buf[T_VERSION] = _("Version"); + buf[T_BUILD_DEPENDS_ON] = _("Build Depends On"); for(i = 0; i < ARRAYSIZE(wbuf); i++) { wlen[i] = mbstowcs(wbuf[i], buf[i], strlen(buf[i]) + 1); @@ -271,6 +273,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) list_display(titles[T_GROUPS], alpm_pkg_get_groups(pkg), cols); deplist_display(titles[T_PROVIDES], alpm_pkg_get_provides(pkg), cols); deplist_display(titles[T_DEPENDS_ON], alpm_pkg_get_depends(pkg), cols); + deplist_display(titles[T_BUILD_DEPENDS_ON], alpm_pkg_get_makedepends(pkg), cols); optdeplist_display(pkg, cols); if(extra || from == ALPM_PKG_FROM_LOCALDB) { -- 2.26.2

2 1

[pacman-dev] [PATCH] meson: handle XFAIL tests outside of TAP
by Dave Reisner 02 May '20

02 May '20

This change causes expected fail tests to actually fail by eliding the '# TODO' from the test plan. In turn, we can now properly use 'should_fail' in the meson test() rule and see these expected fail tests in the output: Before: ... 320/332 upgrade077.py OK 0.12679290771484375 s 321/332 upgrade078.py OK 0.12620115280151367 s 322/332 upgrade080.py OK 0.1252129077911377 s ... Ok: 332 Expected Fail: 0 Fail: 0 Unexpected Pass: 0 Skipped: 0 Timeout: 0 After: ... 320/332 upgrade077.py OK 0.12679290771484375 s 321/332 upgrade078.py EXPECTEDFAIL0.12620115280151367 s 322/332 upgrade080.py OK 0.1252129077911377 s ... Ok: 326 Expected Fail: 6 Fail: 0 Unexpected Pass: 0 Skipped: 0 Timeout: 0 --- test/pacman/meson.build | 15 ++++++++++++++- test/pacman/pmenv.py | 7 ++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/test/pacman/meson.build b/test/pacman/meson.build index 9de4f5a1..fd0dbf90 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -330,6 +330,17 @@ pacman_tests = [ 'tests/xfercommand001.py', ] +xfail_tests = { + 'tests/deprange001.py': true, + # expect failure on 32 bit machines + 'tests/query006.py': cc.sizeof('ssize_t') < 8, + 'tests/replace110.py': true, + 'tests/sync-update-package-removing-required-provides.py': true, + 'tests/sync403.py': true, + 'tests/sync406.py': true, + 'tests/upgrade078.py': true, +} + foreach input : pacman_tests test_name = input.split('/')[1] args = [ @@ -351,7 +362,9 @@ foreach input : pacman_tests test_name, PYTHON, protocol : 'tap', + env : ['RUNNING_UNDER_MESON=1'], args : args, - timeout: 120, + timeout : 120, + should_fail : xfail_tests.get(input, false), depends : [pacman_bin]) endforeach diff --git a/test/pacman/pmenv.py b/test/pacman/pmenv.py index 24437b61..d87193f2 100644 --- a/test/pacman/pmenv.py +++ b/test/pacman/pmenv.py @@ -70,5 +70,10 @@ def run(self): t.run(self.pacman) tap.diag("==> Checking rules") - tap.todo = t.expectfailure + # When running under meson, we don't emit 'todo' in the plan and instead + # handle expected failures in the test() objects. This really should be + # fixed in meson: + # https://github.com/mesonbuild/meson/issues/2923#issuecomment-614647076 + tap.todo = (t.expectfailure and + not 'RUNNING_UNDER_MESON' in os.environ) tap.subtest(lambda: t.check(), t.description) -- 2.26.2

1 0

[pacman-dev] [PATCH v2] Add Gitlab Runner configuration
by Allan McRae 02 May '20

02 May '20

Arch Linux is setting up a Gitlab instance. This adds CI for the pacman project, testing a range of configurations on Arch and basic builds on Fedora and Debian. Note that asciidoc is specifically not installed on the Debian run because it is all sorts of broken... Also, the defaults have been set to meson, with two autotools tests that will soon be removed. Original-file from: Andrew Gregory <andrew.gregory.8(a)gmail.com> Altered-to-run-on-Arch-Gitlab by: Sven-Hendrik Haase <svenstaro(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I should actually send the updated version... .gitlab-ci.yml | 128 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..4961352e --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,128 @@ +variables: + MAKEFLAGS: "-j10" + VERBOSE: 1 + +.arch-test: + image: archlinux/base + before_script: + - > + pacman -Syu --needed --noconfirm + base-devel git + gpgme libarchive curl + python + fakeroot fakechroot + meson + +arch: + extends: .arch-test + script: + - meson build + - ninja -C build + - fakechroot meson test -C build + +arch-debug: + extends: .arch-test + script: + - meson --buildtype=debug build + - ninja -C build + - fakechroot meson test -C build + +arch-docs: + extends: .arch-test + script: + - pacman -Syu --needed --noconfirm asciidoc + - meson -Ddoc=enabled build + - ninja -C build + +arch-autoconf: + extends: .arch-test + script: + - pacman -Syu --needed --noconfirm autoconf-archive + - autoreconf -i + - ./configure --enable-warningflags --disable-doc + - make + - fakechroot make check + +arch-distcheck: + extends: .arch-test + script: + - pacman -Syu --needed --noconfirm autoconf-archive asciidoc + - autoreconf -i + - ./configure --enable-warningflags + - fakechroot make distcheck + +arch-clang: + extends: .arch-test + script: + - pacman -Syu --needed --noconfirm clang + - CC=clang meson build + - ninja -C build + - fakechroot meson test -C build + +arch-valgrind: + extends: .arch-test + script: + - pacman -Syu --needed --noconfirm autoconf-archive valgrind + - autoreconf -i + - ./configure --enable-warningflags --disable-doc + - make + - fakechroot make PY_LOG_FLAGS=--valgrind check + +arch-nettle: + extends: .arch-test + script: + - meson -Dcrypto=nettle --buildtype=debug build + - ninja -C build + - fakechroot meson test -C build + +arch-no-gpg: + extends: .arch-test + script: + - meson -Dgpgme=disabled --buildtype=debug build + - ninja -C build + - fakechroot meson test -C build + +arch-no-curl: + extends: .arch-test + script: + - meson -Dcurl=disabled --buildtype=debug build + - ninja -C build + - fakechroot meson test -C build + +arch-no-nls: + extends: .arch-test + script: + - meson -Di18n=false --buildtype=debug build + - ninja -C build + - fakechroot meson test -C build + +debian: + image: debian:bullseye + before_script: + - apt update + - > + apt -y install --no-install-recommends + git pkg-config meson gcc libtool + libgpgme-dev libarchive-dev libcurl4-openssl-dev libssl-dev curl + gettext python3 python3-setuptools dash gawk ca-certificates + fakeroot fakechroot + script: + - meson --buildtype=debug build + - ninja -C build + - fakechroot meson test -C build + +fedora: + image: fedora + before_script: + - > + dnf -y install + git findutils patch sed + meson gcc libtool + gpgme-devel libarchive-devel libcurl-devel openssl-devel gettext-devel + asciidoc python3 dash gawk + fakeroot fakechroot + perl-Module-Load-Conditional + script: + - meson --buildtype=debug build + - ninja -C build + - fakechroot meson test -C build -- 2.25.1

1 0

[pacman-dev] [PATCH] Add Gitlab Runner configuration
by Allan McRae 02 May '20

02 May '20

Arch Linux is setting up a Gitlab instance. This adds CI for the pacman project, testing a range of configurations on Arch and basic builds on Fedora and Debian. Note that asciidoc is specifically not installed on the Debian run because it is all sorts of broken... Also, the defaults have been set to meson, with two autotools tests that will soon be removed. Original-file from: Andrew Gregory <andrew.gregory.8(a)gmail.com> Altered-to-run-on-Arch-Gitlab by: Sven-Hendrik Haase <svenstaro(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- .gitlab-ci.yml | 116 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..5979fa61 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,116 @@ +variables: + MAKEFLAGS: "-j10" + VERBOSE: 1 + +.arch-test: + image: archlinux/base + before_script: + - > + pacman -Syu --needed --noconfirm + base-devel git + gpgme libarchive curl + asciidoc python + fakeroot fakechroot autoconf-archive + +arch-default: + extends: .arch-test + script: + - autoreconf -i + - ./configure --enable-warningflags + - make + - fakechroot make check + +arch-clang: + extends: .arch-test + script: + - pacman -Syu --needed --noconfirm clang + - autoreconf -i + - CC=clang ./configure --enable-warningflags + - make + - fakechroot make check + +arch-meson: + extends: .arch-test + script: + - pacman -Syu --needed --noconfirm meson + - meson build + - ninja -C build + - fakechroot meson test -C build + +arch-distcheck: + extends: .arch-test + script: + - autoreconf -i + - ./configure --enable-warningflags + - fakechroot make distcheck + +arch-valgrind: + extends: .arch-test + script: + - pacman -Syu --needed --noconfirm valgrind + - autoreconf -i + - ./configure --enable-warningflags + - make + - fakechroot make PY_LOG_FLAGS=--valgrind check + +arch-no-gpg: + extends: .arch-test + script: + - autoreconf -i + - ./configure --enable-warningflags --without-gpgme + - make + - fakechroot make check + +arch-no-curl: + extends: .arch-test + script: + - autoreconf -i + - ./configure --enable-warningflags --without-libcurl + - make + - fakechroot make check + +arch-no-nls: + extends: .arch-test + script: + - autoreconf -i + - ./configure --enable-warningflags --disable-nls + - make + - fakechroot make check + +debian-test: + image: debian + before_script: + - apt update + - > + apt -y install --no-install-recommends + git make autoconf autopoint automake pkg-config patch gcc libtool + libgpgme-dev libarchive-dev libcurl4-openssl-dev libssl-dev curl + gettext python3 dash gawk ca-certificates + asciidoc docbook-xsl xsltproc libxml2-utils + fakeroot fakechroot autoconf-archive + script: + - autoreconf -i + - ./configure --enable-warningflags + - make + - fakechroot make check + +debian-gcc: + extends: debian-test + image: gcc + +fedora: + image: fedora + before_script: + - > + dnf -y install + git findutils patch sed + make automake autoconf gcc libtool + gpgme-devel libarchive-devel libcurl-devel openssl-devel gettext-devel + asciidoc python3 dash gawk + fakeroot fakechroot autoconf-archive + perl-Module-Load-Conditional + script: + - autoreconf -i + - ./configure --enable-warningflags + - make + - fakechroot make check -- 2.25.1

1 0

[pacman-dev] [PATCH] Adds a "retry?" prompt for when transaction creation fails for user-friendlier fail support.
by Pedro 29 Apr '20

29 Apr '20

EDIT: Rewrote the prompt message and added a check for the --noconfirm flag >From what I could see, the function trans_init that comes right before the prompt has already specific messages for each operation, so I consider that this new implementation fits the purpose. My motivation to submit this patch is that it's pretty common for AUR-helpers to automatically invoke pacman after a build, but correct transaction error handling is quite rare. So I thought that to implement a handling mechanism in the user side would solve the problem not only in that case, but also for other scripts that invoke pacman. Signed-off-by: Pedro <pedrocga1(a)gmail.com> --- src/pacman/remove.c | 13 ++++++++++--- src/pacman/sync.c | 13 ++++++++++--- src/pacman/upgrade.c | 13 ++++++++++--- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 9920f502..66bb100d 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -87,9 +87,16 @@ int pacman_remove(alpm_list_t *targets) } /* Step 0: create a new transaction */ - if(trans_init(config->flags, 0) == -1) { - return 1; - } + while(1) { + if(trans_init(config->flags, 1) == -1) { + if(config->noconfirm || yesno(_("Retry the operation with the same flags?")) == 0) { + return 1; + } + /* Try again */ + continue; + } + break; + } /* Step 1: add targets to the created transaction */ for(i = targets; i; i = alpm_list_next(i)) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index f7dcb958..e472d89a 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -694,9 +694,16 @@ static int sync_trans(alpm_list_t *targets) alpm_list_t *i; /* Step 1: create a new transaction... */ - if(trans_init(config->flags, 1) == -1) { - return 1; - } + while(1) { + if(trans_init(config->flags, 1) == -1) { + if(config->noconfirm == 1 || yesno(_("Retry the operation with the same flags?")) == 0) { + return 1; + } + /* Try again */ + continue; + } + break; + } /* process targets */ for(i = targets; i; i = alpm_list_next(i)) { diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 5f984e44..2ea74618 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -79,9 +79,16 @@ int pacman_upgrade(alpm_list_t *targets) } /* Step 1: create a new transaction */ - if(trans_init(config->flags, 1) == -1) { - retval = 1; - goto fail_free; + while(1) { + if(trans_init(config->flags, 1) == -1) { + if(config-->noconfirm || yesno(_("Retry the operation with the same flags?")) == 0) { + retval = 1; + goto fail_free; + } + /* Try again */ + continue; + } + break; } printf(_("loading packages...\n")); -- 2.26.2

5 4

[pacman-dev] [PATCH] Convert downloading databases to the new multiplexed API
by Anatol Pomozov 29 Apr '20

29 Apr '20

Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- src/pacman/util.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 6693ec75..93487e73 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -150,26 +150,17 @@ int check_syncdbs(size_t need_repos, int check_valid) int sync_syncdbs(int level, alpm_list_t *syncs) { - alpm_list_t *i; - unsigned int success = 1; - - for(i = syncs; i; i = alpm_list_next(i)) { - alpm_db_t *db = i->data; - - int ret = alpm_db_update((level < 2 ? 0 : 1), db); - if(ret < 0) { - pm_printf(ALPM_LOG_ERROR, _("failed to update %s (%s)\n"), - alpm_db_get_name(db), alpm_strerror(alpm_errno(config->handle))); - success = 0; - } else if(ret == 1) { - printf(_(" %s is up to date\n"), alpm_db_get_name(db)); - } - } + int ret; + int force = (level < 2 ? 0 : 1); - if(!success) { - pm_printf(ALPM_LOG_ERROR, _("failed to synchronize all databases\n")); + multibar_move_complete_top = 0; + ret = alpm_dbs_update(config->handle, syncs, force); + if(ret < 0) { + pm_printf(ALPM_LOG_ERROR, _("failed to synchronize all databases (%s)\n"), + alpm_strerror(alpm_errno(config->handle))); } - return (success > 0); + + return (ret >= 0); } /* discard unhandled input on the terminal's input buffer */ -- 2.26.1

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-61-g969e1ab9
by Allan McRae 29 Apr '20

29 Apr '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 969e1ab996e79f3e121d0fb3bfd4e91ac7d6f488 (commit) via 24392223752480b9088321ad0f914118d0346e55 (commit) from 3ea7fdd96c874e111588a6e64ee30b75b55db785 (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 969e1ab996e79f3e121d0fb3bfd4e91ac7d6f488 Author: Ivy Foster <escondida(a)iff.ink> Date: Thu Apr 23 13:12:03 2020 -0500 Add NoProgressbar to pacman.conf options This is useful for dumb terminals that do not support escape sequences. Signed-off-by: Ivy Foster <escondida(a)iff.ink> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 24392223752480b9088321ad0f914118d0346e55 Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Fri Apr 24 23:43:58 2020 +0200 Constify some input pointers Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.asciidoc | 4 ++++ etc/pacman.conf.in | 1 + lib/libalpm/diskspace.c | 2 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/util.c | 2 +- src/pacman/conf.c | 2 ++ src/pacman/pacman-conf.c | 3 +++ src/pacman/util.c | 2 +- 8 files changed, 14 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] (no subject)
by Carson Black 29 Apr '20

29 Apr '20

This asciicast demonstrates the output of this patch: https://asciinema.org/a/321160

4 13

[pacman-dev] [PATCH v2] Add NoProgressbar to pacman.conf options
by escondida＠iff.ink 29 Apr '20

29 Apr '20

From: Ivy Foster <escondida(a)iff.ink> This is useful for dumb terminals that do not support escape sequences. Signed-off-by: Ivy Foster <escondida(a)iff.ink> --- doc/pacman.conf.5.asciidoc | 4 ++++ etc/pacman.conf.in | 1 + src/pacman/conf.c | 2 ++ src/pacman/pacman-conf.c | 3 +++ 4 files changed, 10 insertions(+) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index b297e332..ecbbd8b3 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -186,6 +186,10 @@ Options *Color*:: Automatically enable colors only when pacman's output is on a tty. +*NoProgressBar*:: + Disables progressbars. This is useful for terminals which do + not support escape characters. + *TotalDownload*:: When downloading, display the amount downloaded, download rate, ETA, and completed percentage of the entire download list rather diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 7446944f..e3c73e13 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -31,6 +31,7 @@ Architecture = auto # Misc options #UseSyslog #Color +#NoProgressBar #TotalDownload CheckSpace #VerbosePkgLists diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f9de386f..e5f37b1a 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -579,6 +579,8 @@ static int _parse_options(const char *key, char *value, config->color = isatty(fileno(stdout)) ? PM_COLOR_ON : PM_COLOR_OFF; enable_colors(config->color); } + } else if(strcmp(key, "NoProgressBar") == 0) { + config->noprogressbar = 1; } else if(strcmp(key, "DisableDownloadTimeout") == 0) { config->disable_dl_timeout = 1; } else { diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 6e25d243..a6f7362b 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -259,6 +259,7 @@ static void dump_config(void) show_bool("VerbosePkgLists", config->verbosepkglists); show_bool("DisableDownloadTimeout", config->disable_dl_timeout); show_bool("ILoveCandy", config->chomp); + show_bool("NoProgressBar", config->noprogressbar); show_cleanmethod("CleanMethod", config->cleanmethod); @@ -368,6 +369,8 @@ static int list_directives(void) show_bool("VerbosePkgLists", config->verbosepkglists); } else if(strcasecmp(i->data, "DisableDownloadTimeout") == 0) { show_bool("DisableDownloadTimeout", config->disable_dl_timeout); + } else if(strcasecmp(i->data, "NoProgressBar") == 0) { + show_bool("NoProgressBar", config->noprogressbar); } else if(strcasecmp(i->data, "CleanMethod") == 0) { show_cleanmethod("CleanMethod", config->cleanmethod); -- 2.26.2

2 1