- Pacman-dev - lists.archlinux.org

[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 12 Jan '21

12 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

[pacman-dev] [PATCH 1/3] doc: rename libalpm-list man page for consistency
by Allan McRae 11 Jan '21

11 Jan '21

All other libalpm man pages are in the form libalpm_<name>. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm_list.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index 5e75aa6e..a0299a70 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -34,7 +34,7 @@ extern "C" { /** * @ingroup libalpm - * @addtogroup libalpm-list libalpm-list(3) + * @addtogroup libalpm_list libalpm_list(3) * @brief Functions to manipulate alpm_list_t lists. * * These functions are designed to create, destroy, and modify lists of -- 2.30.0

2 7

[pacman-dev] [PATCH] pacman-key: --refresh-keys queries WKD before keyserver
by foxboron＠archlinux.org 11 Jan '21

11 Jan '21

From: Morten Linderud <morten(a)linderud.pw> With the recent outages of the keyservers there is a possibility of `--refresh-keys` failing to fetch new keys. A lot of current key distribution is done over WKD these days, and `pacman-key` has the ability to use it for `--recv-key`. There was a hope `gpg` would end up supporting WKD for the refresh functionality, but this seems to be limited to expired keys fetched through WKD. Since this functionality isn't yet available it makes sense to stuff it into `pacman-key`. The current implementation looks over all available keyids in the keyring, attempts to fetch over WKD and then fall backs to keyservers if no email has a valid WKD available. The downside of this approach is that it takes a bit longer to refresh the keys, but it should be more robust as the distribution should be providing their own WKDs. Co-authored-by: Jonas Witschel <diabonas(a)archlinux.org> Signed-off-by: Morten Linderud <morten(a)linderud.pw> --- scripts/pacman-key.sh.in | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index c65669f5..3bd8ea3e 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -540,11 +540,41 @@ receive_keys() { } refresh_keys() { + local ret=0 ids masterkey emails + check_keyids_exist "$@" - if ! "${GPG_PACMAN[@]}" --refresh-keys "$@" ; then - error "$(gettext "A specified local key could not be updated from a keyserver.")" - exit 1 + + # don't try to refresh the user's local masterkey + masterkey="$("${GPG_PACMAN[@]}" --list-keys --with-colons pacman@localhost | + awk -F: '$1 == "pub" { print $5 }')" + + mapfile -t ids < \ + <("${GPG_PACMAN[@]}" --list-keys --with-colons "$@" | + awk -F: '$1 == "pub" { print $5 }' | grep -v "^$masterkey$") + + if (( ! ${#ids[*]} )); then + error "No keys in the keyring." + exit 1 fi + + for id in "${ids[@]}"; do + mapfile -t emails < \ + <("${GPG_PACMAN[@]}" --list-keys --list-options show-only-fpr-mbox "$id" | + awk '{print $2 }') + + # first try looking up the key in a WKD (only works by email address) + for email in "${emails[@]}"; do + "${GPG_PACMAN[@]}" --locate-external-keys "$email" && break + done + + # if no key was found, fall back to using the keyservers (with the key fingerprint instead) + if (( $? )) && ! "${GPG_PACMAN[@]}" --refresh-keys "$id"; then + error "$(gettext "A specified local key could not be updated from WKD or keyserver.")" + ret=1 + fi + done + + exit $ret } verify_sig() { -- 2.30.0

2 1

[pacman-dev] [PATCH] pacman-key: Close msg string in generate_master_key
by foxboron＠archlinux.org 11 Jan '21

11 Jan '21

From: Morten Linderud <morten(a)linderud.pw> In 19980a61e9ed9b9a57520aaa919c40a4b5311f87 there was a msg added which didn't get the string closed. Signed-off-by: Morten Linderud <morten(a)linderud.pw> --- scripts/pacman-key.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 59162840..c65669f5 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -145,7 +145,7 @@ key_lookup_from_name() { generate_master_key() { # Generate the master key, which will be in both pubring and secring - msg "$(gettext "Generating pacman master key. This may take some time.") + msg "$(gettext "Generating pacman master key. This may take some time.")" "${GPG_PACMAN[@]}" --gen-key --batch <<EOF %echo Generating pacman keyring master key... -- 2.30.0

2 1

[pacman-dev] [PATCH] Reopen stdin before chrooting
by morganamilo 09 Jan '21

09 Jan '21

Fixes FS#68630 diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 7b19162c..4fb7fe3c 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1135,12 +1135,6 @@ int main(int argc, char *argv[]) cleanup(EXIT_FAILURE); } - if(config->sysroot && (chroot(config->sysroot) != 0 || chdir("/") != 0)) { - pm_printf(ALPM_LOG_ERROR, - _("chroot to '%s' failed: (%s)\n"), config->sysroot, strerror(errno)); - cleanup(EXIT_FAILURE); - } - /* we support reading targets from stdin if a cmdline parameter is '-' */ if(alpm_list_find_str(pm_targets, "-")) { if(!isatty(fileno(stdin))) { @@ -1191,6 +1185,12 @@ int main(int argc, char *argv[]) } } + if(config->sysroot && (chroot(config->sysroot) != 0 || chdir("/") != 0)) { + pm_printf(ALPM_LOG_ERROR, + _("chroot to '%s' failed: (%s)\n"), config->sysroot, strerror(errno)); + cleanup(EXIT_FAILURE); + } + pm_printf(ALPM_LOG_DEBUG, "pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version()); /* parse the config file */ -- 2.30.0

2 1