- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] Testing "from" changes
by Allan McRae 08 Jan '21

08 Jan '21

The change was bad.

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-41-g521c6859
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 via 521c6859677666310b95a985fd9905b7afb7ec05 (commit) from c8f335aef75aa749d4b48f0774a1b9de93d06cdd (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 521c6859677666310b95a985fd9905b7afb7ec05 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> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 42 +++++++++++++++++++++--------------------- lib/libalpm/alpm_list.h | 17 ++--------------- 2 files changed, 23 insertions(+), 36 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-40-gc8f335ae
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 via c8f335aef75aa749d4b48f0774a1b9de93d06cdd (commit) via 6fdbf124442756e311524e3426662dd47e7c6efc (commit) via 239e865321ec757981799a9699067a329a22ea82 (commit) via 8a993b50132d5c0d46067313a78e83a20626475e (commit) via 3ba186457402a7197be6beac3b8c94dc08f692b0 (commit) via 90b161f7fcc356c33bcd0fe1ea1bc3682a70846f (commit) via 11290d77a77209c4bbefd00549fa6249185a88f3 (commit) via fc697fc1e7e978fb019ac07ea995c05de57dccb5 (commit) via 3b0560172fdcf84aaec4dc6c3f0bcc7842100e52 (commit) via 4cf85e3d563e6848a97c9f988027ec1bd648c3dc (commit) via e80cd3410fbbbc4622d5009d000f62a9025b684c (commit) via fb86c5060e8a6b8dad7241b1dc5feaeb25febc90 (commit) via 8e291e6f4b732e6ddc2ba4345b829ee524d7ceb2 (commit) via 19980a61e9ed9b9a57520aaa919c40a4b5311f87 (commit) from a023565ed370851fd5bf61298460fe0adb0b4189 (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 c8f335aef75aa749d4b48f0774a1b9de93d06cdd Author: Emil Velikov via pacman-dev <pacman-dev(a)lists.archlinux.org> 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 6fdbf124442756e311524e3426662dd47e7c6efc Author: Emil Velikov via pacman-dev <pacman-dev(a)lists.archlinux.org> 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 239e865321ec757981799a9699067a329a22ea82 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 8 20:51:51 2021 +1000 get_file_pkg_ops: update comment commit 8a993b50132d5c0d46067313a78e83a20626475e Author: Emil Velikov via pacman-dev <pacman-dev(a)lists.archlinux.org> 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 3ba186457402a7197be6beac3b8c94dc08f692b0 Author: morganamilo via pacman-dev <pacman-dev(a)lists.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 90b161f7fcc356c33bcd0fe1ea1bc3682a70846f Author: Emil Velikov via pacman-dev <pacman-dev(a)lists.archlinux.org> 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 11290d77a77209c4bbefd00549fa6249185a88f3 Author: Emil Velikov via pacman-dev <pacman-dev(a)lists.archlinux.org> 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 fc697fc1e7e978fb019ac07ea995c05de57dccb5 Author: Emil Velikov via pacman-dev <pacman-dev(a)lists.archlinux.org> 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 3b0560172fdcf84aaec4dc6c3f0bcc7842100e52 Author: morganamilo via pacman-dev <pacman-dev(a)lists.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 4cf85e3d563e6848a97c9f988027ec1bd648c3dc Author: morganamilo via pacman-dev <pacman-dev(a)lists.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 e80cd3410fbbbc4622d5009d000f62a9025b684c Author: morganamilo via pacman-dev <pacman-dev(a)lists.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 fb86c5060e8a6b8dad7241b1dc5feaeb25febc90 Author: morganamilo via pacman-dev <pacman-dev(a)lists.archlinux.org> Date: Fri Jan 1 16:57:44 2021 +0000 libalpm: remove useless if Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8e291e6f4b732e6ddc2ba4345b829ee524d7ceb2 Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Dec 29 23:31:21 2020 +0000 doc: fix typos Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 19980a61e9ed9b9a57520aaa919c40a4b5311f87 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Dec 29 23:32:33 2020 +1000 pacman-key: warn about time taken for master key generation Generating the pacman master key can take some time on systems without enough entropy. Warn the user that the generation may take some time. Fixes FS#30286. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Doxyfile.in | 1 - lib/libalpm/alpm.h | 21 +++++++++-------- lib/libalpm/alpm_list.c | 1 - lib/libalpm/be_local.c | 4 ++-- lib/libalpm/be_package.c | 7 +++--- lib/libalpm/be_sync.c | 19 +++++++++++++-- lib/libalpm/db.h | 2 +- lib/libalpm/dload.c | 17 ++++++-------- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 4 ++-- lib/libalpm/sync.c | 6 ++++- lib/libalpm/util.h | 3 --- meson.build | 6 +++-- scripts/pacman-key.sh.in | 2 ++ src/pacman/callback.c | 60 +++++++++++++++++++++++++++++++++++++----------- src/pacman/callback.h | 2 +- 16 files changed, 102 insertions(+), 55 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2 1/3] libalpm: introduce get_sync_pkg_ops() helper
by Emil Velikov 08 Jan '21

08 Jan '21

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> --- lib/libalpm/be_sync.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 225df76d..8fdf0fb2 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -281,6 +281,23 @@ static int _sync_get_validation(alpm_pkg_t *pkg) return pkg->validation; } +/** Package sync operations struct accessor. We implement this as a method + * rather than a static struct as in be_files because we want to reuse the + * majority of the default_pkg_ops struct and add only a few operations of + * our own on top. + */ +static struct pkg_operations *get_sync_pkg_ops(void) +{ + static struct pkg_operations sync_pkg_ops; + static int sync_pkg_ops_initalized = 0; + if(!sync_pkg_ops_initalized) { + sync_pkg_ops = default_pkg_ops; + sync_pkg_ops.get_validation = _sync_get_validation; + sync_pkg_ops_initalized = 1; + } + return &sync_pkg_ops; +} + static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname, const char **entry_filename, alpm_pkg_t *likely_pkg) { @@ -321,8 +338,7 @@ static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname, pkg->origin = ALPM_PKG_FROM_SYNCDB; pkg->origin_data.db = db; - pkg->ops = &default_pkg_ops; - pkg->ops->get_validation = _sync_get_validation; + pkg->ops = get_sync_pkg_ops(); pkg->handle = db->handle; /* add to the collection */ -- 2.30.0

2 3

[pacman-dev] [PATCH 1/5] libalpm: remove useless if
by morganamilo 08 Jan '21

08 Jan '21

--- lib/libalpm/dload.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index d43e6d45..d3636e18 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -899,10 +899,6 @@ int SYMEXPORT alpm_fetch_pkgurl(alpm_handle_t *handle, const alpm_list_t *urls, struct dload_payload *payload = i->data; char *filepath; - if(payload->signature) { - continue; - } - if(payload->destfile_name) { const char *filename = mbasename(payload->destfile_name); filepath = _alpm_filecache_find(handle, filename); -- 2.30.0

3 10

[pacman-dev] Adding privilege levitation to pacman
by Emil Velikov 06 Jan '21

06 Jan '21

Hello everyone, For a while now I've been wondering about adding privilege elevation to pacman, or if you prefer to libalpm. In particular, one that uses polkit akin to systemd and various other tools. The reason behind this is a multiple fold, but my main selfish wish is to get rid of yaourt. As you know, it is an "unsafe pacman wrapper" which is capable of a very basic elevation via sudo. Once that is complete, I have been itching to try and minimise the use/requirement of root, or as it's better known - apply the principle of least privilege. Would either of the above be suitable for inclusion in pacman/libalpm? Having the thumbs-up, before writing and testing the code, would be appreciated. Thanks Emil

5 16

[pacman-dev] [PATCH v2] pacman: add file checksum validation against mtree
by Emil Velikov 05 Jan '21

05 Jan '21

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. v2: Produce separate messages for failed to calc checksum vs missing checksum information in mtree Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> --- src/pacman/check.c | 74 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 7 deletions(-) diff --git a/src/pacman/check.c b/src/pacman/check.c index 02217d0f..ec741a95 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -176,19 +176,78 @@ static int check_file_size(const char *pkgname, const char *filepath, return 0; } -/* placeholders - libarchive currently does not read checksums from mtree files -static int check_file_md5sum(const char *pkgname, const char *filepath, - struct stat *st, struct archive_entry *entry, int backup) +#if ARCHIVE_VERSION_NUMBER >= 3005000 +static int check_file_cksum(const char *pkgname, const char *filepath, + int backup, const char *cksum_name, const char *cksum_calc, const char *cksum_mtree) { + if(!cksum_calc) { + if(!config->quiet) { + pm_printf(ALPM_LOG_WARNING, _("%s: %s (failed to calculate %s checksum)\n"), + pkgname, filepath, cksum_name); + } + return 1; + } + + if(!cksum_mtree) { + if(!config->quiet) { + pm_printf(ALPM_LOG_WARNING, _("%s: %s (%s checksum information not available)\n"), + pkgname, filepath, cksum_name); + } + return 1; + } + + if(strcmp(cksum_calc, cksum_mtree) != 0) { + if(backup) { + if(!config->quiet) { + printf("%s%s%s: ", config->colstr.title, _("backup file"), + config->colstr.nocolor); + printf(_("%s: %s (%s checksum mismatch)\n"), + pkgname, filepath, cksum_name); + } + return 0; + } + if(!config->quiet) { + pm_printf(ALPM_LOG_WARNING, _("%s: %s (%s checksum mismatch)\n"), + pkgname, filepath, cksum_name); + } + return 1; + } + return 0; } +#endif + +static int check_file_md5sum(const char *pkgname, const char *filepath, + struct archive_entry *entry, int backup) +{ + int errors = 0; +#if ARCHIVE_VERSION_NUMBER >= 3005000 + char *cksum_calc = alpm_compute_md5sum(filepath); + char *cksum_mtree = hex_representation(archive_entry_digest(entry, + ARCHIVE_ENTRY_DIGEST_MD5), 16); + errors = check_file_cksum(pkgname, filepath, backup, "MD5", cksum_calc, + cksum_mtree); + free(cksum_mtree); + free(cksum_calc); +#endif + return (errors != 0 ? 1 : 0); +} static int check_file_sha256sum(const char *pkgname, const char *filepath, - struct stat *st, struct archive_entry *entry, int backup) + struct archive_entry *entry, int backup) { - return 0; + int errors = 0; +#if ARCHIVE_VERSION_NUMBER >= 3005000 + char *cksum_calc = alpm_compute_sha256sum(filepath); + char *cksum_mtree = hex_representation(archive_entry_digest(entry, + ARCHIVE_ENTRY_DIGEST_SHA256), 32); + errors = check_file_cksum(pkgname, filepath, backup, "SHA256", cksum_calc, + cksum_mtree); + free(cksum_mtree); + free(cksum_calc); +#endif + return (errors != 0 ? 1 : 0); } -*/ /* Loop through the files of the package to check if they exist. */ int check_pkg_fast(alpm_pkg_t *pkg) @@ -369,7 +428,8 @@ int check_pkg_full(alpm_pkg_t *pkg) if(type == AE_IFREG) { file_errors += check_file_size(pkgname, filepath, &st, entry, backup); - /* file_errors += check_file_md5sum(pkgname, filepath, &st, entry, backup); */ + file_errors += check_file_md5sum(pkgname, filepath, entry, backup); + file_errors += check_file_sha256sum(pkgname, filepath, entry, backup); } if(config->quiet && file_errors) { -- 2.30.0

2 1

[pacman-dev] [PATCH v2 1/3] meson: pacman-conf add missing libcommon link
by Emil Velikov 05 Jan '21

05 Jan '21

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> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 264c6501..740ad717 100644 --- a/meson.build +++ b/meson.build @@ -347,7 +347,7 @@ executable( 'pacman-conf', pacman_conf_sources, include_directories : includes, - link_with : [libalpm], + link_with : [libalpm, libcommon], dependencies : [libarchive], install : true, ) -- 2.30.0

1 2