- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] FS#66472: correct length of ".files.sig" string
by Pascal Ernster 21 Jan '21

21 Jan '21

Signed-off-by: Pascal Ernster <pacman-dev(a)hardfalcon.net> --- src/pacman/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index a05af5da..9ec4c92e 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -105,7 +105,7 @@ static int sync_cleandb(const char *dbpath) dbname = strndup(dname, len - 7); } else if(len > 6 && strcmp(dname + len - 6, ".files") == 0) { dbname = strndup(dname, len - 6); - } else if(len > 6 && strcmp(dname + len - 6, ".files.sig") == 0) { + } else if(len > 10 && strcmp(dname + len - 10, ".files.sig") == 0) { dbname = strndup(dname, len - 10); } else { ret += unlink_verbose(path, 0); -- 2.30.0

4 5

[pacman-dev] [PATCH 1/7] pacman: add -w to -U
by Andrew Gregory 19 Jan '21

19 Jan '21

Mostly for testing. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- doc/pacman.8.asciidoc | 6 +++--- src/pacman/pacman.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc index 476c16f3..bb205627 100644 --- a/doc/pacman.8.asciidoc +++ b/doc/pacman.8.asciidoc @@ -241,6 +241,9 @@ Transaction Options (apply to '-S', '-R' and '-U') Upgrade Options (apply to '-S' and '-U')[[UO]] ---------------------------------------------- +*-w, \--downloadonly*:: + Retrieve all packages from the server, but do not install/upgrade anything. + *\--asdeps*:: Install packages non-explicitly; in other words, fake their install reason to be installed as a dependency. This is useful for makepkg and other @@ -445,9 +448,6 @@ can be useful when the user switches from a testing repository to a stable one. Additional targets can also be specified manually, so that '-Su foo' will do a system upgrade and install/upgrade the "foo" package in the same operation. -*-w, \--downloadonly*:: - Retrieve all packages from the server, but do not install/upgrade anything. - *-y, \--refresh*:: Download a fresh copy of the master package database from the server(s) defined in linkman:pacman.conf[5]. This should typically be used each time diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 3045a58e..cc280d41 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -161,7 +161,6 @@ static void usage(int op, const char * const myname) addlist(_(" -q, --quiet show less information for query and search\n")); addlist(_(" -s, --search <regex> search remote repositories for matching strings\n")); addlist(_(" -u, --sysupgrade upgrade installed packages (-uu enables downgrades)\n")); - addlist(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); addlist(_(" -y, --refresh download fresh package databases from the server\n" " (-yy to force a refresh even if up to date)\n")); addlist(_(" --needed do not reinstall up to date packages\n")); @@ -189,6 +188,7 @@ static void usage(int op, const char * const myname) switch(op) { case PM_OP_SYNC: case PM_OP_UPGRADE: + addlist(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); addlist(_(" --overwrite <glob>\n" " overwrite conflicting files (can be used more than once)\n")); addlist(_(" --asdeps install packages as non-explicitly installed\n")); @@ -735,6 +735,12 @@ static int parsearg_upgrade(int opt) case OP_IGNOREGROUP: parsearg_util_addlist(&(config->ignoregrp)); break; + case OP_DOWNLOADONLY: + case 'w': + config->op_s_downloadonly = 1; + config->flags |= ALPM_TRANS_FLAG_DOWNLOADONLY; + config->flags |= ALPM_TRANS_FLAG_NOCONFLICTS; + break; default: return 1; } return 0; @@ -820,12 +826,6 @@ static int parsearg_sync(int opt) case 'u': (config->op_s_upgrade)++; break; - case OP_DOWNLOADONLY: - case 'w': - config->op_s_downloadonly = 1; - config->flags |= ALPM_TRANS_FLAG_DOWNLOADONLY; - config->flags |= ALPM_TRANS_FLAG_NOCONFLICTS; - break; case OP_REFRESH: case 'y': (config->op_s_sync)++; -- 2.30.0

1 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-55-g1c4e0798
by Allan McRae 19 Jan '21

19 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 via 1c4e07989940a435483563be7c12915b32289fbe (commit) via 79227dabe07c43b5a208696312a42b00a328398d (commit) via 8ed98023b45d1cdea4217f7152dcdc77944a0ea7 (commit) via a4931704205718869fdf62d0e20a2a4b27216436 (commit) via 5151de301119ef73de12edc98e6c6ff4e2412873 (commit) via 5d21b2d44c1727e33bd7c71e657501eb013c44d0 (commit) via 4311cc3648df4d695b4c69b048137f87cb5dd89a (commit) via 8566cd9be905c96b56ec550ed30058bcc9aed06e (commit) via 57a75dedb115df9e6ed516bbb2cea5ef8582ce51 (commit) via e9cc95f3721967b3cb9f766d400606a8ef4491d0 (commit) via 8f7415c41b079ede67581a7685a779e427dab440 (commit) via 3f5125e47cbc87470890bfc76aa406732a10167d (commit) via 4cdbbcfc34c7edb72ad962bcd07bd78dcffa1ea1 (commit) via c1d23c0ff22f0edd34f266e9e95c30049f6b4639 (commit) from 8fda300e069315ea8ddb8fbc822addf4431da436 (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 1c4e07989940a435483563be7c12915b32289fbe Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:21:01 2021 -0800 do not try to download an empty db list 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 79227dabe07c43b5a208696312a42b00a328398d Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:21:00 2021 -0800 make alpm download config accessible without curl 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8ed98023b45d1cdea4217f7152dcdc77944a0ea7 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:20:59 2021 -0800 sighandler: initialize sigaction fields Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a4931704205718869fdf62d0e20a2a4b27216436 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:20:58 2021 -0800 fully free error list in check_keyring Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5151de301119ef73de12edc98e6c6ff4e2412873 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:20:57 2021 -0800 plug memory leaks in _alpm_key_import Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5d21b2d44c1727e33bd7c71e657501eb013c44d0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:20:56 2021 -0800 pacman-conf: free rootdir before replacing Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4311cc3648df4d695b4c69b048137f87cb5dd89a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 15 23:20:55 2021 -0800 pacman: indicate --overwrite takes a glob Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8566cd9be905c96b56ec550ed30058bcc9aed06e Author: Morten Linderud <morten(a)linderud.pw> Date: Sun Jan 10 17:13:47 2021 +0100 pacman-key: Close msg string in generate_master_key In 19980a61e9ed9b9a57520aaa919c40a4b5311f87 there was a msg added which didn't get the string closed. Signed-off-by: Morten Linderud <morten(a)linderud.pw> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 57a75dedb115df9e6ed516bbb2cea5ef8582ce51 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 9 11:54:05 2021 +1000 mailmap addition Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e9cc95f3721967b3cb9f766d400606a8ef4491d0 Author: morganamilo <morganamilo(a)archlinux.org> Date: Thu Dec 31 18:13:55 2020 +0000 Read targets from stdin before chrooting Operations involving --sysroot and reading targets from stdin were failing due to attempting to read targets after chrooting. Move the chroot to happen after targets are read. Fixes FS#68630 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8f7415c41b079ede67581a7685a779e427dab440 Author: Emil Velikov <emil.l.velikov(a)gmail.com> Date: Tue Jan 5 00:56:22 2021 +0000 pacman: add file checksum validation against mtree With libarchive v3.5.0 we have API to fetch the digest from the mtree. Use that to validate if the installed files are modified or not. As always, a modified backup file will trigger a warning but will not result in an actual failure. Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3f5125e47cbc87470890bfc76aa406732a10167d Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 9 09:26:53 2021 +1000 doc: move missed sections from alpm_ to libalpm_ Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4cdbbcfc34c7edb72ad962bcd07bd78dcffa1ea1 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 9 09:19:50 2021 +1000 doc: reference all libalpm sections within libalpm man page Also, fix minor typo. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c1d23c0ff22f0edd34f266e9e95c30049f6b4639 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 9 09:19:03 2021 +1000 doc: rename libalpm-list man page for consistency All other libalpm man pages are in the form libalpm_<name>. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .mailmap | 1 + lib/libalpm/alpm.h | 57 +++++++++++++++++++++---------------- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/be_sync.c | 4 +++ lib/libalpm/handle.c | 12 -------- lib/libalpm/handle.h | 3 +- lib/libalpm/signing.c | 5 +++- lib/libalpm/sync.c | 3 +- lib/libalpm/util.c | 2 ++ scripts/pacman-key.sh.in | 2 +- src/pacman/check.c | 74 +++++++++++++++++++++++++++++++++++++++++++----- src/pacman/pacman-conf.c | 1 + src/pacman/pacman.c | 14 ++++----- src/pacman/sighandler.c | 1 + 14 files changed, 126 insertions(+), 55 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/7] pacman: indicate --overwrite takes a glob
by Andrew Gregory 19 Jan '21

19 Jan '21

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 7b19162c..b39f5031 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -189,7 +189,7 @@ static void usage(int op, const char * const myname) switch(op) { case PM_OP_SYNC: case PM_OP_UPGRADE: - addlist(_(" --overwrite <path>\n" + addlist(_(" --overwrite <glob>\n" " overwrite conflicting files (can be used more than once)\n")); addlist(_(" --asdeps install packages as non-explicitly installed\n")); addlist(_(" --asexplicit install packages as explicitly installed\n")); -- 2.30.0

2 1

[pacman-dev] [PATCH] libalpm: fix payloads not being reset between servers
by morganamilo 17 Jan '21

17 Jan '21

This was originally fixed in e83e868a77865d42a33076605f9a90a165f7c93a but removed when implementing parallel downloads. --- Some what untested. Just need to wait for my internet to act up again. diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index df5e8be7..3a65da7f 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -367,6 +367,12 @@ static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload fseek(payload->localf, 0, SEEK_SET); } + + /* reset progress for next server */ + payload->initial_size += payload->prevprogress; + payload->prevprogress = 0; + payload->unlink_on_fail = 0; + /* Set curl with the new URL */ curl_easy_setopt(curl, CURLOPT_URL, payload->fileurl); -- 2.30.0

3 2

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

16 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