- Pacman-dev - lists.archlinux.org

[Git][pacman/pacman][master] Fix unused result warnings
by Allan McRae (＠allan) 14 Mar '24

14 Mar '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 111eed02 by Allan McRae at 2024-03-14T01:50:05+00:00 Fix unused result warnings Not actually a fix, as the pacman output will still be weird and we will not gracefully exit, but it does print an error message... Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - src/pacman/util.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/111eed0251238a9d3f90e76… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/111eed0251238a9d3f90e76… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] repo-add: fix parseopts missing arg to -k/--key
by Allan McRae (＠allan) 14 Mar '24

14 Mar '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 0571ee82 by Christian Heusel at 2024-03-14T01:20:53+00:00 repo-add: fix parseopts missing arg to -k/--key The current code treats -k/--key as a binary option which later makes it fail parsing the argument as then the end of arguments '--' is treated as the GPGKEY. We fix this by adding the appropriate specifier to the long and shortopt. Closes https://gitlab.archlinux.org/pacman/pacman/-/issues/105 Fixes: 4f43ce3e ("repo-add: use parseopts from libmakepkg") Signed-off-by: Christian Heusel <christian(a)heusel.eu> - - - - - 1 changed file: - scripts/repo-add.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/0571ee82bff0edbd5ffac22… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/0571ee82bff0edbd5ffac22… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] make_aligned_titles: pass the correct buffer length
by Allan McRae (＠allan) 14 Mar '24

14 Mar '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 5e049626 by Ivan Shapovalov at 2024-03-13T04:32:42+01:00 make_aligned_titles: pass the correct buffer length The third parameter to wcstombs() is the length of the output buffer (first parameter) in bytes. Take the correct sizeof() here. This is not a problem in practice, but prevents _FORTIFY_SOURCE=3 from detecting a possible output buffer overflow (as the source buffer is bigger than the destination). Fixes #104. Signed-off-by: Ivan Shapovalov <intelfx(a)intelfx.name> - - - - - 1 changed file: - src/pacman/package.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/5e0496260b7d3f9c9fcf2b1… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/5e0496260b7d3f9c9fcf2b1… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] 2 commits: Manage releases through gitlab
by Allan McRae (＠allan) 06 Mar '24

06 Mar '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: d7f3ce12 by Allan McRae at 2024-03-06T10:23:33+00:00 Manage releases through gitlab Also provide an example for how to check for errors in translations Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 95f148c2 by Allan McRae at 2024-03-06T10:23:33+00:00 Update website to reflect gitlab usage Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 2 changed files: - RELEASE - doc/index.asciidoc View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/6bb95c8856437513ee0ab1… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/6bb95c8856437513ee0ab1… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Fix error messages for unknown key in databases
by Allan McRae (＠allan) 06 Mar '24

06 Mar '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 6bb95c88 by Allan McRae at 2024-03-05T07:25:11+10:00 Fix error messages for unknown key in databases Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 2 changed files: - lib/libalpm/be_local.c - lib/libalpm/be_sync.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/6bb95c8856437513ee0ab19… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/6bb95c8856437513ee0ab19… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman] Pushed new branch release/6.1.x
by Allan McRae (＠allan) 05 Mar '24

05 Mar '24

Allan McRae pushed new branch release/6.1.x at Pacman / Pacman -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/tree/release/6.1.x You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman] Pushed new tag v6.1.0
by Allan McRae (＠allan) 04 Mar '24

04 Mar '24

Allan McRae pushed new tag v6.1.0 at Pacman / Pacman -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/tree/v6.1.0 You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] 5 commits: Update README for 6.1
by Allan McRae (＠allan) 04 Mar '24

04 Mar '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 90f5ca42 by Allan McRae at 2024-03-04T11:44:11+10:00 Update README for 6.1 Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1c536abe by Allan McRae at 2024-03-04T11:44:11+10:00 Update NEWS for 6.1 release Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 4b25bb63 by Allan McRae at 2024-03-04T11:44:11+10:00 Update meson.build for release Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 23151a88 by Allan McRae at 2024-03-04T11:44:11+10:00 Update web index for release Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - e3dc296b by Allan McRae at 2024-03-04T13:07:58+10:00 Pull translations for release Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 30 changed files: - NEWS - README - doc/index.asciidoc - lib/libalpm/po/ar.po - lib/libalpm/po/ast.po - lib/libalpm/po/az_AZ.po - lib/libalpm/po/bg.po - lib/libalpm/po/br.po - lib/libalpm/po/ca.po - lib/libalpm/po/cs.po - lib/libalpm/po/da.po - lib/libalpm/po/de.po - lib/libalpm/po/el.po - lib/libalpm/po/en_GB.po - lib/libalpm/po/eo.po - lib/libalpm/po/es.po - lib/libalpm/po/es_419.po - lib/libalpm/po/eu.po - lib/libalpm/po/eu_ES.po - lib/libalpm/po/fi.po - lib/libalpm/po/fr.po - lib/libalpm/po/gl.po - lib/libalpm/po/hi.po - lib/libalpm/po/hr.po - lib/libalpm/po/hu.po - lib/libalpm/po/id.po - lib/libalpm/po/it.po - lib/libalpm/po/ja.po - lib/libalpm/po/kk.po - lib/libalpm/po/ko.po View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/9f6c0817719edc9eb0618c… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/9f6c0817719edc9eb0618c… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] 2 commits: conf: make prepend_dir and globdir NULL aware
by Allan McRae (＠allan) 04 Mar '24

04 Mar '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: cddad6fc by Andrew Gregory at 2024-03-04T01:33:51+00:00 conf: make prepend_dir and globdir NULL aware Allows sysroot to be left NULL. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> - - - - - 9f6c0817 by Andrew Gregory at 2024-03-04T01:33:51+00:00 conf: do not default sysroot to / Setting sysroot to / is not the same as having no sysroot, because the sysroot is prepended to ALL config paths including relative ones: $ cd /etc $ pacman --config=pacman.conf error: config file /pacman.conf could not be read: No such file or directory Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> - - - - - 1 changed file: - src/pacman/conf.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/016fd2633e2285341eae38… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/016fd2633e2285341eae38… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] libmakepkg/srcinfo.sh: fix missing extglob in srcinfo_write_attr
by Allan McRae (＠allan) 04 Mar '24

04 Mar '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 016fd263 by Levente Polyak at 2024-02-28T21:30:22+01:00 libmakepkg/srcinfo.sh: fix missing extglob in srcinfo_write_attr We use an extended glob here, but were relying on having it globally set in makepkg. This causes it to fail when used in scripts. Since scripts using libmakepkg may not want extglob to be set, save and restore the environment while explicitly setting extglob only where we need it. Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> - - - - - 1 changed file: - scripts/libmakepkg/srcinfo.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/016fd2633e2285341eae383… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/016fd2633e2285341eae383… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Do not segfault with badly formed URL
by Allan McRae (＠allan) 27 Feb '24

27 Feb '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: f343db5b by Allan McRae at 2024-02-28T07:38:56+10:00 Do not segfault with badly formed URL Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - lib/libalpm/dload.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/f343db5b8e979e19c3b897f… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/f343db5b8e979e19c3b897f… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Fix bug introduced to string_length
by Allan McRae (＠allan) 26 Feb '24

26 Feb '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 4a115b4d by Allan McRae at 2024-02-26T13:59:18+10:00 Fix bug introduced to string_length Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - src/pacman/util.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/4a115b4dcac49d9e30e8114… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/4a115b4dcac49d9e30e8114… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] pacman/callback.c: handle empty pkgname
by Allan McRae (＠allan) 26 Feb '24

26 Feb '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 74deada5 by Allan McRae at 2024-02-26T03:42:53+00:00 pacman/callback.c: handle empty pkgname In pacman's progress callback, pkgname being null may result in a segfault, due to undefined printf behaviour. libalpm always passes at least an empty string for pkgname, so this situation is largely avoided. However, the callback mostly checked for pkgname's being non-null and not empty. This means a additional space was being added to the output messages (although with zero actual effect on the output). Be a bit more robust here by treating null and empty pkgname the same and fixing the invisible output issue... Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - src/pacman/callback.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/74deada511358a4ce9c10ee… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/74deada511358a4ce9c10ee… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] 2 commits: Improve robustness of parsing the --debug argument
by Allan McRae (＠allan) 26 Feb '24

26 Feb '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 51211085 by Allan McRae at 2024-02-26T03:10:35+00:00 Improve robustness of parsing the --debug argument Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - b30dac6a by Allan McRae at 2024-02-26T13:14:23+10:00 Improve robustness of parsing the --ask argument Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - src/pacman/pacman.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/c9c56be3960c7ba7ccacc7… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/c9c56be3960c7ba7ccacc7… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] pacman/util.c: fix potential buffer overflow in string_length
by Allan McRae (＠allan) 26 Feb '24

26 Feb '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: c9c56be3 by Allan McRae at 2024-02-26T03:07:08+00:00 pacman/util.c: fix potential buffer overflow in string_length A potential buffer overflow could occur if a detected terminal escape sequence was not for a terminal colour (i.e. did not contain an "m"). Fix the potential buffer overflow while explicitly detecting only terminal colour escape sequences. Any other escape sequence is unexpected, and just gets pushed to the terminal. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - src/pacman/util.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/c9c56be3960c7ba7ccacc7c… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/c9c56be3960c7ba7ccacc7c… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] pacman-key: remove lock-never from keyring configuration
by Allan McRae (＠allan) 26 Feb '24

26 Feb '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 1d1bb6fa by Allan McRae at 2024-02-26T03:04:05+00:00 pacman-key: remove lock-never from keyring configuration I'm not sure why this was originally included, but it has now become a problem with multiple processes updating the keyring (e.g. the systemd timer for WKD updates from Arch Linux). Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - scripts/pacman-key.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/1d1bb6fa1a8247242fbdd22… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/1d1bb6fa1a8247242fbdd22… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] 2 commits: makepkg: move rust related documentation into the configuration file
by Allan McRae (＠allan) 26 Feb '24

26 Feb '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 2a0dd9ec by Allan McRae at 2024-02-25T09:32:57+10:00 makepkg: move rust related documentation into the configuration file Adding more and more languages will make the man page become increasingly difficult to navigate. Move documentation into the configuration file where variables are defined. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - dba383f0 by loqs at 2024-02-25T09:33:29+10:00 makepkg: Add support for Fortran build flags Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 5 changed files: - doc/makepkg.conf.5.asciidoc - + etc/makepkg.conf.d/fortran.conf.in - etc/makepkg.conf.d/rust.conf.in - meson.build - + scripts/libmakepkg/buildenv/fortran.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/d55b47e5512808b67bc944… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/d55b47e5512808b67bc944… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Update copyright years
by Allan McRae (＠allan) 24 Feb '24

24 Feb '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: d55b47e5 by Allan McRae at 2024-02-24T18:40:44+10:00 Update copyright years Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 30 changed files: - doc/index.asciidoc - lib/libalpm/add.c - lib/libalpm/add.h - lib/libalpm/alpm.c - lib/libalpm/alpm.h - lib/libalpm/alpm_list.c - lib/libalpm/alpm_list.h - lib/libalpm/backup.c - lib/libalpm/backup.h - lib/libalpm/be_local.c - lib/libalpm/be_package.c - lib/libalpm/be_sync.c - lib/libalpm/conflict.c - lib/libalpm/conflict.h - lib/libalpm/db.c - lib/libalpm/db.h - lib/libalpm/deps.c - lib/libalpm/deps.h - lib/libalpm/diskspace.c - lib/libalpm/diskspace.h - lib/libalpm/dload.c - lib/libalpm/dload.h - lib/libalpm/error.c - lib/libalpm/filelist.c - lib/libalpm/filelist.h - lib/libalpm/graph.c - lib/libalpm/graph.h - lib/libalpm/group.c - lib/libalpm/group.h - lib/libalpm/handle.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/d55b47e5512808b67bc944f… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/d55b47e5512808b67bc944f… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

pacman-6.2 release freeze
by Allan McRae 19 Feb '24

19 Feb '24

Hi all, Just a heads up that we are now frozen for the upcoming 6.2 release. I expect to tag the release in two weeks. I have pushed the strings for translation to Transifex. Allan

2 1

[Git][pacman/pacman][master] Prepare translations
by Allan McRae (＠allan) 19 Feb '24

19 Feb '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: c8afb0aa by Allan McRae at 2024-02-19T11:27:21+10:00 Prepare translations Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 6 changed files: - lib/libalpm/po/ar.po - lib/libalpm/po/ast.po - lib/libalpm/po/az_AZ.po - lib/libalpm/po/bg.po - lib/libalpm/po/br.po - lib/libalpm/po/ca.po View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/c8afb0aa1a5c04c1f7fb660… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/c8afb0aa1a5c04c1f7fb660… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] verify_signature: wait as long as possible before bailing
by Allan McRae (＠allan) 18 Feb '24

18 Feb '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: c7c4c2a7 by Allan McRae at 2024-02-19T09:24:13+10:00 verify_signature: wait as long as possible before bailing Bailing early caused problems with makepkg failing on verify but expired signatures. As this is often out of the packagers control, and it is better to verify a signature than not, we try bailing as late as possible and let makepkg warn about the expired signature. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - scripts/libmakepkg/integrity/verify_signature.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/c7c4c2a7d21fe99cc564fb2… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/c7c4c2a7d21fe99cc564fb2… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] manually apply --sysroot to configuration
by Allan McRae (＠allan) 18 Feb '24

18 Feb '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 7016adcb by Andrew Gregory at 2024-02-19T09:20:16+10:00 manually apply --sysroot to configuration The previous chroot-based sysroot often broke due to glibc's delayed loading for much of its functionality when the sysroot did not contain compatible copies of the necessary libraries. This approach instead manually prepends the sysroot to all configuration paths. BREAKING CHANGE: targets to -U are no longer interpreted relative to sysroot Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 5 changed files: - doc/pacman.8.asciidoc - src/pacman/conf.c - src/pacman/pacman-conf.c - src/pacman/pacman.c - src/pacman/util.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/7016adcb7035ef4590e0ea3… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/7016adcb7035ef4590e0ea3… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] libalpm: download signatures with the external downloader
by Allan McRae (＠allan) 16 Feb '24

16 Feb '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 2180e4d1 by Masato TOYOSHIMA at 2024-02-16T19:27:09+10:00 libalpm: download signatures with the external downloader Ensure relevant signature files are downloaded when using the fetch callback. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - lib/libalpm/dload.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/2180e4d127af2ce0722b831… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/2180e4d127af2ce0722b831… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] download smallest files first but always use one parallel job to download large files concurrently
by Thomas Reichel 16 Feb '24

16 Feb '24

When downloading small files the download time seems dominated by connection latency rather than bandwidth. Downloading several small files in parallel is an effective way to reduce the impact of latency. However, downloading many small files in parallel does not always saturate bandwidth, which is inefficient. This commit attempts to fully utilize parallelism to download small files while maintaining high bandwidth utilization. This is accomplished by downloading the smallest files first using all but 1 parallel connection while downloading a large file using the remaining parallel connection. The result seems to maintain a more stable download speed throughout entire transactions. This is in contrast to the usual behavior I observed when downloading many packages, where the download speed progressively declines as smaller packages are downloaded. When my entire cache is deleted and all packages are redownloaded using ` pacman -Qqn | sudo pacman -Sw -`, the mean download speed is 47.8 MiB/s. After this patch, the mean download speed is 54.0 MiB/s. In terms of time savings, this patch causes a 14.9 GiB download to go from 5 minutes 20 seconds to 4 minutes 43 seconds on my system and network. Your mileage may vary on different systems, networks, and selections of packages. I expect there to be virtually no effect on selections of packages that are all fairly large. Signed-off-by: Thomas Reichel <tom.p.reichel(a)gmail.com> --- lib/libalpm/dload.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 7c344760..4d8777f9 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -884,7 +884,7 @@ cleanup: } /* - * Use to sort payloads by max size in decending order (largest -> smallest) + * Use to sort payloads by max size in ascending order (smallest -> largest) */ static int compare_dload_payload_sizes(const void *left_ptr, const void *right_ptr) { @@ -893,7 +893,7 @@ static int compare_dload_payload_sizes(const void *left_ptr, const void *right_p left = (struct dload_payload *) left_ptr; right = (struct dload_payload *) right_ptr; - return right->max_size - left->max_size; + return left->max_size - right->max_size; } /* Returns -1 if an error happened for a required file @@ -910,18 +910,39 @@ static int curl_download_internal(alpm_handle_t *handle, int updated = 0; /* was a file actually updated */ CURLM *curlm = handle->curlm; size_t payloads_size = alpm_list_count(payloads); + /* download a single large file along with smaller files */ + struct dload_payload *large_file = NULL; + /* a reverse iterator for payloads */ + alpm_list_t* payloads_reverse; /* Sort payloads by package size */ payloads = alpm_list_msort(payloads, payloads_size, &compare_dload_payload_sizes); + payloads_reverse = alpm_list_last(payloads); + while(active_downloads_num > 0 || payloads) { CURLMcode mc; for(; active_downloads_num < max_streams && payloads; active_downloads_num++) { - struct dload_payload *payload = payloads->data; + struct dload_payload *payload; + if (large_file == NULL) { + payload = payloads_reverse->data; + } else { + payload = payloads->data; + } if(curl_add_payload(handle, curlm, payload, localpath) == 0) { - payloads = payloads->next; + if (payloads_reverse == payloads) { + /* pointers met in the middle, we finished by advancing either */ + payloads = NULL; + break; + } + if (large_file == NULL) { + large_file = payloads_reverse->data; + payloads_reverse = payloads_reverse->prev; + } else { + payloads = payloads->next; + } } else { /* The payload failed to start. Do not start any new downloads. * Wait until all active downloads complete. @@ -959,6 +980,16 @@ static int curl_download_internal(alpm_handle_t *handle, payloads = NULL; err = -1; } else if(ret == 0) { + struct dload_payload *finished_payload; + CURLcode curlerr; + /* which file downloaded? */ + curlerr = curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &finished_payload); + ASSERT(curlerr == CURLE_OK, RET_ERR(handle, ALPM_ERR_LIBCURL, -1)); + /* did we just finish the large file that was downloading? */ + if (large_file != NULL && finished_payload == large_file) { + large_file = NULL; + } + updated = 1; } } else { -- 2.43.1

3 7

[Git][pacman/pacman][master] libmakepkg: skip stripping guile-2.2 files
by Allan McRae (＠allan) 15 Feb '24

15 Feb '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 48729f8e by Allan McRae at 2024-02-15T23:34:05+00:00 libmakepkg: skip stripping guile-2.2 files Guile 2.2 uses ELF format for its byte-compiled files. These are not normal executables, and are not strippable in the normal sense. Given these are ELF files and detected by "file" as non-stripped binaries, it is only possible to skip these using the file path. Fixes #73 Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - scripts/libmakepkg/tidy/strip.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/48729f8eccc99a09ebd2f1a… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/48729f8eccc99a09ebd2f1a… You're receiving this email because of your account on gitlab.archlinux.org.

1 0