May 2021 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH v3] libalpm: clone data on alpm_db_set_servers
by morganamilo 09 May '21

09 May '21

Every alpm_option_set function clones the input so lets be more consistent. Also this fixes servers not being sanatized. --- v2: fix copy paste error --- lib/libalpm/alpm.h | 4 +--- lib/libalpm/db.c | 8 +++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 65b8e2fb..e6aefd4c 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1312,9 +1312,7 @@ alpm_list_t *alpm_db_get_servers(const alpm_db_t *db); /** Sets the list of servers for the database to use. * @param db the database to set the servers - * @param servers a char* list of servers. Note: the database will - * take ownership of the list and it should no longer be - * freed by the caller + * @param servers a char* list of servers. */ int alpm_db_set_servers(alpm_db_t *db, alpm_list_t *servers); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 8511bb83..b8d1b157 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -139,9 +139,15 @@ alpm_list_t SYMEXPORT *alpm_db_get_servers(const alpm_db_t *db) int SYMEXPORT alpm_db_set_servers(alpm_db_t *db, alpm_list_t *servers) { + alpm_list_t *i; ASSERT(db != NULL, return -1); FREELIST(db->servers); - db->servers = servers; + for(i = servers; i; i = i->next) { + char *url = i->data; + if(alpm_db_add_server(db, url) != 0) { + return -1; + } + } return 0; } -- 2.31.1

1 0

[pacman-dev] [PATCH 0/1] signhandler add SIGQUIT soft_interrupt_handler
by ZheNing Hu 09 May '21

09 May '21

Hello, eveyone! I'am a newbie, because of the experience of using pacman downloading with the `Ctrl +\` exit was not very good,it leave the database lock, so I am thinking can we just deal with SIGQUIT rather than doing nothing. Hopefully this will improve the experience of users. Thanks. ZheNing Hu (1): signhandler: add SIGQUIT soft_interrupt_handler src/pacman/sighandler.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.31.0

3 3

[pacman-dev] [PATCH] libalpm: clone data on alpm_db_set_servers
by morganamilo 09 May '21

09 May '21

Every alpm_option_set function clones the input so lets be more consistent. Also this fixes servers not being sanatized. --- lib/libalpm/db.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 8511bb83..6ddf5461 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -139,9 +139,16 @@ alpm_list_t SYMEXPORT *alpm_db_get_servers(const alpm_db_t *db) int SYMEXPORT alpm_db_set_servers(alpm_db_t *db, alpm_list_t *servers) { + alpm_list_t *i; ASSERT(db != NULL, return -1); FREELIST(db->servers); - db->servers = servers; + for(i = servers; i; i = i->next) { + char *url = i->data; + if(alpm_db_add_server(db, url) != 0) { + return -1; + } + servers = servers->next; + } return 0; } -- 2.31.1

3 3

[pacman-dev] [PATCH] remove unused variable in meson.build
by morganamilo 07 May '21

07 May '21

--- meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build index c8835ab6..46f38de6 100644 --- a/meson.build +++ b/meson.build @@ -28,7 +28,6 @@ LIBMAKEPKGDIR = join_paths(PREFIX, DATAROOTDIR, 'makepkg') PKGDATADIR = join_paths(PREFIX, DATAROOTDIR, meson.project_name()) PYTHON = import('python').find_installation('python3') -DU = find_program('du') LDCONFIG = get_option('ldconfig') MESON_MAKE_SYMLINK = join_paths(meson.source_root(), 'build-aux/meson-make-symlink.sh') -- 2.31.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-107-gef14c338
by Allan McRae 03 May '21

03 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 ef14c3380da0ed0e3eeba7e8b6c66294db316883 (commit) from 72238aa046b8a8de1c7b9110726986c7538023b5 (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 ef14c3380da0ed0e3eeba7e8b6c66294db316883 Author: morganamilo <morganamilo(a)archlinux.org> Date: Sat May 1 21:25:35 2021 +0100 libalpm: fix error when installing cached packages without signatures With a repo using "SigLevel = Optional" and a package already downloaded into the cache, download_files() returns 1 (via _alpm_download) to indicate no files were downloaded. This causes installation of the package to fail. Explicitly check that download_files() returns -1 (error) rather than non-zero. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] (no subject)
by Jazmine Breaux 03 May '21

03 May '21

1 0

[pacman-dev] [PATCH v2] libalpm: fix error when downloading up to date files
by morganamilo 03 May '21

03 May '21

--- lib/libalpm/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 2419cc69..bdfab635 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1128,7 +1128,7 @@ int _alpm_sync_load(alpm_handle_t *handle, alpm_list_t **data) uint64_t total_bytes = 0; alpm_trans_t *trans = handle->trans; - if(download_files(handle)) { + if(download_files(handle) == -1) { return -1; } -- 2.31.1

2 1

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

02 May '21

Le 02/05/2021 à 11:47, Allan McRae a écrit :> On 2/5/21 12:33 am, Guillaume Benoit wrote:>> Le 01/05/2021 à 05:53, Andrew Gregory a écrit :>>> On 04/30/21 at 12:09pm, Guillaume Benoit wrote:>>>> After download, alpm_fetch_pkgurl uses payload->destfile_name>>>> and payload->tempfile_name in order to find the downloaded file path.>>>> Those fields are not set if a custom fetch callback is defined.>>>> Use filecache_find_url instead, like in the beginning of the function.>>>>>>>> --->>>> lib/libalpm/dload.c | 13 ++++--------->>>> 1 file changed, 4 insertions(+), 9 deletions(-)>>>>>>>> diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c>>>> index 6f33451a..d45c7707 100644>>>> --- a/lib/libalpm/dload.c>>>> +++ b/lib/libalpm/dload.c>>>> @@ -1007,16 +1007,11 @@ int SYMEXPORT alpm_fetch_pkgurl(alpm_handle_t>>>> *handle, const alpm_list_t *urls,>>>> EVENT(handle, &event);>>>> }>>>> - for(i = payloads; i; i = i->next) {>>>> - struct dload_payload *payload = i->data;>>>> - char *filepath;>>>> + for(i = urls; i; i = i->next) {>>>> + char *url = i->data;>>>> - if(payload->destfile_name) {>>>> - const char *filename =>>>> mbasename(payload->destfile_name);>>>> - filepath = _alpm_filecache_find(handle, filename);>>>> - } else {>>>> - STRDUP(filepath, payload->tempfile_name,>>>> GOTO_ERR(handle, ALPM_ERR_MEMORY, err));>>>> - }>>>> + /* attempt again to find the file in our pkgcache */>>>> + char *filepath = filecache_find_url(handle, url);>>>> if(filepath) {>>>> alpm_list_append(fetched, filepath);>>>> } else {>>>>>> Without testing since this needs to be rebased now; this looks broken.>>> filecache_find_url with fail for any url where destfile_name doesn't>>> match the file name in the url. Notably, that includes the download>>> links on Arch's package pages:>>> https://archlinux.org/packages/core/x86_64/pacman/download/>>>>> Yes, with or without this patch, the current implementation doesn't work>> for this kind of url when using a fetch callback.>> The solution I see is to change the fetch callback signature by making>> it return the path of the downloaded file.>> Otherwise this patch works for standard mirror urls.>> .> > While this patch does improve the current situation, it is a step> backwards in terms the full fix, which will need to pass the full> payload to the front-end so it can fill in the needed values.> > On that basis, I will not be accepting this patch.> > Given fetching a URL with XferCommand has not worked for a long time (or> ever?), this issue is not a blocker for 6.0.> > Allan> Yes, with pacman 5, fetching a URL with XferCommand doesn't work.With pacman 6, it doesn't work with the current code but it works with this patch,except for the special URLs given by Andrew Gregory.I can try to provide a different patch that pass the full payload to the front-endbut it can't help making pacman 6 correctly fetching a URL with XferCommand when thefilename can be guessed from the URL.

3 2

[pacman-dev] [PATCH] libalpm: fix error when downloading up to date files
by morganamilo 01 May '21

01 May '21

--- lib/libalpm/sync.c | 2 +- lib/libalpm/trans.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 2419cc69..bdfab635 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1128,7 +1128,7 @@ int _alpm_sync_load(alpm_handle_t *handle, alpm_list_t **data) uint64_t total_bytes = 0; alpm_trans_t *trans = handle->trans; - if(download_files(handle)) { + if(download_files(handle) == -1) { return -1; } diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 939ab05a..e608555b 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -185,7 +185,7 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data) } if(trans->add) { - if(_alpm_sync_load(handle, data) != 0) { + if(_alpm_sync_load(handle, data) == -1) { /* pm_errno is set by _alpm_sync_load() */ return -1; } -- 2.31.1

1 0

Re: [pacman-dev] Patch Policy Inquiry
by Sijie Bu 01 May '21

01 May '21

Hello, Sorry for the late reply. I was a bit busy for the past two days. The specific Arch Linux 32 changes in question, though I have not confirmed yet, seems to be detecting Pentium 4 CPUs and optimizing accordingly. I will have to discuss with my project mentor to see if we need these too (because we're targeting the R6 sub-architecture, which is relatively new). But otherwise, looks like the pacman code should compile and run cleanly. Thank you for the clarifications. Sincerely

1 0