- Pacman-dev - lists.archlinux.org

[pacman-dev] [RFC] command-line provided paths under --sysroot
by Andrew Gregory 17 Jan '21

17 Jan '21

Implementing --sysroot the lazy way with a simple chroot turned out to have a number of complications that significantly reduce its utility. I've been sitting on a patch to reimplement it by prefixing all configuration paths with the sysroot, but this raises the question of how we should handle paths provided on the command line. Using chroot meant that all paths, regardless of what they were or where they came from, would be interpreted relative to the sysroot. Switching to manually adjusting paths means that we have the option to change that. I'm inclined to change pacman to use command line arguments/options as-is and have --sysroot just modify values from the config file. I think that's the friendlier option for users. Thoughts?

4 3

[pacman-dev] [PATCH 6/7] make alpm download config accessible without curl
by Andrew Gregory 17 Jan '21

17 Jan '21

Download-related config options are currently limited to builds with curl. This causes compilation errors when those options are used without an appropriate guard which often goes unnoticed because we all use curl. Front-ends providing their own download callback may also want to use these settings. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- I saw the patch to hide the offending use of parallel_downloads after I wrote this. I think it makes more sense to just make these available to the front-end; we've already had one attempt to parallelize xfercommand. lib/libalpm/handle.c | 12 ------------ lib/libalpm/handle.h | 3 ++- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 3994f314..0444ee5d 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -303,11 +303,7 @@ const char SYMEXPORT *alpm_option_get_dbext(alpm_handle_t *handle) int SYMEXPORT alpm_option_get_parallel_downloads(alpm_handle_t *handle) { CHECK_HANDLE(handle, return -1); -#ifdef HAVE_LIBCURL return handle->parallel_downloads; -#else - return 1; -#endif } int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb) @@ -854,11 +850,7 @@ int SYMEXPORT alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, unsigned short disable_dl_timeout) { CHECK_HANDLE(handle, return -1); -#ifdef HAVE_LIBCURL handle->disable_dl_timeout = disable_dl_timeout; -#else - (void)disable_dl_timeout; /* silence unused variable warnings */ -#endif return 0; } @@ -866,11 +858,7 @@ int SYMEXPORT alpm_option_set_parallel_downloads(alpm_handle_t *handle, unsigned int num_streams) { CHECK_HANDLE(handle, return -1); -#ifdef HAVE_LIBCURL ASSERT(num_streams >= 1, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); handle->parallel_downloads = num_streams; -#else - (void)num_streams; /* silence unused variable warnings */ -#endif return 0; } diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 9fef0fbf..3e7d323e 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -60,9 +60,10 @@ struct __alpm_handle_t { #ifdef HAVE_LIBCURL /* libcurl handle */ CURLM *curlm; +#endif + unsigned short disable_dl_timeout; unsigned int parallel_downloads; /* number of download streams */ -#endif #ifdef HAVE_LIBGPGME alpm_list_t *known_keys; /* keys verified to be in our keychain */ -- 2.30.0

2 1

[pacman-dev] [PATCH 7/7] do not try to download an empty db list
by Andrew Gregory 16 Jan '21

16 Jan '21

Starting the download process, even if there is nothing to actually download, causes an error when pacman is built without curl and has no XferCommand defined (like our test suite). Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/be_sync.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 0a5cb7c2..91e5f5cf 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -198,6 +198,10 @@ int SYMEXPORT alpm_db_update(alpm_handle_t *handle, alpm_list_t *dbs, int force) payload->max_size = 128 * 1024 * 1024; payloads = alpm_list_add(payloads, payload); } + if(payloads == NULL) { + ret = 0; + goto cleanup; + } event.type = ALPM_EVENT_DB_RETRIEVE_START; EVENT(handle, &event); -- 2.30.0

1 0

[pacman-dev] [PATCH 5/7] sighandler: initialize sigaction fields
by Andrew Gregory 16 Jan '21

16 Jan '21

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/util.c | 2 ++ src/pacman/sighandler.c | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 9ae08745..3fbd757a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -562,7 +562,9 @@ static void _alpm_reset_signals(void) 0 }; struct sigaction def; + def.sa_flags = 0; def.sa_handler = SIG_DFL; + sigemptyset(&def.sa_mask); for(i = signals; *i; i++) { sigaction(*i, &def, NULL); } diff --git a/src/pacman/sighandler.c b/src/pacman/sighandler.c index ff9c6ac4..9794b30b 100644 --- a/src/pacman/sighandler.c +++ b/src/pacman/sighandler.c @@ -106,6 +106,7 @@ static void segv_handler(int signum) /* restore the default handler */ _reset_handler(signum); /* unblock SIGSEGV */ + sigemptyset(&segvset); sigaddset(&segvset, signum); sigprocmask(SIG_UNBLOCK, &segvset, NULL); /* re-raise to trigger a core dump */ -- 2.30.0

1 0

[pacman-dev] [PATCH 4/7] fully free error list in check_keyring
by Andrew Gregory 16 Jan '21

16 Jan '21

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/sync.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 3919d266..2859debb 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -934,8 +934,9 @@ static int check_keyring(alpm_handle_t *handle) } free(keyinfo->uid); free(keyinfo->keyid); - + free(keyinfo); } + alpm_list_free(errors); event.type = ALPM_EVENT_KEY_DOWNLOAD_DONE; EVENT(handle, &event); if(fail) { -- 2.30.0

1 0

[pacman-dev] [PATCH 3/7] plug memory leaks in _alpm_key_import
by Andrew Gregory 16 Jan '21

16 Jan '21

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/signing.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 2cbbd103..1f6977a0 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -505,7 +505,7 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr) } STRDUP(fetch_key.uid, uid, return -1); - STRDUP(fetch_key.fingerprint, fpr, return -1); + STRDUP(fetch_key.fingerprint, fpr, free(fetch_key.uid); return -1); alpm_question_import_key_t question = { .type = ALPM_QUESTION_IMPORT_KEY, @@ -517,6 +517,7 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr) /* Try to import the key from a WKD first */ if(email_from_uid(uid, &email) == 0) { ret = key_import_wkd(handle, email); + free(email); } /* If importing from the WKD fails, fall back to keyserver lookup */ @@ -537,6 +538,8 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr) } } gpgme_key_unref(fetch_key.data); + free(fetch_key.uid); + free(fetch_key.fingerprint); return ret; } -- 2.30.0

1 0

[pacman-dev] [PATCH 2/7] pacman-conf: free rootdir before replacing
by Andrew Gregory 16 Jan '21

16 Jan '21

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman-conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 463badf1..05492ed9 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -76,6 +76,7 @@ static void parse_opts(int argc, char **argv) config_file = optarg; break; case 'R': + free(config->rootdir); if ((config->rootdir = strdup(optarg)) == NULL) { fprintf(stderr, _("error setting rootdir '%s': out of memory\n"), optarg); cleanup(); -- 2.30.0

1 0

[pacman-dev] [PATCH] checkupdates: Provide --nosync option
by Samir Benmendil 16 Jan '21

16 Jan '21

Adds an option to not attempt to sync the CHECKUPDATES_DB. This provides a way to very quickly get a list of outdated packages provided there is a different mechanism to update CHECKUPDATES_DB already in place such as a crontab entry or systemd.timer. Signed-off-by: Samir Benmendil <me(a)rmz.io> --- src/checkupdates.sh.in | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/checkupdates.sh.in b/src/checkupdates.sh.in index 67ff144..027600f 100644 --- a/src/checkupdates.sh.in +++ b/src/checkupdates.sh.in @@ -65,8 +65,8 @@ Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary __EOF__ } -OPT_SHORT='dh' -OPT_LONG=('download' 'help' 'nocolor') +OPT_SHORT='dnh' +OPT_LONG=('download' 'help' 'nocolor' 'norefresh') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 @@ -74,10 +74,13 @@ fi set -- "${OPTRET[@]}" unset OPT_SHORT OPT_LONG OPTRET +SYNC=1 while :; do case $1 in -d|--download) DOWNLOAD_CACHE=1 ;; + -n|--nosync) + SYNC=0 ;; -h|--help) usage exit 0 ;; @@ -112,10 +115,12 @@ if [[ -z "$DBPath" ]] || [[ ! -d "$DBPath" ]]; then DBPath="@localstatedir@/lib/pacman/" fi -mkdir -p "$CHECKUPDATES_DB" -ln -s "${DBPath}/local" "$CHECKUPDATES_DB" &> /dev/null -if ! fakeroot -- pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null &> /dev/null; then - die 'Cannot fetch updates' +if (( ${SYNC} )); then + mkdir -p "$CHECKUPDATES_DB" + ln -s "${DBPath}/local" "$CHECKUPDATES_DB" &> /dev/null + if ! fakeroot -- pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null &> /dev/null; then + die 'Cannot fetch updates' + fi fi mapfile -t updates < <(pacman -Qu --dbpath "$CHECKUPDATES_DB" 2> /dev/null | grep -v '\[.*\]') -- 2.30.0

2 1

[pacman-dev] [PATCH] balpm: set handle->parallel_downloads only with curl
by Emil Velikov 13 Jan '21

13 Jan '21

The variable is missing when building without curl. Move it within the ifdef guard. Fixes: 9dc29ebf ("libalpm: set parallel_downloads to 1 when creating the handle") Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> --- Noticed while skimming through now the parallel downloader works. Might be a good idea to add as a CI permutation as/if we move to gitlab. --- lib/libalpm/alpm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 85cc4618..9504d4ca 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -73,9 +73,8 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, #ifdef HAVE_LIBCURL curl_global_init(CURL_GLOBAL_ALL); myhandle->curlm = curl_multi_init(); -#endif - myhandle->parallel_downloads = 1; +#endif #ifdef ENABLE_NLS bindtextdomain("libalpm", LOCALEDIR); -- 2.30.0

2 1

[pacman-dev] [PATCH] libalpm: download sig files with -U when missing
by morganamilo 12 Jan '21

12 Jan '21

--- Also, I think the way signature downloading is a bit weird. You can't just download a signature. You have to say you want to download the package then the downloader will download the sig after the package finishes downloading. I think it would make more sense for signatures to be their own payloads and then have a dlsigcb. This would go towards fixing FS#67813 If totaldlcb reports 0 packages to download, then we can show the progress bars for the sigs instead of the packages. --- lib/libalpm/dload.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index df5e8be7..66ebeae9 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -863,8 +863,27 @@ int SYMEXPORT alpm_fetch_pkgurl(alpm_handle_t *handle, const alpm_list_t *urls, char *url = i->data; /* attempt to find the file in our pkgcache */ + char *filepath = filecache_find_url(handle, url); - if(filepath) { + int need_download = !filepath; + /* even if the package file in the cache we need to check for + * accompanion *.sig file as well. + * If *.sig is not cached then force download the package + its signature file. + */ + if(!need_download && (handle->siglevel & ALPM_SIG_PACKAGE)) { + char *sig_filename = NULL; + int len = strlen(filepath) + 5; + + MALLOC(sig_filename, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(sig_filename, len, "%s.sig", filepath); + + need_download = !_alpm_filecache_exists(handle, sig_filename); + + FREE(sig_filename); + } + + + if(!need_download) { /* the file is locally cached so add it to the output right away */ alpm_list_append(fetched, filepath); } else { -- 2.30.0

4 9