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

[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

[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

[Git][pacman/pacman][master] set bash env variables before running scripts
by Allan McRae (＠allan) 16 Oct '22

16 Oct '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: da68447e by Andrew Gregory at 2022-10-15T10:40:59-07:00 set bash env variables before running scripts Bash sources user configuration files under a number of conditions that can cause issues with scripts when bash is used as the scriptlet shell. Bash assumes it's being run under rsh/ssh if stdin is connected to a socket and sources the user bashrc unless the environment variable $SHLVL is >= 2. Commit 6a4c6a02de9b45abe4c0f78c4f5d14d92d3359d6 switched from pipes to sockets when communicating with child processes to work around SIGPIPE issues. Normally $SHLVL would be inherited from the shell running pacman, but operations involving scriptlets are generally run with sudo which does not let the $SHLVL variable through unless specifically configured to. Similarly $BASH_ENV can cause bash to source user-specified configuration files if set. https://lists.gnu.org/archive/html/help-bash/2022-02/msg00082.html Note: the list discussion and bash source all reference SHLVL >= 2, this is the SHLVL value *after* bash has incremented it on startup. Setting it to 1 in pacman is sufficient to disable the unwanted behavior. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> - - - - - 1 changed file: - lib/libalpm/util.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/da68447ec6325f3ee0c87db… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/da68447ec6325f3ee0c87db… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Fix missing if
by Allan McRae (＠allan) 09 Oct '22

09 Oct '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 86981383 by Allan McRae at 2022-10-09T13:43:31+10:00 Fix missing if 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/86981383a2f4380bda26311… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/86981383a2f4380bda26311… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] strip: Include `.o` files in strip operation
by Allan McRae (＠allan) 09 Oct '22

09 Oct '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: de118245 by Frederik Schwan at 2022-10-09T11:01:12+10:00 strip: Include `.o` files in strip operation `.o` objects used to be omitted by strip.sh due to a missing match in the `Relocatable file` section. This patch fixes the issue by handling `.o` objects similar to kernel modules. fixes FS#74941 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/de11824527ec4e2561e161a… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/de11824527ec4e2561e161a… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] strip: fix unique source paths
by Allan McRae (＠allan) 09 Oct '22

09 Oct '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 478af273 by Morten Linderud at 2022-10-09T10:57:26+10:00 strip: fix unique source paths `${pkgbase}` was added to the wrong invocation. This ensures we are producing correct debug packages. Example from the package: /usr/src/debug/pacman/pacman-6.0.2/src/pacman/callback.c /usr/src/debug/pacman/pacman-6.0.2/src/pacman/callback.h /usr/src/debug/pacman/pacman-6.0.2/src/pacman/check.c /usr/src/debug/pacman/pacman-6.0.2/src/pacman/check.h Fixes: 776b7c1e75f2 ("debugflags: Ensure we have unique source paths") Signed-off-by: Morten Linderud <morten(a)linderud.pw> 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/478af273dfe24ded197ec54… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/478af273dfe24ded197ec54… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Always create directories outputted from debugedit in debug packages
by Allan McRae (＠allan) 09 Oct '22

09 Oct '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: efd0c24c by Allan McRae at 2022-10-08T21:07:45+10:00 Always create directories outputted from debugedit in debug packages The debugedit call to list all source files may include things like build/<...>. We have been filtering out these <> files, but they can point to the build directory which is important to be available for relative source paths stored in the .debug files. 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/efd0c24c07b86be014a4edb… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/efd0c24c07b86be014a4edb… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

Fixes for building on macOS
by daniel.nachun＠gmail.com 09 Oct '22

09 Oct '22

1 0

[PATCH] Always create directories outputted from debugedit in debug packages
by Allan McRae 09 Oct '22

09 Oct '22

The debugedit call to list all source files may include things like build/<...>. We have been filtering out these <> files, but they can point to the build directory which is important to be available for relative source paths stored in the .debug files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/tidy/strip.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 91c66f13..17526a34 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -72,8 +72,8 @@ strip_file() { while IFS= read -r t; do file="${srcdir}/${t}" dest="${dbgsrc}/${t}" - if [[ -f "$file" ]] && ! [[ -f $dest ]]; then - mkdir -p "${dest%/*}" + mkdir -p "${dest%/*}" + [[ -f "$file" ]]; then cp -- "$file" "$dest" fi done < <(source_files "$binary") -- 2.37.3

1 0

[PATCH] strip: fix unique source paths
by Morten Linderud 06 Oct '22

06 Oct '22

From: Morten Linderud <morten(a)linderud.pw> `${pkgbase}` was added to the wrong invocation. This ensures we are producing correct debug packages. Example from the package: /usr/src/debug/pacman/pacman-6.0.2/src/pacman/callback.c /usr/src/debug/pacman/pacman-6.0.2/src/pacman/callback.h /usr/src/debug/pacman/pacman-6.0.2/src/pacman/check.c /usr/src/debug/pacman/pacman-6.0.2/src/pacman/check.h Fixes: 776b7c1e75f2 ("debugflags: Ensure we have unique source paths") Signed-off-by: Morten Linderud <morten(a)linderud.pw> --- scripts/libmakepkg/tidy/strip.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 91c66f13..01af6e03 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -47,7 +47,7 @@ source_files() { LANG=C debugedit --no-recompute-build-id \ --base-dir "${srcdir}" \ - --dest-dir "${dbgsrcdir}/${pkgbase}" \ + --dest-dir "${dbgsrcdir}" \ --list-file /dev/stdout "$1" \ | sort -zu | tr '\0' '\n' } @@ -141,7 +141,7 @@ tidy_strip() { if check_option "debug" "y"; then dbgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@/usr/lib/debug" - dbgsrcdir="${DBGSRCDIR:-/usr/src/debug}" + dbgsrcdir="${DBGSRCDIR:-/usr/src/debug}/${pkgbase}" dbgsrc="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@$dbgsrcdir" mkdir -p "$dbgdir" "$dbgsrc" fi -- 2.38.0

1 0