- Pacman-dev - lists.archlinux.org

[Git][pacman/pacman][master] Add the -pedantic' compiler flag back to our debug builds
by Allan McRae (＠allan) 13 Feb '23

13 Feb '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: 6c913af9 by Allan McRae at 2023-02-13T22:07:32+10:00 Add the -pedantic' compiler flag back to our debug builds This was lost in the transition from autotools to meson. No additional warnings are given with current gcc and clang. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - meson.build View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/6c913af95d24fd9bca8c429… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/6c913af95d24fd9bca8c429… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] 3 commits: libmakepkg: move rust buildenv handling to separate file
by Allan McRae (＠allan) 13 Feb '23

13 Feb '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: 09e82f01 by Allan McRae at 2023-01-13T11:35:35+10:00 libmakepkg: move rust buildenv handling to separate file This serves as a demonstration for how other languages could drop in support into libmakepkg. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - e0bbfb56 by Allan McRae at 2023-01-13T11:35:42+10:00 libmakepkg: ensure clearing of buildflags happens first When 'options=('!buildflags') is used, we want to ensure our buildflags are cleared first. Currently this happens due to luck of alphabetical ordering, but this could change with libmakepkg drop-ins. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 71764b6d by Allan McRae at 2023-01-17T10:26:07+10:00 makepkg.conf: allow configuration additions via a subdirectory Move rust related buildflags to their own configuration file to provide an example of how other languages could be supported. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 10 changed files: - + etc/makepkg.conf.d/rust.conf.in - etc/makepkg.conf.in - meson.build - scripts/libmakepkg/buildenv.sh.in - scripts/libmakepkg/buildenv/buildflags.sh.in - scripts/libmakepkg/buildenv/debugflags.sh.in - scripts/libmakepkg/buildenv/meson.build - + scripts/libmakepkg/buildenv/rust.sh.in - scripts/libmakepkg/lint_config/variable.sh.in - scripts/libmakepkg/util/config.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/d35728f92421eb9e0980fb… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/d35728f92421eb9e0980fb… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

Working on SandboxUser patch
by Allan McRae 12 Feb '23

12 Feb '23

Just to avoid any potential overlap - I am working on the SandboxUser patch that Remi submitted a long while ago... https://lists.archlinux.org/archives/list/pacman-dev@lists.archlinux.org/th… The patch is far too big for me to confidently review in one go, so I am splitting it into smaller sections as I go. Progress can be seen here: https://gitlab.archlinux.org/pacman/pacman/-/commits/allan/privsep Allan

7 21

[PATCH] repo-add: do not recreate the database if nothing was changed
by Ivan Shapovalov 08 Feb '23

08 Feb '23

Signed-off-by: Ivan Shapovalov <intelfx(a)intelfx.name> --- When `repo-add` is used to add a package that already exists in the database, it will recompress the database unconditionally, even if `--new` is passed. Avoid doing that. scripts/repo-add.sh.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 221abdc0..78195de1 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -44,6 +44,8 @@ USE_COLOR='y' PREVENT_DOWNGRADE=0 INCLUDE_SIGS=0 +ENTRIES_CHANGED=0 + # Import libmakepkg source "$LIBRARY"/util/compress.sh source "$LIBRARY"/util/message.sh @@ -343,6 +345,8 @@ db_write_entry() { rm -f ${oldfile} ${oldfile}.sig fi + (( ++ENTRIES_CHANGED )) + return 0 } # end db_write_entry @@ -365,6 +369,9 @@ db_remove_entry() { pkgentry=$(find_pkgentry "$pkgname") done + if [[ $notfound == 0 ]]; then + (( ++ENTRIES_CHANGED )) + fi return $notfound } # end db_remove_entry @@ -684,13 +691,13 @@ for arg in "${args[@]:1}"; do done # if the whole operation was a success, re-zip and rotate databases -if (( !fail )); then +if (( !fail )) && (( ENTRIES_CHANGED > 0 )); then msg "$(gettext "Creating updated database file '%s'")" "$REPO_DB_FILE" create_db rotate_db else msg "$(gettext "No packages modified, nothing to do.")" - exit 1 + exit $(( fail != 0 )) fi exit 0 -- 2.38.0

3 6

RFC: Automatically fallback to Arch Linux Archive if all mirrors returned 404
by Yuuta Liang 05 Feb '23

05 Feb '23

Hi, I am using Arch Linux on lots of my personal servers, and most of them are not updated regularly. This causes trouble when I need to install a package on these servers because the requested package versions are already gone from mirrors. Upgrading these machines requires some effort because I need to wait and also manually fix pacnews, so it is not very ad-hoc. This is also an annoying issue on old (well, not the latest I'd say) Arch ISOs. I sometimes use Arch ISO to debug offline Linux systems, and I need to quickly install some debug tools, but my old Arch ISOs usually need to get a full update to install these packages, which is really annoying. Although Arch Linux is currently providing an archive service, it still requires manually typing the URL, which is not very convenient. I would like to work on a patch that automatically falls back to downloading `https://archive.archlinux.org/packages/.all/package_name-version-arch.pkg.tar.xxx` if all mirrors returned 404. The administrator may configure the archive URL prefix in pacman.conf(5). How does that sound? This is only a handy helper for users and will not likely to break any Arch systems except those very old ones, which need to be upgraded to get things working. If it sounds good, I would like to submit the patch as soon as possible, or are there any suggestions? Thank you very much. Best regards, Yuuta Liang

2 1

[Important] Gitlab migation plan for Pacman
by Morten Linderud 03 Jan '23

03 Jan '23

Hi, Some time ago it was decided to migrate the pacman development from the Mailing List to the Gitlab instance hosted by Arch Linux. The pacman source has been hosted there for a while but the development has strictly been conducted on the Mailing List and this is about to change. https://gitlab.archlinux.org/pacman/pacman/ The plan is as follows: 1. Open the patch submission via Gitlab and close the mailing list submission 2. Open the Gitlab issue tracker and close down the flyspry issue tracker 3. Manually migrate bugs from flyspry to Gitlab and close the others. Currently the issue tracker is open on Gitlab, and merge requests have also been enabled for some time. No EOL dates has been set on on patch submission nor flyspry, but I'd encourage any new development to using gitlab instead of the mailing list and flyspry from this point on. I propose we close down Flyspry and patch submission 1st of January 2023. This change also implies decommisioning the Patchwork instance. For this to be done we need to keep track of any unmerged/unreviewed patches from the mailing list. This list has been made and if anything is missing please do reach out. https://gitlab.archlinux.org/pacman/pacman/-/issues/1 There is also some documentation work that needs to be done to direct users from the Mailing List to Gitlab. Any help updating this documentation is very much appreciated. Cheers, Morten Linderud

3 6

[Git][pacman/pacman][master] pacman-key: Fix shell syntax
by Allan McRae (＠allan) 02 Jan '23

02 Jan '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: d35728f9 by Stefan Weil at 2023-01-01T15:54:48+01:00 pacman-key: Fix shell syntax Fixes: 3f8029af92752c04 ("pacman-key: Use ngettext for plurals") Signed-off-by: Stefan Weil <sw(a)weilnetz.de> - - - - - 1 changed file: - scripts/pacman-key.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/d35728f92421eb9e0980fb7… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/d35728f92421eb9e0980fb7… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] pacman-key: Use ngettext for plurals
by Allan McRae (＠allan) 01 Jan '23

01 Jan '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: 3f8029af by Allan McRae at 2023-01-01T13:41:52+10:00 pacman-key: Use ngettext for plurals There are two strings that may be singular or plural in pacman-key. Use ngettext to handle these strings correctly, and provide a fallback function if it is not available. Fixes FS#70556. 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/3f8029af92752c04a55c67f… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/3f8029af92752c04a55c67f… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] zsh: make names unique to avoid clashes
by Allan McRae (＠allan) 01 Jan '23

01 Jan '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: 6344aab3 by Allan McRae at 2022-12-24T00:55:30+10:00 zsh: make names unique to avoid clashes The function _keys is a bit generic and can result in clashes. Change other functions starting with _key_ to be _pacman_key_ as well. Fixes FS#74507. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - scripts/completion/zsh_completion.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/6344aab3bd4fcbe5f68b56f… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/6344aab3bd4fcbe5f68b56f… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Fix repo-add
by Allan McRae (＠allan) 19 Dec '22

19 Dec '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 52eb094a by morganamilo at 2022-12-19T10:08:57+10:00 Fix repo-add Commit 4f43ce3e4a7829cf9c7f8b28925ddb5a1013ce19 broke repo-add by switching to parseopts without accounting for the added "--". This caused the dbname to always be read as "--". Accounts for "--" and makes repo-add respect "--" as end of opts. - - - - - 1 changed file: - scripts/repo-add.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/52eb094aa26254c4e659959… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/52eb094aa26254c4e659959… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] makepkg.conf: clarify PKGEXT and SRCEXT
by Allan McRae (＠allan) 18 Dec '22

18 Dec '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: a1941973 by Allan McRae at 2022-12-19T09:56:29+10:00 makepkg.conf: clarify PKGEXT and SRCEXT Mention valid suffixes should start with .pkg or .src Fixes FS#64749. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - doc/makepkg.conf.5.asciidoc View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/a19419736916932f8d0017b… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/a19419736916932f8d0017b… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

Fix issues with libintl and libgpgme during builds
by Ziemowit Laski 14 Dec '22

14 Dec '22

This is pretty simple and hopefully self-explanatory, but please do ask questions if needed. Thanks, --Zem From c4a5adf001d3124854572bab561fbe3a21a885d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ziemowit=20=C5=81=C4=85ski?= <15880281+zlaski(a)users.noreply.github.com> Date: Tue, 6 Dec 2022 19:53:57 -0800 Subject: [PATCH] Fix issues with libintl and libgpgme The `libintl` library was not getting pulled in if `ngettext()` was missing but option `i18n` was not specified. The accepted `libgpgme` version was too old, leading to a missing `GPGME_KEYLIST_MODE_LOCATE` macro. Signed-off-by: Ziemowit Łąski <zlaski(a)ziemas.net> --- meson.build | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index c8ee42fd..a6c92276 100644 --- a/meson.build +++ b/meson.build @@ -77,16 +77,21 @@ conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/')) conf.set_quoted('HOOKDIR', join_paths(SYSCONFDIR, 'pacman.d/hooks/')) conf.set_quoted('ROOTDIR', ROOTDIR) -libintl = dependency('', required: false) -if get_option('i18n') - if not cc.has_function('ngettext') - libintl = cc.find_library('intl', required : false, static: get_option('buildstatic')) - if not libintl.found() - error('ngettext not found but NLS support requested') - endif - endif - conf.set('ENABLE_NLS', 1) +# i18n / ngettext +has_ngettext = cc.has_function('ngettext') +libintl = dependency('libintl', + required: false, + static: get_option('buildstatic')) +if not libintl.found() + libintl = cc.find_library('libintl', + required: false, + static: get_option('buildstatic')) +endif +conf.set('HAVE_LIBINTL', libintl.found()) +if not libintl.found() and (get_option('i18n') or not has_ngettext) + error('libintl not found even though ngettext() not found or NLS support requested') endif +conf.set('ENABLE_NLS', 1) # dependencies libarchive = dependency('libarchive', @@ -104,7 +109,7 @@ libcurl = dependency('libcurl', static : get_option('buildstatic')) conf.set('HAVE_LIBCURL', libcurl.found()) -needed_gpgme_version = '>=1.3.0' +needed_gpgme_version = '>=1.12.0' gpgme = dependency('gpgme', version : needed_gpgme_version, required : get_option('gpgme'), @@ -290,7 +295,7 @@ subdir('src/util') subdir('scripts') # Internationalization -if get_option('i18n') +if conf.get('HAVE_LIBINTL') i18n = import('i18n') subdir('lib/libalpm/po') subdir('src/pacman/po') @@ -350,7 +355,7 @@ pacman_bin = executable( pacman_sources, include_directories : includes, link_with : [libalpm, libcommon], - dependencies : [libarchive], + dependencies : [libarchive, libintl], install : true, ) @@ -359,7 +364,7 @@ executable( pacman_conf_sources, include_directories : includes, link_with : [libalpm, libcommon], - dependencies : [libarchive], + dependencies : [libarchive, libintl], install : true, ) @@ -368,7 +373,7 @@ executable( testpkg_sources, include_directories : includes, link_with : [libalpm], - dependencies : [libarchive], + dependencies : [libarchive, libintl], install : true, ) @@ -420,7 +425,7 @@ foreach path : [ join_paths(DATAROOTDIR, 'makepkg-template/'), join_paths(DATAROOTDIR, 'libalpm/hooks/'), ] - meson.add_install_script('sh', '-c', 'mkdir -p "$DESTDIR/@0@"'.format(path)) + meson.add_install_script('sh', '-c', 'mkdir -p "$DESTDIR@0@"'.format(path)) endforeach TEST_ENV = environment() @@ -464,6 +469,7 @@ message('\n '.join([ ' Build docs : @0@'.format(build_doc), ' debug build : @0@'.format(get_option('buildtype') == 'debug'), ' Use libcurl : @0@'.format(conf.get('HAVE_LIBCURL')), + ' Use libintl : @0@'.format(conf.get('HAVE_LIBINTL')), ' Use GPGME : @0@'.format(conf.get('HAVE_LIBGPGME')), ' Use OpenSSL : @0@'.format(conf.has('HAVE_LIBSSL') and conf.get('HAVE_LIBSSL') == 1), -- 2.38.1.windows.1

2 2

[Git][pacman/pacman][master] Bump required GPGME version to 1.12.0
by Allan McRae (＠allan) 13 Dec '22

13 Dec '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: f4f66fcc by Ziemowit Laski at 2022-12-13T11:46:18+10:00 Bump required GPGME version to 1.12.0 GPGME_KEYLIST_MODE_LOCATE was introduced in 1.12.0 Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - meson.build View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/f4f66fcca7c371c1a1756ff… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/f4f66fcca7c371c1a1756ff… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

RFC: Simple package diff
by Allan McRae 13 Dec '22

13 Dec '22

The idea of package deltas just won't go away... However, binary diffs really are not ideal with pacman verifying the compressed package - that means we need to reconstruct the package on the users system to verify. Also our old approach using xdelta3 somewhat died when moving packages away from gz (or xz?) compression. Other binary diff approaches really suffered the same issue. In general, I find the approach of reconstructing the full package to be suboptimal. I also don't particulaly want to verify uncompressed packages. I wondered if this was a case of perfect being the enemy of good, so I have investigated a different, very lazy approach. Instead of taking a binary diff, we could just provide the files that have changed between package versions. This is super easy to do as we have checksums for all files in the mtree file. We could then extract this "diff" package directly, and use the mtree file to adjust timestamps/permissions/etc(?) on kept files, and it would be just like the full package had been installed. I ran some numbers to see if this was worth while. The results for the last bunch of updates for bash, coreutils, qt5-base and systemd are given here: https://wiki.archlinux.org/title/User:Allan/Pkgdiff On major version updates, this is approach is a waste of time. But for minor updates bash download would average 25% of the size, coreutils about 36% (though was ~1% for simple rebuilds!), qt5-base about 40% and systemd 60%. Not shown but worth noting note that when Arch changes gcc/binutils versions or updates CFLAGS etc, this can stop any binary diff being as useful. If we implemented using these diffs but only allowed it for updates from the previous package version (i.e. no diffs to package (current - 2) or earlier, or diff chaining), then this would be rather simple to implement (at least from the pacman side...). Any comments before I invest time implementing? Allan

3 4

[Git][pacman/pacman][master] 9 commits: libmakepkg: fix compatibility with bash-5.2 patsub_replacement
by Allan McRae (＠allan) 13 Dec '22

13 Dec '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 0e938f18 by Allan McRae at 2022-12-12T18:37:59+10:00 libmakepkg: fix compatibility with bash-5.2 patsub_replacement Bash-5.2 introduced the patsub_replacement shell option, which is enabled by default. Apparently is it supposed to handle a sed-like idiom, but what it does achieve is making any substitution involving a "&" requiring special care. For makepkg's DLAGENTS, we replace "%o" and "%u" if present. Any "&" in the replacement fields triggers patsub_replacement unless quoted. This is particularly important for the URL field. Add relevant quotes to avoid issues. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 3436bc6c by Allan McRae at 2022-12-13T10:00:13+10:00 Finish comparing all pairs of filenames for duplicates before erroring This also prevents a use-after-free issue where we free the list we are interating over and the do i->next. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 0fe764a2 by Allan McRae at 2022-12-13T10:00:13+10:00 Fix memory leak when setting up download bars Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - ea83fd39 by Allan McRae at 2022-12-13T10:00:13+10:00 Catch possible error in archive_entry_pathname when extracting files Prevents a null deference on error. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 19a85874 by Allan McRae at 2022-12-13T10:00:13+10:00 _alpm_pkg_load_internal: prevent double closing file descriptor Move closing of the file descriptor until the end of the function, as any following error will lead to a "goto error" that attempts to close it again. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 775d511f by Allan McRae at 2022-12-13T10:00:13+10:00 load_packages: fix memory leak on error The memory assigned in _alpm_pkg_load_internal was not freed on error. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 471a0304 by Allan McRae at 2022-12-13T10:00:13+10:00 Avoid NULL deference in curl_check_finished_download We have not set handle in the function at this stage, so we can not assign an error to it. Pass the handle to the function to avoid waiting until the payload is retrieved. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - fcb1d4f8 by Allan McRae at 2022-12-13T10:00:13+10:00 makepkg: package debug source files with options 'debug' and '!strip' When package software with debug symbols without stripping, we should still process the files with debugedit and include the needed source files in the package. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - bb035eba by Allan McRae at 2022-12-13T10:00:13+10:00 gitlab CI: use "meson setup" everywhere Avoids a warning from meson. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 8 changed files: - .gitlab-ci.yml - lib/libalpm/be_package.c - lib/libalpm/dload.c - lib/libalpm/sync.c - lib/libalpm/util.c - scripts/libmakepkg/source/file.sh.in - scripts/libmakepkg/tidy/strip.sh.in - src/pacman/callback.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/1327ce7bd840686847b019… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/1327ce7bd840686847b019… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] libmakepkg: fix compatibility with bash-5.2 patsub_replacement
by Allan McRae 12 Dec '22

12 Dec '22

Bash-5.2 introduced the patsub_replacement shell option, which is enabled by default. Apparently is it supposed to handle a sed-like idiom, but what it does achieve is making any substitution involving a "&" requiring special care. For makepkg's DLAGENTS, we replace "%o" and "%u" if present. Any "&" in the replacement fields triggers patsub_replacement unless quoted. This is particularly important for the URL field. Add relevant quotes to avoid issues. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Posting to pacman-dev and not just to our gitlab so that this is flagged for distros to backport when updating bash. scripts/libmakepkg/source/file.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index fa09d446..10e0026e 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -60,11 +60,11 @@ download_file() { # replace %o by the temporary dlfile if it exists if [[ ${cmdline[*]} = *%o* ]]; then dlfile=$filename.part - cmdline=("${cmdline[@]//%o/$dlfile}") + cmdline=("${cmdline[@]//%o/"$dlfile"}") fi # add the URL, either in place of %u or at the end if [[ ${cmdline[*]} = *%u* ]]; then - cmdline=("${cmdline[@]//%u/$url}") + cmdline=("${cmdline[@]//%u/"$url"}") else cmdline+=("$url") fi -- 2.38.1

1 0

persistent hooks (inhibit shutdown)
by Andrew Gregory 05 Dec '22

05 Dec '22

If anybody's interested, I've been playing around with more complex hook setups and wrote a hook/script to track the pacman process during transactions and inhibit shutdown.[0] This technique could be used for hooks with pre and post transaction components that need need tighter coupling than separate hooks allow or to setup post transaction hooks that are guaranteed to run even if the transaction fails, unlike our current implementation of PostTransaction hooks. [0]: https://github.com/andrewgregory/pachooks/blob/a15e08d7321f17aae2431bddc1e9…

2 1

[Git][pacman/pacman][master] 4 commits: pacman.conf.in: adjust example custom repo path for consistency
by Allan McRae (＠allan) 04 Dec '22

04 Dec '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: e7806a43 by Allan McRae at 2022-12-04T20:11:43+10:00 pacman.conf.in: adjust example custom repo path for consistency The example makepkg.conf.in suggests using "PKGDEST=/home/packages". It makes sense to use the same path for the custom repo example in pacman.conf.in. Fixes FS#48497. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 4f43ce3e by Allan McRae at 2022-12-04T20:14:32+10:00 repo-add: use parseopts from libmakepkg Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 310bf878 by Allan McRae at 2022-12-04T20:15:33+10:00 repo-add: do not add md5sums to the repo dbs Keeping md5sums in the repo databases no longer serves a real purpose. md5sums are no longer considered secure, and we already have sha256sums in the repos (along with PGP verification). Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1327ce7b by Allan McRae at 2022-12-04T20:15:33+10:00 makepkg: remove md5sums from generated mtree file md5sums are cryptographically broken and we supply sha256sums to verify files on a users system have not been modified from the packaged version. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 3 changed files: - etc/pacman.conf.in - scripts/makepkg.sh.in - scripts/repo-add.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/23aa82812e6831313e3490… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/23aa82812e6831313e3490… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[pacman-key] Support for new gpg kbx files in imports.
by Masato TOYOSHIMA 02 Dec '22

02 Dec '22

Hello. Support for new gpg kbx files in imports. Allow Import for both types pubring.gpg and pubring.kbx. ``` diff --git a/001-import-pubring-kbx-and-gpg.patch b/001-import-pubring-kbx-and-gpg.patch new file mode 100644 index 0000000..bc246d5 --- /dev/null +++ b/001-import-pubring-kbx-and-gpg.patch @@ -0,0 +1,29 @@ +diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in +index 913f2c3..5910b47 100644 +--- a/scripts/pacman-key.sh.in ++++ b/scripts/pacman-key.sh.in +@@ -453,14 +453,21 @@ import() { + local importdir + local ret=0 + for importdir in "$@"; do ++ if [[ ! -f "${importdir}/pubring.gpg" && ! -f "${importdir}/pubring.kbx" ]]; then ++ error "$(gettext "Both file %s does not exist and could not be imported.")" "${importdir}/pubring.gpg and ${importdir}/pubring.kbx" ++ ret=1 + if [[ -f "${importdir}/pubring.gpg" ]]; then + if ! "${GPG_PACMAN[@]}" --quiet --batch --import "${importdir}/pubring.gpg" ; then + error "$(gettext "%s could not be imported.")" "${importdir}/pubring.gpg" + ret=1 + fi +- else +- error "$(gettext "File %s does not exist and could not be imported.")" "${importdir}/pubring.gpg" +- ret=1 ++ fi ++ if [[ -f "${importdir}/pubring.kbx" ]]; then ++ if ! "${GPG_PACMAN[@]}" --quiet --batch --homedir "${importdir}" --keyring pubring.kbx --export | "${GPG_PACMAN[@]}" --import - ; then ++ error "$(gettext "%s could not be imported.")" "${importdir}/pubring.kbx" ++ ret=1 ++ fi ++ fi + fi + done + if (( ret )); then ```

1 0

[PATCH] Add support for a Proxy directive
by Brian Geffon 21 Nov '22

21 Nov '22

Currently the only way to use a proxy is via XferCommand; however, when doing so there is no support for parallel downloads. This change introduces a new directive Proxy which supports whatever proxy protocols are supported by libcurl. Signed-off-by: Brian Geffon <briang(a)apache.org> --- doc/pacman.conf.5.asciidoc | 7 +++++++ etc/pacman.conf.in | 5 +++++ lib/libalpm/alpm.h | 24 ++++++++++++++++++++++++ lib/libalpm/dload.c | 3 +++ lib/libalpm/handle.c | 22 ++++++++++++++++++++++ lib/libalpm/handle.h | 1 + scripts/completion/zsh_completion.in | 1 + src/pacman/conf.c | 10 ++++++++++ src/pacman/conf.h | 2 ++ src/pacman/pacman-conf.c | 4 +++- 10 files changed, 78 insertions(+), 1 deletion(-) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index 41f3ea03..657264e1 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -132,6 +132,13 @@ Options HTTP/FTP support, or need the more advanced proxy support that comes with utilities like wget. +*Proxy =* https://host:port:: + If set, use this endpoint as the proxy for downloads. The currently + supported set of protocols are http, https, socks4, socks4a, socks5, + and socks5h. If no port is specified it defaults to 1080. This option + only applies when using the built in downloader. When using XferCommand + any proxy settings must be passed as command line arguments to the command. + *NoUpgrade =* file ...:: All files listed with a `NoUpgrade` directive will never be touched during a package install/upgrade, and the new files will be installed with a diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 1799efc7..6b2ef8b9 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -21,6 +21,11 @@ HoldPkg = pacman glibc #CleanMethod = KeepInstalled Architecture = auto +# The Proxy directive only applies when not using an XferCommand. When using +# an XferCommand any proxy strings must be passed as arguments to the command. +#Proxy = socks5h://127.0.0.1:1080 +#Proxy = https://127.0.0.1:8080 + # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = #IgnoreGroup = diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 07e16b9f..37dd414f 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -2166,6 +2166,30 @@ int alpm_option_set_dbext(alpm_handle_t *handle, const char *dbext); /* End of dbext accessors */ /** @} */ +/** @name Accessors for proxy server configuration + * + * This controls the proxy server that will be used for downloads. + * This may be necessary for computers that only have internet access + * via HTTP or Socks proxies. + * + * @{ + */ + +/** Gets the configured proxy. + * @param handle the context handle + * @return the configured proxy + */ +const char *alpm_option_get_proxy(alpm_handle_t *handle); + +/** Sets the proxy server. + * @param handle the context handle + * @param proxy the full proxy string to use. + * @return 0 on success, -1 on error (pm_errno is set accordingly) + */ +int alpm_option_set_proxy(alpm_handle_t *handle, const char *proxy); + +/* End of proxy accessors */ +/** @} */ /** @name Accessors for the signature levels * @{ diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 4fa17b35..171a802c 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -340,6 +340,9 @@ static void curl_set_handle_opts(CURL *curl, struct dload_payload *payload) curl_easy_setopt(curl, CURLOPT_TCP_KEEPINTVL, 60L); curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); curl_easy_setopt(curl, CURLOPT_PRIVATE, (void *)payload); + if (handle->proxy) { + curl_easy_setopt(curl, CURLOPT_PROXY, handle->proxy); + } _alpm_log(handle, ALPM_LOG_DEBUG, "%s: url is %s\n", payload->remote_name, payload->fileurl); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index d1eafeda..e72627ea 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -73,6 +73,7 @@ void _alpm_handle_free(alpm_handle_t *handle) FREE(handle->root); FREE(handle->dbpath); FREE(handle->dbext); + FREE(handle->proxy); FREELIST(handle->cachedirs); FREELIST(handle->hookdirs); FREE(handle->logfile); @@ -330,6 +331,12 @@ const char SYMEXPORT *alpm_option_get_dbext(alpm_handle_t *handle) return handle->dbext; } +const char SYMEXPORT *alpm_option_get_proxy(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->proxy; +} + int SYMEXPORT alpm_option_get_parallel_downloads(alpm_handle_t *handle) { CHECK_HANDLE(handle, return -1); @@ -822,6 +829,21 @@ int SYMEXPORT alpm_option_set_dbext(alpm_handle_t *handle, const char *dbext) return 0; } +int SYMEXPORT alpm_option_set_proxy(alpm_handle_t *handle, const char *proxy) +{ + CHECK_HANDLE(handle, return -1); + ASSERT(proxy, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); + + if(handle->proxy) { + FREE(handle->proxy); + } + + STRDUP(handle->proxy, proxy, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + + _alpm_log(handle, ALPM_LOG_DEBUG, "option 'proxy' = %s\n", handle->proxy); + return 0; +} + int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, int level) { diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 3a464689..32063ef9 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -107,6 +107,7 @@ struct _alpm_handle_t { int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ char *dbext; /* Sync DB extension */ + char *proxy; /* Proxy server to use */ int siglevel; /* Default signature verification level */ int localfilesiglevel; /* Signature verification level for local file upgrade operations */ diff --git a/scripts/completion/zsh_completion.in b/scripts/completion/zsh_completion.in index f65edeb2..69b19a18 100644 --- a/scripts/completion/zsh_completion.in +++ b/scripts/completion/zsh_completion.in @@ -516,6 +516,7 @@ _pacman_conf_general_directives=( 'DisableDownloadTimeout' 'NoProgressBar' 'ParallelDownloads' + 'Proxy' 'CleanMethod' 'SigLevel' 'LocalFileSigLevel' diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f9edf75b..37691519 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -154,6 +154,7 @@ int config_free(config_t *oldconfig) free(oldconfig->rootdir); free(oldconfig->dbpath); free(oldconfig->logfile); + free(oldconfig->proxy); free(oldconfig->gpgdir); FREELIST(oldconfig->hookdirs); FREELIST(oldconfig->cachedirs); @@ -668,6 +669,11 @@ static int _parse_options(const char *key, char *value, config->logfile = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: logfile: %s\n", value); } + } else if(strcmp(key, "Proxy") == 0) { + if(!config->proxy) { + config->proxy = strdup(value); + pm_printf(ALPM_LOG_DEBUG, "config: proxy: %s\n", value); + } } else if(strcmp(key, "XferCommand") == 0) { char **c; if((config->xfercommand_argv = wordsplit(value)) == NULL) { @@ -901,6 +907,10 @@ static int setup_libalpm(void) pm_printf(ALPM_LOG_WARNING, _("no '%s' configured\n"), "XferCommand"); } + if (config->proxy) { + alpm_option_set_proxy(handle, config->proxy); + } + alpm_option_set_architectures(handle, config->architectures); alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index f7916ca9..c441cd80 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -115,6 +115,8 @@ typedef struct __config_t { unsigned short verbosepkglists; /* number of parallel download streams */ unsigned int parallel_downloads; + /* the proxy server to use */ + char *proxy; /* select -Sc behavior */ unsigned short cleanmethod; alpm_list_t *holdpkg; diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index a9d1f52b..baf3cebd 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -269,6 +269,7 @@ static void dump_config(void) show_bool("ILoveCandy", config->chomp); show_bool("NoProgressBar", config->noprogressbar); + show_str("Proxy", config->proxy); show_int("ParallelDownloads", config->parallel_downloads); show_cleanmethod("CleanMethod", config->cleanmethod); @@ -384,7 +385,8 @@ static int list_directives(void) } else if(strcasecmp(i->data, "ParallelDownloads") == 0) { show_int("ParallelDownloads", config->parallel_downloads); - + } else if(strcasecmp(i->data, "Proxy") == 0) { + show_str("Proxy", config->proxy); } else if(strcasecmp(i->data, "CleanMethod") == 0) { show_cleanmethod("CleanMethod", config->cleanmethod); -- 2.38.0

2 4

[PATCH] Add --noconfirm-unsafe for advanced script usage
by Laszlo Toth 09 Nov '22

09 Nov '22

This is intended for e.g., regular, automated cache clearing or updating/creating Docker images. There is --noconfirm, but that selects the default answer for yes/no questions, which may be no when we want yes. Then 'yes | pacman -Scc' could be used, but that does not work reliably w/ multiselection. So, add a new option which always answers yes for yes/no, and the default for multiselections. Now --confirm disables both --noconfirm and --noconfirm-unsafe. noask is not updated to use this mode as well... it's not safe. Signed-off-by: Laszlo Toth <laszlth(a)gmail.com> --- doc/pacman.8.asciidoc | 11 ++++++++--- src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 8 ++++++++ src/pacman/util.c | 18 ++++++++++++++---- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc index 630ff0d9..ec400175 100644 --- a/doc/pacman.8.asciidoc +++ b/doc/pacman.8.asciidoc @@ -185,11 +185,16 @@ Options the installation root setting. *\--noconfirm*:: - Bypass any and all ``Are you sure?'' messages. It's not a good idea to do - this unless you want to run pacman from a script. + Bypass any and all ``Are you sure?'' messages via using the default answer. + It's not a good idea to do this unless you want to run pacman from a script. + +*\--noconfirm-unsafe*:: + Bypass any and all ``Are you sure?'' messages via answering yes or + selecting the default option. + It's NOT a good idea to do this unless you want to run pacman from a script. *\--confirm*:: - Cancels the effects of a previous '\--noconfirm'. + Cancels the effects of a previous '\--noconfirm' or '\--noconfirm-unsafe'. *\--disable-download-timeout*:: Disable defaults for low speed limit and timeout on downloads. Use this diff --git a/src/pacman/conf.h b/src/pacman/conf.h index f7916ca9..fbed3055 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -57,6 +57,7 @@ typedef struct __config_t { unsigned short usesyslog; unsigned short color; unsigned short disable_dl_timeout; + unsigned short noconfirmunsafe; char *print_format; /* unfortunately, we have to keep track of paths both here and in the library * because they can come from both the command line or config file, and we @@ -210,7 +211,8 @@ enum { OP_DOWNLOADONLY, OP_REFRESH, OP_ASSUMEINSTALLED, - OP_DISABLEDLTIMEOUT + OP_DISABLEDLTIMEOUT, + OP_NOCONFIRMUNSAFE }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index e5c6e420..bb04fdc8 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -226,6 +226,8 @@ static void usage(int op, const char * const myname) addlist(_(" --confirm always ask for confirmation\n")); addlist(_(" --disable-download-timeout\n" " use relaxed timeouts for download\n")); + addlist(_(" --noconfirm-unsafe\n" + " answer yes or default for every confirmation\n")); } list = alpm_list_msort(list, alpm_list_count(list), options_cmp); for(i = list; i; i = alpm_list_next(i)) { @@ -442,8 +444,13 @@ static int parsearg_global(int opt) case OP_NOCONFIRM: config->noconfirm = 1; break; + case OP_NOCONFIRMUNSAFE: + config->noconfirm = 0; + config->noconfirmunsafe = 1; + break; case OP_CONFIRM: config->noconfirm = 0; + config->noconfirmunsafe = 0; break; case OP_DBPATH: case 'b': @@ -948,6 +955,7 @@ static int parseargs(int argc, char *argv[]) {"dbonly", no_argument, 0, OP_DBONLY}, {"color", required_argument, 0, OP_COLOR}, {"disable-download-timeout", no_argument, 0, OP_DISABLEDLTIMEOUT}, + {"noconfirm-unsafe", no_argument, 0, OP_NOCONFIRMUNSAFE}, {0, 0, 0, 0} }; diff --git a/src/pacman/util.c b/src/pacman/util.c index 5f5c7c54..532e058d 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1527,7 +1527,7 @@ int multiselect_question(char *array, int count) FILE *stream; size_t response_len = 64; - if(config->noconfirm) { + if(config->noconfirm || config->noconfirmunsafe) { stream = stdout; } else { /* Use stderr so questions are always displayed when redirecting output */ @@ -1550,7 +1550,7 @@ int multiselect_question(char *array, int count) fprintf(stream, ": "); fflush(stream); - if(config->noconfirm) { + if(config->noconfirm || config->noconfirmunsafe) { fprintf(stream, "\n"); break; } @@ -1604,7 +1604,7 @@ int select_question(int count) FILE *stream; int preset = 1; - if(config->noconfirm) { + if(config->noconfirm || config->noconfirmunsafe) { stream = stdout; } else { /* Use stderr so questions are always displayed when redirecting output */ @@ -1617,6 +1617,11 @@ int select_question(int count) fprintf(stream, ": "); fflush(stream); + if(config->noconfirmunsafe) { + fprintf(stream, "y\n"); + break; + } + if(config->noconfirm) { fprintf(stream, "\n"); break; @@ -1682,7 +1687,7 @@ static int question(short preset, const char *format, va_list args) FILE *stream; int fd_in = fileno(stdin); - if(config->noconfirm) { + if(config->noconfirm || config->noconfirmunsafe) { stream = stdout; } else { /* Use stderr so questions are always displayed when redirecting output */ @@ -1705,6 +1710,11 @@ static int question(short preset, const char *format, va_list args) fputs(config->colstr.nocolor, stream); fflush(stream); + if(config->noconfirmunsafe) { + fprintf(stream, "y\n"); + return preset; + } + if(config->noconfirm) { fprintf(stream, "\n"); return preset; -- 2.38.1

3 2

[Git][pacman/pacman][master] 3 commits: Remove obsolete Doxyfile declarations
by Allan McRae (＠allan) 08 Nov '22

08 Nov '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 83e5326a by Allan McRae at 2022-11-08T11:49:31+10:00 Remove obsolete Doxyfile declarations Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 05e52ef7 by Allan McRae at 2022-11-08T14:19:35+10:00 Document alpm_pkg_xdata_t type and accessor Also more definitions to more relevant areas in alpm.h. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 23aa8281 by Allan McRae at 2022-11-08T14:20:36+10:00 Fix typo in comment Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 2 changed files: - doc/Doxyfile.in - lib/libalpm/alpm.h View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/b2c9543ea94bbfd00480ab… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/b2c9543ea94bbfd00480ab… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Use modern openssl interfaces for calculating MD5 and SHA256 checksum
by Allan McRae (＠allan) 07 Nov '22

07 Nov '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: b2c9543e by Allan McRae at 2022-11-07T16:58:29+10:00 Use modern openssl interfaces for calculating MD5 and SHA256 checksum The currently used openssl interfaces for calculating checksums have been deprecated in openssl-3.0. Move to the modern interfaces to avoid build warnings. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - lib/libalpm/util.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/b2c9543ea94bbfd00480ab6… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/b2c9543ea94bbfd00480ab6… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] executable/meson.build: include debugedit.sh.in
by Allan McRae (＠allan) 07 Nov '22

07 Nov '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 3ed08f97 by Morten Linderud at 2022-11-07T01:02:12+01:00 executable/meson.build: include debugedit.sh.in Signed-off-by: Morten Linderud <morten(a)linderud.pw> - - - - - 1 changed file: - scripts/libmakepkg/executable/meson.build View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/3ed08f97ecd5941c3f72e3e… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/3ed08f97ecd5941c3f72e3e… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH 1/1] support http header 'Cache-Control: no-cache' for soft failure
by Christian Hesse 25 Oct '22

25 Oct '22

From: Christian Hesse <mail(a)eworm.de> By setting the HTTP header 'Cache-Control: no-cache' when returning with the status code 404 (not found) the server can indicate that this is a soft failure. No error message is shown, and server's error count is not increased. This can be used by servers that are not expected to be complete, for example when serving a local cache [0]. In nginx this can be achived by adding a single directive in location block: add_header Cache-Control "no-cache"; Also this is a perfect match for pacredir [1]. [0] https://wiki.archlinux.org/title/Pacman/Tips_and_tricks#Network_shared_pacm… [1] https://git.eworm.de/cgit/pacredir/about/ Signed-off-by: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/dload.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 4fa17b35..23034584 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -274,8 +274,10 @@ static size_t dload_parseheader_cb(void *ptr, size_t size, size_t nmemb, void *u { size_t realsize = size * nmemb; const char *fptr, *endptr = NULL; + const char * const cc_header = "Cache-Control:"; const char * const cd_header = "Content-Disposition:"; const char * const fn_key = "filename="; + const char * const nc_key = "no-cache"; struct dload_payload *payload = (struct dload_payload *)user; long respcode; @@ -302,6 +304,15 @@ static size_t dload_parseheader_cb(void *ptr, size_t size, size_t nmemb, void *u } } + /* By setting the HTTP header 'Cache-Control: no-cache' the server can indicate + that this is a soft failure which should not be cached. No error message is + shown, and server's error count is not increased. */ + if(_alpm_raw_ncmp(cc_header, ptr, strlen(cc_header)) == 0) { + if(strstr(ptr, nc_key)) { + payload->errors_ok = 1; + } + } + curl_easy_getinfo(payload->curl, CURLINFO_RESPONSE_CODE, &respcode); if(payload->respcode != respcode) { payload->respcode = respcode; -- 2.37.3

4 11