September 2022 - Pacman-dev - lists.archlinux.org

[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

[PATCH] pacman: Add space before percent sign in download progress string.
by severoraz＠gmail.com 28 Sep '22

28 Sep '22

From: Severo Raz <severoraz(a)gmail.com> Also add explanatory comment and reduce use of magic numbers. Signed-off-by: Severo Raz <severoraz(a)gmail.com> --- src/pacman/callback.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index aa6303bf..c48b887d 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -152,19 +152,28 @@ static int64_t get_update_timediff(int first_call) /* refactored from cb_trans_progress */ static void fill_progress(const int percent, const int proglen) { - /* 8 = 1 space + 1 [ + 1 ] + 5 for percent */ - const int hashlen = proglen > 8 ? proglen - 8 : 0; - const int hash = percent * hashlen / 100; - int i; + /* + * Format: + * " [###---] NNN %" + * where NNN is the space-padded percentage. + * + * thrshlen = strlen(" [] 100 %") = 9 + * perclen = strlen(" 100 %") = 6 + */ + const int threshlen = 9; + const int perclen = 6; + const int pbarlen = (proglen > threshlen) ? (proglen - threshlen) : 0; + + if(pbarlen > 0) { + const int remlen = (100 - percent) * pbarlen / 100; - if(hashlen > 0) { fputs(" [", stdout); - for(i = hashlen; i > 0; --i) { + for(int i = pbarlen; i > 0; --i) { /* if special progress bar enabled */ if(config->chomp) { - if(i > hashlen - hash) { + if(i > remlen) { putchar('-'); - } else if(i == hashlen - hash) { + } else if(i == remlen) { if(percent % 2 == 0) { fputs("\033[1;33mC\033[m", stdout); } else { @@ -176,7 +185,7 @@ static void fill_progress(const int percent, const int proglen) fputs("\033[0;37m \033[m", stdout); } } /* else regular progress bar */ - else if(i > hashlen - hash) { + else if(i > remlen) { putchar('#'); } else { putchar('-'); @@ -185,9 +194,8 @@ static void fill_progress(const int percent, const int proglen) putchar(']'); } /* print display percent after progress bar */ - /* 5 = 1 space + 3 digits + 1 % */ - if(proglen >= 5) { - printf(" %3d%%", percent); + if(proglen >= perclen) { + printf(" %3d %%", percent); } putchar('\r'); -- 2.37.3

4 5

[Git][pacman/pacman][master] 2 commits: Update Transifex config
by Allan McRae (＠allan) 26 Sep '22

26 Sep '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: e10751a1 by Allan McRae at 2022-09-26T20:53:48+10:00 Update Transifex config Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 546433b4 by Allan McRae at 2022-09-26T21:10:54+10:00 Update Transifex client usage instructions Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 2 changed files: - .tx/config - RELEASE View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/673ce1ab10a652948f4f62… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/673ce1ab10a652948f4f62… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][release/6.0.x] 2 commits: Update Transifex config
by Allan McRae (＠allan) 26 Sep '22

26 Sep '22

Allan McRae pushed to branch release/6.0.x at Pacman / Pacman Commits: 6b1a8365 by Allan McRae at 2022-09-26T20:54:21+10:00 Update Transifex config Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit e10751a1e05f19644bb444248bac2cfda3ddaf6a) - - - - - 77420fe5 by Allan McRae at 2022-09-26T21:09:49+10:00 Final update of 6.0.x translations from Transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 30 changed files: - .tx/config - 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 - lib/libalpm/po/libalpm.pot - lib/libalpm/po/lt.po View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/0a6fecd07271a54d9009ea… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/0a6fecd07271a54d9009ea… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] 2 commits: makepkg.8: add missing fullstop
by Allan McRae (＠allan) 26 Sep '22

26 Sep '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 53dd3e84 by Allan McRae at 2022-09-07T23:14:12+10:00 makepkg.8: add missing fullstop Fixes FS#75838 Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 673ce1ab by Kristian Klausen at 2022-09-26T20:22:11+10:00 pacman-key: Don't check gpg's trustdb after each key revocation The trustdb is marked as dirty when a key is revoked[1] and GPG will recheck it the next time. Checking the trustdb can take 300-500ms which with 52 revoked keys (and counting) adds up. This is very noticeable when initializing and populating pacman's keyring like archiso is doing[2]. It is also unnecessary as the trustdb is always checked as the last step when populating the keyring. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=g10/keyedit.c… [2] https://gitlab.archlinux.org/archlinux/archiso/-/issues/191 - - - - - 2 changed files: - doc/makepkg.8.asciidoc - scripts/pacman-key.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/656abdb256b65da13f82fb… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/656abdb256b65da13f82fb… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] makepkg.8: add missing fullstop
by Allan McRae 07 Sep '22

07 Sep '22

Fixes FS#75838 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.8.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/makepkg.8.asciidoc b/doc/makepkg.8.asciidoc index d023b038..a86c33f0 100644 --- a/doc/makepkg.8.asciidoc +++ b/doc/makepkg.8.asciidoc @@ -75,7 +75,7 @@ Options For each source file in the source array of PKGBUILD, download the file if required and generate integrity checks. The integrity checks generated are determined by the checks present in the PKGBUILD, falling back to the - value of the INTEGRITY_CHECK array in makepkg.conf(5) if these are absent + value of the INTEGRITY_CHECK array in makepkg.conf(5) if these are absent. This output can be redirected into your PKGBUILD for source validation using "`makepkg -g >> PKGBUILD`". -- 2.37.2

1 0