- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] Force push to master
by Allan McRae 08 Jan '21

08 Jan '21

Hi all, I just did a force push to master. This is due to the mailing list configuration being changed such that the From field is rewritten. I did not notice this, and that resulted in commits not being properly attributed to their authors. I am reluctant to ever do a force push, but I think proper attribution warranted it in this instance. The only people who will be affected by this force push at those who pulled the changes in the last couple of hours. Allan

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-41-g8fda300e
by Allan McRae 08 Jan '21

08 Jan '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 discards 521c6859677666310b95a985fd9905b7afb7ec05 (commit) discards c8f335aef75aa749d4b48f0774a1b9de93d06cdd (commit) discards 6fdbf124442756e311524e3426662dd47e7c6efc (commit) discards 239e865321ec757981799a9699067a329a22ea82 (commit) discards 8a993b50132d5c0d46067313a78e83a20626475e (commit) discards 3ba186457402a7197be6beac3b8c94dc08f692b0 (commit) discards 90b161f7fcc356c33bcd0fe1ea1bc3682a70846f (commit) discards 11290d77a77209c4bbefd00549fa6249185a88f3 (commit) discards fc697fc1e7e978fb019ac07ea995c05de57dccb5 (commit) discards 3b0560172fdcf84aaec4dc6c3f0bcc7842100e52 (commit) discards 4cf85e3d563e6848a97c9f988027ec1bd648c3dc (commit) discards e80cd3410fbbbc4622d5009d000f62a9025b684c (commit) discards fb86c5060e8a6b8dad7241b1dc5feaeb25febc90 (commit) via 8fda300e069315ea8ddb8fbc822addf4431da436 (commit) via 45a648961b2d9d5ac4a217e783c446f14ba3a82b (commit) via 1d2dd9a128690cef754bc102605df4918a508848 (commit) via f8614d8c5be0f58db8e14092a387ff6ffbf209d7 (commit) via 027d76b9f504c61878f0e78bf04847e60f90013c (commit) via 4472ce55d7e45fdd8cb6c0213a76128fa826a31e (commit) via b9ab7790d5ab1f6e4eff21025a97dd01b3bee090 (commit) via 67a42b9549b3d0bc5a6c1f774e965553b304c1cf (commit) via d53ba019f5dfee00fd66491c1fa1ac8978fd628d (commit) via 793e2097a6f46bbc5048c540e32a4caf92a6836a (commit) via f5b373788fce2326f98a8740fdeb9b8f7dd0a846 (commit) via bc1591a0b84643ef457fcd840eff97b902287c86 (commit) via 7cc8e0181fe2bde3ec1359adf697588f47af231c (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (521c6859677666310b95a985fd9905b7afb7ec05) \ N -- N -- N (8fda300e069315ea8ddb8fbc822addf4431da436) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 8fda300e069315ea8ddb8fbc822addf4431da436 Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Dec 29 11:54:56 2020 +1000 doc: change group names to libalpm_* Also change the group's title to point to the group's man page. This makes generated man pages be named libalpm_* which is more consistent with what library man pages are usually called. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 45a648961b2d9d5ac4a217e783c446f14ba3a82b Author: Emil Velikov <emil.l.velikov(a)gmail.com> Date: Tue Jan 5 00:36:10 2021 +0000 libalpm: const annotate struct db_operations Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1d2dd9a128690cef754bc102605df4918a508848 Author: Emil Velikov <emil.l.velikov(a)gmail.com> Date: Tue Jan 5 00:36:09 2021 +0000 libalpm: const annotate struct pkg_operations Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f8614d8c5be0f58db8e14092a387ff6ffbf209d7 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 8 20:51:51 2021 +1000 get_file_pkg_ops: update comment commit 027d76b9f504c61878f0e78bf04847e60f90013c Author: Emil Velikov <emil.l.velikov(a)gmail.com> Date: Tue Jan 5 00:36:08 2021 +0000 libalpm: introduce get_sync_pkg_ops() helper Currently default_pkg_ops is accessed in two different ways. There is get_file_pkg_ops (in be_package.c) creating a local once-off 'tweaked' copy. As well as load_pkg_for_entry (be_sync.c) which modifies in-place and uses default_pkg_ops. This seems rather misleading and fragile approach. Introduce a helper for the second use-case so that default_pkg_ops is handled consistently and essentially remains unchanged throughout. Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4472ce55d7e45fdd8cb6c0213a76128fa826a31e Author: morganamilo <morganamilo(a)archlinux.org> Date: Fri Jan 1 16:57:48 2021 +0000 pacman: total download show how many packages have been download Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b9ab7790d5ab1f6e4eff21025a97dd01b3bee090 Author: Emil Velikov <emil.l.velikov(a)gmail.com> Date: Tue Jan 5 00:48:13 2021 +0000 Remove unused SYMHIDDEN macros The macro hasn't been used since 2007 with commit 7f7da2b5fc01f46d28236384540c7ecfdac16a63. Although it was still copied over into alpm_list.c an year or so later with commit ca1a1871 ("More cleanup to alpm_list") Just remove all instances of it. Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 67a42b9549b3d0bc5a6c1f774e965553b304c1cf Author: Emil Velikov <emil.l.velikov(a)gmail.com> Date: Tue Jan 5 00:48:12 2021 +0000 meson: use hidden symbol visiblity by default All the required public API is annotated with SYMEXPORT, so we can just add the meson notation, to hide all the symbols by default. Thus we no longer spill all the internal API into the global namespace. This is effectively a regression from the autotools build, which used hidden and internal for DARWIN and others respectively. The use of hidden is considered sufficient, considering: - internal was introduced with commit 920b0d20 ("Update usage of gcc __attribute__ flags"), referencing the GCC manual and potential optimisations, although - the details about the optimisations or respective benefits are close to non-existent, - the code/data size of the binaries is identical across hidden and internal. While the latter produces slightly larger overall binaries. - Internal is not widely supported - missing on Darwin, the CMake build system lacks a wrapper (unlike for hidden) - Internal is not widely used in projects. Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d53ba019f5dfee00fd66491c1fa1ac8978fd628d Author: Emil Velikov <emil.l.velikov(a)gmail.com> Date: Tue Jan 5 00:48:11 2021 +0000 meson: pacman-conf add missing libcommon link Currently, we are erroneously exporting all the symbols via the libalpm.so. As such, the libcommon dependency is resolved. The libalpm.so exports are about to be resolved shortly, yet that exposed that pacman-conf is missing a link against libcommon. Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 793e2097a6f46bbc5048c540e32a4caf92a6836a Author: morganamilo <morganamilo(a)archlinux.org> Date: Fri Jan 1 16:57:47 2021 +0000 libalpm: pass the number of packages being downloaded in totaldlcb Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f5b373788fce2326f98a8740fdeb9b8f7dd0a846 Author: morganamilo <morganamilo(a)archlinux.org> Date: Sat Jan 2 00:00:02 2021 +0000 libalpm: don't use curl's deprecated functions This bumps the minimun curl version from 7.32.0 to 7.55.0. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bc1591a0b84643ef457fcd840eff97b902287c86 Author: morganamilo <morganamilo(a)archlinux.org> Date: Fri Jan 1 16:57:45 2021 +0000 pacman: clean filename for downlaods The progress bar already did this. But the init event and up to date message printed the full file name. Unify these for consistency. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7cc8e0181fe2bde3ec1359adf697588f47af231c Author: morganamilo <morganamilo(a)archlinux.org> Date: Fri Jan 1 16:57:44 2021 +0000 libalpm: remove useless if Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- The official pacman repository

1 0